reconnect with and without labels in bars

WintonCentre · May 27, 2017 · 1660a3d · 1660a3d
1 parent 7e31075
commit 1660a3d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/src/unspun/screens/introduction.cljs b/src/unspun/screens/introduction.cljs
@@ -59,7 +59,27 @@
             (view {:style {:flex            0.18
                            :backgroundColor (:dark-primary palette)
                            }}
-                  (touchable-highlight {:style {:flex            1
+                  (touchable-highlight {:style   {:flex            1
+                                                  :margin      20
+                                                  :height          50
+                                                  :borderColor    (:accent (get-palette (rum/react palette-index)))
+                                                  :borderWidth    2
+                                                  :borderRadius    30
+                                                  :shadowColor     "#000"
+                                                  :shadowOffset    {:width shadow-size :height shadow-size}
+                                                  :shadowRadius    shadow-size
+                                                  :shadowOpacity   0.5
+                                                  :alignItems      "center"
+                                                  :justifyContent  "center"
+                                                  }
+                                        :onPress #(jumpToDrawer "scenarios" "stories")}
+
+                                       (text {:style {:color      (:text-icons (get-palette (rum/react palette-index)))
+                                                      :textAlign  "center"
+                                                      :fontWeight "bold"}}
+                                             "Start"))
+
+                  #_(touchable-highlight {:style {:flex            1
                                                 :margin          20
                                                 :backgroundColor (:accent (get-palette (rum/react palette-index)))
                                                 :borderRadius    30

diff --git a/src/unspun/screens/logo.cljs b/src/unspun/screens/logo.cljs
@@ -9,7 +9,7 @@
 ;(def logo-img (js/require "./assets/images/logo.png"))
 (def brand (js/require "./assets/images/brand.png"))
 
-(def shadow-size 2)
+(def shadow-size 1)
 
 (defn alert [title]
   (.alert rn/alert title))
@@ -95,7 +95,9 @@
                                           :marginLeft      20
                                           :marginRight     20
                                           :height          50
-                                          :backgroundColor (:accent (get-palette (rum/react palette-index)))
+                                          ;:backgroundColor (:accent (get-palette (rum/react palette-index)))
+                                          :borderColor    (:accent (get-palette (rum/react palette-index)))
+                                          :borderWidth    2
                                           :borderRadius    30
                                           :shadowColor     "#000"
                                           :shadowOffset    {:width shadow-size :height shadow-size}
@@ -106,7 +108,7 @@
                                           }
                                 :onPress #(jumpToDrawer "scenarios" "stories")}
 
-                               (text {:style {:color      (:light-accent (get-palette (rum/react palette-index)))
+                               (text {:style {:color      (:text-icons (get-palette (rum/react palette-index)))
                                               :textAlign  "center"
                                               :fontWeight "bold"}}
                                      "Start")))))

diff --git a/src/unspun/screens/rum_bars.cljs b/src/unspun/screens/rum_bars.cljs
@@ -258,7 +258,7 @@
                                                     :fontSize     (/ tffsz 0.85)
                                                     :textAlign    "right"
                                                     :paddingRight 10}}
-                                           (:without scenar)))
+                                           (:without-label scenar)))
                                (view {:key   2
                                       :style {:flex 0.2}}
                                      (labelled-vertical-bar palette br (rum/react (:scale state))))
@@ -274,7 +274,7 @@
                                                     :fontSize  (/ tffsz 0.85)
                                                     :padding   10
                                                     :textAlign "left"}}
-                                           (:with scenar)))))
+                                           (:with-label scenar)))))
 
                    (view {:key   4
                           :style {:position "absolute"