status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-01-27 11:16:03 +00:00
Code Issues Projects Releases Wiki Activity

[#4767] Fix onboarding screen text and button overlap

Browse Source 
Also, hide "Fetching messages" from welcome screen.

Signed-off-by: Dmitry Novotochinov <dmitry.novot@gmail.com>
This commit is contained in:
Dmitry Novotochinov 2018-07-11 16:20:32 +03:00
parent bf9a291a09
commit 3293c37c81
No known key found for this signature in database
GPG Key ID: 43D1DAF5AD39C927
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/status_im/translations/en.cljs
View File

@ -72,7 +72,7 @@
:home "Home" :home "Home"
:no-recent-chats "There are no recent Chats or DApps here yet. Tap the “Plus” button to see the list of Dapps or discover people to chat with." :no-recent-chats "There are no recent Chats or DApps here yet. Tap the “Plus” button to see the list of Dapps or discover people to chat with."
:welcome-to-status "Welcome to Status" :welcome-to-status "Welcome to Status"
:welcome-to-status-description "Here you can securely chat with people, or browse and interact with DApps. Tap the “Plus” icon to begin." :welcome-to-status-description "Here you can chat with people in a secure\n private chat, browse and interact with DApps.\n Use the “Plus” icon to explore Status"
;;chat ;;chat
:is-typing "is typing" :is-typing "is typing"

20
src/status_im/ui/screens/home/styles.cljs
View File

@ -156,30 +156,32 @@
:color colors/gray}) :color colors/gray})
(def welcome-view (def welcome-view
{:flex 1 {:flex 1})
:padding-horizontal 30})
(def welcome-image-container (defstyle welcome-image-container
{:flex 1 {:align-items :center
:align-items :center :android {:margin-top 38}
:justify-content :center}) :ios {:margin-top 42}})
(def welcome-image (def welcome-image
{:width 320 {:width 320
:height 278}) :height 278})
(def welcome-text (defstyle welcome-text
{:line-height 28 {:line-height 28
:font-size 22 :font-size 22
:font-weight :bold :font-weight :bold
:letter-spacing -0.3 :letter-spacing -0.3
:android {:margin-top 22}
:ios {:margin-top 96}
:text-align :center :text-align :center
:color colors/black}) :color colors/black})
(def welcome-text-description (defstyle welcome-text-description
{:line-height 21 {:line-height 21
:margin-top 8 :margin-top 8
:margin-bottom 32 :android {:margin-bottom 82}
:ios {:margin-bottom 32}
:font-size 14 :font-size 14
:letter-spacing -0.2 :letter-spacing -0.2
:text-align :center :text-align :center

21
src/status_im/ui/screens/home/views.cljs
View File

@ -20,14 +20,16 @@
[status-im.ui.components.icons.vector-icons :as icons])) [status-im.ui.components.icons.vector-icons :as icons]))
(defn- toolbar [show-welcome?] (defn- toolbar [show-welcome?]
[toolbar/toolbar nil nil (when-not (and show-welcome?
(when-not show-welcome? platform/android?)
[toolbar/content-wrapper [toolbar/toolbar nil nil
[components.common/logo styles/toolbar-logo]]) (when-not show-welcome?
[toolbar/actions [toolbar/content-wrapper
(when platform/ios? [components.common/logo styles/toolbar-logo]])
[(-> (toolbar.actions/add true #(re-frame/dispatch [:navigate-to :new])) [toolbar/actions
(assoc-in [:icon-opts :accessibility-label] :new-chat-button))])]]) (when platform/ios?
[(-> (toolbar.actions/add true #(re-frame/dispatch [:navigate-to :new]))
(assoc-in [:icon-opts :accessibility-label] :new-chat-button))])]]))
(defn- home-action-button [] (defn- home-action-button []
[react/view styles/action-button-container [react/view styles/action-button-container
@ -91,4 +93,5 @@
[home-list-item home-item])}]) [home-list-item home-item])}])
(when platform/android? (when platform/android?
[home-action-button]) [home-action-button])
[connectivity/error-view]])) (when-not show-welcome?
[connectivity/error-view])]))