mirror of
https://github.com/status-im/status-mobile.git
synced 2025-02-26 23:31:03 +00:00
make designers happy again
Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>
This commit is contained in:
parent
272da01051
commit
f53c4c275e
@ -117,8 +117,7 @@
|
||||
|
||||
(defn i18n-text
|
||||
[{:keys [style key]}]
|
||||
(let [default-style {:letter-spacing -0.2
|
||||
:font-size 14}]
|
||||
(let [default-style {:font-size 14}]
|
||||
[text {:style (merge default-style style)} (i18n/label key)]))
|
||||
|
||||
(defn icon
|
||||
|
@ -76,7 +76,7 @@
|
||||
(def separator
|
||||
(merge
|
||||
base-separator
|
||||
{:margin-left 70}))
|
||||
{:margin-left 64}))
|
||||
|
||||
(defstyle list-header-footer-spacing
|
||||
{:android {:background-color colors/white
|
||||
@ -112,7 +112,7 @@
|
||||
(def action-separator
|
||||
{:height 1
|
||||
:background-color colors/white-light-transparent
|
||||
:margin-left 70})
|
||||
:margin-left 64})
|
||||
|
||||
(def list-with-label-wrapper
|
||||
{:margin-top 26
|
||||
|
@ -206,7 +206,7 @@
|
||||
colors/gray)})
|
||||
|
||||
(defn quoted-message-text [outgoing]
|
||||
{:font-size 12
|
||||
{:font-size 14
|
||||
:color (if outgoing
|
||||
colors/wild-blue-yonder
|
||||
colors/gray)})
|
||||
|
@ -14,7 +14,7 @@
|
||||
:width size
|
||||
:height size
|
||||
:opacity 0.4
|
||||
:border-color colors/gray
|
||||
:border-color colors/black-transparent
|
||||
:border-width 1
|
||||
:border-radius (radius size)})
|
||||
|
||||
|
@ -104,9 +104,9 @@
|
||||
|
||||
(defstyle datetime-text
|
||||
{:color colors/text-gray
|
||||
:android {:font-size 14}
|
||||
:android {:font-size 12}
|
||||
:desktop {:font-size 14}
|
||||
:ios {:font-size 15}})
|
||||
:ios {:font-size 12}})
|
||||
|
||||
(defstyle new-messages-text
|
||||
{:left 0
|
||||
|
@ -108,7 +108,7 @@
|
||||
[react/view styles/chat-container
|
||||
[react/view styles/chat-icon-container
|
||||
(if dapp
|
||||
[chat-icon.screen/dapp-icon-browser dapp 36]
|
||||
[chat-icon.screen/dapp-icon-browser dapp 40]
|
||||
[react/view styles/browser-icon-container
|
||||
[vector-icons/icon :icons/discover {:color colors/gray}]])]
|
||||
[react/view styles/chat-info-container
|
||||
|
@ -17,14 +17,10 @@
|
||||
:icon-size 46})
|
||||
|
||||
(defstyle intro-text
|
||||
{:text-align :center
|
||||
:color colors/black
|
||||
:ios {:line-height 28
|
||||
:font-size 22
|
||||
:font-weight :bold
|
||||
:letter-spacing -0.3}
|
||||
:android {:font-size 24
|
||||
:line-height 30}})
|
||||
{:text-align :center
|
||||
:color colors/black
|
||||
:font-weight :bold
|
||||
:font-size 24})
|
||||
|
||||
(def intro-text-description
|
||||
{:line-height 21
|
||||
|
@ -18,14 +18,14 @@
|
||||
{:padding-vertical 14
|
||||
:font-size 15
|
||||
:text-align :center
|
||||
:ios {:letter-spacing -0.2}
|
||||
:android {:color colors/black}})
|
||||
:font-weight :bold
|
||||
:color colors/black})
|
||||
|
||||
(defstyle profile-three-words
|
||||
{:font-size 12
|
||||
:text-align :center
|
||||
:ios {:letter-spacing -0.2}
|
||||
:android {:color colors/black}})
|
||||
{:font-size 12
|
||||
:text-align :center
|
||||
:font-weight :bold
|
||||
:color colors/gray})
|
||||
|
||||
(defstyle profile-name-input-text
|
||||
{:font-size 15
|
||||
@ -99,5 +99,4 @@
|
||||
|
||||
(def profile-form
|
||||
{:background-color colors/white
|
||||
:padding-top 16
|
||||
:padding-bottom 8})
|
||||
:padding-vertical 16})
|
||||
|
@ -31,20 +31,19 @@
|
||||
(list-selection/show {:title (i18n/label :t/image-source-title)
|
||||
:options options})))
|
||||
|
||||
(defn- profile-header-display [{:keys [name] :as contact}]
|
||||
[react/view styles/profile-header-display
|
||||
[chat-icon.screen/my-profile-icon {:account contact
|
||||
:edit? false}]
|
||||
[react/view styles/profile-header-name-container
|
||||
[react/text {:style styles/profile-name-text
|
||||
:font :medium
|
||||
:number-of-lines 1}
|
||||
name]
|
||||
(when (:public-key contact)
|
||||
[react/text {:style styles/profile-three-words
|
||||
:font :medium
|
||||
(defn- profile-header-display [{:keys [name public-key] :as contact}]
|
||||
(let [generated-name (when public-key (gfy/generate-gfy public-key))]
|
||||
[react/view styles/profile-header-display
|
||||
[chat-icon.screen/my-profile-icon {:account contact
|
||||
:edit? false}]
|
||||
[react/view styles/profile-header-name-container
|
||||
[react/text {:style styles/profile-name-text
|
||||
:number-of-lines 1}
|
||||
(gfy/generate-gfy (:public-key contact))])]])
|
||||
name]
|
||||
(when (and public-key (not= generated-name name))
|
||||
[react/text {:style styles/profile-three-words
|
||||
:number-of-lines 1}
|
||||
generated-name])]]))
|
||||
|
||||
(defn- profile-header-edit [{:keys [name group-chat] :as contact}
|
||||
icon-options on-change-text-event allow-icon-change?]
|
||||
|
@ -105,6 +105,7 @@
|
||||
[profile.components/settings-item {:label-kw :t/ens-names
|
||||
:action-fn #(re-frame/dispatch [:profile.ui/ens-names-button-pressed])
|
||||
:accessibility-label :ens-names-button}]
|
||||
[profile.components/settings-item-separator]
|
||||
[profile.components/settings-item {:label-kw :t/main-currency
|
||||
:value (:code currency)
|
||||
:action-fn #(re-frame/dispatch [:navigate-to :currency-settings])
|
||||
|
Loading…
x
Reference in New Issue
Block a user