From 1657f189ba6874b547860b5d254cb2fe070c6373 Mon Sep 17 00:00:00 2001 From: Foo Pang Date: Sat, 16 Dec 2017 11:53:32 +0800 Subject: [PATCH] Refactor: replace global platform-specific styles with local styles --- src/status_im/android/platform.cljs | 74 +------------- src/status_im/chat/new_chat/view.cljs | 2 +- src/status_im/chat/new_public_chat/view.cljs | 2 +- src/status_im/chat/screen.cljs | 7 +- src/status_im/chat/styles/screen.cljs | 4 + src/status_im/chat/views/actions.cljs | 4 +- .../views/input/animations/responder.cljs | 2 +- src/status_im/chat/views/input/utils.cljs | 4 +- src/status_im/chat/views/toolbar_content.cljs | 3 +- src/status_im/ios/platform.cljs | 79 +-------------- .../ui/components/chat_icon/styles.cljs | 9 +- src/status_im/ui/components/status_bar.cljs | 18 ---- .../ui/components/status_bar/styles.cljs | 96 +++++++++++++++++++ .../ui/components/status_bar/view.cljs | 18 ++++ .../ui/components/text_field/styles.cljs | 33 ++++--- .../ui/components/toolbar/styles.cljs | 13 +-- .../ui/screens/accounts/login/views.cljs | 2 +- .../ui/screens/accounts/recover/views.cljs | 2 +- src/status_im/ui/screens/accounts/views.cljs | 4 +- .../ui/screens/chats_list/styles.cljs | 6 +- .../ui/screens/chats_list/views.cljs | 2 +- .../screens/contacts/contact_list/views.cljs | 3 +- .../contacts/contact_list_modal/views.cljs | 2 +- .../screens/contacts/new_contact/views.cljs | 4 +- src/status_im/ui/screens/contacts/views.cljs | 2 +- .../ui/screens/group/add_contacts/views.cljs | 2 +- .../ui/screens/group/edit_contacts/views.cljs | 2 +- .../ui/screens/group/reorder/views.cljs | 2 +- src/status_im/ui/screens/group/views.cljs | 7 +- src/status_im/ui/screens/main_tabs/views.cljs | 2 +- .../network_settings/add_rpc/views.cljs | 2 +- .../network_details/views.cljs | 2 +- .../network_settings/parse_json/views.cljs | 2 +- .../ui/screens/network_settings/views.cljs | 2 +- .../ui/screens/profile/edit/views.cljs | 2 +- .../screens/profile/photo_capture/views.cljs | 2 +- .../ui/screens/profile/qr_code/views.cljs | 2 +- src/status_im/ui/screens/profile/styles.cljs | 3 - src/status_im/ui/screens/profile/views.cljs | 2 +- .../ui/screens/qr_scanner/views.cljs | 2 +- src/status_im/ui/screens/views.cljs | 2 +- .../ui/screens/wallet/assets/views.cljs | 4 +- .../wallet/choose_recipient/views.cljs | 2 +- .../ui/screens/wallet/request/views.cljs | 4 +- .../wallet/send/transaction_sent/views.cljs | 2 +- .../ui/screens/wallet/send/views.cljs | 2 +- .../ui/screens/wallet/transactions/views.cljs | 4 +- .../ui/screens/wallet/wallet_list/views.cljs | 2 +- 48 files changed, 200 insertions(+), 253 deletions(-) delete mode 100644 src/status_im/ui/components/status_bar.cljs create mode 100644 src/status_im/ui/components/status_bar/styles.cljs create mode 100644 src/status_im/ui/components/status_bar/view.cljs diff --git a/src/status_im/android/platform.cljs b/src/status_im/android/platform.cljs index e8e62a8825..77dde04f0f 100644 --- a/src/status_im/android/platform.cljs +++ b/src/status_im/android/platform.cljs @@ -1,71 +1,5 @@ (ns status-im.android.platform - (:require [status-im.ui.components.styles :as styles] - [status-im.react-native.js-dependencies :as rn-dependencies])) - -;; DEPRECATION NOTICE -;; -;; NOTE(oskarth): These component-styles are legacy and should be removed, -;; please don't add or modify these styles. Instead, use defstyle macro to -;; inline platform-specific styles in the appropriate namespace - -(def component-styles - {:status-bar {:default {:height 25 - :bar-style "dark-content" - :elevation 2 - :translucent? true - :color styles/color-white} - :main {:height 25 - :bar-style "dark-content" - :translucent? true - :color styles/color-white - :expandable-offset 3} - :transparent {:height 25 - :bar-style "light-content" - :translucent? true - :color styles/color-transparent} - :modal {:height 0 - :bar-style "light-content" - :color styles/color-black} - ;;TODO because this bug in RN https://github.com/facebook/react-native/issues/7474 - :modal-white {:height 0 - :bar-style "light-content" - :color styles/color-black} - ;;TODO because this bug in RN https://github.com/facebook/react-native/issues/7474 - :modal-wallet {:height 0 - :bar-style "light-content" - :color styles/color-black} - :transaction {:height 0 - :bar-style "light-content" - :color styles/color-dark-blue-2} - :wallet {:height 25 - :bar-style "light-content" - :translucent? true - :color styles/color-blue5}} - :sized-text {:margin-top 0 - :additional-height 0} - :chat {:new-message {:border-top-color styles/color-transparent - :border-top-width 0.5}} - :discover {:subtitle {:color styles/color-gray2 - :font-size 14} - :popular {:border-radius 4 - :margin-top 2 - :margin-bottom 4 - :margin-right 2} - :tag {:flex-direction "column" - :background-color "#7099e619" - :border-radius 5 - :padding 4} - :item {:status-text {:line-height 22 - :font-size 16}}} - :contacts {:show-all-text-font :medium} - :bottom-gradient {:height 3} - :input-label {:left 4} - :input-error-text {:margin-left 4} - :toolbar-nav-action {:width 56 - :height 56 - :align-items :center - :justify-content :center} - :text-field-focus-line-height 2}) + (:require [status-im.react-native.js-dependencies :as rn-dependencies])) (def fonts {:light {:font-family "Roboto-Light"} @@ -88,8 +22,7 @@ ;; Structure to be exported (def platform-specific - {:component-styles component-styles - :fonts fonts + {:fonts fonts :list-selection-fn show-dialog :tabs {:tab-shadows? true} :chats {:action-button? true @@ -100,5 +33,4 @@ :new-contact-in-toolbar? false} :group-block-shadows? true :discover {:uppercase-subtitles? false} - :public-group-icon-container {:margin-top 4} - :private-group-icon-container {:margin-top 6}}) + :status-bar-default-height 25}) diff --git a/src/status_im/chat/new_chat/view.cljs b/src/status_im/chat/new_chat/view.cljs index b959b09ba4..9d93d36470 100644 --- a/src/status_im/chat/new_chat/view.cljs +++ b/src/status_im/chat/new_chat/view.cljs @@ -8,7 +8,7 @@ [status-im.ui.components.action-button.styles :refer [actions-list]] [status-im.ui.components.react :refer [view text list-view list-item]] [status-im.ui.components.contact.contact :refer [contact-view]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :refer [toolbar-with-search]] [status-im.ui.components.drawer.view :refer [drawer-view]] [status-im.chat.new-chat.styles :as styles] diff --git a/src/status_im/chat/new_public_chat/view.cljs b/src/status_im/chat/new_public_chat/view.cljs index 7676045a77..35254663fa 100644 --- a/src/status_im/chat/new_public_chat/view.cljs +++ b/src/status_im/chat/new_public_chat/view.cljs @@ -5,7 +5,7 @@ [status-im.ui.components.react :as react :refer [text]] [status-im.ui.components.text-field.view :refer [text-field]] [status-im.ui.components.styles :as components.styles] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :as toolbar] [status-im.chat.new-public-chat.styles :as styles] [status-im.chat.new-public-chat.db :as v] diff --git a/src/status_im/chat/screen.cljs b/src/status_im/chat/screen.cljs index d0ff2c26f1..d130e6a8f9 100644 --- a/src/status_im/chat/screen.cljs +++ b/src/status_im/chat/screen.cljs @@ -3,7 +3,7 @@ (:require [re-frame.core :as re-frame] [status-im.ui.components.react :as react] [status-im.ui.components.icons.vector-icons :as vector-icons] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.chat-icon.screen :as chat-icon-screen] [status-im.chat.styles.screen :as style] [status-im.utils.listview :as listview] @@ -16,7 +16,7 @@ [status-im.chat.views.message.datemark :as message-datemark] [status-im.chat.views.input.input :as input] [status-im.chat.views.actions :as actions] - [status-im.chat.views.bottom-info :as bottom-info] + [status-im.chat.views.bottom-info :as bottom-info] [status-im.i18n :as i18n] [status-im.ui.components.animation :as anim] [status-im.ui.components.sync-state.offline :as offline] @@ -106,5 +106,4 @@ [actions/actions-view]) (when show-bottom-info? [bottom-info/bottom-info-view]) - [offline/offline-view {:top (get-in platform/platform-specific - [:component-styles :status-bar :default :height])}]])) + [offline/offline-view {:top (get platform/platform-specific :status-bar-default-height)}]])) diff --git a/src/status_im/chat/styles/screen.cljs b/src/status_im/chat/styles/screen.cljs index b4ad457611..ae06d0d9fb 100644 --- a/src/status_im/chat/styles/screen.cljs +++ b/src/status_im/chat/styles/screen.cljs @@ -200,3 +200,7 @@ {:text-align :center :text-align-vertical :center :color :#7099e6}) + +(defstyle actions-list-view + {:ios {:border-bottom-color component.styles/color-gray3 + :border-bottom-width 0.5}}) diff --git a/src/status_im/chat/views/actions.cljs b/src/status_im/chat/views/actions.cljs index 9c987620dd..a0b9985a77 100644 --- a/src/status_im/chat/views/actions.cljs +++ b/src/status_im/chat/views/actions.cljs @@ -116,13 +116,13 @@ chat-id [:chat :chat-id] public? [:chat :public?] members [:current-chat-contacts] - status-bar-height (get-in platform/platform-specific [:component-styles :status-bar :default :height])] + status-bar-height (get platform/platform-specific :status-bar-default-height)] (when-let [actions (if group-chat (group-chat-items members public?) (user-chat-items chat-id))] [react/view (merge (styles/actions-wrapper status-bar-height) - (get-in platform/platform-specific [:component-styles :actions-list-view])) + styles/actions-list-view) [react/view styles/actions-separator] [react/view styles/actions-view (for [action actions] diff --git a/src/status_im/chat/views/input/animations/responder.cljs b/src/status_im/chat/views/input/animations/responder.cljs index f19a6c6e90..2560c622c6 100644 --- a/src/status_im/chat/views/input/animations/responder.cljs +++ b/src/status_im/chat/views/input/animations/responder.cljs @@ -12,7 +12,7 @@ (> (Math/abs (.-dy gesture)) 10)) (defn on-move [response-height layout-height] - (let [margin-top (+ (get-in p/platform-specific [:component-styles :status-bar :main :height]) + (let [margin-top (+ (get p/platform-specific :status-bar-default-height) (/ (:height toolbar-st/toolbar) 2))] (fn [_ gesture] (when (enough-dy gesture) diff --git a/src/status_im/chat/views/input/utils.cljs b/src/status_im/chat/views/input/utils.cljs index 48cb2250e5..e1d5e154b7 100644 --- a/src/status_im/chat/views/input/utils.cljs +++ b/src/status_im/chat/views/input/utils.cljs @@ -7,13 +7,13 @@ (def default-height 300) (defn default-container-area-height [bottom screen-height] - (let [status-bar-height (get-in p/platform-specific [:component-styles :status-bar :main :height])] + (let [status-bar-height (get p/platform-specific :status-bar-default-height)] (if (> (+ bottom default-height status-bar-height) screen-height) (- screen-height bottom status-bar-height) default-height))) (defn max-container-area-height [bottom screen-height] - (let [status-bar-height (get-in p/platform-specific [:component-styles :status-bar :main :height]) + (let [status-bar-height (get p/platform-specific :status-bar-default-height) toolbar-height (:height toolbar-st/toolbar) margin-top (+ status-bar-height (/ toolbar-height 2))] (- screen-height bottom margin-top))) diff --git a/src/status_im/chat/views/toolbar_content.cljs b/src/status_im/chat/views/toolbar_content.cljs index 7572ba64c6..26d551c966 100644 --- a/src/status_im/chat/views/toolbar_content.cljs +++ b/src/status_im/chat/views/toolbar_content.cljs @@ -52,8 +52,7 @@ [last-activity {:sync-state sync-state}] (if public? [view {:flex-direction :row} - [text {:style (get-in platform-specific [:component-styles :toolbar-last-activity])} - (label :t/public-group-status)]] + [text (label :t/public-group-status)]] [view {:flex-direction :row} [text {:style st/members} (if public? diff --git a/src/status_im/ios/platform.cljs b/src/status_im/ios/platform.cljs index ff29541422..f21bf55651 100644 --- a/src/status_im/ios/platform.cljs +++ b/src/status_im/ios/platform.cljs @@ -1,79 +1,8 @@ (ns status-im.ios.platform - (:require [status-im.ui.components.styles :as styles] - [status-im.i18n :refer [label]] + (:require [status-im.i18n :refer [label]] [status-im.utils.utils :as utils] [status-im.react-native.js-dependencies :as rn-dependencies])) -;; DEPRECATION NOTICE -;; -;; NOTE(oskarth): These component-styles are legacy and should be removed, -;; please don't add or modify these styles. Instead, use defstyle macro to -;; inline platform-specific styles in the appropriate namespace - -(def component-styles - {:status-bar {:default {:height 20 - :bar-style "default" - :color styles/color-white} - :main {:height 20 - :bar-style "default" - :color styles/color-white - :expandable-offset 8} - :transparent {:height 20 - :bar-style "light-content" - :color styles/color-transparent} - :modal {:height 20 - :bar-style "light-content" - :color "#2f3031"} - :modal-white {:height 20 - :bar-style "default" - :color styles/color-white} - :transaction {:height 20 - :bar-style "light-content" - :color styles/color-transparent} - :modal-wallet {:height 20 - :bar-style "light-content" - :color styles/color-blue4} - :wallet {:height 20 - :bar-style "light-content" - :color styles/color-blue4}} - :sized-text {:margin-top -5 - :additional-height 5} - :actions-list-view {:border-bottom-color styles/color-gray3 - :border-bottom-width 0.5} - :chat {:new-message {:border-top-color styles/color-gray3 - :border-top-width 0.5}} - :discover {:subtitle {:color styles/color-steel - :font-size 13 - :letter-spacing 1} - :popular {:border-radius 3 - :border-width 1 - :border-color "#D7D7D7"} - :tag {:flex-direction "column" - :background-color "rgb(227, 235, 250)" - :border-radius 4 - :border-width 1 - :border-color "rgba(112, 153, 230, 0.31)" - :padding 6} - :item {:status-text {:color styles/color-steel - :font-size 14 - :letter-spacing -0.1} - :icon {:padding-top 0 - :bottom -4 - :justify-content :flex-end}}} - :contacts {:show-all-text-font :default} - :bottom-gradient {:height 1} - :input-label {:left 0} - :input-error-text {:margin-left 0} - :toolbar-nav-action {:width 46 - :height 56 - :align-items :center - :justify-content :center} - :toolbar-border-container {:background-color styles/color-white} - :toolbar-border {:height 1 - :background-color styles/color-gray5 - :opacity 0.5} - :text-field-focus-line-height 1}) - (def fonts {:light {:font-family "SFUIText-Light"} :default {:font-family "SFUIText-Regular"} @@ -101,8 +30,7 @@ ;; Structure to be exported (def platform-specific - {:component-styles component-styles - :fonts fonts + {:fonts fonts :list-selection-fn show-action-sheet :tabs {:tab-shadows? false} :chats {:action-button? false @@ -113,5 +41,4 @@ :new-contact-in-toolbar? true} :group-block-shadows? false :discover {:uppercase-subtitles? true} - :public-group-icon-container {:margin-top 2} - :private-group-icon-container {:margin-top 2}}) + :status-bar-default-height 20}) diff --git a/src/status_im/ui/components/chat_icon/styles.cljs b/src/status_im/ui/components/chat_icon/styles.cljs index 98ad590ca8..9989a7e54f 100644 --- a/src/status_im/ui/components/chat_icon/styles.cljs +++ b/src/status_im/ui/components/chat_icon/styles.cljs @@ -1,7 +1,6 @@ (ns status-im.ui.components.chat-icon.styles (:require [status-im.ui.components.styles :refer [color-white - online-color]] - [status-im.utils.platform :as p])) + online-color]])) (defn default-chat-icon [color] {:margin 0 @@ -257,7 +256,5 @@ :justify-content :center}) (def profile-icon-edit-text - (merge (get-in p/platform-specific [:component-styles :profile :profile-icon-edit-text]) - {:color :white - :background-color :transparent})) - + {:color :white + :background-color :transparent}) diff --git a/src/status_im/ui/components/status_bar.cljs b/src/status_im/ui/components/status_bar.cljs deleted file mode 100644 index e97fd4be2a..0000000000 --- a/src/status_im/ui/components/status_bar.cljs +++ /dev/null @@ -1,18 +0,0 @@ -(ns status-im.ui.components.status-bar - (:require [status-im.ui.components.react :as ui] - [status-im.utils.platform :refer [platform-specific]])) - -(defn status-bar [{type :type - :or {type :default}}] - (let [{:keys [height - bar-style - elevation - translucent? - color]} (get-in platform-specific [:component-styles :status-bar type])] - [ui/view - [ui/status-bar {:background-color (if translucent? "transparent" color) - :translucent translucent? - :bar-style bar-style}] - [ui/view {:style {:height height - :elevation elevation - :background-color color}}]])) \ No newline at end of file diff --git a/src/status_im/ui/components/status_bar/styles.cljs b/src/status_im/ui/components/status_bar/styles.cljs new file mode 100644 index 0000000000..425d58c63f --- /dev/null +++ b/src/status_im/ui/components/status_bar/styles.cljs @@ -0,0 +1,96 @@ +(ns status-im.ui.components.status-bar.styles + (:require [status-im.ui.components.styles :as styles] + [status-im.utils.platform :as platform]) + (:require-macros [status-im.utils.styles :refer [defstyle]])) + +(defn- create-status-bar-style [{:keys [background-color bar-style translucent?] + :or {bar-style "light-content"}}] + {:background-color (if translucent? "transparent" background-color) + :translucent translucent? + :bar-style bar-style}) + +(defn- create-view-style [{:keys [background-color height elevation] + :or {height (get platform/platform-specific :status-bar-default-height)}}] + {:background-color background-color + :elevation elevation + :height height}) + +;; :main +(defstyle status-bar-main + {:ios (create-status-bar-style {:background-color styles/color-white + :bar-style "default"}) + :android (create-status-bar-style {:translucent? true + :bar-style "dark-content"})}) + +(def view-main + (create-view-style {:background-color styles/color-white})) + +;; :transparent +(defstyle status-bar-transparent + {:ios (create-status-bar-style {:background-color styles/color-transparent}) + :android (create-status-bar-style {:translucent? true})}) + +(def view-transparent + (create-view-style {:background-color styles/color-transparent})) + +;; :modal +(defstyle status-bar-modal + {:ios (create-status-bar-style {:background-color "#2f3031"}) + :android (create-status-bar-style {:background-color styles/color-black})}) + +(defstyle view-modal + {:ios (create-view-style {:background-color "#2f3031"}) + :android (create-view-style {:background-color styles/color-black + :height 0})}) + +;; :modal-white +(defstyle status-bar-modal-white + {:ios (create-status-bar-style {:background-color styles/color-white + :bar-style "default"}) + :android (create-status-bar-style {:background-color styles/color-black + :bar-style "light-content"})}) + +(defstyle view-modal-white + {:ios (create-view-style {:background-color styles/color-white}) + :android (create-view-style {:background-color styles/color-black + :height 0})}) + +;; :modal-wallet +(defstyle status-bar-modal-wallet + {:ios (create-status-bar-style {:background-color styles/color-blue4}) + :android (create-status-bar-style {:background-color styles/color-black})}) + +(defstyle view-model-wallet + {:ios (create-view-style {:background-color styles/color-blue4}) + :android (create-view-style {:background-color styles/color-black + :height 0})}) + +;; :transaction +(defstyle status-bar-transaction + {:ios (create-status-bar-style {:background-color styles/color-transparent}) + :android (create-status-bar-style {:background-color styles/color-dark-blue-2})}) + +(defstyle view-transaction + {:ios (create-view-style {:background-color styles/color-transparent}) + :android (create-view-style {:background-color styles/color-dark-blue-2 + :height 0})}) + +;; :wallet +(defstyle status-bar-wallet + {:ios (create-status-bar-style {:background-color styles/color-blue4}) + :android (create-status-bar-style {:translucent? true})}) + +(defstyle view-wallet + {:ios (create-view-style {:background-color styles/color-blue4}) + :android (create-view-style {:background-color styles/color-blue5})}) + +;; :default +(defstyle status-bar-default + {:ios (create-status-bar-style {:background-color styles/color-white + :bar-style "default"}) + :android (create-status-bar-style {:translucent? true + :bar-style "dark-content"})}) + +(defstyle view-default + (create-view-style {:background-color styles/color-white + :elevation 2})) diff --git a/src/status_im/ui/components/status_bar/view.cljs b/src/status_im/ui/components/status_bar/view.cljs new file mode 100644 index 0000000000..7ce2b73020 --- /dev/null +++ b/src/status_im/ui/components/status_bar/view.cljs @@ -0,0 +1,18 @@ +(ns status-im.ui.components.status-bar.view + (:require [status-im.ui.components.react :as ui] + [status-im.ui.components.status-bar.styles :as styles])) + +(defn status-bar [{type :type}] + (let [[status-bar-style view-style] + (case type + :main [styles/status-bar-main styles/view-main] + :transparent [styles/status-bar-transparent styles/view-transparent] + :modal [styles/status-bar-modal styles/view-modal] + :modal-white [styles/status-bar-modal-white styles/view-modal-white] + :modal-wallet [styles/status-bar-modal-wallet styles/view-model-wallet] + :transaction [styles/status-bar-transaction styles/view-transaction] + :wallet [styles/status-bar-wallet styles/view-wallet] + [styles/status-bar-default styles/view-default])] + [ui/view + [ui/status-bar status-bar-style] + [ui/view {:style view-style}]])) diff --git a/src/status_im/ui/components/text_field/styles.cljs b/src/status_im/ui/components/text_field/styles.cljs index 852a0ab02d..a9fa4e71e7 100644 --- a/src/status_im/ui/components/text_field/styles.cljs +++ b/src/status_im/ui/components/text_field/styles.cljs @@ -1,6 +1,5 @@ (ns status-im.ui.components.text-field.styles - (:require [status-im.utils.platform :refer [platform-specific]])) - + (:require-macros [status-im.utils.styles :refer [defnstyle]])) (def text-field-container {:position :relative @@ -15,14 +14,14 @@ :padding-bottom 5 :text-align-vertical :top}) -(defn label [top font-size color] - (let [input-label-style (get-in platform-specific [:component-styles :input-label])] - (merge input-label-style - {:position :absolute - :top top - :color color - :font-size font-size - :background-color :transparent}))) +(defnstyle label [top font-size color] + {:position :absolute + :top top + :color color + :font-size font-size + :background-color :transparent + :ios {:left 0} + :android {:left 4}}) (def label-float {}) @@ -36,10 +35,10 @@ :height height :width width}) -(defn error-text [color] - (let [input-error-text-style (get-in platform-specific [:component-styles :input-error-text])] - (merge input-error-text-style - {:color color - :background-color :transparent - :font-size 12 - :line-height 20}))) +(defnstyle error-text [color] + {:color color + :background-color :transparent + :font-size 12 + :line-height 20 + :ios {:margin-left 0} + :android {:margin-left 4}}) diff --git a/src/status_im/ui/components/toolbar/styles.cljs b/src/status_im/ui/components/toolbar/styles.cljs index 79f13955a9..16ce2f668c 100644 --- a/src/status_im/ui/components/toolbar/styles.cljs +++ b/src/status_im/ui/components/toolbar/styles.cljs @@ -1,7 +1,6 @@ (ns status-im.ui.components.toolbar.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) - (:require [status-im.ui.components.styles :as styles] - [status-im.utils.platform :as p])) + (:require [status-im.ui.components.styles :as styles])) (def toolbar-background1 styles/color-white) @@ -41,11 +40,13 @@ :font-size 17 :ios {:text-align "center"}}) -(def toolbar-border-container - (get-in p/platform-specific [:component-styles :toolbar-border-container])) +(defstyle toolbar-border-container + {:ios {:background-color styles/color-white}}) -(def toolbar-border - (get-in p/platform-specific [:component-styles :toolbar-border])) +(defstyle toolbar-border + {:ios {:height 1 + :background-color styles/color-gray5 + :opacity 0.5}}) (def toolbar-actions {:flex 0 diff --git a/src/status_im/ui/screens/accounts/login/views.cljs b/src/status_im/ui/screens/accounts/login/views.cljs index 9944aaca48..4148f4be62 100644 --- a/src/status_im/ui/screens/accounts/login/views.cljs +++ b/src/status_im/ui/screens/accounts/login/views.cljs @@ -5,7 +5,7 @@ [status-im.ui.screens.accounts.styles :as ast] [status-im.ui.screens.accounts.views :refer [account-badge]] [status-im.ui.components.text-input-with-label.view :refer [text-input-with-label]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.toolbar.actions :as act] [status-im.ui.screens.accounts.login.styles :as st] diff --git a/src/status_im/ui/screens/accounts/recover/views.cljs b/src/status_im/ui/screens/accounts/recover/views.cljs index b9b391cbc1..14d9436a36 100644 --- a/src/status_im/ui/screens/accounts/recover/views.cljs +++ b/src/status_im/ui/screens/accounts/recover/views.cljs @@ -8,7 +8,7 @@ keyboard-avoiding-view touchable-highlight]] [status-im.ui.components.sticky-button :refer [sticky-button]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.toolbar.actions :as act] [status-im.i18n :as i18n] diff --git a/src/status_im/ui/screens/accounts/views.cljs b/src/status_im/ui/screens/accounts/views.cljs index 55b687bfe9..2c89ff7f65 100644 --- a/src/status_im/ui/screens/accounts/views.cljs +++ b/src/status_im/ui/screens/accounts/views.cljs @@ -1,8 +1,8 @@ (ns status-im.ui.screens.accounts.views (:require-macros [status-im.utils.views :refer [defview]]) (:require [re-frame.core :refer [dispatch dispatch-sync]] - [status-im.ui.screens.accounts.styles :as st] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.screens.accounts.styles :as st] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.actions :as act] [status-im.ui.components.common.common :as common] [status-im.ui.components.action-button.action-button :refer [action-button]] diff --git a/src/status_im/ui/screens/chats_list/styles.cljs b/src/status_im/ui/screens/chats_list/styles.cljs index 3c4e9cf9eb..700932924b 100644 --- a/src/status_im/ui/screens/chats_list/styles.cljs +++ b/src/status_im/ui/screens/chats_list/styles.cljs @@ -1,12 +1,10 @@ (ns status-im.ui.screens.chats-list.styles (:require-macros [status-im.utils.styles :refer [defstyle defnstyle]]) (:require [status-im.ui.components.styles :as component.styles] - [status-im.ui.components.tabs.styles :as tabs-st] - [status-im.utils.platform :as p])) + [status-im.ui.components.tabs.styles :as tabs-st])) (defn toolbar [] - (merge {:background-color component.styles/color-white} - (get-in p/platform-specific [:component-styles :toolbar]))) + {:background-color component.styles/color-white}) (def chat-separator-item {:border-bottom-width 1 diff --git a/src/status_im/ui/screens/chats_list/views.cljs b/src/status_im/ui/screens/chats_list/views.cljs index 2d23acb040..93c680f85d 100644 --- a/src/status_im/ui/screens/chats_list/views.cljs +++ b/src/status_im/ui/screens/chats_list/views.cljs @@ -7,7 +7,7 @@ [status-im.ui.components.native-action-button :refer [native-action-button]] [status-im.ui.components.drawer.view :as drawer] [status-im.ui.components.styles :refer [color-blue]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.toolbar.actions :as act] [status-im.ui.components.toolbar.styles :as tst] diff --git a/src/status_im/ui/screens/contacts/contact_list/views.cljs b/src/status_im/ui/screens/contacts/contact_list/views.cljs index 63ed97c0f4..d2e070f1f6 100644 --- a/src/status_im/ui/screens/contacts/contact_list/views.cljs +++ b/src/status_im/ui/screens/contacts/contact_list/views.cljs @@ -5,7 +5,7 @@ [status-im.ui.components.contact.contact :refer [contact-view]] [status-im.ui.screens.contacts.views :refer [contact-options]] [status-im.ui.components.react :refer [view list-view list-item]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.toolbar.actions :as act] [status-im.ui.components.drawer.view :refer [drawer-view]] @@ -66,4 +66,3 @@ [contact-list-toolbar-edit group] [contact-list-toolbar group])] [contacts-list-view group edit?]]])) - diff --git a/src/status_im/ui/screens/contacts/contact_list_modal/views.cljs b/src/status_im/ui/screens/contacts/contact_list_modal/views.cljs index 5161527332..4db7f796a6 100644 --- a/src/status_im/ui/screens/contacts/contact_list_modal/views.cljs +++ b/src/status_im/ui/screens/contacts/contact_list_modal/views.cljs @@ -8,7 +8,7 @@ [status-im.ui.components.action-button.action-button :refer [action-button action-separator]] [status-im.ui.components.action-button.styles :refer [actions-list]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :refer [toolbar-with-search]] [status-im.ui.components.drawer.view :refer [drawer-view]] [status-im.ui.screens.contacts.styles :as st] diff --git a/src/status_im/ui/screens/contacts/new_contact/views.cljs b/src/status_im/ui/screens/contacts/new_contact/views.cljs index 08e3ff2386..fd4c895478 100644 --- a/src/status_im/ui/screens/contacts/new_contact/views.cljs +++ b/src/status_im/ui/screens/contacts/new_contact/views.cljs @@ -5,7 +5,7 @@ [cljs.spec.alpha :as s] [status-im.ui.components.react :as react] [status-im.ui.components.text-field.view :as text-field] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.styles :as components.styles :refer [icon-ok button-input-container button-input color-blue]] [status-im.ui.components.image-button.view :as scan-button] @@ -67,7 +67,7 @@ account [:get-current-account]] [react/view st/contact-form-container [status-bar/status-bar] - [toolbar/toolbar {:style (get-in platform/platform-specific [:component-styles :toolbar])} + [toolbar/toolbar {} toolbar/default-nav-back [toolbar/content-title (i18n/label :t/add-new-contact)] [toolbar/actions (toolbar-actions new-contact-identity account error)]] diff --git a/src/status_im/ui/screens/contacts/views.cljs b/src/status_im/ui/screens/contacts/views.cljs index 69d9c61cca..b756414e87 100644 --- a/src/status_im/ui/screens/contacts/views.cljs +++ b/src/status_im/ui/screens/contacts/views.cljs @@ -92,7 +92,7 @@ [view [text {:style st/show-all-text :uppercase? (get-in platform-specific [:uppercase?]) - :font (get-in platform-specific [:component-styles :contacts :show-all-text-font])} + :font (if ios? :default :medium)} (str (- contacts-count contacts-limit) " " (label :t/more))]]]]]) [common/bottom-shadow]])) diff --git a/src/status_im/ui/screens/group/add_contacts/views.cljs b/src/status_im/ui/screens/group/add_contacts/views.cljs index f83dab29cf..4d493f138f 100644 --- a/src/status_im/ui/screens/group/add_contacts/views.cljs +++ b/src/status_im/ui/screens/group/add_contacts/views.cljs @@ -4,7 +4,7 @@ [status-im.ui.components.renderers.renderers :as renderers] [status-im.ui.components.react :as react] [status-im.ui.components.sticky-button :refer [sticky-button]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :refer [toolbar-with-search]] [status-im.utils.listview :refer [to-datasource]] [status-im.ui.screens.group.styles :as styles] diff --git a/src/status_im/ui/screens/group/edit_contacts/views.cljs b/src/status_im/ui/screens/group/edit_contacts/views.cljs index a783da9944..c7c37fa417 100644 --- a/src/status_im/ui/screens/group/edit_contacts/views.cljs +++ b/src/status_im/ui/screens/group/edit_contacts/views.cljs @@ -4,7 +4,7 @@ [status-im.ui.components.contact.contact :refer [contact-view]] [status-im.ui.components.renderers.renderers :as renderers] [status-im.ui.components.react :refer [view list-view list-item]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :refer [toolbar-with-search]] [status-im.utils.listview :refer [to-datasource]] [status-im.ui.screens.group.styles :as styles] diff --git a/src/status_im/ui/screens/group/reorder/views.cljs b/src/status_im/ui/screens/group/reorder/views.cljs index f237cc17d6..a9969fca52 100644 --- a/src/status_im/ui/screens/group/reorder/views.cljs +++ b/src/status_im/ui/screens/group/reorder/views.cljs @@ -5,7 +5,7 @@ [status-im.ui.components.react :refer [view text list-item]] [status-im.ui.components.icons.vector-icons :as vi] [status-im.ui.components.sticky-button :refer [sticky-button]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.sortable-list-view :refer [sortable-list-view sortable-item]] [status-im.ui.components.common.common :as common] diff --git a/src/status_im/ui/screens/group/views.cljs b/src/status_im/ui/screens/group/views.cljs index 6054363d29..36059afbd1 100644 --- a/src/status_im/ui/screens/group/views.cljs +++ b/src/status_im/ui/screens/group/views.cljs @@ -8,9 +8,9 @@ keyboard-avoiding-view list-view list-item]] [status-im.ui.components.icons.vector-icons :as vi] [status-im.ui.components.text-input-with-label.view :refer [text-input-with-label]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :as toolbar] - [status-im.utils.platform :refer [platform-specific]] + [status-im.utils.platform :refer [platform-specific ios?]] [status-im.ui.components.sticky-button :refer [sticky-button]] [status-im.utils.listview :refer [to-datasource]] [status-im.ui.components.renderers.renderers :as renderers] @@ -89,7 +89,7 @@ [view [text {:style cstyles/show-all-text :uppercase? (get-in platform-specific [:uppercase?]) - :font (get-in platform-specific [:component-styles :contacts :show-all-text-font])} + :font (if ios? :default :medium)} (str (- contacts-count contacts-limit) " " (label :t/more))]]]]]) (def ^:const contacts-limit 3) @@ -168,4 +168,3 @@ (dispatch [:navigate-to-clean :contact-list])) #(dispatch [:create-new-group-chat-and-open group-name])) true])]))) - diff --git a/src/status_im/ui/screens/main_tabs/views.cljs b/src/status_im/ui/screens/main_tabs/views.cljs index 3bed3d916c..735af1f58a 100644 --- a/src/status_im/ui/screens/main_tabs/views.cljs +++ b/src/status_im/ui/screens/main_tabs/views.cljs @@ -2,7 +2,7 @@ (:require [status-im.ui.components.drawer.view :refer [drawer-view]] [status-im.ui.components.icons.vector-icons :as vector-icons] [status-im.ui.components.react :as react] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.styles :as styles] [status-im.ui.components.tabs.styles :as tabs.styles] [status-im.ui.components.tabs.views :as tabs] diff --git a/src/status_im/ui/screens/network_settings/add_rpc/views.cljs b/src/status_im/ui/screens/network_settings/add_rpc/views.cljs index 63b97be1bb..84a98892ad 100644 --- a/src/status_im/ui/screens/network_settings/add_rpc/views.cljs +++ b/src/status_im/ui/screens/network_settings/add_rpc/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.network-settings.add-rpc.views (:require [re-frame.core :refer [dispatch]] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.text-input-with-label.view :refer [text-input-with-label]] [status-im.ui.screens.network-settings.views :as network-settings] diff --git a/src/status_im/ui/screens/network_settings/network_details/views.cljs b/src/status_im/ui/screens/network_settings/network_details/views.cljs index 59753963db..9cbdb946fd 100644 --- a/src/status_im/ui/screens/network_settings/network_details/views.cljs +++ b/src/status_im/ui/screens/network_settings/network_details/views.cljs @@ -2,7 +2,7 @@ (:require-macros [status-im.utils.views :as views]) (:require [re-frame.core :as rf] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.context-menu :as context-menu] [status-im.ui.screens.network-settings.views :as network-settings] diff --git a/src/status_im/ui/screens/network_settings/parse_json/views.cljs b/src/status_im/ui/screens/network_settings/parse_json/views.cljs index ba87ade3e1..28e3970aad 100644 --- a/src/status_im/ui/screens/network_settings/parse_json/views.cljs +++ b/src/status_im/ui/screens/network_settings/parse_json/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.network-settings.parse-json.views (:require [re-frame.core :refer [dispatch]] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.screens.network-settings.views :as network-settings] [status-im.ui.components.react :refer [view text text-input]] diff --git a/src/status_im/ui/screens/network_settings/views.cljs b/src/status_im/ui/screens/network_settings/views.cljs index 91ad3d8bce..837d8b33d7 100644 --- a/src/status_im/ui/screens/network_settings/views.cljs +++ b/src/status_im/ui/screens/network_settings/views.cljs @@ -3,7 +3,7 @@ (:require [status-im.utils.listview :as lw] [re-frame.core :as rf] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.action-button.action-button :as action-button] [status-im.ui.components.action-button.styles :as action-button-styles] diff --git a/src/status_im/ui/screens/profile/edit/views.cljs b/src/status_im/ui/screens/profile/edit/views.cljs index 312466acfa..59ec590128 100644 --- a/src/status_im/ui/screens/profile/edit/views.cljs +++ b/src/status_im/ui/screens/profile/edit/views.cljs @@ -7,7 +7,7 @@ [status-im.ui.components.chat-icon.screen :refer [my-profile-icon]] [status-im.ui.components.context-menu :refer [context-menu]] [status-im.ui.components.react :as react] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.sticky-button :refer [sticky-button]] [status-im.ui.components.text-input-with-label.view :refer [text-input-with-label]] [status-im.ui.components.toolbar.view :as toolbar] diff --git a/src/status_im/ui/screens/profile/photo_capture/views.cljs b/src/status_im/ui/screens/profile/photo_capture/views.cljs index ff39ea6c5f..c3cbb1c7e8 100644 --- a/src/status_im/ui/screens/profile/photo_capture/views.cljs +++ b/src/status_im/ui/screens/profile/photo_capture/views.cljs @@ -4,7 +4,7 @@ [status-im.ui.components.camera :as camera] [status-im.ui.components.icons.custom-icons :as custom-icons] [status-im.ui.components.react :as react] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.toolbar.view :as toolbar] [status-im.i18n :as i18n] [status-im.ui.screens.profile.photo-capture.styles :as styles] diff --git a/src/status_im/ui/screens/profile/qr_code/views.cljs b/src/status_im/ui/screens/profile/qr_code/views.cljs index 17e02347ce..64eac9e0e7 100644 --- a/src/status_im/ui/screens/profile/qr_code/views.cljs +++ b/src/status_im/ui/screens/profile/qr_code/views.cljs @@ -4,7 +4,7 @@ [status-im.ui.components.qr-code :refer [qr-code]] [status-im.ui.components.react :as react] [status-im.ui.components.icons.vector-icons :as vi] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.i18n :refer [label]] [status-im.ui.screens.profile.qr-code.styles :as styles] [status-im.utils.money :as money] diff --git a/src/status_im/ui/screens/profile/styles.cljs b/src/status_im/ui/screens/profile/styles.cljs index 4595ad878b..4be706a88e 100644 --- a/src/status_im/ui/screens/profile/styles.cljs +++ b/src/status_im/ui/screens/profile/styles.cljs @@ -150,9 +150,6 @@ (def profile-focus-line-color color-light-blue) -(def profile-focus-line-height - (get-in platform/platform-specific [:component-styles :text-field-focus-line-height])) - (defstyle profile-name-input {:color text1-color :ios {:font-size 17 diff --git a/src/status_im/ui/screens/profile/views.cljs b/src/status_im/ui/screens/profile/views.cljs index e145b1811b..2f26f7efe4 100644 --- a/src/status_im/ui/screens/profile/views.cljs +++ b/src/status_im/ui/screens/profile/views.cljs @@ -11,7 +11,7 @@ [status-im.ui.components.list-selection :refer [share-options]] [status-im.ui.components.react :as react] [status-im.ui.components.icons.vector-icons :as vi] - [status-im.ui.components.status-bar :refer [status-bar]] + [status-im.ui.components.status-bar.view :refer [status-bar]] [status-im.ui.components.styles :refer [color-blue]] [status-im.ui.components.toolbar.actions :as actions] [status-im.ui.components.toolbar.view :as toolbar] diff --git a/src/status_im/ui/screens/qr_scanner/views.cljs b/src/status_im/ui/screens/qr_scanner/views.cljs index 7ca5c2072d..c0affb8d96 100644 --- a/src/status_im/ui/screens/qr_scanner/views.cljs +++ b/src/status_im/ui/screens/qr_scanner/views.cljs @@ -4,7 +4,7 @@ [re-frame.core :as re-frame] [status-im.ui.components.react :as react] [status-im.ui.components.camera :as camera] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.screens.qr-scanner.styles :as styles])) diff --git a/src/status_im/ui/screens/views.cljs b/src/status_im/ui/screens/views.cljs index 5dc1a3e9e6..6e49d521ff 100644 --- a/src/status_im/ui/screens/views.cljs +++ b/src/status_im/ui/screens/views.cljs @@ -44,7 +44,7 @@ [status-im.ui.screens.wallet.send.transaction-sent.views :refer [transaction-sent transaction-sent-modal]] [status-im.ui.screens.wallet.assets.views :as wallet-assets] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.screens.discover.search-results.views :as discover-search] [status-im.ui.screens.discover.recent-statuses.views :as discover-recent] diff --git a/src/status_im/ui/screens/wallet/assets/views.cljs b/src/status_im/ui/screens/wallet/assets/views.cljs index de8c14bfa1..a33fc94f30 100644 --- a/src/status_im/ui/screens/wallet/assets/views.cljs +++ b/src/status_im/ui/screens/wallet/assets/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.wallet.assets.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [status-im.ui.components.react :as react] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.button.view :as button] [status-im.i18n :as i18n] @@ -92,4 +92,4 @@ [tabs/swipable-tabs tabs-list current-tab true {:navigation-event :navigation-replace :tab-style assets.styles/tab - :tabs-container-style assets.styles/tabs-container}]])) \ No newline at end of file + :tabs-container-style assets.styles/tabs-container}]])) diff --git a/src/status_im/ui/screens/wallet/choose_recipient/views.cljs b/src/status_im/ui/screens/wallet/choose_recipient/views.cljs index 4e207f8a35..b14bebd9a8 100644 --- a/src/status_im/ui/screens/wallet/choose_recipient/views.cljs +++ b/src/status_im/ui/screens/wallet/choose_recipient/views.cljs @@ -5,7 +5,7 @@ [status-im.ui.components.camera :as camera] [status-im.ui.components.icons.vector-icons :as vector-icons] [status-im.ui.components.react :as react] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.toolbar.actions :as act] [status-im.i18n :as i18n] diff --git a/src/status_im/ui/screens/wallet/request/views.cljs b/src/status_im/ui/screens/wallet/request/views.cljs index d789d3c4ba..c812e5da87 100644 --- a/src/status_im/ui/screens/wallet/request/views.cljs +++ b/src/status_im/ui/screens/wallet/request/views.cljs @@ -6,7 +6,7 @@ [status-im.ui.components.qr-code :as components.qr-code] [status-im.ui.components.toolbar.actions :as actions] [status-im.ui.components.toolbar.view :as toolbar] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.screens.wallet.styles :as wallet.styles] [status-im.ui.components.common.common :as common] [status-im.ui.components.icons.vector-icons :as vi] @@ -71,4 +71,4 @@ [react/touchable-highlight {:style wallet.styles/button :disabled (not request-enabled?) :on-press send-request} [react/view (wallet.styles/button-container request-enabled?) [components/button-text (i18n/label :t/send-request)] - [vi/icon :icons/forward {:color :white :container-style wallet.styles/forward-icon-container}]]]]])) \ No newline at end of file + [vi/icon :icons/forward {:color :white :container-style wallet.styles/forward-icon-container}]]]]])) diff --git a/src/status_im/ui/screens/wallet/send/transaction_sent/views.cljs b/src/status_im/ui/screens/wallet/send/transaction_sent/views.cljs index 02bf9c2119..e96ae549ac 100644 --- a/src/status_im/ui/screens/wallet/send/transaction_sent/views.cljs +++ b/src/status_im/ui/screens/wallet/send/transaction_sent/views.cljs @@ -1,7 +1,7 @@ (ns status-im.ui.screens.wallet.send.transaction-sent.views (:require-macros [status-im.utils.views :refer [defview letsubs]]) (:require [status-im.ui.components.react :as react] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.icons.vector-icons :as vi] [status-im.ui.screens.wallet.styles :as wallet.styles] [status-im.ui.screens.wallet.send.transaction-sent.styles :as styles] diff --git a/src/status_im/ui/screens/wallet/send/views.cljs b/src/status_im/ui/screens/wallet/send/views.cljs index d6513bfa83..467a7fd34e 100644 --- a/src/status_im/ui/screens/wallet/send/views.cljs +++ b/src/status_im/ui/screens/wallet/send/views.cljs @@ -5,7 +5,7 @@ [status-im.ui.components.common.common :as common] [status-im.ui.components.icons.vector-icons :as vector-icons] [status-im.ui.components.react :as react] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.styles :as components.styles] [status-im.ui.components.toolbar.actions :as act] [status-im.ui.components.toolbar.view :as toolbar] diff --git a/src/status_im/ui/screens/wallet/transactions/views.cljs b/src/status_im/ui/screens/wallet/transactions/views.cljs index f49598ccc7..6af8fd079b 100644 --- a/src/status_im/ui/screens/wallet/transactions/views.cljs +++ b/src/status_im/ui/screens/wallet/transactions/views.cljs @@ -4,7 +4,7 @@ [status-im.ui.components.checkbox.view :as checkbox] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.styles :as styles] [status-im.ui.components.tabs.views :as tabs] [status-im.ui.components.toolbar.actions :as actions] @@ -93,7 +93,7 @@ [react/text {:style transactions.styles/address-hash :ellipsize-mode "middle" :number-of-lines 1} - address]] + address]] (when (unsigned? type) [action-buttons transaction])] [list/item-icon {:icon :icons/forward diff --git a/src/status_im/ui/screens/wallet/wallet_list/views.cljs b/src/status_im/ui/screens/wallet/wallet_list/views.cljs index 069f359b5a..61e27951f5 100644 --- a/src/status_im/ui/screens/wallet/wallet_list/views.cljs +++ b/src/status_im/ui/screens/wallet/wallet_list/views.cljs @@ -4,7 +4,7 @@ [re-frame.core :as re-frame] [status-im.ui.components.list.views :as list] [status-im.ui.components.react :as react] - [status-im.ui.components.status-bar :as status-bar] + [status-im.ui.components.status-bar.view :as status-bar] [status-im.ui.components.toolbar.view :as toolbar] [status-im.ui.components.toolbar.actions :as actions] [status-im.i18n :as i18n]