Skip to content

New intro screen #15127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
J-Son89 merged 2 commits into from
Mar 6, 2023
Merged

New intro screen #15127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5034b4c
feat: add new intro page
J-Son89 Mar 6, 2023
6c5082b
e2e: new intro fix
churik Mar 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 resources/images/ui2/welcome-1@2x.png → resources/images/ui2/intro-1@2x.png
View file
Open in desktop
File renamed without changes
0 resources/images/ui2/welcome-1.png → resources/images/ui2/intro-1@3x.png
View file
Open in desktop
File renamed without changes
Binary file added resources/images/ui2/intro-2@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/images/ui2/intro-2@3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/images/ui2/intro-3@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/images/ui2/intro-3@3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/images/ui2/intro-4@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/images/ui2/intro-4@3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 16 additions & 14 deletions src/quo2/components/drawers/drawer_buttons/style.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,24 @@
(def outer-container {:height 216})

(def top-card
{:flex 1
:padding-vertical 12
:padding-horizontal 20
:border-radius 20
:background-color colors/neutral-80})
{:flex 1
:padding-vertical 12
:padding-horizontal 20
:border-top-left-radius 20
:border-top-right-radius 20
:background-color colors/neutral-80})

(def bottom-card
{:position :absolute
:top 80
:left 0
:right 0
:bottom 0
:padding-vertical 12
:padding-horizontal 20
:border-radius 20
:background-color (colors/alpha colors/white 0.05)})
{:position :absolute
:top 80
:left 0
:right 0
:bottom 0
:padding-vertical 12
:padding-horizontal 20
:border-top-left-radius 20
:border-top-right-radius 20
:background-color (colors/alpha colors/white 0.05)})

(def bottom-container
{:flex-direction :row
Expand Down
19 changes: 11 additions & 8 deletions src/quo2/components/drawers/drawer_buttons/view.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,14 @@
children))

(defn card
[{:keys [on-press style heading gap top?]} children]
[{:keys [on-press style heading gap accessibility-label top?]} children]
[rn/touchable-highlight
{:on-press on-press
:border-radius 20
:style style
:underlay-color (:background-color style)}
[rn/view {}
{:accessibility-label accessibility-label
:on-press on-press
:border-radius 20
:style style
:underlay-color (:background-color style)}
[rn/view
[text/text
{:size :heading-1
:style (style/heading-text gap)
Expand All @@ -60,9 +61,11 @@
opts
{:container-style style-object
:top-card { :on-press event
:heading string}
:heading string
:accessibility-label keyword}
:bottom-card { :on-press event
:heading string}}
:heading string
:accessibility-label keyword}}
child-1 string, keyword or hiccup
child-2 string, keyword or hiccup
"
Expand Down
47 changes: 0 additions & 47 deletions src/status_im/ui/screens/onboarding/intro/styles.cljs
View file
Open in desktop

This file was deleted.

204 changes: 0 additions & 204 deletions src/status_im/ui/screens/onboarding/intro/views.cljs
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/status_im/ui/screens/screens.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
[status-im.ui.screens.notifications-settings.views :as notifications-settings]
[status-im.ui.screens.offline-messaging-settings.edit-mailserver.views :as edit-mailserver]
[status-im.ui.screens.offline-messaging-settings.views :as offline-messaging-settings]
[status-im.ui.screens.onboarding.intro.views :as onboarding.intro]
[status-im.ui.screens.onboarding.keys.views :as onboarding.keys]
[status-im.ui.screens.onboarding.notifications.views :as onboarding.notifications]
[status-im.ui.screens.onboarding.password.views :as onboarding.password]
Expand Down Expand Up @@ -130,11 +129,6 @@
{:name :progress
:component progress/progress}

;[Onboarding]
{:name :intro
:insets {:bottom true}
:component onboarding.intro/intro}

;[Onboarding]
{:name :get-your-keys
:insets {:bottom true}
Expand Down
4 changes: 4 additions & 0 deletions src/status_im2/common/resources.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

(def ui
{:add-new-contact (js/require "../resources/images/ui2/add-contact.png")
:intro-1 (js/require "../resources/images/ui2/intro-1.png")
Copy link
Copy Markdown
Contributor

@ulisesmac ulisesmac Feb 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The images added contain a transparent padding top (i.e. some transparent pixels), is it correct?
I've seen this sometimes in the designs, but I'm not sure whether that's due to the way figma exports the files or it's intended by the design team.

Copy link
Copy Markdown
Contributor Author

@J-Son89 J-Son89 Mar 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, let's check with design team about this 👍 I exported using Figma which is the method we normally use afaik

Copy link
Copy Markdown
Contributor Author

@J-Son89 J-Son89 Mar 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

images look good in the app btw 👍

Copy link
Copy Markdown
Contributor

@Parveshdhull Parveshdhull Mar 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes they looks different images
image

Fresh Install flow uses different image then app locked etc.
(probably they are just placeholder and going to be replaced, not sure)

Copy link
Copy Markdown
Contributor

@ulisesmac ulisesmac Mar 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@J-Son89 @Parveshdhull I'm talking about these transparent pixels:
image

Is it ok to keep that "padding-like"?

Copy link
Copy Markdown
Contributor

@briansztamfater briansztamfater Mar 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should use this kind of images without transparent pixels, and add paddings programatically if necessary

Copy link
Copy Markdown
Contributor Author

@J-Son89 J-Son89 Mar 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll discuss with design team!

:intro-2 (js/require "../resources/images/ui2/intro-2.png")
:intro-3 (js/require "../resources/images/ui2/intro-3.png")
:intro-4 (js/require "../resources/images/ui2/intro-4.png")
:lifestyle (js/require "../resources/images/ui2/lifestyle.png")
:music (js/require "../resources/images/ui2/music.png")
:podcasts (js/require "../resources/images/ui2/podcasts.png")
Expand Down
Loading