status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[fix #5604] Fixed the problem of tooltips being cropped out on the android platform. 

Three screens: account/create, account/login and wallet/transaction-fee are known to be affected by this issue. In the former two screens, the fixes incur no visible UI changes; in the last screen, the tooltips are shifted down by 8 points.

Signed-off-by: Dmitry Novotochinov <dmitry.novot@gmail.com>
This commit is contained in:
Shi Lei 2018-08-26 00:35:15 +08:00 committed by Dmitry Novotochinov
parent 30b4234f7b
commit 8fa0522bad
No known key found for this signature in database
GPG Key ID: 43D1DAF5AD39C927
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/status_im/ui/screens/accounts/create/styles.cljs
View File

@ -1,4 +1,5 @@
(ns status-im.ui.screens.accounts.create.styles (ns status-im.ui.screens.accounts.create.styles
(:require-macros [status-im.utils.styles :refer [defstyle]])
(:require [status-im.ui.components.colors :as colors])) (:require [status-im.ui.components.colors :as colors]))
(def create-account-view (def create-account-view
@ -42,9 +43,11 @@
{:size 82 {:size 82
:icon-size 34}) :icon-size 34})
(def input-container (defstyle input-container
{:margin-horizontal 16 {:margin-horizontal 16
:margin-top 105}) :margin-top 105
:android {:padding-top 13
:margin-top 92}})
(def input-description (def input-description
{:font-size 14 {:font-size 14

4
src/status_im/ui/screens/accounts/login/styles.cljs
View File

@ -37,7 +37,9 @@
:margin-top 8}) :margin-top 8})
(def password-container (def password-container
{:margin-top 24}) {:margin-top 24
:android {:margin-top 11
:padding-top 13}})
(def save-password-checkbox-container (def save-password-checkbox-container
{:margin-top 0 {:margin-top 0

4
src/status_im/ui/screens/wallet/send/styles.cljs
View File

@ -1,4 +1,5 @@
(ns status-im.ui.screens.wallet.send.styles (ns status-im.ui.screens.wallet.send.styles
(:require-macros [status-im.utils.styles :refer [defstyle]])
(:require [status-im.ui.components.colors :as colors] (:require [status-im.ui.components.colors :as colors]
[status-im.ui.components.styles :as styles] [status-im.ui.components.styles :as styles]
[status-im.ui.screens.wallet.components.styles :as wallet.components.styles])) [status-im.ui.screens.wallet.components.styles :as wallet.components.styles]))
@ -148,3 +149,6 @@
(def password-error-tooltip (def password-error-tooltip
{:bottom-value 15 {:bottom-value 15
:color colors/red-light}) :color colors/red-light})
(defstyle gas-input-error-tooltip
{:android {:bottom-value -38}})

10
src/status_im/ui/screens/wallet/transaction_fee/views.cljs
View File

@ -52,7 +52,7 @@
:default-value gas :default-value gas
:accessibility-label :gas-limit-input})]]] :accessibility-label :gas-limit-input})]]]
(when (:invalid? gas-edit) (when (:invalid? gas-edit)
[tooltip/tooltip (i18n/label :t/invalid-number)])] [tooltip/tooltip (i18n/label :t/invalid-number) styles/gas-input-error-tooltip])]
[react/view styles/gas-container-wrapper [react/view styles/gas-container-wrapper
[components/cartouche {} [components/cartouche {}
@ -65,9 +65,11 @@
[components/cartouche-secondary-text [components/cartouche-secondary-text
(i18n/label :t/gwei)]]] (i18n/label :t/gwei)]]]
(when (:invalid? gas-price-edit) (when (:invalid? gas-price-edit)
[tooltip/tooltip (i18n/label (if (= :invalid-number (:invalid? gas-price-edit)) [tooltip/tooltip
:t/invalid-number (i18n/label (if (= :invalid-number (:invalid? gas-price-edit))
:t/wallet-send-min-wei))])]] :t/invalid-number
:t/wallet-send-min-wei))
styles/gas-input-error-tooltip])]]
[react/view styles/transaction-fee-info [react/view styles/transaction-fee-info
[react/view styles/transaction-fee-info-icon [react/view styles/transaction-fee-info-icon