diff --git a/android/app/src/main/res/drawable-hdpi/icon_add.png b/android/app/src/main/res/drawable-hdpi/icon_add.png new file mode 100644 index 0000000000..60ab6e1281 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_add.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_add_gray.png b/android/app/src/main/res/drawable-hdpi/icon_add_gray.png new file mode 100644 index 0000000000..20ba082172 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_add_gray.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_back.png b/android/app/src/main/res/drawable-hdpi/icon_back.png new file mode 100644 index 0000000000..ce2e4b5734 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_back.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_dollar.png b/android/app/src/main/res/drawable-hdpi/icon_dollar.png new file mode 100644 index 0000000000..c2a449b532 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_dollar.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_group.png b/android/app/src/main/res/drawable-hdpi/icon_group.png new file mode 100644 index 0000000000..ba7d13d4aa Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_group.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_hamburger.png b/android/app/src/main/res/drawable-hdpi/icon_hamburger.png new file mode 100644 index 0000000000..33beaca124 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_hamburger.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_list.png b/android/app/src/main/res/drawable-hdpi/icon_list.png new file mode 100644 index 0000000000..d0d15ed91a Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_list.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_lock_gray.png b/android/app/src/main/res/drawable-hdpi/icon_lock_gray.png new file mode 100644 index 0000000000..5e7c958046 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_lock_gray.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_lock_white.png b/android/app/src/main/res/drawable-hdpi/icon_lock_white.png new file mode 100644 index 0000000000..700c8fdf81 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_lock_white.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_more_vertical.png b/android/app/src/main/res/drawable-hdpi/icon_more_vertical.png new file mode 100644 index 0000000000..b0948a2a7e Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_more_vertical.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_ok.png b/android/app/src/main/res/drawable-hdpi/icon_ok.png new file mode 100644 index 0000000000..d9bb8a1cbf Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_ok.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_ok_small.png b/android/app/src/main/res/drawable-hdpi/icon_ok_small.png new file mode 100644 index 0000000000..6475aebf6a Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_ok_small.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_ok_small_copy_2.png b/android/app/src/main/res/drawable-hdpi/icon_ok_small_copy_2.png new file mode 100644 index 0000000000..6475aebf6a Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_ok_small_copy_2.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_search.png b/android/app/src/main/res/drawable-hdpi/icon_search.png new file mode 100644 index 0000000000..d6fe0b2cc1 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_search.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_send.png b/android/app/src/main/res/drawable-hdpi/icon_send.png new file mode 100644 index 0000000000..af524d1b38 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_send.png differ diff --git a/android/app/src/main/res/drawable-hdpi/icon_smile.png b/android/app/src/main/res/drawable-hdpi/icon_smile.png new file mode 100644 index 0000000000..2c5ca1da03 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon_smile.png differ diff --git a/images/icon_add.png b/android/app/src/main/res/drawable-mdpi/icon_add.png similarity index 100% rename from images/icon_add.png rename to android/app/src/main/res/drawable-mdpi/icon_add.png diff --git a/images/icon_add_gray.png b/android/app/src/main/res/drawable-mdpi/icon_add_gray.png similarity index 100% rename from images/icon_add_gray.png rename to android/app/src/main/res/drawable-mdpi/icon_add_gray.png diff --git a/images/icon_back.png b/android/app/src/main/res/drawable-mdpi/icon_back.png similarity index 100% rename from images/icon_back.png rename to android/app/src/main/res/drawable-mdpi/icon_back.png diff --git a/images/icon_dollar.png b/android/app/src/main/res/drawable-mdpi/icon_dollar.png similarity index 100% rename from images/icon_dollar.png rename to android/app/src/main/res/drawable-mdpi/icon_dollar.png diff --git a/images/icon_group.png b/android/app/src/main/res/drawable-mdpi/icon_group.png similarity index 100% rename from images/icon_group.png rename to android/app/src/main/res/drawable-mdpi/icon_group.png diff --git a/images/icon_hamburger.png b/android/app/src/main/res/drawable-mdpi/icon_hamburger.png similarity index 100% rename from images/icon_hamburger.png rename to android/app/src/main/res/drawable-mdpi/icon_hamburger.png diff --git a/images/icon_list.png b/android/app/src/main/res/drawable-mdpi/icon_list.png similarity index 100% rename from images/icon_list.png rename to android/app/src/main/res/drawable-mdpi/icon_list.png diff --git a/images/icon_lock_gray.png b/android/app/src/main/res/drawable-mdpi/icon_lock_gray.png similarity index 100% rename from images/icon_lock_gray.png rename to android/app/src/main/res/drawable-mdpi/icon_lock_gray.png diff --git a/images/icon_lock_white.png b/android/app/src/main/res/drawable-mdpi/icon_lock_white.png similarity index 100% rename from images/icon_lock_white.png rename to android/app/src/main/res/drawable-mdpi/icon_lock_white.png diff --git a/android/app/src/main/res/drawable-mdpi/icon_more_vertical.png b/android/app/src/main/res/drawable-mdpi/icon_more_vertical.png new file mode 100644 index 0000000000..8146a3ffeb Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/icon_more_vertical.png differ diff --git a/images/icon_ok.png b/android/app/src/main/res/drawable-mdpi/icon_ok.png similarity index 100% rename from images/icon_ok.png rename to android/app/src/main/res/drawable-mdpi/icon_ok.png diff --git a/images/icon_ok_small.png b/android/app/src/main/res/drawable-mdpi/icon_ok_small.png similarity index 100% rename from images/icon_ok_small.png rename to android/app/src/main/res/drawable-mdpi/icon_ok_small.png diff --git a/android/app/src/main/res/drawable-mdpi/icon_ok_small_copy_2.png b/android/app/src/main/res/drawable-mdpi/icon_ok_small_copy_2.png new file mode 100644 index 0000000000..86047df5f3 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/icon_ok_small_copy_2.png differ diff --git a/images/icon_search.png b/android/app/src/main/res/drawable-mdpi/icon_search.png similarity index 100% rename from images/icon_search.png rename to android/app/src/main/res/drawable-mdpi/icon_search.png diff --git a/images/icon_send.png b/android/app/src/main/res/drawable-mdpi/icon_send.png similarity index 100% rename from images/icon_send.png rename to android/app/src/main/res/drawable-mdpi/icon_send.png diff --git a/images/icon_smile.png b/android/app/src/main/res/drawable-mdpi/icon_smile.png similarity index 100% rename from images/icon_smile.png rename to android/app/src/main/res/drawable-mdpi/icon_smile.png diff --git a/android/app/src/main/res/drawable-xhdpi/icon_add.png b/android/app/src/main/res/drawable-xhdpi/icon_add.png new file mode 100644 index 0000000000..be85af38f4 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_add.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_add_gray.png b/android/app/src/main/res/drawable-xhdpi/icon_add_gray.png new file mode 100644 index 0000000000..a05f10fa16 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_add_gray.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_back.png b/android/app/src/main/res/drawable-xhdpi/icon_back.png new file mode 100644 index 0000000000..07072c52c1 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_back.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_dollar.png b/android/app/src/main/res/drawable-xhdpi/icon_dollar.png new file mode 100644 index 0000000000..615f013c40 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_dollar.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_group.png b/android/app/src/main/res/drawable-xhdpi/icon_group.png new file mode 100644 index 0000000000..8576e6f1e2 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_group.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_hamburger.png b/android/app/src/main/res/drawable-xhdpi/icon_hamburger.png new file mode 100644 index 0000000000..1f85e4ca7f Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_hamburger.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_list.png b/android/app/src/main/res/drawable-xhdpi/icon_list.png new file mode 100644 index 0000000000..d50123e3c6 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_list.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_lock_gray.png b/android/app/src/main/res/drawable-xhdpi/icon_lock_gray.png new file mode 100644 index 0000000000..40369d5424 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_lock_gray.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_lock_white.png b/android/app/src/main/res/drawable-xhdpi/icon_lock_white.png new file mode 100644 index 0000000000..827cd72242 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_lock_white.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_more_vertical.png b/android/app/src/main/res/drawable-xhdpi/icon_more_vertical.png new file mode 100644 index 0000000000..bba25f4642 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_more_vertical.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_ok.png b/android/app/src/main/res/drawable-xhdpi/icon_ok.png new file mode 100644 index 0000000000..80888a7606 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_ok.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_ok_small.png b/android/app/src/main/res/drawable-xhdpi/icon_ok_small.png new file mode 100644 index 0000000000..a8bc5e7185 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_ok_small.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_ok_small_copy_2.png b/android/app/src/main/res/drawable-xhdpi/icon_ok_small_copy_2.png new file mode 100644 index 0000000000..a8bc5e7185 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_ok_small_copy_2.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_search.png b/android/app/src/main/res/drawable-xhdpi/icon_search.png new file mode 100644 index 0000000000..8be3300e49 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_search.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_send.png b/android/app/src/main/res/drawable-xhdpi/icon_send.png new file mode 100644 index 0000000000..f8e71b580f Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_send.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon_smile.png b/android/app/src/main/res/drawable-xhdpi/icon_smile.png new file mode 100644 index 0000000000..fbb4b0e99d Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon_smile.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_add.png b/android/app/src/main/res/drawable-xxhdpi/icon_add.png new file mode 100644 index 0000000000..2780585768 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_add.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_add_gray.png b/android/app/src/main/res/drawable-xxhdpi/icon_add_gray.png new file mode 100644 index 0000000000..55a1592352 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_add_gray.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_back.png b/android/app/src/main/res/drawable-xxhdpi/icon_back.png new file mode 100644 index 0000000000..4d688372c9 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_back.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_dollar.png b/android/app/src/main/res/drawable-xxhdpi/icon_dollar.png new file mode 100644 index 0000000000..85d93cab2c Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_dollar.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_group.png b/android/app/src/main/res/drawable-xxhdpi/icon_group.png new file mode 100644 index 0000000000..b14d23f73b Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_group.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_hamburger.png b/android/app/src/main/res/drawable-xxhdpi/icon_hamburger.png new file mode 100644 index 0000000000..8bd85bc66a Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_hamburger.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_list.png b/android/app/src/main/res/drawable-xxhdpi/icon_list.png new file mode 100644 index 0000000000..e253971bae Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_list.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_lock_gray.png b/android/app/src/main/res/drawable-xxhdpi/icon_lock_gray.png new file mode 100644 index 0000000000..f18aaa61e1 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_lock_gray.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_lock_white.png b/android/app/src/main/res/drawable-xxhdpi/icon_lock_white.png new file mode 100644 index 0000000000..ccddc79dec Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_lock_white.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_more_vertical.png b/android/app/src/main/res/drawable-xxhdpi/icon_more_vertical.png new file mode 100644 index 0000000000..d30018f924 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_more_vertical.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_ok.png b/android/app/src/main/res/drawable-xxhdpi/icon_ok.png new file mode 100644 index 0000000000..4abb3e2e57 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_ok.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_ok_small.png b/android/app/src/main/res/drawable-xxhdpi/icon_ok_small.png new file mode 100644 index 0000000000..e824f5e8eb Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_ok_small.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_ok_small_copy_2.png b/android/app/src/main/res/drawable-xxhdpi/icon_ok_small_copy_2.png new file mode 100644 index 0000000000..e824f5e8eb Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_ok_small_copy_2.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_search.png b/android/app/src/main/res/drawable-xxhdpi/icon_search.png new file mode 100644 index 0000000000..b057823f3b Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_search.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_send.png b/android/app/src/main/res/drawable-xxhdpi/icon_send.png new file mode 100644 index 0000000000..29c51712c3 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_send.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon_smile.png b/android/app/src/main/res/drawable-xxhdpi/icon_smile.png new file mode 100644 index 0000000000..45dfb63996 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon_smile.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_add.png b/android/app/src/main/res/drawable-xxxhdpi/icon_add.png new file mode 100644 index 0000000000..97b4682acb Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_add.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_add_gray.png b/android/app/src/main/res/drawable-xxxhdpi/icon_add_gray.png new file mode 100644 index 0000000000..89ada28fa4 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_add_gray.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_back.png b/android/app/src/main/res/drawable-xxxhdpi/icon_back.png new file mode 100644 index 0000000000..a420d369f3 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_back.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_dollar.png b/android/app/src/main/res/drawable-xxxhdpi/icon_dollar.png new file mode 100644 index 0000000000..56a12cb0b0 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_dollar.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_group.png b/android/app/src/main/res/drawable-xxxhdpi/icon_group.png new file mode 100644 index 0000000000..0cefda6ed1 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_group.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_hamburger.png b/android/app/src/main/res/drawable-xxxhdpi/icon_hamburger.png new file mode 100644 index 0000000000..edc06a5b04 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_hamburger.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_list.png b/android/app/src/main/res/drawable-xxxhdpi/icon_list.png new file mode 100644 index 0000000000..052e33d187 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_list.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_lock_gray.png b/android/app/src/main/res/drawable-xxxhdpi/icon_lock_gray.png new file mode 100644 index 0000000000..8b3739e6a8 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_lock_gray.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_lock_white.png b/android/app/src/main/res/drawable-xxxhdpi/icon_lock_white.png new file mode 100644 index 0000000000..41875c78c2 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_lock_white.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_more_vertical.png b/android/app/src/main/res/drawable-xxxhdpi/icon_more_vertical.png new file mode 100644 index 0000000000..3fada95805 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_more_vertical.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_ok.png b/android/app/src/main/res/drawable-xxxhdpi/icon_ok.png new file mode 100644 index 0000000000..6b15f29aec Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_ok.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_ok_small.png b/android/app/src/main/res/drawable-xxxhdpi/icon_ok_small.png new file mode 100644 index 0000000000..ced7bb97ca Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_ok_small.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_ok_small_copy_2.png b/android/app/src/main/res/drawable-xxxhdpi/icon_ok_small_copy_2.png new file mode 100644 index 0000000000..ced7bb97ca Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_ok_small_copy_2.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_search.png b/android/app/src/main/res/drawable-xxxhdpi/icon_search.png new file mode 100644 index 0000000000..5a83f68df9 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_search.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_send.png b/android/app/src/main/res/drawable-xxxhdpi/icon_send.png new file mode 100644 index 0000000000..a109667f64 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_send.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon_smile.png b/android/app/src/main/res/drawable-xxxhdpi/icon_smile.png new file mode 100644 index 0000000000..49d62400dd Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon_smile.png differ diff --git a/src/syng_im/components/chat.cljs b/src/syng_im/components/chat.cljs index a9cb044f50..bda82c7803 100644 --- a/src/syng_im/components/chat.cljs +++ b/src/syng_im/components/chat.cljs @@ -116,8 +116,10 @@ "Chat name")] (if group? [view {:style {:flexDirection "row"}} - [image {:source res/icon-group - :style {:marginTop 4}}] + [image {:source {:uri "icon_group"} + :style {:marginTop 4 + :width 14 + :height 9}}] [text {:style {:marginTop -0.5 :marginLeft 4 :fontFamily font @@ -168,7 +170,7 @@ :backgroundColor chat-background}} (when android? ;; TODO add IOS version - [toolbar-android {:navIcon res/icon-back + [toolbar-android {:navIcon {:uri "icon_back"} :style {:backgroundColor color-white :height 56 :elevation 2} diff --git a/src/syng_im/components/chat/chat_message.cljs b/src/syng_im/components/chat/chat_message.cljs index 1275c001f4..12ffbf75fa 100644 --- a/src/syng_im/components/chat/chat_message.cljs +++ b/src/syng_im/components/chat/chat_message.cljs @@ -156,7 +156,9 @@ [image {:source (:icon command) :style {:position "absolute" :top 4 - :right 0}}] + :right 0 + :width 12 + :height 13}}] [text {:style {:marginTop 5 :marginHorizontal 0 :fontSize 14 @@ -200,7 +202,9 @@ [image {:source (:request-icon command) :style {:position "absolute" :top 9 - :left 10}}]] + :left 10 + :width 12 + :height 13}}]] [text {:style {:marginTop 2 :fontFamily font :fontSize 12 @@ -248,11 +252,13 @@ :marginTop 2 :marginBottom 8}} [image {:source (case delivery-status - :delivered res/icon-ok-small - :seen res/icon-ok-small - :seen-by-everyone res/icon-ok-small - :failed res/delivery-failed-icon) - :style {:marginTop 6}}] + :delivered {:uri "icon_ok_small"} + :seen {:uri "icon_ok_small"} + :seen-by-everyone {:uri "icon_ok_small"} + :failed res/delivery-failed-icon) + :style {:marginTop 6 + :width 9 + :height 7}}] [text {:style {:fontFamily font :fontSize 12 :color text2-color diff --git a/src/syng_im/components/chat/input/simple_command.cljs b/src/syng_im/components/chat/input/simple_command.cljs index 5896018f3e..d4066ce587 100644 --- a/src/syng_im/components/chat/input/simple_command.cljs +++ b/src/syng_im/components/chat/input/simple_command.cljs @@ -76,7 +76,7 @@ :height 36 :borderRadius 50 :backgroundColor color-blue}} - [image {:source res/icon-send + [image {:source {:uri "icon_send"} :style {:marginTop 10.5 :marginLeft 12 :width 15 diff --git a/src/syng_im/components/chat/plain_message_input.cljs b/src/syng_im/components/chat/plain_message_input.cljs index 3ddbc9be19..4924d9a913 100644 --- a/src/syng_im/components/chat/plain_message_input.cljs +++ b/src/syng_im/components/chat/plain_message_input.cljs @@ -40,7 +40,7 @@ [view {:style {:flexDirection "row" :height 56 :backgroundColor color-white}} - [image {:source res/icon-list + [image {:source {:uri "icon_list"} :style {:marginTop 22 :marginRight 6 :marginBottom 6 @@ -62,7 +62,7 @@ :onSubmitEditing (fn [e] (send @chat input-message))} input-message] - [image {:source res/icon-smile + [image {:source {:uri "icon_smile"} :style {:marginTop 18 :marginRight 18 :width 20 @@ -78,7 +78,7 @@ :height 36 :borderRadius 50 :backgroundColor color-blue}} - [image {:source res/icon-send + [image {:source {:uri "icon_send"} :style {:marginTop 10.5 :marginLeft 12 :width 15 diff --git a/src/syng_im/components/chats/chat_list_item_inner.cljs b/src/syng_im/components/chats/chat_list_item_inner.cljs index 4a274bcea1..e1010715e6 100644 --- a/src/syng_im/components/chats/chat_list_item_inner.cljs +++ b/src/syng_im/components/chats/chat_list_item_inner.cljs @@ -71,9 +71,11 @@ :fontFamily title-font}} name] ;;; group size (when group-chat - [image {:source res/icon-group - :style {:marginTop 4 - :marginLeft 8}}]) + [image {:source {:uri "icon_group"} + :style {:marginTop 4 + :marginLeft 8 + :width 14 + :height 9}}]) (when group-chat [text {:style {:marginTop -0.5 :marginLeft 4 @@ -100,9 +102,11 @@ :right 0}} (when delivery-status [image {:source (if (= (keyword delivery-status) :seen) - res/icon-ok-small - res/icon-ok-small) - :style {:marginTop 6}}]) + {:uri "icon_ok_small"} + {:uri "icon_ok_small"}) + :style {:marginTop 6 + :width 9 + :height 7}}]) ;;; datetime [text {:style {:fontFamily font :fontSize 12 diff --git a/src/syng_im/components/chats/chats_list.cljs b/src/syng_im/components/chats/chats_list.cljs index 22709b51af..8295a0b24f 100644 --- a/src/syng_im/components/chats/chats_list.cljs +++ b/src/syng_im/components/chats/chats_list.cljs @@ -35,15 +35,15 @@ :backgroundColor "white"}} (when android? ;; TODO add IOS version - [toolbar-android {:navIcon res/icon-hamburger + [toolbar-android {:navIcon {:uri "icon_hamburger"} :style {:backgroundColor color-white :height 56 :elevation 2} :onIconClicked (fn [] (nav-pop navigator)) :actions [{:title "Search" - :icon res/icon-search - :show "always"}]} + :icon {:uri "icon_search"} + :show "always"}]} [view {:style {:flex 1 :alignItems "center" :justifyContent "center" diff --git a/src/syng_im/components/chats/new_group.cljs b/src/syng_im/components/chats/new_group.cljs index e977bffcaf..0e33f82c5b 100644 --- a/src/syng_im/components/chats/new_group.cljs +++ b/src/syng_im/components/chats/new_group.cljs @@ -29,7 +29,7 @@ :backgroundColor color-white}} (when android? ;; TODO add IOS version - [toolbar-android {:navIcon res/icon-back + [toolbar-android {:navIcon {:uri "icon_back"} :style {:backgroundColor color-white :height 56 :elevation 2} @@ -85,9 +85,11 @@ :underlay-color :transparent} [view {:style {:flexDirection "row" :marginBottom 16}} - [image {:style {:marginVertical 19 - :marginHorizontal 3} - :source res/icon-add-gray}] + [image {:source {:uri "icon_add_gray"} + :style {:marginVertical 19 + :marginHorizontal 3 + :width 17 + :height 17}}] [text {:style {:marginTop 18 :marginLeft 32 :color text2-color diff --git a/src/syng_im/models/commands.cljs b/src/syng_im/models/commands.cljs index 9944950ea1..76c1c27fc9 100644 --- a/src/syng_im/models/commands.cljs +++ b/src/syng_im/models/commands.cljs @@ -17,8 +17,8 @@ :text "!money" :description "Send money" :color color-dark-mint - :request-icon res/icon-lock-white - :icon res/icon-lock-gray + :request-icon {:uri "icon_lock_white"} + :icon {:uri "icon_lock_gray"} :suggestion true} {:command :location :text "!location" @@ -35,8 +35,8 @@ :description "Send confirmation code" :request-text "Confirmation code request" :color color-blue - :request-icon res/icon-lock-white - :icon res/icon-lock-gray + :request-icon {:uri "icon_lock_white"} + :icon {:uri "icon_lock_gray"} :suggestion true} {:command :send :text "!send" @@ -52,8 +52,8 @@ :text "!keypairPassword" :description "" :color color-blue - :request-icon res/icon-lock-white - :icon res/icon-lock-gray + :request-icon {:uri "icon_lock_white"} + :icon {:uri "icon_lock_gray"} :suggestion false} {:command :help :text "!help" diff --git a/src/syng_im/resources.cljs b/src/syng_im/resources.cljs index 86992cd208..ce2a17a11e 100644 --- a/src/syng_im/resources.cljs +++ b/src/syng_im/resources.cljs @@ -17,19 +17,4 @@ (def trash-icon (js/require "./images/trash.png")) (def leave-icon (js/require "./images/leave.png")) -(def icon-back (js/require "./images/icon_back.png")) -(def icon-dollar (js/require "./images/icon_dollar.png")) -(def icon-list (js/require "./images/icon_list.png")) -(def icon-lock-gray (js/require "./images/icon_lock_gray.png")) -(def icon-lock-white (js/require "./images/icon_lock_white.png")) -(def icon-ok-small (js/require "./images/icon_ok_small.png")) -(def icon-smile (js/require "./images/icon_smile.png")) - -(def icon-add (js/require "./images/icon_add.png")) -(def icon-add-gray (js/require "./images/icon_add_gray.png")) -(def icon-group (js/require "./images/icon_group.png")) -(def icon-hamburger (js/require "./images/icon_hamburger.png")) -(def icon-search (js/require "./images/icon_search.png")) -(def icon-send (js/require "./images/icon_send.png")) (def icon-close-gray (js/require "./images/icon_close_gray.png")) -(def icon-ok (js/require "./images/icon_ok.png"))