Update guide list display

Signed-off-by: Kyle Corry <kylecorry31@gmail.com>

Author: kylecorry31

app/src/main/java/com/kylecorry/trail_sense/tools/field_guide/domain/FieldGuidePageTag.kt

@@ -1,10 +1,5 @@
 package com.kylecorry.trail_sense.tools.field_guide.domain
 
-import android.graphics.Color
-import androidx.annotation.ColorInt
-import androidx.annotation.DrawableRes
-import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.shared.colors.AppColor
 import com.kylecorry.trail_sense.shared.data.Identifiable
 
 enum class FieldGuidePageTagType {
@@ -17,9 +12,7 @@ enum class FieldGuidePageTagType {
 
 enum class FieldGuidePageTag(
     override val id: Long,
-    val type: FieldGuidePageTagType,
-    @DrawableRes val icon: Int? = null,
-    @ColorInt val color: Int = Color.WHITE
+    val type: FieldGuidePageTagType
 ) : Identifiable {
     Africa(1, FieldGuidePageTagType.Continent),
     Antarctica(2, FieldGuidePageTagType.Continent),
@@ -40,79 +33,55 @@ enum class FieldGuidePageTag(
     Arachnid(17, FieldGuidePageTagType.Classification),
     Crustacean(18, FieldGuidePageTagType.Classification),
     Mollusk(19, FieldGuidePageTagType.Classification),
-    Forest(20, FieldGuidePageTagType.Habitat, icon = R.drawable.tree, color = AppColor.Green.color),
+    Forest(20, FieldGuidePageTagType.Habitat),
     Desert(
         21,
-        FieldGuidePageTagType.Habitat,
-        icon = R.drawable.thermometer,
-        color = AppColor.Yellow.color
+        FieldGuidePageTagType.Habitat
     ),
     Grassland(
         22,
-        FieldGuidePageTagType.Habitat,
-        icon = R.drawable.ic_grass,
-        color = AppColor.Green.color
+        FieldGuidePageTagType.Habitat
     ),
     Wetland(
         23,
-        FieldGuidePageTagType.Habitat,
-        icon = R.drawable.ic_grass,
-        color = AppColor.Brown.color
+        FieldGuidePageTagType.Habitat
     ),
     Mountain(
         24,
-        FieldGuidePageTagType.Habitat,
-        icon = R.drawable.ic_altitude,
-        color = AppColor.Gray.color
+        FieldGuidePageTagType.Habitat
     ),
     Urban(
         25,
-        FieldGuidePageTagType.Habitat,
-        icon = R.drawable.ic_building,
-        color = AppColor.Gray.color
+        FieldGuidePageTagType.Habitat
     ),
     Marine(
         26,
-        FieldGuidePageTagType.Habitat,
-        icon = R.drawable.ic_tide_table,
-        color = AppColor.Blue.color
+        FieldGuidePageTagType.Habitat
     ),
     Freshwater(
         27,
-        FieldGuidePageTagType.Habitat,
-        icon = R.drawable.ic_category_water,
-        color = AppColor.Blue.color
+        FieldGuidePageTagType.Habitat
     ),
     Cave(
         28,
-        FieldGuidePageTagType.Habitat,
-        icon = R.drawable.ic_ruins,
-        color = AppColor.Gray.color
+        FieldGuidePageTagType.Habitat
     ),
     Tundra(
         29,
-        FieldGuidePageTagType.Habitat,
-        icon = R.drawable.ic_precipitation_snow,
-        color = AppColor.Gray.color
+        FieldGuidePageTagType.Habitat
     ),
     Rock(30, FieldGuidePageTagType.Classification),
     Diurnal(
         31,
-        FieldGuidePageTagType.ActivityPattern,
-        icon = R.drawable.ic_sun,
-        color = AppColor.Yellow.color
+        FieldGuidePageTagType.ActivityPattern
     ),
     Nocturnal(
         32,
-        FieldGuidePageTagType.ActivityPattern,
-        icon = R.drawable.ic_moon,
-        color = AppColor.Gray.color
+        FieldGuidePageTagType.ActivityPattern
     ),
     Crepuscular(
         33,
-        FieldGuidePageTagType.ActivityPattern,
-        icon = R.drawable.ic_sun,
-        color = AppColor.Orange.color
+        FieldGuidePageTagType.ActivityPattern
     ),
     Edible(34, FieldGuidePageTagType.HumanInteraction),
     Inedible(35, FieldGuidePageTagType.HumanInteraction),

app/src/main/java/com/kylecorry/trail_sense/tools/field_guide/infrastructure/BuiltInFieldGuide.kt

@@ -171,6 +171,7 @@ object BuiltInFieldGuide {
                 FieldGuidePageTag.NorthAmerica,
                 FieldGuidePageTag.SouthAmerica,
                 FieldGuidePageTag.Animal,
+                FieldGuidePageTag.Mollusk,
                 FieldGuidePageTag.Marine,
                 FieldGuidePageTag.Edible
             )

app/src/main/java/com/kylecorry/trail_sense/tools/field_guide/ui/FieldGuideFragment.kt

@@ -15,16 +15,12 @@ import com.kylecorry.andromeda.fragments.BoundFragment
 import com.kylecorry.andromeda.fragments.inBackground
 import com.kylecorry.andromeda.views.list.AsyncListIcon
 import com.kylecorry.andromeda.views.list.ListItem
-import com.kylecorry.andromeda.views.list.ListItemTag
-import com.kylecorry.andromeda.views.list.ResourceListIcon
 import com.kylecorry.trail_sense.databinding.FragmentFieldGuideBinding
-import com.kylecorry.trail_sense.shared.formatEnumName
 import com.kylecorry.trail_sense.shared.io.DeleteTempFilesCommand
 import com.kylecorry.trail_sense.shared.io.FileSubsystem
 import com.kylecorry.trail_sense.shared.views.Views
 import com.kylecorry.trail_sense.tools.field_guide.domain.FieldGuidePage
 import com.kylecorry.trail_sense.tools.field_guide.domain.FieldGuidePageTag
-import com.kylecorry.trail_sense.tools.field_guide.domain.FieldGuidePageTagType
 import com.kylecorry.trail_sense.tools.field_guide.infrastructure.BuiltInFieldGuide
 
 class FieldGuideFragment : BoundFragment<FragmentFieldGuideBinding>() {
@@ -85,27 +81,12 @@ class FieldGuideFragment : BoundFragment<FragmentFieldGuideBinding>() {
                 }
             }
 
-            val displayedTagTypes = listOf(
-                FieldGuidePageTagType.Habitat,
-                FieldGuidePageTagType.ActivityPattern
-            )
-
             binding.list.setItems(filteredSpecies.map {
                 val firstSentence = it.notes?.substringBefore(".")?.plus(".") ?: ""
                 ListItem(
                     it.id,
                     it.name,
                     firstSentence.take(200),
-                    // TODO: Each tag should be assigned a color and icon
-                    tags = it.tags
-                        .filter { it.type in displayedTagTypes }
-                        .map {
-                            ListItemTag(
-                                formatEnumName(it.name),
-                                it.icon?.let { ResourceListIcon(it, size = 16f) },
-                                it.color
-                            )
-                        },
                     icon = AsyncListIcon(
                         viewLifecycleOwner,
                         { loadThumbnail(it) },
@@ -114,6 +95,7 @@ class FieldGuideFragment : BoundFragment<FragmentFieldGuideBinding>() {
                         clearOnPause = true
                     ),
                 ) {
+                    // TODO: Open a separate page
                     dialog(
                         it.name,
                         it.notes ?: "",

app/src/main/res/raw/field_guide_cricket.txt

@@ -1,4 +1,4 @@
-Crickets
+Cricket
 Small nocturnal insects with the ability to jump and produce chirps. They feed on plants, decaying organic matter, and small insects. Crickets are edible.
 
 https://en.m.wikipedia.org/wiki/Grylloidea

app/src/main/res/raw/rubus.txt

@@ -1,3 +1,4 @@
+Brambles
 Rubus is a large and diverse genus of flowering plants in the rose family, Rosaceae, subfamily Rosoideae, commonly known as brambles. Fruits of various species are known as raspberries, blackberries, dewberries, and bristleberries. It is a diverse genus, with the estimated number of Rubus species varying from 250 to over 1000, found across all continents except Antarctica.
 
 Text derived from https://en.m.wikipedia.org/wiki/Rubus (CC BY-SA 4.0)