From 676f141d9913e8fb5f49a17ab09c4f7d06e532e1 Mon Sep 17 00:00:00 2001 From: Dharanish Date: Mon, 1 Jul 2024 23:41:02 +0200 Subject: [PATCH] Implement scrolling with group --- .../activities/habits/list/views/HabitCardListView.kt | 9 +++++++-- .../activities/habits/list/views/HabitGroupCardView.kt | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt index ceb20855c..a656b4d48 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt @@ -63,8 +63,13 @@ class HabitCardListView( set(value) { field = value attachedHolders - .map { it.itemView as HabitCardView } - .forEach { it.dataOffset = value } + .forEach { + if (it.itemView is HabitCardView) { + (it.itemView as HabitCardView).dataOffset = value + } else { + (it.itemView as HabitGroupCardView).dataOffset = value + } + } } private val attachedHolders = mutableListOf() diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitGroupCardView.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitGroupCardView.kt index bc7495e40..aa207807b 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitGroupCardView.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitGroupCardView.kt @@ -30,6 +30,8 @@ class HabitGroupCardView( ) : FrameLayout(context), ModelObservable.Listener { + var dataOffset = 0 + var habitGroup: HabitGroup? = null set(newHabitGroup) { if (isAttachedToWindow) {