WIP: favorited page

mikolasan · Dec 2, 2023 · 8a41cb8 · 8a41cb8
1 parent be4fbed
commit 8a41cb8
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,4 +1,3 @@
-
 plugins {
     id 'kotlin-android'
     id 'com.android.application'

diff --git a/app/src/main/java/io/github/mikolasan/imperialrussia/ImperialListAdapter.kt b/app/src/main/java/io/github/mikolasan/imperialrussia/ImperialListAdapter.kt
@@ -19,7 +19,7 @@ import java.util.Locale
 class ImperialListAdapter(private val workingUnits: WorkingUnits) : BaseAdapter(), Filterable {
     var allUnits: Array<ImperialUnit> = workingUnits.orderedUnits
     var units: Array<ImperialUnit> = workingUnits.orderedUnits
-    var names: List<String> = listOf()
+    var names: List<String> = allUnits.map { u -> u.unitName.name.lowercase(Locale.ROOT) }
 
     private var arrowClickListener: (Int, View, ImperialUnit) -> Unit = { position, _, _ ->
         println("arrowClickListener $position")
@@ -184,7 +184,7 @@ class ImperialListAdapter(private val workingUnits: WorkingUnits) : BaseAdapter(
         val bookmark: ImageView = layout.findViewById(R.id.bookmark)
         bookmark.setOnClickListener {
             unit.bookmarked = !unit.bookmarked
-//            bookmarkClickListener(dataPosition, it, unit)
+            bookmarkClickListener(dataPosition, it, unit)
             notifyDataSetChanged()
         }
     }

diff --git a/app/src/main/java/io/github/mikolasan/imperialrussia/MainActivity.kt b/app/src/main/java/io/github/mikolasan/imperialrussia/MainActivity.kt
@@ -268,17 +268,19 @@ class MainActivity : FragmentActivity() {
 
         }
 
-
-        try {
-            val nav = findNavController(R.id.nav_host_fragment)
-            val bundle = bundleOf(
-                "category" to unit.category.type.name,
-                "topUnit" to workingUnits.topUnit.unitName.name,
-                "bottomUnit" to workingUnits.bottomUnit.unitName.name
-            )
-            nav.navigate(R.id.action_select_unit, bundle)
-        } catch (e: Exception) {
-            // ignore
+        // TODO: only when the second unit is selected as fav
+        if (workingUnits.favoritedUnits.size > 1) {
+            try {
+                val nav = findNavController(R.id.nav_host_fragment)
+                val bundle = bundleOf(
+                    "category" to unit.category.type.name,
+                    "topUnit" to workingUnits.topUnit.unitName.name,
+                    "bottomUnit" to workingUnits.bottomUnit.unitName.name
+                )
+                nav.navigate(R.id.action_select_unit, bundle)
+            } catch (e: Exception) {
+                // ignore
+            }
         }
 
         settings.saveTopUnit(workingUnits.topUnit, workingUnits.topUnit.formattedString)

diff --git a/app/src/main/java/io/github/mikolasan/imperialrussia/UnitListFragment.kt b/app/src/main/java/io/github/mikolasan/imperialrussia/UnitListFragment.kt
@@ -41,7 +41,12 @@ class UnitListFragment : Fragment() {
             unitsList.setSelectionAfterHeaderView()
         }
         listAdapter.setOnBookmarkClickListener { _: Int, arrow: View, unit: ImperialUnit ->
-
+            if (unit.bookmarked) {
+                (activity as MainActivity).workingUnits.favoritedUnits.plusAssign(unit)
+                (activity as MainActivity).onUnitSelected(unit)
+            } else {
+                (activity as MainActivity).workingUnits.favoritedUnits.minusAssign(unit)
+            }
         }
     }
 

diff --git a/app/src/main/java/io/github/mikolasan/imperialrussia/WorkingUnits.kt b/app/src/main/java/io/github/mikolasan/imperialrussia/WorkingUnits.kt
@@ -7,6 +7,7 @@ class WorkingUnits() {
     lateinit var allUnits: Map<ImperialUnitType, Array<ImperialUnit>>
     var selectedCategory: ImperialUnitType? = null
     lateinit var orderedUnits: Array<ImperialUnit>
+    var favoritedUnits: MutableList<ImperialUnit> = mutableListOf()
     lateinit var topUnit: ImperialUnit
     lateinit var bottomUnit: ImperialUnit
     lateinit var listAdapter: ImperialListAdapter

diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,6 @@ buildscript {
 
         def nav_version = "2.7.5"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
-
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }