From 0da2757450b65ab389561723aaa619ac83b4d8e9 Mon Sep 17 00:00:00 2001
From: virvar <revalka@gmail.com>
Date: Fri, 18 Mar 2016 16:29:33 +0300
Subject: [PATCH] Components

---
 src/messenger/android/chat.cljs                     |  9 +++------
 src/messenger/android/login.cljs                    |  4 ++--
 .../components/invertible-scroll-view.cljs          |  7 +++++++
 src/messenger/components/spinner.cljs               |  7 +++++++
 src/messenger/utils/ui_utils.cljs                   | 13 -------------
 5 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 src/messenger/components/invertible-scroll-view.cljs
 create mode 100644 src/messenger/components/spinner.cljs
 delete mode 100644 src/messenger/utils/ui_utils.cljs

diff --git a/src/messenger/android/chat.cljs b/src/messenger/android/chat.cljs
index fb2b40ffae..7c27635c5e 100644
--- a/src/messenger/android/chat.cljs
+++ b/src/messenger/android/chat.cljs
@@ -8,9 +8,8 @@
   (:require [om.next :as om :refer-macros [defui]]
             [re-natal.support :as sup]
             [messenger.state :as state]
-            [messenger.utils.resources :as res]))
-
-(set! js/InvertibleScrollView (js/require "react-native-invertible-scroll-view"))
+            [messenger.utils.resources :as res]
+            [messenger.components.invertible-scroll-view :refer [invertible-scroll-view]]))
 
 (defn nav-pop [nav]
   (binding [state/*nav-render* false]
@@ -200,9 +199,7 @@
            (list-view {:dataSource messages-ds
                        :renderScrollComponent
                        (fn [props]
-                         (js/React.createElement js/InvertibleScrollView
-                                                 (clj->js (merge (js->clj props)
-                                                                 {:inverted true}))))
+                         (invertible-scroll-view nil))
                        :renderRow render-row
                        :style {:backgroundColor "white"}})
            (new-message)))))
diff --git a/src/messenger/android/login.cljs b/src/messenger/android/login.cljs
index 68916e9483..67f25da956 100644
--- a/src/messenger/android/login.cljs
+++ b/src/messenger/android/login.cljs
@@ -9,7 +9,7 @@
             [messenger.comm.intercom :as intercom :refer [set-user-phone-number]]
             [messenger.utils.utils :refer [log toast http-post]]
             [messenger.utils.resources :as res]
-            [messenger.utils.ui-utils :as ui]
+            [messenger.components.spinner :refer [spinner]]
             [messenger.android.sign-up-confirm :refer [sign-up-confirm]]
             [messenger.constants :refer [ethereum-rpc-url]]))
 
@@ -78,6 +78,6 @@
                                                         :textAlign "center"}}
                                                "Sign up"))))
              (when loading
-               (ui/spinner {:visible true}))))))
+               (spinner {:visible true}))))))
 
 (def login (om/factory Login))
diff --git a/src/messenger/components/invertible-scroll-view.cljs b/src/messenger/components/invertible-scroll-view.cljs
new file mode 100644
index 0000000000..4408077a77
--- /dev/null
+++ b/src/messenger/components/invertible-scroll-view.cljs
@@ -0,0 +1,7 @@
+(ns messenger.components.invertible-scroll-view)
+
+(set! js/InvertibleScrollView (js/require "react-native-invertible-scroll-view"))
+
+(defn invertible-scroll-view [props]
+  (js/React.createElement js/InvertibleScrollView
+                          (clj->js (merge {:inverted true} props))))
diff --git a/src/messenger/components/spinner.cljs b/src/messenger/components/spinner.cljs
new file mode 100644
index 0000000000..83c5f55f53
--- /dev/null
+++ b/src/messenger/components/spinner.cljs
@@ -0,0 +1,7 @@
+(ns messenger.components.spinner)
+
+(set! js/Spinner (.-default (js/require "react-native-loading-spinner-overlay")))
+
+(defn spinner [props]
+  (js/React.createElement js/Spinner
+                          (clj->js props)))
diff --git a/src/messenger/utils/ui_utils.cljs b/src/messenger/utils/ui_utils.cljs
deleted file mode 100644
index 1afa3cc0f7..0000000000
--- a/src/messenger/utils/ui_utils.cljs
+++ /dev/null
@@ -1,13 +0,0 @@
-(ns messenger.utils.ui-utils
-  ;; (:require-macros
-  ;;  [natal-shell.components :refer [view text image touchable-highlight list-view
-  ;;                                  toolbar-android text-input]]
-  ;;  [natal-shell.core :refer [with-error-view]])
-  ;; (:require [om.next :as om :refer-macros [defui]])
-  )
-
-(set! js/Spinner (.-default (js/require "react-native-loading-spinner-overlay")))
-
-(defn spinner [props]
-  (js/React.createElement js/Spinner
-                          (clj->js props)))