AccountWizardActivity: new design
Change-Id: Ib3cd7f7e3e9c71eeb968657c74200047190e5ab6
diff --git a/ring-android/app/src/main/java/cx/ring/views/AvatarDrawable.java b/ring-android/app/src/main/java/cx/ring/views/AvatarDrawable.java
index 29deae5..f875740 100644
--- a/ring-android/app/src/main/java/cx/ring/views/AvatarDrawable.java
+++ b/ring-android/app/src/main/java/cx/ring/views/AvatarDrawable.java
@@ -50,7 +50,7 @@
public class AvatarDrawable extends Drawable {
private static final int SIZE_AB = 36;
private static final float DEFAULT_TEXT_SIZE_PERCENTAGE = 0.5f;
- private static final int PLACEHOLDER_ICON = R.drawable.baseline_account_circle_24;
+ private static final int PLACEHOLDER_ICON = R.drawable.baseline_account_crop_24;
private static final int PRESENCE_COLOR = R.color.green_A700;
private static final int[] contactColors = {
diff --git a/ring-android/app/src/main/res/drawable/baseline_account_circle_white_36.xml b/ring-android/app/src/main/res/drawable/baseline_account_circle_white_36.xml
new file mode 100644
index 0000000..f0e7723
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/baseline_account_circle_white_36.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" />
+</vector>
diff --git a/ring-android/app/src/main/res/drawable/baseline_account_circle_24.xml b/ring-android/app/src/main/res/drawable/baseline_account_crop_24.xml
similarity index 100%
rename from ring-android/app/src/main/res/drawable/baseline_account_circle_24.xml
rename to ring-android/app/src/main/res/drawable/baseline_account_crop_24.xml
diff --git a/ring-android/app/src/main/res/drawable/baseline_arrow_forward_black_18.xml b/ring-android/app/src/main/res/drawable/baseline_arrow_forward_black_18.xml
new file mode 100644
index 0000000..3d1f9c6
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/baseline_arrow_forward_black_18.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="18dp"
+ android:height="18dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M5.88,4.12L13.76,12l-7.88,7.88L8,22l10,-10L8,2z"
+ android:fillColor="@android:color/black" />
+</vector>
diff --git a/ring-android/app/src/main/res/drawable/baseline_arrow_forward_white_18.xml b/ring-android/app/src/main/res/drawable/baseline_arrow_forward_white_18.xml
new file mode 100644
index 0000000..819c529
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/baseline_arrow_forward_white_18.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="18dp"
+ android:height="18dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M5.88,4.12L13.76,12l-7.88,7.88L8,22l10,-10L8,2z"
+ android:fillColor="@android:color/white" />
+</vector>
diff --git a/ring-android/app/src/main/res/drawable/baseline_backup_black_36.xml b/ring-android/app/src/main/res/drawable/baseline_backup_black_36.xml
new file mode 100644
index 0000000..0e04386
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/baseline_backup_black_36.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM14,13v4h-4v-4H7l5,-5 5,5h-3z"
+ android:fillColor="@android:color/black" />
+</vector>
diff --git a/ring-android/app/src/main/res/drawable/baseline_devices_white_36.xml b/ring-android/app/src/main/res/drawable/baseline_devices_white_36.xml
new file mode 100644
index 0000000..0d76916
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/baseline_devices_white_36.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="@android:color/white"
+ android:pathData="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z" />
+</vector>
diff --git a/ring-android/app/src/main/res/drawable/baseline_router_black_36.xml b/ring-android/app/src/main/res/drawable/baseline_router_black_36.xml
new file mode 100644
index 0000000..5f4fefd
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/baseline_router_black_36.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="36dp"
+ android:height="36dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:pathData="M20.2,5.9l0.8,-0.8C19.6,3.7 17.8,3 16,3s-3.6,0.7 -5,2.1l0.8,0.8C13,4.8 14.5,4.2 16,4.2s3,0.6 4.2,1.7zM19.3,6.7c-0.9,-0.9 -2.1,-1.4 -3.3,-1.4s-2.4,0.5 -3.3,1.4l0.8,0.8c0.7,-0.7 1.6,-1 2.5,-1 0.9,0 1.8,0.3 2.5,1l0.8,-0.8zM19,13h-2L17,9h-2v4L5,13c-1.1,0 -2,0.9 -2,2v4c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2v-4c0,-1.1 -0.9,-2 -2,-2zM8,18L6,18v-2h2v2zM11.5,18h-2v-2h2v2zM15,18h-2v-2h2v2z"
+ android:fillColor="@android:color/black" />
+</vector>
diff --git a/ring-android/app/src/main/res/drawable/wizard_button_background_selector.xml b/ring-android/app/src/main/res/drawable/wizard_button_background_selector.xml
new file mode 100644
index 0000000..8ea08ba
--- /dev/null
+++ b/ring-android/app/src/main/res/drawable/wizard_button_background_selector.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2004-2020 Savoir-faire Linux Inc.
+ ~
+ ~ Authors: AmirHossein Naghshzan <amirhossein.naghshzan@savoirfairelinux.com>
+ ~
+ ~ This program is free software; you can redistribute it and/or modify
+ ~ it under the terms of the GNU General Public License as published by
+ ~ the Free Software Foundation; either version 3 of the License, or
+ ~ (at your option) any later version.
+ ~
+ ~ This program is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ ~ GNU General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU General Public License
+ ~ along with this program; if not, write to the Free Software
+ ~ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/color_primary_light" android:state_enabled="true"/>
+ <item android:color="@color/grey_300" android:state_enabled="false"/>
+</selector>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml b/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
index 02b4981..45b806c 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
@@ -22,7 +22,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:layout_margin="16dp"
+ android:layout_marginRight="16dp"
+ android:layout_marginLeft="16dp"
android:contentDescription="@string/app_name"
app:srcCompat="@drawable/ic_jami_full_logo" />
@@ -30,45 +31,61 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
- android:paddingLeft="16dp"
- android:paddingTop="24dp"
- android:paddingRight="16dp"
- android:paddingBottom="24dp"
+ android:padding="30dp"
+ android:layout_marginBottom="18dp"
+ android:layout_marginTop="18dp"
android:text="@string/help_ring"
- android:textSize="14sp" />
+ android:textSize="18sp"
+ android:textStyle="bold"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/ring_create_btn"
- style="@style/Widget.MaterialComponents.Button"
- android:layout_width="260dp"
- android:layout_height="wrap_content"
+ style="@style/WizardButton"
+ android:layout_width="@dimen/wizard_button_width"
+ android:layout_height="@dimen/wizard_button_height"
android:layout_gravity="center"
- android:layout_marginBottom="16dp"
- android:text="@string/account_new_button" />
+ android:text="@string/account_new_button"
+ android:textSize="@dimen/wizard_button_text_size"
+ android:drawableLeft="@drawable/baseline_account_circle_white_36"
+ android:drawableRight="@drawable/baseline_arrow_forward_white_18"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/ring_add_account"
- style="@style/Widget.MaterialComponents.Button"
- android:layout_width="260dp"
- android:layout_height="wrap_content"
+ style="@style/WizardButton"
+ android:layout_width="@dimen/wizard_button_width"
+ android:layout_height="@dimen/wizard_button_height"
android:layout_gravity="center"
- android:text="@string/account_link_device" />
+ android:layout_marginBottom="12dp"
+ android:textSize="@dimen/wizard_button_text_size"
+ android:text="@string/account_link_device"
+ android:drawableLeft="@drawable/baseline_devices_white_36"
+ android:drawableRight="@drawable/baseline_arrow_forward_white_18"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/ring_import_account"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
- android:layout_width="260dp"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/wizard_button_width"
+ android:layout_height="@dimen/wizard_button_height"
android:layout_gravity="center"
- android:text="@string/account_link_archive_button" />
+ app:cornerRadius="@dimen/wizard_button_corner_radius"
+ android:text="@string/account_link_archive_button"
+ android:textSize="@dimen/wizard_button_text_size"
+ android:padding="@dimen/wizard_button_padding"
+ android:drawableLeft="@drawable/baseline_backup_black_36"
+ android:drawableRight="@drawable/baseline_arrow_forward_black_18"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/account_connect_server"
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
- android:layout_width="260dp"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/wizard_button_width"
+ android:layout_height="@dimen/wizard_button_height"
android:layout_gravity="center"
- android:text="@string/account_connect_server_button" />
+ app:cornerRadius="@dimen/wizard_button_corner_radius"
+ android:textSize="@dimen/wizard_button_text_size"
+ android:padding="@dimen/wizard_button_padding"
+ android:text="@string/account_connect_server_button"
+ android:drawableLeft="@drawable/baseline_router_black_36"
+ android:drawableRight="@drawable/baseline_arrow_forward_black_18"/>
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_acc_jami_connect.xml b/ring-android/app/src/main/res/layout/frag_acc_jami_connect.xml
index 22b0ada..a3e33c6 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_jami_connect.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_jami_connect.xml
@@ -98,6 +98,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/connect_button"
+ style="@style/WizardButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
diff --git a/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml b/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
index 21df94f..c1a0fab 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
@@ -111,6 +111,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/next_create_account"
+ style="@style/WizardButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignEnd="@id/scrollview"
diff --git a/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml b/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
index b769fc5..2e8d40f 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
@@ -166,6 +166,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/create_account"
+ style="@style/WizardButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignEnd="@id/scrollview"
@@ -174,7 +175,6 @@
android:layout_marginTop="8dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginBottom="24dp"
- android:background="@color/color_primary_light"
android:enabled="false"
android:text="@string/account_new_button"
android:theme="@style/ButtonColoredInverse" />
diff --git a/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml b/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
index e587192..a973c86 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
@@ -92,6 +92,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/link_button"
+ style="@style/WizardButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignEnd="@id/scrollview"
diff --git a/ring-android/app/src/main/res/values/dimens.xml b/ring-android/app/src/main/res/values/dimens.xml
index b48f676..6a78149 100644
--- a/ring-android/app/src/main/res/values/dimens.xml
+++ b/ring-android/app/src/main/res/values/dimens.xml
@@ -73,4 +73,10 @@
<dimen name="call_preview_elevation_dragged">16dp</dimen>
<dimen name="call_preview_margin">12dp</dimen>
+ <dimen name="wizard_button_width">340dp</dimen>
+ <dimen name="wizard_button_height">60dp</dimen>
+ <dimen name="wizard_button_corner_radius">12dp</dimen>
+ <dimen name="wizard_button_text_size">12sp</dimen>
+ <dimen name="wizard_button_padding">12dp</dimen>
+
</resources>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/values/styles.xml b/ring-android/app/src/main/res/values/styles.xml
index 40cde4f..cf7f7d9 100644
--- a/ring-android/app/src/main/res/values/styles.xml
+++ b/ring-android/app/src/main/res/values/styles.xml
@@ -292,4 +292,10 @@
<item name="colorControlActivated">@color/conversation_primary_selection_handles</item>
</style>
+ <style name="WizardButton" parent="Widget.MaterialComponents.Button">
+ <item name="cornerRadius">@dimen/wizard_button_corner_radius</item>
+ <item name="android:padding">@dimen/wizard_button_padding</item>
+ <item name="android:backgroundTint">@drawable/wizard_button_background_selector</item>
+ </style>
+
</resources>
\ No newline at end of file