From 7335ef240bc557e029a0cb55f5799eedcebb290f Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 29 Jun 2022 13:32:23 +0200
Subject: [PATCH] Show streak in detail view

---
 .../wearos/habitica/ui/activities/RYAActivity.kt |  6 +++---
 .../habitica/ui/activities/TaskDetailActivity.kt |  7 +++++++
 .../src/main/res/layout/activity_task_detail.xml | 16 ++++++++++++++--
 wearos/src/main/res/layout/row_daily.xml         |  4 ++--
 4 files changed, 26 insertions(+), 7 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 a7e077d2a..252b7f71a 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,7 +1,7 @@
 package com.habitrpg.wearos.habitica.ui.activities
 
 import android.os.Bundle
-import android.widget.LinearLayout
+import android.widget.FrameLayout
 import androidx.activity.viewModels
 import androidx.core.view.isVisible
 import com.habitrpg.android.habitica.R
@@ -59,10 +59,10 @@ class RYAActivity : BaseActivity<ActivityRyaBinding, RYAViewModel>() {
             taskBinding.root.setOnClickListener {
                 viewModel.tappedTask(task)
             }
-            val layoutParams = taskBinding.root.layoutParams as LinearLayout.LayoutParams
+            val layoutParams = taskBinding.chip.layoutParams as FrameLayout.LayoutParams
             layoutParams.marginStart = 0
             layoutParams.marginEnd = 0
-            taskBinding.root.layoutParams = layoutParams
+            taskBinding.chip.layoutParams = layoutParams
             holder.bind(task)
         }
     }
diff --git a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
index 632fdb977..76676574c 100644
--- a/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
+++ b/wearos/src/main/java/com/habitrpg/wearos/habitica/ui/activities/TaskDetailActivity.kt
@@ -50,6 +50,13 @@ class TaskDetailActivity : BaseActivity<ActivityTaskDetailBinding, TaskDetailVie
             } else {
                 binding.taskNotesView.isVisible = false
             }
+            val streakString = task?.streakString
+            if (streakString != null) {
+                binding.taskStreakView.isVisible = true
+                binding.taskStreakView.text = streakString
+            } else {
+                binding.taskStreakView.isVisible = false
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/activity_task_detail.xml b/wearos/src/main/res/layout/activity_task_detail.xml
index 7dbcb8918..f55d1cda2 100644
--- a/wearos/src/main/res/layout/activity_task_detail.xml
+++ b/wearos/src/main/res/layout/activity_task_detail.xml
@@ -28,14 +28,26 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/gray_400"
                 android:gravity="center"
+                style="@style/Text.Body1"/>
+
+            <TextView
+                android:id="@+id/task_streak_view"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@color/watch_gray_200"
+                android:gravity="center"
+                android:drawableStart="@drawable/task_icon_streak"
+                android:drawableTint="@color/watch_gray_200"
+                android:drawablePadding="@dimen/spacing_small"
                 style="@style/Text.Body1"
-                android:layout_marginBottom="30dp"/>
+                android:textSize="12sp"/>
             <Button
                 android:id="@+id/edit_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 style="@style/ChipButton"
                 android:drawableStart="@drawable/handoff"
-                android:text="@string/edit_on_phone"/>
+                android:text="@string/edit_on_phone"
+                android:layout_marginTop="12dp"/>
         </LinearLayout>
 </com.habitrpg.wearos.habitica.ui.views.HabiticaScrollView>
\ No newline at end of file
diff --git a/wearos/src/main/res/layout/row_daily.xml b/wearos/src/main/res/layout/row_daily.xml
index afac6827d..98fb8eb33 100644
--- a/wearos/src/main/res/layout/row_daily.xml
+++ b/wearos/src/main/res/layout/row_daily.xml
@@ -2,9 +2,9 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    android:layout_height="wrap_content">
     <LinearLayout
+        android:id="@+id/chip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         style="@style/Chip">