Fix images displaying for desktop

status-im · Sep 16, 2019 · 69dc1f0 · 69dc1f0
1 parent 7d4041c
commit 69dc1f0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/clj-rn.conf.edn b/clj-rn.conf.edn
@@ -81,7 +81,8 @@
 
  ;; Resoures
  :resource-dirs ["resources/images"
-                 "resources/icons"]
+                 "resources/icons"
+                 "desktop/resources"]
 
  :figwheel-options {:nrepl-port 7888
                     :nrepl-middleware ["cider.nrepl/cider-middleware"

diff --git a/src/status_im/ui/components/icons/vector_icons.cljs b/src/status_im/ui/components/icons/vector_icons.cljs
@@ -1,6 +1,8 @@
 (ns status-im.ui.components.icons.vector-icons
   (:require [status-im.ui.components.react :as react]
-            [status-im.ui.components.colors :as colors])
+            [status-im.ui.components.colors :as colors]
+            [status-im.utils.platform :as platform]
+            [clojure.string :as string])
   (:refer-clojure :exclude [use]))
 
 (defn- match-color [color]
@@ -19,6 +21,11 @@
     :else
     colors/black))
 
+(defn icon-source [name]
+  (if platform/desktop?
+    {:source (js/require (str "./desktop/resources/" (string/replace (clojure.core/name name) "-" "_") ".png"))}
+    {:source {:uri (keyword (clojure.core/name name))}}))
+
 (defn icon
   ([name] (icon name nil))
   ([name {:keys [color resize-mode container-style
@@ -31,15 +38,15 @@
                            {:width  (or width 24)
                             :height (or height 24)})
      :accessibility-label accessibility-label}
-    [react/image {:source {:uri (keyword (clojure.core/name name))}
-                  :style  (cond-> {:width  (or width 24)
-                                   :height (or height 24)}
+    [react/image (merge {:style  (cond-> {:width  (or width 24)
+                                          :height (or height 24)}
 
-                            resize-mode
-                            (assoc :resize-mode resize-mode)
+                                   resize-mode
+                                   (assoc :resize-mode resize-mode)
 
-                            color
-                            (assoc :tint-color (match-color color)))}]]))
+                                   color
+                                   (assoc :tint-color (match-color color)))}
+                        (icon-source name))]]))
 
 (defn tiny-icon
   ([name] (tiny-icon name {}))

diff --git a/src/status_im/ui/screens/home/styles.cljs b/src/status_im/ui/screens/home/styles.cljs
@@ -15,10 +15,12 @@
   {:flex-shrink 1})
 
 (def last-message-text
-  {:flex        1
-   :align-self  :stretch
-   :line-height 22
-   :color       colors/gray})
+  (merge {:flex        1
+          :align-self  :stretch
+          :line-height 22
+          :color       colors/gray}
+         (when platform/desktop?
+           {:max-height      20})))
 
 (def search-input-height 56)