Merge pull request #5482 from streetcomplete/viewmodels

ViewModels (a start)

Author: westnordost

app/build.gradle.kts

@@ -139,6 +139,7 @@ dependencies {
     implementation("androidx.viewpager:viewpager:1.0.0")
     implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
 
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
     // photos
     implementation("androidx.exifinterface:exifinterface:1.3.7")
 

app/src/androidTest/java/de/westnordost/streetcomplete/data/osm/edits/ElementEditsDaoTest.kt

@@ -1,5 +1,6 @@
 package de.westnordost.streetcomplete.data.osm.edits
 
+import de.westnordost.streetcomplete.data.AllEditTypes
 import de.westnordost.streetcomplete.data.ApplicationDbTestCase
 import de.westnordost.streetcomplete.data.osm.edits.create.CreateNodeAction
 import de.westnordost.streetcomplete.data.osm.edits.create.RevertCreateNodeAction
@@ -43,7 +44,7 @@ class ElementEditsDaoTest : ApplicationDbTestCase() {
     @BeforeTest fun createDao() {
         val list = listOf(1 to TEST_QUEST_TYPE, 2 to TEST_QUEST_TYPE2)
         val list2 = listOf(1 to TestOverlay)
-        dao = ElementEditsDao(database, QuestTypeRegistry(list), OverlayRegistry(list2))
+        dao = ElementEditsDao(database, AllEditTypes(listOf(QuestTypeRegistry(list), OverlayRegistry(list2))))
     }
 
     @Test fun addGet_UpdateElementTagsEdit() {

app/src/main/java/de/westnordost/streetcomplete/StreetCompleteApplication.kt

@@ -9,6 +9,7 @@ import androidx.work.WorkManager
 import de.westnordost.streetcomplete.data.CacheTrimmer
 import de.westnordost.streetcomplete.data.CleanerWorker
 import de.westnordost.streetcomplete.data.Preloader
+import de.westnordost.streetcomplete.data.allEditTypesModule
 import de.westnordost.streetcomplete.data.dbModule
 import de.westnordost.streetcomplete.data.download.downloadModule
 import de.westnordost.streetcomplete.data.download.tiles.DownloadedTilesController
@@ -39,11 +40,13 @@ import de.westnordost.streetcomplete.data.visiblequests.questPresetsModule
 import de.westnordost.streetcomplete.overlays.overlaysModule
 import de.westnordost.streetcomplete.quests.oneway_suspects.data.trafficFlowSegmentsModule
 import de.westnordost.streetcomplete.quests.questsModule
+import de.westnordost.streetcomplete.screens.about.aboutScreenModule
 import de.westnordost.streetcomplete.screens.main.mainModule
 import de.westnordost.streetcomplete.screens.main.map.mapModule
 import de.westnordost.streetcomplete.screens.measure.arModule
 import de.westnordost.streetcomplete.screens.settings.ResurveyIntervalsUpdater
 import de.westnordost.streetcomplete.screens.settings.settingsModule
+import de.westnordost.streetcomplete.screens.user.userScreenModule
 import de.westnordost.streetcomplete.util.CrashReportExceptionHandler
 import de.westnordost.streetcomplete.util.getDefaultTheme
 import de.westnordost.streetcomplete.util.getSelectedLocale
@@ -92,6 +95,8 @@ class StreetCompleteApplication : Application() {
             modules(
                 achievementsModule,
                 appModule,
+                aboutScreenModule,
+                userScreenModule,
                 createdElementsModule,
                 dbModule,
                 logsModule,
@@ -113,6 +118,7 @@ class StreetCompleteApplication : Application() {
                 preferencesModule,
                 questModule,
                 questPresetsModule,
+                allEditTypesModule,
                 questsModule,
                 settingsModule,
                 statisticsModule,

app/src/main/java/de/westnordost/streetcomplete/data/AllEditTypes.kt

@@ -0,0 +1,16 @@
+package de.westnordost.streetcomplete.data
+
+import de.westnordost.streetcomplete.data.osm.edits.EditType
+
+class AllEditTypes(
+    registries: List<ObjectTypeRegistry<out EditType>>
+) : AbstractCollection<EditType>() {
+
+    private val byName = registries.flatten().associateByTo(LinkedHashMap()) { it.name }
+
+    override val size: Int get() = byName.size
+
+    override fun iterator(): Iterator<EditType> = byName.values.iterator()
+
+    fun getByName(typeName: String): EditType? = byName[typeName]
+}

app/src/main/java/de/westnordost/streetcomplete/data/AllEditTypesModule.kt

@@ -0,0 +1,14 @@
+package de.westnordost.streetcomplete.data
+
+import de.westnordost.streetcomplete.data.overlays.OverlayRegistry
+import de.westnordost.streetcomplete.data.quest.QuestTypeRegistry
+import org.koin.dsl.module
+
+val allEditTypesModule =  module {
+    single {
+        AllEditTypes(listOf(
+            get<QuestTypeRegistry>(),
+            get<OverlayRegistry>()
+        ))
+    }
+}

app/src/main/java/de/westnordost/streetcomplete/data/logs/LogsFilters.kt

@@ -2,9 +2,7 @@ package de.westnordost.streetcomplete.data.logs
 
 import de.westnordost.streetcomplete.util.ktx.toEpochMilli
 import kotlinx.datetime.LocalDateTime
-import kotlinx.serialization.Serializable
 
-@Serializable
 data class LogsFilters(
     val levels: Set<LogLevel> = LogLevel.entries.toSet(),
     val messageContains: String? = null,

app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/ElementEditsDao.kt

@@ -1,5 +1,6 @@
 package de.westnordost.streetcomplete.data.osm.edits
 
+import de.westnordost.streetcomplete.data.AllEditTypes
 import de.westnordost.streetcomplete.data.CursorPosition
 import de.westnordost.streetcomplete.data.Database
 import de.westnordost.streetcomplete.data.osm.edits.ElementEditsTable.Columns.ACTION
@@ -23,9 +24,6 @@ import de.westnordost.streetcomplete.data.osm.edits.move.RevertMoveNodeAction
 import de.westnordost.streetcomplete.data.osm.edits.split_way.SplitWayAction
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.RevertUpdateElementTagsAction
 import de.westnordost.streetcomplete.data.osm.edits.update_tags.UpdateElementTagsAction
-import de.westnordost.streetcomplete.data.osm.osmquests.OsmElementQuestType
-import de.westnordost.streetcomplete.data.overlays.OverlayRegistry
-import de.westnordost.streetcomplete.data.quest.QuestTypeRegistry
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
@@ -35,8 +33,7 @@ import kotlinx.serialization.modules.subclass
 
 class ElementEditsDao(
     private val db: Database,
-    private val questTypeRegistry: QuestTypeRegistry,
-    private val overlayRegistry: OverlayRegistry
+    private val allEditTypes: AllEditTypes,
 ) {
     private val json = Json {
         serializersModule = SerializersModule {
@@ -111,8 +108,7 @@ class ElementEditsDao(
 
     private fun CursorPosition.toElementEdit() = ElementEdit(
         getLong(ID),
-        questTypeRegistry.getByName(getString(QUEST_TYPE)) as? OsmElementQuestType<*>
-            ?: overlayRegistry.getByName(getString(QUEST_TYPE))!!,
+        allEditTypes.getByName(getString(QUEST_TYPE)) as ElementEditType,
         json.decodeFromString(getString(GEOMETRY)),
         getString(SOURCE),
         getLong(CREATED_TIMESTAMP),

app/src/main/java/de/westnordost/streetcomplete/data/osm/edits/ElementEditsModule.kt

@@ -14,7 +14,7 @@ val elementEditsModule = module {
     factory { ChangesetAutoCloser(get()) }
     factory { ElementEditUploader(get(), get(), get()) }
 
-    factory { ElementEditsDao(get(), get(), get()) }
+    factory { ElementEditsDao(get(), get()) }
     factory { ElementIdProviderDao(get()) }
     factory { LastEditTimeStore(get()) }
     factory { OpenChangesetsDao(get()) }

app/src/main/java/de/westnordost/streetcomplete/data/user/achievements/AchievementsController.kt

@@ -1,5 +1,6 @@
 package de.westnordost.streetcomplete.data.user.achievements
 
+import de.westnordost.streetcomplete.data.AllEditTypes
 import de.westnordost.streetcomplete.data.overlays.OverlayRegistry
 import de.westnordost.streetcomplete.data.quest.QuestTypeRegistry
 import de.westnordost.streetcomplete.data.user.statistics.StatisticsSource
@@ -11,8 +12,7 @@ class AchievementsController(
     private val statisticsSource: StatisticsSource,
     private val userAchievementsDao: UserAchievementsDao,
     private val userLinksDao: UserLinksDao,
-    private val questTypeRegistry: QuestTypeRegistry,
-    private val overlayRegistry: OverlayRegistry,
+    private val allEditTypes: AllEditTypes,
     private val allAchievements: List<Achievement>,
     allLinks: List<Link>
 ) : AchievementsSource {
@@ -159,12 +159,10 @@ class AchievementsController(
         }
 
     private fun isContributingToAchievement(editType: String, achievementId: String): Boolean =
-        (questTypeRegistry.getByName(editType) ?: overlayRegistry.getByName(editType))
-            ?.achievements?.anyHasId(achievementId) == true
+        allEditTypes.getByName(editType)?.achievements?.anyHasId(achievementId) == true
 
     private fun getEditTypesContributingToAchievement(achievementId: String): List<String> =
-        questTypeRegistry.filter { it.achievements.anyHasId(achievementId) }.map { it.name } +
-        overlayRegistry.filter { it.achievements.anyHasId(achievementId) }.map { it.name }
+        allEditTypes.filter { it.achievements.anyHasId(achievementId) }.map { it.name }
 }
 
 private fun List<EditTypeAchievement>.anyHasId(achievementId: String) = any { it.id == achievementId }

app/src/main/java/de/westnordost/streetcomplete/data/user/achievements/AchievementsModule.kt

@@ -42,7 +42,7 @@ val achievementsModule = module {
     factory { UserLinksDao(get()) }
 
     single<AchievementsSource> { get<AchievementsController>() }
-    single { AchievementsController(get(), get(), get(), get(), get(), get(named("Achievements")), get(named("Links"))) }
+    single { AchievementsController(get(), get(), get(), get(), get(named("Achievements")), get(named("Links"))) }
 }
 
 // list of (quest) synonyms (this alternate name is mentioned to aid searching for this code)