Fix crashing on deleting measure

Hamza417 · Aug 7, 2024 · ec4af73 · ec4af73
1 parent 194cf7b
commit ec4af73
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 38 deletions.
diff --git a/app/src/full/java/app/simple/positional/adapters/measure/AdapterMeasures.kt b/app/src/full/java/app/simple/positional/adapters/measure/AdapterMeasures.kt
@@ -16,6 +16,8 @@ import app.simple.positional.util.ColorUtils.resolveAttrColor
 import app.simple.positional.util.ConditionUtils.isZero
 import app.simple.positional.util.HtmlHelper
 import app.simple.positional.util.TimeFormatter.formatDate
+import app.simple.positional.util.ViewUtils.gone
+import app.simple.positional.util.ViewUtils.visible
 
 class AdapterMeasures(private val list: ArrayList<Measure>) :
     RecyclerView.Adapter<VerticalListViewHolder>() {
@@ -36,22 +38,28 @@ class AdapterMeasures(private val list: ArrayList<Measure>) :
         }
     }
 
-    override fun onBindViewHolder(holder: VerticalListViewHolder, position_: Int) {
-        val position = position_ - 1
+    override fun onBindViewHolder(holder: VerticalListViewHolder, holderPosition: Int) {
+        val position = holderPosition.minus(1)
 
         if (holder is Holder) {
             holder.name.text = list[position].name
             holder.note.text = list[position].note
             holder.date.text = list[position].dateCreated.formatDate()
 
+            if (holder.note.text.isEmpty()) {
+                holder.note.gone(false)
+            } else {
+                holder.note.visible(false)
+            }
+
             if (list[position].dateCreated == MeasurePreferences.getLastSelectedMeasure()) {
                 holder.name.setTextColor(holder.itemView.context.resolveAttrColor(R.attr.colorAppAccent))
             } else {
                 holder.name.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.textPrimary))
             }
 
             holder.menu.setOnClickListener {
-                adapterMeasuresCallback.onMeasureMenuClicked(list[position], it)
+                adapterMeasuresCallback.onMeasureMenuClicked(list[position], it, position)
             }
 
             holder.container.setOnClickListener {
@@ -63,10 +71,7 @@ class AdapterMeasures(private val list: ArrayList<Measure>) :
     }
 
     override fun getItemCount(): Int {
-        return when {
-            list.isEmpty() -> 0
-            else -> list.size.plus(1)
-        }
+        return list.size.plus(1)
     }
 
     override fun getItemViewType(position: Int): Int {
@@ -76,10 +81,14 @@ class AdapterMeasures(private val list: ArrayList<Measure>) :
         }
     }
 
