Show selected map in the map list

Author: p-lr

app/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "com.peterlaurence.trekme"
         minSdkVersion 24
         targetSdkVersion 29
-        versionCode 95
-        versionName "2.4.1"
+        versionCode 96
+        versionName "2.4.2"
     }
 
     buildTypes {

app/src/main/java/com/peterlaurence/trekme/model/map/MapModel.kt

@@ -9,6 +9,7 @@ import com.peterlaurence.trekme.ui.maplist.MapSettingsFragment
  *
  * * the [Map] that should be used when navigating to the [MapViewFragment]
  * * the [Map] that should be displayed when navigating to the [MapSettingsFragment]
+ * TODO: Refactor-rename as MapRepository and inject using Hilt
  */
 object MapModel {
     private var map: Map? = null

app/src/main/java/com/peterlaurence/trekme/ui/maplist/MapAdapter.kt

@@ -17,6 +17,7 @@ import androidx.recyclerview.widget.RecyclerView
 import com.peterlaurence.trekme.R
 import com.peterlaurence.trekme.core.map.Map
 import com.peterlaurence.trekme.core.map.Map.CalibrationStatus
+import com.peterlaurence.trekme.model.map.MapModel
 import com.peterlaurence.trekme.ui.maplist.MapAdapter.MapViewHolder
 
 /**
@@ -32,9 +33,6 @@ class MapAdapter internal constructor(
         private val colorAccent: Int, private val colorWhiteText: Int,
         private val colorBlackText: Int, private val resources: Resources
 ) : RecyclerView.Adapter<MapViewHolder>() {
-    private var selectedMapIndex = -1
-    private var previousSelectedMapIndex = -1
-
     private val diffCallback = object : DiffUtil.ItemCallback<Map>() {
         override fun areItemsTheSame(oldItem: Map, newItem: Map): Boolean {
             return oldItem.id == newItem.id
@@ -50,22 +48,6 @@ class MapAdapter internal constructor(
         differ.submitList(mapList)
     }
 
-    /**
-     * Simple implementation of a toggle selection. When an item is clicked, we change its
-     * background and we remember his index. When another item is clicked, the background of the
-     * first item is set to its original state.
-     *
-     * @param position index of the selected view
-     */
-    private fun updateSelectionColor(position: Int) {
-        selectedMapIndex = position
-        notifyItemChanged(position)
-        if (previousSelectedMapIndex != -1) {
-            notifyItemChanged(previousSelectedMapIndex)
-        }
-        previousSelectedMapIndex = position
-    }
-
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MapViewHolder {
         val ctx = parent.context
         val v = LayoutInflater.from(ctx).inflate(R.layout.map_row, parent, false)
@@ -86,12 +68,13 @@ class MapAdapter internal constructor(
             } else {
                 favoriteButton.setImageResource(R.drawable.ic_baseline_star_border_24)
             }
-            if (layoutPosition == selectedMapIndex) {
+            if (map == MapModel.getCurrentMap()) {
                 cardView.setCardBackgroundColor(colorAccent)
                 mapName.setTextColor(colorWhiteText)
                 editButton.setTextColor(colorWhiteText)
                 deleteButton.setColorFilter(colorWhiteText)
                 calibrationStatus.setTextColor(colorWhiteText)
+                favoriteButton.setColorFilter(colorWhiteText)
             } else {
                 cardView.setCardBackgroundColor(Color.WHITE)
                 mapName.setTextColor(colorBlackText)
@@ -106,9 +89,6 @@ class MapAdapter internal constructor(
 
             /* Set click listeners */
             itemView.setOnClickListener {
-                // Toggle background color
-                updateSelectionColor(position)
-
                 // Call the listener for Map selection
                 mapSelectionListener.onMapSelected(map)
             }