From 0da3ccd5ea74974183c3dc3ff13224ebe1e41c76 Mon Sep 17 00:00:00 2001 From: Ihor Kysylevych Date: Thu, 15 Feb 2018 17:28:13 +0200 Subject: [PATCH] [FIX #3223] Fit Recipient screen to mocks on iOS Signed-off-by: Julien Eluard --- src/status_im/ui/screens/wallet/components.cljs | 10 ++++++---- src/status_im/ui/screens/wallet/components/styles.cljs | 7 +++++++ src/status_im/ui/screens/wallet/components/views.cljs | 6 +++++- src/status_im/ui/screens/wallet/request/views.cljs | 3 ++- src/status_im/ui/screens/wallet/styles.cljs | 4 ++++ 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/status_im/ui/screens/wallet/components.cljs b/src/status_im/ui/screens/wallet/components.cljs index eff8502a3e..4c1b963533 100644 --- a/src/status_im/ui/screens/wallet/components.cljs +++ b/src/status_im/ui/screens/wallet/components.cljs @@ -27,10 +27,12 @@ (def default-action (actions/back-white actions/default-handler)) (defn- toolbar - ([title] (toolbar default-action title)) - ([action title] (toolbar action title nil)) - ([action title options] - [toolbar/toolbar {:style styles/toolbar} + ([title] (toolbar {} title)) + ([props title] (toolbar props default-action title)) + ([props action title] (toolbar props action title nil)) + ([props action title options] + [toolbar/toolbar (utils/deep-merge {:style styles/toolbar} + props) [toolbar/nav-button action] [toolbar/content-title {:color :white} title] diff --git a/src/status_im/ui/screens/wallet/components/styles.cljs b/src/status_im/ui/screens/wallet/components/styles.cljs index 9b59fb9e2c..79ad8d3728 100644 --- a/src/status_im/ui/screens/wallet/components/styles.cljs +++ b/src/status_im/ui/screens/wallet/components/styles.cljs @@ -23,6 +23,13 @@ :height 52 :letter-spacing -0.2})) +(def contact-code-text-input + {:text-align-vertical :top + :padding-top 16 + :padding-left 2 + :padding-right 8 + :height 72}) + (defstyle label {:color :white :ios {:font-size 14 diff --git a/src/status_im/ui/screens/wallet/components/views.cljs b/src/status_im/ui/screens/wallet/components/views.cljs index 326ff6c734..9305335656 100644 --- a/src/status_im/ui/screens/wallet/components/views.cljs +++ b/src/status_im/ui/screens/wallet/components/views.cljs @@ -19,6 +19,7 @@ [status-im.ui.screens.wallet.components.styles :as styles] [status-im.ui.screens.wallet.choose-recipient.views :as choose-recipient] [status-im.ui.screens.wallet.views :as wallet] + [status-im.ui.screens.wallet.styles :as wallet.styles] [status-im.ui.screens.wallet.utils :as wallet.utils] [status-im.utils.ethereum.core :as ethereum] [status-im.utils.ethereum.tokens :as tokens] @@ -140,11 +141,14 @@ (let [content (reagent/atom nil)] (fn [] [components/simple-screen {:avoid-keyboard? true} - [components/toolbar (i18n/label :t/recipient)] + [components/toolbar {:style wallet.styles/toolbar-bottom-line} + components/default-action + (i18n/label :t/recipient)] [react/view components.styles/flex [components/cartouche {} (i18n/label :t/recipient) [components/text-input {:multiline true + :style styles/contact-code-text-input :placeholder (i18n/label :t/recipient-code) :on-change-text #(reset! content %)}]] [bottom-buttons/bottom-button diff --git a/src/status_im/ui/screens/wallet/request/views.cljs b/src/status_im/ui/screens/wallet/request/views.cljs index d2f946efc0..99abe30748 100644 --- a/src/status_im/ui/screens/wallet/request/views.cljs +++ b/src/status_im/ui/screens/wallet/request/views.cljs @@ -66,7 +66,8 @@ (views/letsubs [{:keys [address]} [:get-current-account] chain-id [:get-network-id]] [comp/simple-screen - [comp/toolbar comp/default-action + [comp/toolbar {} + comp/default-action (i18n/label :t/receive) [toolbar/actions [{:icon :icons/share :icon-opts {:color :white} diff --git a/src/status_im/ui/screens/wallet/styles.cljs b/src/status_im/ui/screens/wallet/styles.cljs index 55c2f82f33..fdae2216ed 100644 --- a/src/status_im/ui/screens/wallet/styles.cljs +++ b/src/status_im/ui/screens/wallet/styles.cljs @@ -8,6 +8,10 @@ (def toolbar {:background-color colors/blue}) +(defstyle toolbar-bottom-line + {:ios {:border-bottom-width 1 + :border-bottom-color colors/white-transparent}}) + (defn button-container [enabled?] (merge {:flex-direction :row :align-items :center}