-    fun deleteMeasure(measure: Measure) {
-        val index = list.indexOf(measure)
-        list.remove(measure)
-        notifyItemRemoved(index + 1)
+    fun deleteMeasure(position: Int) {
+        list.removeAt(position)
+        notifyItemRemoved(position.plus(1))
+        notifyItemChanged(0)
+    }
+
+    fun isEmpty(): Boolean {
+        return list.isEmpty()
     }
 
     inner class Holder(itemView: View) : VerticalListViewHolder(itemView) {
@@ -101,7 +110,7 @@ class AdapterMeasures(private val list: ArrayList<Measure>) :
     companion object {
         interface AdapterMeasuresCallback {
             fun onMeasureClicked(measure: Measure)
-            fun onMeasureMenuClicked(measure: Measure, view: View)
+            fun onMeasureMenuClicked(measure: Measure, view: View, position: Int)
         }
     }
 }
diff --git a/app/src/full/java/app/simple/positional/ui/subpanels/Measures.kt b/app/src/full/java/app/simple/positional/ui/subpanels/Measures.kt
@@ -62,7 +62,7 @@ class Measures : ScopedFragment() {
                     MeasurePreferences.setLastSelectedMeasure(measure.dateCreated)
                 }
 
-                override fun onMeasureMenuClicked(measure: Measure, view: View) {
+                override fun onMeasureMenuClicked(measure: Measure, view: View, position: Int) {
                     val popup = PopupTrailsMenu(
                         layoutInflater.inflate(R.layout.popup_trails,
                             DynamicCornerLinearLayout(requireContext())), view)
@@ -77,7 +77,13 @@ class Measures : ScopedFragment() {
                             DeletePopupMenu(view) {
                                 measureViewModel.deleteMeasure(measure) {
                                     requireActivity().runOnUiThread {
-                                        adapterMeasures.deleteMeasure(measure)
+                                        adapterMeasures.deleteMeasure(position).also {
+                                            if (adapterMeasures.isEmpty()) {
+                                                art.visible(true)
+                                            } else {
+                                                art.invisible(true)
+                                            }
+                                        }
                                     }
                                 }
                             }

diff --git a/app/src/main/java/app/simple/positional/adapters/trail/AdapterTrails.kt b/app/src/main/java/app/simple/positional/adapters/trail/AdapterTrails.kt
@@ -36,36 +36,38 @@ class AdapterTrails(private val list: ArrayList<TrailEntry>) :
         }
     }
 
-    override fun onBindViewHolder(holder: VerticalListViewHolder, position_: Int) {
+    override fun onBindViewHolder(holder: VerticalListViewHolder, holderPosition: Int) {
+        val position = holderPosition - 1
 
-        val position = position_ - 1
+        when (holder) {
+            is Holder -> {
+                holder.name.text = list[position].trailName
+                holder.note.text = list[position].trailNote
+                holder.date.text = list[position].dateCreated.formatDate()
 
-        if (holder is Holder) {
-            holder.name.text = list[position].trailName
-            holder.note.text = list[position].trailNote
-            holder.date.text = list[position].dateCreated.formatDate()
+                if (list[position].trailName == TrailPreferences.getCurrentTrail()) {
+                    holder.name.setTextColor(holder.itemView.context.resolveAttrColor(R.attr.colorAppAccent))
+                } else {
+                    holder.name.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.textPrimary))
+                }
 
-            if (list[position].trailName == TrailPreferences.getCurrentTrail()) {
-                holder.name.setTextColor(holder.itemView.context.resolveAttrColor(R.attr.colorAppAccent))
-            } else {
-                holder.name.setTextColor(ContextCompat.getColor(holder.itemView.context, R.color.textPrimary))
-            }
+                holder.menu.setOnClickListener {
+                    adapterTrailsCallback.onTrailMenu(list[position], it)
+                }
 
-            holder.menu.setOnClickListener {
-                adapterTrailsCallback.onTrailMenu(list[position], it)
-            }
+                holder.container.setOnClickListener {
+                    adapterTrailsCallback.onTrailClicked(list[position].trailName)
+                }
 
-            holder.container.setOnClickListener {
-                adapterTrailsCallback.onTrailClicked(list[position].trailName)
             }
-
-        } else if (holder is Header) {
-            holder.total.text = HtmlHelper.fromHtml("<b>${holder.itemView.context.getString(R.string.total)}</b> ${list.size}")
+            is Header -> {
+                holder.total.text = HtmlHelper.fromHtml("<b>${holder.itemView.context.getString(R.string.total)}</b> ${list.size}")
+            }
         }
     }
 
     override fun getItemCount(): Int {
-        return if(list.isNullOrEmpty()) {
+        return if (list.isEmpty()) {
             0
         } else {
             list.size + 1

diff --git a/app/src/main/res/layout/adapter_trails.xml b/app/src/main/res/layout/adapter_trails.xml
@@ -11,7 +11,6 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="32dp"
-        android:layout_marginBottom="8dp"
         android:fontFamily="@font/medium"
         android:textColor="@color/textPrimary"
         android:textSize="@dimen/trail_name_text_size"
@@ -27,7 +26,7 @@
         android:layout_marginEnd="32dp"
         android:fontFamily="@font/regular"
         android:textColor="@color/textTertiary"
-        android:textSize="@dimen/description_text_size"
+        android:textSize="@dimen/options_item_text_size"
         app:layout_constraintBottom_toTopOf="@id/trails_date"
         app:layout_constraintEnd_toStartOf="@+id/menu"
         app:layout_constraintStart_toStartOf="parent"
@@ -37,10 +36,9 @@
         android:id="@+id/trails_date"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
         android:layout_marginEnd="32dp"
         android:fontFamily="@font/regular"
-        android:textColor="@color/textTertiary"
+        android:textColor="?attr/colorAppAccent"
         android:textSize="@dimen/description_text_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/menu"