From 6b2129c4536eb2ac253c8598d8548b608d54ca4c Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 24 Jun 2022 10:40:38 +0200
Subject: [PATCH] Improve layout

---
 .../habitrpg/wearos/habitica/ui/activities/RYAActivity.kt  | 7 +++++--
 wearos/src/main/res/layout/activity_task_form.xml          | 6 +++---
 wearos/src/main/res/values/styles.xml                      | 4 ++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
index c0d0acc47..6cee407b3 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/RYAActivity.kt
@@ -1,8 +1,8 @@
 package com.habitrpg.wearos.habitica.ui.activities
 
 import android.os.Bundle
+import android.widget.LinearLayout
 import androidx.activity.viewModels
-import androidx.core.view.children
 import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.databinding.ActivityRyaBinding
@@ -61,7 +61,10 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
                 viewModel.tappedTask(task)
             }
             val verticalPadding = 2.dpToPx(this)
-            taskBinding.root.children.first().setPadding(0, verticalPadding, 0, verticalPadding)
+            val layoutParams = taskBinding.root.layoutParams as LinearLayout.LayoutParams
+            layoutParams.marginStart = 0
+            layoutParams.marginEnd = 0
+            taskBinding.root.layoutParams = layoutParams
             holder.bind(task)
         }
     }
diff --git a/wearos/src/main/res/layout/activity_task_form.xml b/wearos/src/main/res/layout/activity_task_form.xml
index 3aaeea411..0ef8b4455 100644
--- a/wearos/src/main/res/layout/activity_task_form.xml
+++ b/wearos/src/main/res/layout/activity_task_form.xml
@@ -92,7 +92,7 @@
                         android:id="@+id/todo_button"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/Chip"
+                        style="@style/Chip.NoPadding"
                         android:gravity="start|center_vertical"
                         android:paddingHorizontal="20dp"
                         android:text="@string/todo" />
@@ -100,7 +100,7 @@
                         android:id="@+id/daily_button"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/Chip"
+                        style="@style/Chip.NoPadding"
                         android:gravity="start|center_vertical"
                         android:paddingHorizontal="20dp"
                         android:text="@string/daily" />
@@ -108,7 +108,7 @@
                         android:id="@+id/habit_button"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/Chip"
+                        style="@style/Chip.NoPadding"
                         android:gravity="start|center_vertical"
                         android:paddingHorizontal="20dp"
                         android:text="@string/habit" />
diff --git a/wearos/src/main/res/values/styles.xml b/wearos/src/main/res/values/styles.xml
index fb57f9152..25ade0bb1 100644
--- a/wearos/src/main/res/values/styles.xml
+++ b/wearos/src/main/res/values/styles.xml
@@ -13,6 +13,10 @@
         <item name="android:minHeight">52dp</item>
     </style>
 
+    <style name="Chip.NoPadding">
+        <item name="android:layout_marginHorizontal">0dp</item>
+    </style>
+
     <style name="ChipButton">
         <item name="android:paddingHorizontal">@dimen/row_padding_horizontal</item>
         <item name="android:paddingVertical">@dimen/row_padding_vertical</item>