Move EntryListViewAdapter callbacks to an interface

albertvaka · Nov 24, 2023 · 6355a65 · 6355a65
1 parent bf0f322
commit 6355a65
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 38 deletions.
diff --git a/app/src/main/java/org/kde/bettercounter/ChartsAdapter.kt b/app/src/main/java/org/kde/bettercounter/ChartsAdapter.kt
@@ -28,7 +28,6 @@ class ChartsAdapter(
 
     private var numCharts : Int = countNumCharts(counter)
     override fun getItemCount(): Int = numCharts
-    fun getCounterName(): String = counter.name
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ChartHolder {
         val binding = FragmentChartBinding.inflate(inflater, parent, false)

diff --git a/app/src/main/java/org/kde/bettercounter/EntryListViewAdapter.kt b/app/src/main/java/org/kde/bettercounter/EntryListViewAdapter.kt
@@ -20,13 +20,18 @@ import java.util.*
 class EntryListViewAdapter(
     private var activity: AppCompatActivity,
     private var viewModel: ViewModel,
+    private var listObserver: EntryListObserver,
+
 ) : RecyclerView.Adapter<EntryViewHolder>(), DragAndSwipeTouchHelper.ListGesturesCallback
 {
-    var onItemSelected: ((Int, CounterSummary) -> Unit)? = null // Gets called again if the last selected item gets updated
-    var onItemAdded: ((Int) -> Unit)? = null
+    interface EntryListObserver {
+        fun onItemSelected(position : Int, counter : CounterSummary)
+        fun onSelectedItemUpdated(position : Int, counter : CounterSummary)
+        fun onItemAdded(position : Int)
+    }
 
-    var lastSelectedCounterName : String? = null
-    fun clearItemSelected() { lastSelectedCounterName = null }
+    var currentSelectedCounterName : String? = null
+    fun clearItemSelected() { currentSelectedCounterName = null }
 
     private val inflater: LayoutInflater = LayoutInflater.from(activity)
     private var counters: MutableList<String> = mutableListOf()
@@ -49,8 +54,8 @@ class EntryListViewAdapter(
             fun observeNewCounter(counterName : String) {
                 viewModel.getCounterSummary(counterName).observe(activity) {
                     notifyItemChanged(counters.indexOf(it.name), Unit)
-                    if (lastSelectedCounterName == it.name) {
-                        onItemSelected?.invoke(counters.indexOf(it.name), it)
+                    if (currentSelectedCounterName == it.name) {
+                        listObserver.onSelectedItemUpdated(counters.indexOf(it.name), it)
                     }
                 }
             }
@@ -72,15 +77,15 @@ class EntryListViewAdapter(
                     val position = counters.size - 1
                     notifyItemInserted(position)
                     observeNewCounter(counterName)
-                    onItemAdded?.invoke(position)
+                    listObserver.onItemAdded(position)
                 }
             }
 
             override fun onCounterRemoved(counterName: String) {
                 val position = counters.indexOf(counterName)
                 counters.removeAt(position)
-                if (lastSelectedCounterName == counterName) {
-                    lastSelectedCounterName = null
+                if (currentSelectedCounterName == counterName) {
+                    currentSelectedCounterName = null
                 }
                 activity.runOnUiThread {
                     notifyItemRemoved(position)
@@ -90,9 +95,9 @@ class EntryListViewAdapter(
             override fun onCounterRenamed(oldName : String, newName: String) {
                 val position = counters.indexOf(oldName)
                 counters[position] = newName
-                if (lastSelectedCounterName == oldName) {
-                    lastSelectedCounterName = newName
-                    onItemSelected?.invoke(position,viewModel.getCounterSummary(newName).value!!)
+                if (currentSelectedCounterName == oldName) {
+                    currentSelectedCounterName = newName
+                    listObserver.onSelectedItemUpdated(position,viewModel.getCounterSummary(newName).value!!)
                 }
                 activity.runOnUiThread {
                     // passing a second parameter disables the disappear+appear animation
@@ -113,8 +118,8 @@ class EntryListViewAdapter(
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EntryViewHolder {
         val binding = FragmentEntryBinding.inflate(inflater, parent, false)
         val holder = EntryViewHolder(activity, binding, viewModel, touchHelper) { counter ->
-            lastSelectedCounterName = counter.name
-            onItemSelected?.invoke(counters.indexOf(counter.name), counter)
+            currentSelectedCounterName = counter.name
+            listObserver.onItemSelected(counters.indexOf(counter.name), counter)
         }
         return holder
     }

diff --git a/app/src/main/java/org/kde/bettercounter/ui/MainActivity.kt b/app/src/main/java/org/kde/bettercounter/ui/MainActivity.kt
@@ -109,35 +109,36 @@ class MainActivity : AppCompatActivity() {
 
         // Counter list
         // ------------
-        entryViewAdapter = EntryListViewAdapter(this, viewModel)
-        entryViewAdapter.onItemAdded = { pos -> binding.recycler.smoothScrollToPosition(pos) }
-        entryViewAdapter.onItemSelected = { position: Int, counter: CounterSummary ->
-            if (sheetBehavior.state == BottomSheetBehavior.STATE_HIDDEN) {
-                sheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
-                onBackPressedCloseSheetCallback.isEnabled = true
-                sheetIsExpanding = true
+        entryViewAdapter = EntryListViewAdapter(this, viewModel, object : EntryListViewAdapter.EntryListObserver {
+            override fun onItemAdded(position: Int) {
+                binding.recycler.smoothScrollToPosition(position)
             }
-            binding.recycler.setPadding(0, 0, 0, sheetUnfoldedPadding)
-            binding.recycler.smoothScrollToPosition(position)
-
-            setFabToEdit(counter)
+            override fun onSelectedItemUpdated(position: Int, counter: CounterSummary) {
+                binding.detailsTitle.text = counter.name
+                val interval = intervalOverride ?: counter.intervalForChart
+                val adapter = ChartsAdapter(this@MainActivity, viewModel, counter, interval) { newInterval ->
+                    intervalOverride = newInterval
+                    onSelectedItemUpdated(position, counter)
+                }
+                binding.charts.swapAdapter(adapter, true)
+                binding.charts.scrollToPosition(adapter.itemCount-1) // Select the latest chart
+            }
+            override fun onItemSelected(position: Int, counter: CounterSummary) {
+                if (sheetBehavior.state == BottomSheetBehavior.STATE_HIDDEN) {
+                    sheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
+                    onBackPressedCloseSheetCallback.isEnabled = true
+                    sheetIsExpanding = true
+                }
+                binding.recycler.setPadding(0, 0, 0, sheetUnfoldedPadding)
+                binding.recycler.smoothScrollToPosition(position)
 
-            binding.detailsTitle.text = counter.name
+                setFabToEdit(counter)
 
-            val currentAdapter = (binding.charts.adapter as ChartsAdapter)
-            if (currentAdapter.getCounterName() != counter.name) {
                 intervalOverride = null
-            }
 
-            val interval = intervalOverride ?: counter.intervalForChart
-            val adapter = ChartsAdapter(this, viewModel, counter, interval) { newInterval ->
-                intervalOverride = newInterval
-                entryViewAdapter.onItemSelected?.invoke(position, counter)
+                onSelectedItemUpdated(position, counter)
             }
-            binding.charts.swapAdapter(adapter, true)
-            binding.charts.scrollToPosition(adapter.itemCount-1)
-        }
-
+        })
         binding.recycler.adapter = entryViewAdapter
         binding.recycler.layoutManager = LinearLayoutManager(this)