diff --git a/apps/mobile-app/android/app/src/main/res/drawable/av_logo.xml b/apps/mobile-app/android/app/src/main/res/drawable/av_logo.xml new file mode 100644 index 000000000..94f16700a --- /dev/null +++ b/apps/mobile-app/android/app/src/main/res/drawable/av_logo.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/apps/mobile-app/android/app/src/main/res/drawable/info_notice_background.xml b/apps/mobile-app/android/app/src/main/res/drawable/info_notice_background.xml new file mode 100644 index 000000000..65483976e --- /dev/null +++ b/apps/mobile-app/android/app/src/main/res/drawable/info_notice_background.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/apps/mobile-app/android/app/src/main/res/drawable/info_row_background.xml b/apps/mobile-app/android/app/src/main/res/drawable/info_row_background.xml new file mode 100644 index 000000000..da6851102 --- /dev/null +++ b/apps/mobile-app/android/app/src/main/res/drawable/info_row_background.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/apps/mobile-app/android/app/src/main/res/drawable/loading_dot.xml b/apps/mobile-app/android/app/src/main/res/drawable/loading_dot.xml index fc4aea753..cf07da626 100644 --- a/apps/mobile-app/android/app/src/main/res/drawable/loading_dot.xml +++ b/apps/mobile-app/android/app/src/main/res/drawable/loading_dot.xml @@ -1,5 +1,5 @@ - + diff --git a/apps/mobile-app/android/app/src/main/res/drawable/rounded_corner_background.xml b/apps/mobile-app/android/app/src/main/res/drawable/rounded_corner_background.xml index 468e6accd..2d38d7a05 100644 --- a/apps/mobile-app/android/app/src/main/res/drawable/rounded_corner_background.xml +++ b/apps/mobile-app/android/app/src/main/res/drawable/rounded_corner_background.xml @@ -1,9 +1,6 @@ - - - + + diff --git a/apps/mobile-app/android/app/src/main/res/layout/activity_passkey_registration.xml b/apps/mobile-app/android/app/src/main/res/layout/activity_passkey_registration.xml index 0b58124bd..d724b2cb5 100644 --- a/apps/mobile-app/android/app/src/main/res/layout/activity_passkey_registration.xml +++ b/apps/mobile-app/android/app/src/main/res/layout/activity_passkey_registration.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?android:attr/colorBackground"> + android:background="@color/av_background"> + + + + android:textColor="@color/av_text_muted" + android:gravity="center" + android:layout_marginBottom="20dp" /> + + + + + + + + + app:boxStrokeColor="@color/av_primary" + app:hintTextColor="@color/av_primary" + app:boxBackgroundColor="@color/av_accent_background" + android:layout_marginBottom="16dp"> @@ -63,13 +105,15 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" - android:layout_marginBottom="16dp"> + android:padding="12dp" + android:background="@drawable/info_row_background" + android:layout_marginBottom="8dp"> @@ -84,14 +128,14 @@ android:layout_height="wrap_content" android:text="@string/passkey_website_label" android:textSize="12sp" - android:textColor="?android:attr/textColorSecondary" /> + android:textColor="@color/av_text_muted" /> + android:textColor="@color/av_text" /> @@ -102,14 +146,16 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:gravity="center_vertical" + android:padding="12dp" + android:background="@drawable/info_row_background" android:layout_marginBottom="32dp" android:visibility="gone"> @@ -124,14 +170,14 @@ android:layout_height="wrap_content" android:text="@string/passkey_username_label" android:textSize="12sp" - android:textColor="?android:attr/textColorSecondary" /> + android:textColor="@color/av_text_muted" /> + android:textColor="@color/av_text" /> @@ -145,7 +191,7 @@ android:id="@+id/errorText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="#D32F2F" + android:textColor="@color/av_error" android:textSize="14sp" android:layout_marginBottom="16dp" android:visibility="gone" /> @@ -157,19 +203,24 @@ android:layout_height="wrap_content" android:text="@string/passkey_create_button" android:textColor="#FFFFFF" - android:backgroundTint="@color/colorPrimary" + android:backgroundTint="@color/av_primary" android:layout_marginBottom="12dp" app:cornerRadius="8dp" - android:paddingVertical="12dp" /> + app:icon="@android:drawable/ic_lock_lock" + app:iconTint="#FFFFFF" + app:iconGravity="textStart" + android:paddingVertical="14dp" + android:textSize="16sp" /> + android:paddingVertical="14dp" + android:textSize="16sp" /> @@ -178,7 +229,7 @@ android:id="@+id/loadingOverlay" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#CC000000" + android:background="#B3000000" android:visibility="gone" android:clickable="true" android:focusable="true"> @@ -195,7 +246,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/rounded_corner_background" - android:padding="20dp"> + android:padding="24dp"> @@ -239,8 +290,8 @@ android:id="@+id/loadingMessage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:textColor="#FFFFFF" + android:layout_marginTop="20dp" + android:textColor="@color/av_text" android:textSize="16sp" android:gravity="center" /> diff --git a/apps/mobile-app/android/app/src/main/res/values-night/colors.xml b/apps/mobile-app/android/app/src/main/res/values-night/colors.xml index 54294107e..bda9e050c 100644 --- a/apps/mobile-app/android/app/src/main/res/values-night/colors.xml +++ b/apps/mobile-app/android/app/src/main/res/values-night/colors.xml @@ -1,3 +1,13 @@ - #000000 - \ No newline at end of file + + #ECEDEE + #9BA1A6 + #000000 + #202020 + #444444 + #f49541 + #6b7280 + #eabf69 + #9BA1A6 + #ef4444 + diff --git a/apps/mobile-app/android/app/src/main/res/values-night/styles.xml b/apps/mobile-app/android/app/src/main/res/values-night/styles.xml index 2e9da3ae7..6dcf2f04f 100644 --- a/apps/mobile-app/android/app/src/main/res/values-night/styles.xml +++ b/apps/mobile-app/android/app/src/main/res/values-night/styles.xml @@ -1,19 +1,14 @@ - - - - \ No newline at end of file + diff --git a/apps/mobile-app/android/app/src/main/res/values/colors.xml b/apps/mobile-app/android/app/src/main/res/values/colors.xml index f8ac4d0ce..1257607f0 100644 --- a/apps/mobile-app/android/app/src/main/res/values/colors.xml +++ b/apps/mobile-app/android/app/src/main/res/values/colors.xml @@ -1,5 +1,31 @@ #ffffff - #023c69 #FFFFFF + + + #023c69 + + + #11181C + #4b5563 + #f3f4f6 + #ffffff + #d1d5db + #f49541 + #6b7280 + #eabf69 + #687076 + #D32F2F + + + #11181C + #4b5563 + #f3f4f6 + #ffffff + #d1d5db + #f49541 + #6b7280 + #eabf69 + #687076 + #D32F2F diff --git a/apps/mobile-app/android/app/src/main/res/values/strings.xml b/apps/mobile-app/android/app/src/main/res/values/strings.xml index a1318c98e..af34ce05f 100644 --- a/apps/mobile-app/android/app/src/main/res/values/strings.xml +++ b/apps/mobile-app/android/app/src/main/res/values/strings.xml @@ -24,13 +24,15 @@ Enter a name for this passkey Website Username - Save Passkey + Create Passkey Cancel - Creating passkey - Saving to vault - Syncing with server + Creating passkey… + Saving to vault… + Syncing with server… Error Please enter a name for the passkey Failed to create passkey Retry + Info icon + Create a passkey to securely sign in without passwords \ No newline at end of file diff --git a/apps/mobile-app/android/app/src/main/res/values/styles.xml b/apps/mobile-app/android/app/src/main/res/values/styles.xml index 734fe88d3..ae251334b 100644 --- a/apps/mobile-app/android/app/src/main/res/values/styles.xml +++ b/apps/mobile-app/android/app/src/main/res/values/styles.xml @@ -17,11 +17,16 @@ @drawable/splashscreen_logo @style/AppTheme - \ No newline at end of file