Android specific updates

status-im · Feb 27, 2020 · 2aad9cb · 2aad9cb
1 parent 7a1fa85
commit 2aad9cb
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 32 deletions.
diff --git a/components/src/status_im/ui/components/react.cljs b/components/src/status_im/ui/components/react.cljs
@@ -274,9 +274,4 @@
 
 (def safe-area-consumer (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaConsumer")))
 
-;; NOTE: Due to a known bug in android: https://github.com/th3rdwave/react-native-safe-area-context/issues/29
-;; do not use safe area in android
-(def safe-area-view
-  (if platform/ios?
-    (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaView"))
-    view))
+(def safe-area-view (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaView")))
diff --git a/src/status_im/ui/components/tabbar/core.cljs b/src/status_im/ui/components/tabbar/core.cljs
@@ -113,28 +113,27 @@
               (.remove listener)))))
       :reagent-render
       (fn [{:keys [navigate index inset]}]
-        (when-not @keyboard-shown?
-          [react/animated-view {:style (tabs.styles/tabs-wrapper @minimized-state inset)}
-           [react/animated-view {:style (tabs.styles/animated-container visible?)}
-            [react/view
-             {:style tabs.styles/tabs-container}
-             [react/view {:style tabs.styles/tabs}
-              (for [[route-index
-                     {:keys [nav-stack accessibility-label count-subscription content]}]
-                    tabs-list-data
+        [react/animated-view {:style (tabs.styles/tabs-wrapper @keyboard-shown? @minimized-state inset)}
+         [react/animated-view {:style (tabs.styles/animated-container visible?)}
+          [react/view
+           {:style tabs.styles/tabs-container}
+           [react/view {:style tabs.styles/tabs}
+            (for [[route-index
+                   {:keys [nav-stack accessibility-label count-subscription content]}]
+                  tabs-list-data
 
-                    :let [{:keys [icon title]} content]]
-                ^{:key nav-stack}
-                [tab
-                 {:icon                icon
-                  :label               title
-                  :on-press            #(navigate (name nav-stack))
-                  :accessibility-label accessibility-label
-                  :count-subscription  count-subscription
-                  :active?             (= (str index) (str route-index))
-                  :nav-stack           nav-stack}])]]]
-           [react/view
-            {:style (tabs.styles/ios-titles-cover inset)}]]))})))
+                  :let [{:keys [icon title]} content]]
+              ^{:key nav-stack}
+              [tab
+               {:icon                icon
+                :label               title
+                :on-press            #(navigate (name nav-stack))
+                :accessibility-label accessibility-label
+                :count-subscription  count-subscription
+                :active?             (= (str index) (str route-index))
+                :nav-stack           nav-stack}])]]]
+         [react/view
+          {:style (tabs.styles/ios-titles-cover inset)}]])})))
 
 (defn tabbar [props]
   (let [navigate (oget props "navigation" "navigate")

diff --git a/src/status_im/ui/components/tabbar/styles.cljs b/src/status_im/ui/components/tabbar/styles.cljs
@@ -98,8 +98,11 @@
    :right            0
    :left             0})
 
-(defn tabs-wrapper [minimized inset]
-  {:padding-bottom   inset
-   :elevation        8
-   :padding-top      (if minimized 0 tabs-diff)
-   :background-color :white})
+(defn tabs-wrapper [keyboard minimized inset]
+  (merge {:padding-bottom   inset
+          :elevation        8
+          :padding-top      (if minimized 0 tabs-diff)
+          :background-color :white}
+         (when keyboard
+           {:position :absolute
+            :bottom   (- tabs-height)})))