From 277ffe16261d69a96c40a9b9bba7a14dabd4aaf0 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Tue, 5 Jul 2022 15:15:29 +0200
Subject: [PATCH] Improve button style

---
 .../habitica/ui/activities/ContinuePhoneActivity.kt |  2 +-
 wearos/src/main/res/layout/activity_login.xml       | 13 +++++++------
 wearos/src/main/res/layout/activity_rya.xml         |  4 +---
 wearos/src/main/res/layout/activity_task_detail.xml |  2 +-
 wearos/src/main/res/layout/activity_task_form.xml   |  6 ++----
 wearos/src/main/res/layout/logout_layout.xml        |  4 ++--
 wearos/src/main/res/values/styles.xml               | 13 +++++++++++--
 7 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
index 210f10b56..1011af0b6 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/ContinuePhoneActivity.kt
@@ -44,7 +44,7 @@ class ContinuePhoneActivity : BaseActivity<ActivityContinuePhoneBinding, Continu
         val set = AnimationSet(true)
         set.interpolator = AnticipateOvershootInterpolator()
         set.duration = 600
-        set.startOffset = 200
+        set.startOffset = 100
         set.fillBefore = true
         set.fillAfter = true
         set.addAnimation(alphaAnimation)
diff --git a/wearos/src/main/res/layout/activity_login.xml b/wearos/src/main/res/layout/activity_login.xml
index f717b4dc3..b764ba9e3 100644
--- a/wearos/src/main/res/layout/activity_login.xml
+++ b/wearos/src/main/res/layout/activity_login.xml
@@ -37,7 +37,7 @@
                 android:id="@+id/sign_in_on_phone_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/ChipButton"
+                style="@style/ChipButton.Icon"
                 android:text="@string/sign_in_on_phone"
                 android:drawableStart="@drawable/handoff"
                 android:layout_marginBottom="@dimen/spacing_small"/>
@@ -45,7 +45,7 @@
                 android:id="@+id/other_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/ChipButton"
+                style="@style/ChipButton.Icon"
                 android:drawableStart="@drawable/ic_keyboard"
                 android:text="@string/other_options"/>
 
@@ -57,7 +57,7 @@
                 android:drawableStart="@drawable/google_icon"
                 android:text="@string/login_btn_google"
                 android:layout_marginBottom="@dimen/spacing_small"
-                style="@style/ChipButton"/>
+                style="@style/ChipButton.Icon"/>
             <Button
                 android:id="@+id/username_password_button"
                 android:layout_width="match_parent"
@@ -65,14 +65,14 @@
                 android:text="@string/sign_in_password"
                 android:layout_marginBottom="@dimen/spacing_small"
                 android:drawableStart="@drawable/ic_keyboard"
-                style="@style/ChipButton"/>
+                style="@style/ChipButton.Icon"/>
             <Button
                 android:id="@+id/register_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/create_account"
                 android:drawableStart="@drawable/handoff"
-                style="@style/ChipButton"/>
+                style="@style/ChipButton.Icon"/>
 
             <EditText
                 android:id="@+id/username_edit_text"
@@ -105,6 +105,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/sign_in"
-                style="@style/ChipButton.Purple"/>
+                style="@style/ChipButton.Purple"
+                android:textSize="16sp"/>
         </LinearLayout>
 </com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_rya.xml b/wearos/src/main/res/layout/activity_rya.xml
index d194aa98d..5165ad853 100644
--- a/wearos/src/main/res/layout/activity_rya.xml
+++ b/wearos/src/main/res/layout/activity_rya.xml
@@ -34,7 +34,6 @@
             android:layout_height="wrap_content"
             android:text="@string/review_dailies"
             style="@style/ChipButton.Purple"
-            android:gravity="center"
             android:layout_marginBottom="@dimen/spacing_small"/>
         <Button
             android:id="@+id/phone_button"
@@ -42,7 +41,7 @@
             android:layout_height="wrap_content"
             android:text="@string/check_on_phone"
             android:drawableStart="@drawable/handoff"
-            style="@style/ChipButton"
+            style="@style/ChipButton.Icon"
             android:gravity="center"/>
 
         <LinearLayout
