Skip to content
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

Jump to bottom

NMA-305 | NMA-306 | Create Identity - Home and Result screens #371

Merged
merged 6 commits into from
Apr 10, 2020
Merged

NMA-305 | NMA-306 | Create Identity - Home and Result screens #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9b2ccd
Showing status based on mocked data
desamtralized Mar 26, 2020
feeaa90
Identity Creation - Complete - Home Screen
desamtralized Mar 26, 2020
11d30b1
Layout for complete username screen
desamtralized Apr 1, 2020
5da37ef
Added view to show 1st letter of created username
desamtralized Apr 6, 2020
a7dce38
Added instruction on how to clear identity creation status
desamtralized Apr 7, 2020
4ad778a
Fixed crash when dismissing confirmation dialog and pressing register…
desamtralized Apr 9, 2020
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
2 changes: 1 addition & 1 deletion wallet/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies {
implementation 'com.github.tony19:logback-android-core:1.1.1-6'
implementation 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'com.tbuonomo.andrui:viewpagerdotsindicator:4.1.2'
implementation 'com.sambarboza:orbitview:0.1.4'
implementation 'com.sambarboza:orbitview:0.2.0'

implementation project(path: ':common')
implementation project(path: ':ui-redesign')
Expand Down
Binary file modified wallet/res/drawable-xhdpi/identity_processing_0.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 modified wallet/res/drawable-xhdpi/identity_processing_1.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 modified wallet/res/drawable-xhdpi/identity_processing_2.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 modified wallet/res/drawable-xhdpi/identity_processing_3.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 modified wallet/res/drawable-xhdpi/identity_processing_4.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 modified wallet/res/drawable-xhdpi/identity_processing_5.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 modified wallet/res/drawable-xhdpi/identity_processing_6.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 removed wallet/res/drawable-xhdpi/identity_processing_7.png
View file
Open in desktop
Binary file not shown.
15 changes: 15 additions & 0 deletions wallet/res/drawable/ic_circle_forward_arrow.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="32dp"
android:height="32dp"
android:viewportWidth="32"
android:viewportHeight="32">
<path
android:strokeWidth="1"
android:pathData="M16,31C24.2843,31 31,24.2843 31,16C31,7.7157 24.2843,1 16,1C7.7157,1 1,7.7157 1,16C1,24.2843 7.7157,31 16,31Z"
android:fillColor="#008DE4"
android:strokeColor="#008DE4"/>
<path
android:pathData="M10,16.75H19.1275L14.935,20.9425L16,22L22,16L16,10L14.9425,11.0575L19.1275,15.25L10,15.25V16.75Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</vector>
33 changes: 33 additions & 0 deletions wallet/res/drawable/identity_complete_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="126dp"
android:height="100dp"
android:viewportWidth="126"
android:viewportHeight="100">
<path
android:pathData="M123.492,37.714C121.955,36.163 119.934,35.393 117.916,35.393H78.298V51.155H117.916C119.934,51.155 121.955,50.382 123.492,48.851C125.028,47.315 125.798,45.296 125.798,43.278C125.798,41.262 125.028,39.246 123.492,37.714Z"
android:fillColor="#E6E5E5"/>
<path
android:pathData="M119.039,53.469C117.498,51.929 115.481,51.155 113.467,51.155H71.096V66.905H113.467C115.481,66.905 117.498,66.142 119.039,64.612C120.573,63.068 121.343,61.054 121.343,59.039C121.344,57.017 120.573,55 119.039,53.469Z"
android:fillColor="#E6E5E5"/>
<path
android:pathData="M114.663,69.214C113.125,67.681 111.115,66.904 109.097,66.904H63.883V82.666H109.097C111.115,82.666 113.126,81.893 114.663,80.359C116.206,78.823 116.976,76.808 116.976,74.786C116.977,72.773 116.207,70.758 114.663,69.214Z"
android:fillColor="#E6E5E5"/>
<path
android:pathData="M110.301,84.977C108.763,83.431 106.746,82.667 104.732,82.667H56.715V98.423H104.732C106.747,98.423 108.764,97.653 110.301,96.119C111.838,94.572 112.608,92.564 112.608,90.543C112.608,88.525 111.838,86.514 110.301,84.977Z"
android:fillColor="#E6E5E5"/>
<path
android:pathData="M79.081,35.389H40.796V98.418H79.081V35.389Z"
android:fillColor="#E6E5E5"/>
<path
android:pathData="M84.658,2.31C83.124,0.768 81.102,0 79.088,0C77.073,0 75.053,0.769 73.521,2.31C71.979,3.844 71.208,5.862 71.208,7.871V7.073C71.208,10.886 70.48,14.766 68.914,18.501C67.352,22.237 65.116,25.477 62.391,28.159L54.142,36.286L77.039,47.29L82.666,33.348C84.06,29.893 85.149,26.266 85.885,22.478C86.622,18.693 86.968,14.917 86.968,11.197V7.871C86.968,5.861 86.194,3.844 84.658,2.31Z"
android:fillColor="#E6E5E5"/>
<path
android:pathData="M42.537,33.819H0V100H42.537V33.819Z"
android:fillColor="#008DE4"/>
<path
android:pathData="M36.973,90.968C36.973,92.874 35.425,94.441 33.5,94.441C31.587,94.441 30.034,92.874 30.034,90.968C30.034,89.048 31.587,87.501 33.5,87.501C35.425,87.501 36.973,89.048 36.973,90.968Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M23.31,90.968C23.31,92.874 21.757,94.441 19.847,94.441C17.932,94.441 16.378,92.874 16.378,90.968C16.378,89.048 17.932,87.501 19.847,87.501C21.757,87.501 23.31,89.048 23.31,90.968Z"
android:fillColor="#012060"/>
</vector>
35 changes: 25 additions & 10 deletions wallet/res/drawable/identity_processing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<animation-list
xmlns:android="http://schemas.android.com/apk/res/android"
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
<item android:drawable="@drawable/identity_processing_0" android:duration="500" />
<item android:drawable="@drawable/identity_processing_1" android:duration="500" />
<item android:drawable="@drawable/identity_processing_2" android:duration="500" />
<item android:drawable="@drawable/identity_processing_3" android:duration="500" />
<item android:drawable="@drawable/identity_processing_4" android:duration="500" />
<item android:drawable="@drawable/identity_processing_5" android:duration="500" />
<item android:drawable="@drawable/identity_processing_6" android:duration="1200" />
<item android:drawable="@drawable/identity_processing_7" android:duration="250" />
<item
android:drawable="@drawable/identity_processing_0"
android:duration="500" />
<item
android:drawable="@drawable/identity_processing_1"
android:duration="500" />
<item
android:drawable="@drawable/identity_processing_2"
android:duration="500" />
<item
android:drawable="@drawable/identity_processing_3"
android:duration="500" />
<item
android:drawable="@drawable/identity_processing_4"
android:duration="500" />
<item
android:drawable="@drawable/identity_processing_5"
android:duration="500" />
<item
android:drawable="@drawable/identity_processing_6"
android:duration="1200" />
<item
android:drawable="@android:color/transparent"
android:duration="250" />
</animation-list>
164 changes: 108 additions & 56 deletions wallet/res/layout/create_username.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,60 +9,9 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/bg_less_bright">

<!--Header-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="230dp"
android:background="@android:color/white"
android:clipChildren="false"
app:layout_constraintTop_toTopOf="parent">

<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:translationX="@dimen/create_username_orbits_translation_x"
android:translationY="-130dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

<include layout="@layout/users_orbit" />

</FrameLayout>

<ImageView
android:id="@+id/close_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginLeft="24dp"
android:layout_marginTop="36dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_close_blue" />

<TextView
android:id="@+id/choose_username_title"
style="@style/MontserratRegular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="146dp"
android:lines="2"
android:textColor="@color/medium_gray"
android:textSize="22sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="RtlHardcoded"
tools:text="Choose your Dash\nUsername" />

</androidx.constraintlayout.widget.ConstraintLayout>
android:background="@color/bg_less_bright"
android:clipChildren="false"
android:clipToPadding="false">

<!--Registration-->
<androidx.constraintlayout.widget.ConstraintLayout
Expand Down Expand Up @@ -161,15 +110,15 @@

</androidx.constraintlayout.widget.ConstraintLayout>

<!-- Processing -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/processing_identity"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@color/dash_blue"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/header"
tools:visibility="visible">
app:layout_constraintTop_toBottomOf="@id/header">

<ImageView
android:id="@+id/processing_identity_loading_image"
Expand Down Expand Up @@ -210,6 +159,109 @@

</androidx.constraintlayout.widget.ConstraintLayout>

<!-- Complete -->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/identity_complete"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="@android:color/white"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/header"
tools:visibility="visible">

<ImageView
android:id="@+id/identity_complete_icon"
android:layout_width="125dp"
android:layout_height="wrap_content"
android:layout_marginStart="22dp"
android:layout_marginLeft="22dp"
android:layout_marginTop="14dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/identity_complete_icon" />

<TextView
android:id="@+id/identity_complete_text"
style="@style/MontserratRegular"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="26dp"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:textSize="26sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/identity_complete_icon"
app:layout_constraintTop_toBottomOf="@id/identity_complete_icon" />

<Button
android:id="@+id/identity_complete_button"
style="@style/DashButton.Blue"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="25dp"
android:text="@string/verify_continue"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

<!--Header-->
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="230dp"
android:background="@android:color/white"
android:clipChildren="false"
android:clipToPadding="false"
app:layout_constraintTop_toTopOf="parent">

<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:translationX="@dimen/create_username_orbits_translation_x"
android:translationY="-130dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

<include layout="@layout/users_orbit" />

</FrameLayout>

<ImageView
android:id="@+id/close_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginLeft="24dp"
android:layout_marginTop="36dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_close_blue" />

<TextView
android:id="@+id/choose_username_title"
style="@style/MontserratRegular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="146dp"
android:lines="2"
android:textColor="@color/medium_gray"
android:textSize="22sp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="RtlHardcoded"
tools:text="Choose your Dash\nUsername" />

</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

</de.schildbach.wallet.ui.widget.KeyboardResponsiveCoordinatorLayout>
73 changes: 73 additions & 0 deletions wallet/res/layout/identity_creation_state.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="@style/DashButton.White"
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginBottom="10dp"
android:animateLayoutChanges="true"
android:orientation="vertical">

<ImageView
android:id="@+id/processing_animated_icon"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_marginLeft="6dp"
android:layout_marginTop="10dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/identity_processing" />

<TextView
android:id="@+id/processing_title"
style="@style/MontserratMedium.B"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
android:text="@string/processing_home_title"
android:textSize="14sp"
app:layout_constraintStart_toEndOf="@id/processing_animated_icon"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/processing_subtitle"
style="@style/MontserratRegular.G"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="1dp"
android:text="@string/processing_home_title"
android:textSize="13sp"
app:layout_constraintStart_toEndOf="@id/processing_animated_icon"
app:layout_constraintTop_toBottomOf="@id/processing_title"
tools:text="@string/processing_home_step_1" />

<ProgressBar
android:id="@+id/processing_progress"
style="@style/ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:indeterminate="false"
android:progress="25"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent" />

<ImageView
android:id="@+id/processing_forward_arrow"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_circle_forward_arrow"
tools:visibility="visible" />

</androidx.constraintlayout.widget.ConstraintLayout>
Loading