From 2cf3347f8c8c878e16dc79387e0b544d4b080f8d Mon Sep 17 00:00:00 2001 From: Quentin Hibon Date: Thu, 28 Jan 2021 23:36:56 +0100 Subject: [PATCH] Set dataOffset when attaching a new CardView Fixes #713. --- .../activities/habits/list/views/HabitCardListAdapter.java | 2 +- .../uhabits/activities/habits/list/views/HabitCardListView.kt | 3 ++- .../activities/habits/list/views/HabitCardViewHolder.kt | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java index ad4f8013e..1b9d30a04 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java @@ -206,7 +206,7 @@ public class HabitCardListAdapter int viewType) { if (listView == null) return null; - View view = listView.createHabitCardView(); + HabitCardView view = listView.createHabitCardView(); return new HabitCardViewHolder(view); } diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt index 259d1f14a..211c436ed 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt @@ -62,7 +62,7 @@ class HabitCardListView( super.setAdapter(adapter) } - fun createHabitCardView(): View { + fun createHabitCardView(): HabitCardView { return cardViewFactory.create() } @@ -91,6 +91,7 @@ class HabitCardListView( } fun attachCardView(holder: HabitCardViewHolder) { + (holder.itemView as HabitCardView).dataOffset = dataOffset attachedHolders.add(holder) } diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt index 3f0b9d0ca..865c0d8f5 100644 --- a/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt +++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt @@ -19,8 +19,6 @@ package org.isoron.uhabits.activities.habits.list.views -import androidx.appcompat.widget.* -import android.view.* import androidx.recyclerview.widget.RecyclerView -class HabitCardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) +class HabitCardViewHolder(itemView: HabitCardView) : RecyclerView.ViewHolder(itemView)