Skip to content

Commit bc9b0f8

Browse files
authored
feat(oboarding): Update ilustrations (#21781)
* Share usage data screen image done * Update login by syncing and login using recovery phrase images * Small refactor: remove `merge` and add a `let` binding * Fix modal entering expected animation
1 parent c8b0634 commit bc9b0f8

File tree

14 files changed

+44
-29
lines changed

14 files changed

+44
-29
lines changed
5.86 KB
Loading
10.6 KB
Loading
113 KB
Loading
215 KB
Loading
542 KB
Loading
1 MB
Loading

src/quo/components/text_combinations/page_top/view.cljs

+3-3
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@
7979
[rn/view {:style style/community-logo-ring}]])
8080

8181
(defn- description-container
82-
[{:keys [description description-text collection-text community-text
83-
collection-image community-image blur?]
82+
[{:keys [description description-text collection-text community-text blur?
83+
collection-image community-image description-accessibility-label]
8484
context-tag-props :context-tag
8585
summary-props :summary}]
86-
[rn/view
86+
[rn/view {:accessibility-label description-accessibility-label}
8787
(cond
8888
(and (= description :text) (not (string/blank? description-text)))
8989
[text/text

src/status_im/common/resources.cljs

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
(def ui
44
{:add-new-contact (js/require "../resources/images/ui2/add-contact.png")
55
:biometrics (js/require "../resources/images/ui2/biometrics.png")
6+
:usage-data (js/require "../resources/images/ui2/usage-data.png")
7+
:login-syncing (js/require "../resources/images/ui2/login-syncing.png")
68
:chat-privately-with-friends (js/require "../resources/images/ui2/chat-privately-with-friends.png")
79
:desktop-how-to-pair-sign-in (js/require "../resources/images/ui2/desktop-how-to-pair-sign-in.png")
810
:desktop-how-to-pair-logged-in (js/require

src/status_im/contexts/onboarding/create_or_sync_profile/view.cljs

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
:title (i18n/label :t/log-in-by-syncing)
9292
:subtitle (i18n/label :t/log-in-by-syncing-subtitle)
9393
:accessibility-label :log-in-by-syncing-icon-card
94-
:image (resources/get-image :ethereum-address)
94+
:image (resources/get-image :login-syncing)
9595
:on-press show-check-before-syncing}])
9696

9797
(defn- use-empty-keycard-icon-card

src/status_im/contexts/onboarding/share_usage/style.cljs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
(ns status-im.contexts.onboarding.share-usage.style)
1+
(ns status-im.contexts.onboarding.share-usage.style
2+
(:require [quo.foundations.colors :as colors]))
23

34
(def title-container
45
{:margin-horizontal 20
@@ -16,3 +17,7 @@
1617
[insets]
1718
{:margin 20
1819
:margin-bottom (+ 12 (:bottom insets))})
20+
21+
(def page
22+
{:flex 1
23+
:background-color colors/neutral-100})

src/status_im/contexts/onboarding/share_usage/view.cljs

+14-11
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,38 @@
1717
(rf/dispatch [:navigate-to-within-stack [next-screen :screen/onboarding.share-usage]]) ;; Onboarding
1818
(rf/dispatch [:navigate-back]))) ;; Login Screen
1919

20+
(defn- learn-more
21+
[]
22+
(rf/dispatch [:show-bottom-sheet
23+
{:content learn-more-sheet/view
24+
:shell? true}]))
25+
2026
(defn view
2127
[]
2228
(let [insets (safe-area/get-insets)
2329
next-screen (:next-screen (rf/sub [:get-screen-params :screen/onboarding.share-usage]))
2430
share-usage-data (rn/use-callback #(share-usage-data-fn true next-screen))
25-
maybe-later (rn/use-callback #(share-usage-data-fn false next-screen))
26-
learn-more (rn/use-callback #(rf/dispatch [:show-bottom-sheet
27-
{:content learn-more-sheet/view
28-
:shell? true}]))]
29-
[:<>
31+
maybe-later (rn/use-callback #(share-usage-data-fn false next-screen))]
32+
[rn/view {:style style/page}
3033
[quo/page-nav
3134
{:margin-top (:top insets)
3235
:background :blur
33-
:icon-name :i/arrow-left
36+
:icon-name :i/close
3437
:on-press events-helper/navigate-back
3538
:right-side [{:icon-left :i/info
3639
:accessibility-label :learn-more
3740
:label (i18n/label :t/learn-more)
3841
:on-press learn-more}]}]
39-
[quo/text-combinations
40-
{:container-style style/title-container
41-
:title (i18n/label :t/help-us-improve-status)
42+
[quo/page-top
43+
{:title (i18n/label :t/help-us-improve-status)
4244
:title-accessibility-label :share-usage-title
43-
:description (i18n/label :t/collecting-usage-data)
45+
:description :text
46+
:description-text (i18n/label :t/collecting-usage-data)
4447
:description-accessibility-label :share-usage-subtitle}]
4548
[rn/image
4649
{:resize-mode :contain
4750
:style (style/page-illustration (:width (rn/get-window)))
48-
:source (resources/get-image :biometrics)}]
51+
:source (resources/get-image :usage-data)}]
4952
[rn/view {:style (style/buttons insets)}
5053
[quo/button
5154
{:size 40

src/status_im/navigation/options.cljs

+9-10
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,15 @@
2525

2626
(defn root-options
2727
[{:keys [background-color theme status-bar-theme nav-bar-color]}]
28-
(merge
29-
(statusbar-and-navbar-options theme status-bar-theme nav-bar-color)
30-
{:topBar {:visible false}
31-
:layout {:componentBackgroundColor (or background-color
32-
(colors/theme-colors colors/white colors/neutral-100 theme))
33-
:orientation ["portrait"]
34-
:backgroundColor (or background-color
35-
(colors/theme-colors colors/white
36-
colors/neutral-100
37-
theme))}}))
28+
(let [layout-background (or background-color
29+
(colors/theme-colors colors/white colors/neutral-100 theme))
30+
component-background (or background-color
31+
(colors/theme-colors colors/white colors/neutral-100 theme))]
32+
(assoc (statusbar-and-navbar-options theme status-bar-theme nav-bar-color)
33+
:topBar {:visible false}
34+
:layout {:componentBackgroundColor component-background
35+
:orientation ["portrait"]
36+
:backgroundColor layout-background})))
3837

3938
(defn dark-root-options
4039
[]

src/status_im/navigation/screens.cljs

+1-3
Original file line numberDiff line numberDiff line change
@@ -757,9 +757,7 @@
757757
:metrics {:track? true}
758758
:options {:theme :dark
759759
:layout options/onboarding-transparent-layout
760-
:animations (merge
761-
transitions/new-to-status-modal-animations
762-
transitions/push-animations-for-transparent-background)
760+
:animations transitions/modal-animations-vertical
763761
:popGesture false
764762
:modalPresentationStyle :overCurrentContext}
765763
:component onboarding.share-usage/view})

src/status_im/navigation/transitions.cljs

+8
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@
4040
:to (:width (rn/get-window))
4141
:duration constants/onboarding-modal-animation-duration}}})
4242

43+
(def modal-animations-vertical
44+
{:showModal {:translationY {:from (:height (rn/get-window))
45+
:to 0
46+
:duration constants/onboarding-modal-animation-duration}}
47+
:dismissModal {:translationY {:from 0
48+
:to (:height (rn/get-window))
49+
:duration constants/onboarding-modal-animation-duration}}})
50+
4351
;;;; Stack Transitions
4452
(def stack-slide-transition
4553
{:push {:content {:translationX {:from (:width (rn/get-window))

0 commit comments

Comments
 (0)