@@ -58,7 +57,6 @@
             style="@style/ChipButton.Purple"
             android:text="@string/start_new_day"
             android:layout_marginTop="2dp"
-            android:gravity="center"
             android:visibility="gone"/>
         <TextView
             android:layout_width="match_parent"
diff --git a/wearos/src/main/res/layout/activity_task_detail.xml b/wearos/src/main/res/layout/activity_task_detail.xml
index 3093f88f8..7d23a7d78 100644
--- a/wearos/src/main/res/layout/activity_task_detail.xml
+++ b/wearos/src/main/res/layout/activity_task_detail.xml
@@ -45,7 +45,7 @@
                 android:id="@+id/edit_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                style="@style/ChipButton"
+                style="@style/ChipButton.Icon"
                 android:drawableStart="@drawable/handoff"
                 android:text="@string/edit_on_phone"
                 android:layout_marginTop="12dp"/>
diff --git a/wearos/src/main/res/layout/activity_task_form.xml b/wearos/src/main/res/layout/activity_task_form.xml
index 2e6172b55..f730f5594 100644
--- a/wearos/src/main/res/layout/activity_task_form.xml
+++ b/wearos/src/main/res/layout/activity_task_form.xml
@@ -39,9 +39,8 @@
                     android:id="@+id/save_button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/ChipButton"
+                    style="@style/ChipButton.Icon"
                     android:text="@string/save"
-                    android:gravity="start|center_vertical"
                     android:layout_marginTop="20dp"
                     android:layout_marginBottom="4dp"
                     android:drawableStart="@drawable/save"/>
@@ -49,8 +48,7 @@
                     android:id="@+id/edit_button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    style="@style/ChipButton"
-                    android:gravity="start|center_vertical"
+                    style="@style/ChipButton.Icon"
                     android:text="@string/action_edit"
                     android:drawableStart="@drawable/edit"/>
             </LinearLayout>
diff --git a/wearos/src/main/res/layout/logout_layout.xml b/wearos/src/main/res/layout/logout_layout.xml
index bc003b454..4dbbfdb96 100644
--- a/wearos/src/main/res/layout/logout_layout.xml
+++ b/wearos/src/main/res/layout/logout_layout.xml
@@ -22,7 +22,7 @@
 
         <Button
             android:id="@+id/logout_button"
-            style="@style/ChipButton"
+            style="@style/ChipButton.Icon"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="@dimen/spacing_small"
@@ -31,7 +31,7 @@
 
         <Button
             android:id="@+id/cancel_button"
-            style="@style/ChipButton"
+            style="@style/ChipButton.Icon"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:drawableStart="@drawable/cancel"
diff --git a/wearos/src/main/res/values/styles.xml b/wearos/src/main/res/values/styles.xml
index fc67faee8..6bdc4a7d2 100644
--- a/wearos/src/main/res/values/styles.xml
+++ b/wearos/src/main/res/values/styles.xml
@@ -25,19 +25,28 @@
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">@color/watch_white</item>
         <item name="fontFamily">sans-serif-medium</item>
-        <item name="android:gravity">start|center_vertical</item>
+        <item name="android:gravity">center</item>
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:letterSpacing">0.01</item>
-        <item name="android:drawablePadding">8dp</item>
         <item name="android:foreground">@drawable/touch_feedback</item>
     </style>
 
+    <style name="ChipButton.Icon" parent="ChipButton">
+        <item name="android:gravity">start|center_vertical</item>
+        <item name="android:drawablePadding">8dp</item>
+    </style>
+
     <style name="ChipButton.Small" parent="ChipButton">
         <item name="android:textSize">14sp</item>
         <item name="android:minHeight">32dp</item>
     </style>
 
+    <style name="ChipButton.Icon.Purple" parent="ChipButton.Icon">
+        <item name="android:backgroundTint">@color/watch_purple_100</item>
+        <item name="android:textColor">@color/watch_black</item>
+    </style>
+
     <style name="ChipButton.Purple" parent="ChipButton">
         <item name="android:backgroundTint">@color/watch_purple_100</item>
         <item name="android:textColor">@color/watch_black</item>