Re-do UI of About screens and Settings screens in Compose

app/build.gradle.kts

@@ -130,6 +130,7 @@ dependencies {
     implementation("io.insert-koin:koin-core")
     implementation("io.insert-koin:koin-android")
     implementation("io.insert-koin:koin-androidx-workmanager")
+    implementation("io.insert-koin:koin-androidx-compose")
 
     // Android stuff
     implementation("com.google.android.material:material:1.12.0")
@@ -138,7 +139,6 @@ dependencies {
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.annotation:annotation:1.8.0")
     implementation("androidx.fragment:fragment-ktx:1.8.1")
-    implementation("androidx.preference:preference-ktx:1.2.1")
     implementation("androidx.recyclerview:recyclerview:1.3.2")
     implementation("androidx.viewpager:viewpager:1.0.0")
     implementation("androidx.localbroadcastmanager:localbroadcastmanager:1.1.0")
@@ -148,10 +148,13 @@ dependencies {
     implementation(composeBom)
     androidTestImplementation(composeBom)
     implementation("androidx.compose.material:material")
+    implementation("androidx.activity:activity-compose")
     // Jetpack Compose Previews
     implementation("androidx.compose.ui:ui-tooling-preview")
     debugImplementation("androidx.compose.ui:ui-tooling")
 
+    implementation("androidx.navigation:navigation-compose:2.7.7")
+
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2")
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.2")
     // photos
@@ -196,7 +199,9 @@ dependencies {
     implementation("org.jbox2d:jbox2d-library:2.2.1.1")
 
     // sharing presets/settings via QR Code
-    implementation("com.google.zxing:core:3.5.3")
+    implementation("io.github.alexzhirkevich:qrose:1.0.1")
+    // for encoding information for the URL configuration (QR code)
+    implementation("com.ionspin.kotlin:bignum:0.3.9")
 
     // serialization
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.0")

app/src/main/AndroidManifest.xml

@@ -45,7 +45,7 @@
         <activity
             android:windowSoftInputMode="adjustResize"
             android:name="de.westnordost.streetcomplete.screens.MainActivity"
-            android:configChanges="orientation|screenSize"
+            android:configChanges="orientation|screenSize|screenLayout"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -78,17 +78,18 @@
             android:name="de.westnordost.streetcomplete.screens.settings.SettingsActivity"
             android:label="@string/action_settings"
             android:parentActivityName="de.westnordost.streetcomplete.screens.MainActivity"
+            android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MANAGE_NETWORK_USAGE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity android:name="de.westnordost.streetcomplete.screens.FragmentContainerActivity" />
-        <activity android:name="de.westnordost.streetcomplete.screens.about.AboutActivity" />
         <activity
-            android:name="de.westnordost.streetcomplete.screens.settings.debug.ShowQuestFormsActivity"
-            android:configChanges="orientation|screenSize|uiMode" />
+            android:name="de.westnordost.streetcomplete.screens.about.AboutActivity"
+            android:configChanges="density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
+            />
         <activity
             android:name="de.westnordost.streetcomplete.screens.user.UserActivity"
             android:screenOrientation="portrait"

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

@@ -10,8 +10,6 @@ object ApplicationConstants {
     const val MAX_DOWNLOADABLE_AREA_IN_SQKM = 12.0
     const val MIN_DOWNLOADABLE_AREA_IN_SQKM = 0.1
 
-    const val COPYRIGHT_YEARS = "2016-2024"
-
     const val DATABASE_NAME = "streetcomplete_v2.db"
     const val OLD_DATABASE_NAME = "streetcomplete.db"
 
@@ -59,9 +57,7 @@ object ApplicationConstants {
     const val NOTIFICATIONS_CHANNEL_SYNC = "downloading"
     const val NOTIFICATIONS_ID_SYNC = 1
 
-    const val DEFAULT_MAP_CACHE_SIZE_IN_MB = 50
-    const val DEFAULT_AUTOSYNC = "ON"
-    const val DEFAULT_RESURVEY_INTERVALS = "DEFAULT"
+    const val DEFAULT_MAP_CACHE_SIZE_IN_MB = 200
 
     const val STREETMEASURE = "de.westnordost.streetmeasure"
 

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

@@ -8,12 +8,12 @@ import androidx.core.content.getSystemService
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
-import com.russhwolf.settings.ObservableSettings
 import com.russhwolf.settings.SettingsListener
 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.changelog.changelogModule
 import de.westnordost.streetcomplete.data.dbModule
 import de.westnordost.streetcomplete.data.download.downloadModule
 import de.westnordost.streetcomplete.data.download.tiles.DownloadedTilesController
@@ -50,17 +50,18 @@ 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.data.preferences.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.getSelectedLocales
 import de.westnordost.streetcomplete.util.ktx.nowAsEpochMilliseconds
 import de.westnordost.streetcomplete.util.logs.AndroidLogger
 import de.westnordost.streetcomplete.util.logs.DatabaseLogger
 import de.westnordost.streetcomplete.util.logs.Log
-import de.westnordost.streetcomplete.util.prefs.preferencesModule
+import de.westnordost.streetcomplete.data.preferences.Preferences
+import de.westnordost.streetcomplete.data.preferences.Theme
+import de.westnordost.streetcomplete.data.preferences.preferencesModule
 import de.westnordost.streetcomplete.util.setDefaultLocales
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
@@ -80,7 +81,7 @@ class StreetCompleteApplication : Application() {
     private val crashReportExceptionHandler: CrashReportExceptionHandler by inject()
     private val resurveyIntervalsUpdater: ResurveyIntervalsUpdater by inject()
     private val downloadedTilesController: DownloadedTilesController by inject()
-    private val prefs: ObservableSettings by inject()
+    private val prefs: Preferences by inject()
     private val editHistoryController: EditHistoryController by inject()
     private val userLoginController: UserLoginController by inject()
     private val cacheTrimmer: CacheTrimmer by inject()
@@ -115,6 +116,7 @@ class StreetCompleteApplication : Application() {
                 mainModule,
                 maptilesModule,
                 metadataModule,
+                changelogModule,
                 noteEditsModule,
                 notesModule,
                 messagesModule,
@@ -142,7 +144,7 @@ class StreetCompleteApplication : Application() {
         setLoggerInstances()
 
         // Force logout users who are logged in with OAuth 1.0a, they need to re-authenticate with OAuth 2
-        if (prefs.getStringOrNull(Prefs.OAUTH1_ACCESS_TOKEN) != null) {
+        if (prefs.hasOAuth1AccessToken) {
             userLoginController.logOut()
         }
 
@@ -159,24 +161,20 @@ class StreetCompleteApplication : Application() {
 
         enqueuePeriodicCleanupWork()
 
-        updateDefaultTheme()
+        updateTheme(prefs.theme)
 
         resurveyIntervalsUpdater.update()
 
-        val lastVersion = prefs.getStringOrNull(Prefs.LAST_VERSION_DATA)
+        val lastVersion = prefs.lastDataVersion
         if (BuildConfig.VERSION_NAME != lastVersion) {
-            prefs.putString(Prefs.LAST_VERSION_DATA, BuildConfig.VERSION_NAME)
+            prefs.lastDataVersion = BuildConfig.VERSION_NAME
             if (lastVersion != null) {
                 onNewVersion()
             }
         }
 
-        settingsListeners += prefs.addStringOrNullListener(Prefs.LANGUAGE_SELECT) {
-            updateDefaultLocales()
-        }
-        settingsListeners += prefs.addStringOrNullListener(Prefs.THEME_SELECT) {
-            updateDefaultTheme()
-        }
+        settingsListeners += prefs.onLanguageChanged { updateDefaultLocales() }
+        settingsListeners += prefs.onThemeChanged { updateTheme(it) }
     }
 
     private fun onNewVersion() {
@@ -207,8 +205,7 @@ class StreetCompleteApplication : Application() {
         setDefaultLocales(getSelectedLocales(prefs))
     }
 
-    private fun updateDefaultTheme() {
-        val theme = Prefs.Theme.valueOf(prefs.getStringOrNull(Prefs.THEME_SELECT) ?: getDefaultTheme())
+    private fun updateTheme(theme: Theme) {
         AppCompatDelegate.setDefaultNightMode(theme.appCompatNightMode)
     }
 
@@ -232,3 +229,9 @@ class StreetCompleteApplication : Application() {
     private val isConnected: Boolean
         get() = getSystemService<ConnectivityManager>()?.activeNetworkInfo?.isConnected == true
 }
+
+private val Theme.appCompatNightMode: Int get() = when (this) {
+    Theme.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
+    Theme.DARK -> AppCompatDelegate.MODE_NIGHT_YES
+    Theme.SYSTEM -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+}

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

@@ -1,16 +1,15 @@
 package de.westnordost.streetcomplete.data
 
-import com.russhwolf.settings.ObservableSettings
 import de.westnordost.osmapi.OsmConnection
 import de.westnordost.osmapi.user.UserApi
 import de.westnordost.streetcomplete.ApplicationConstants
-import de.westnordost.streetcomplete.Prefs
 import de.westnordost.streetcomplete.data.osm.mapdata.MapDataApi
 import de.westnordost.streetcomplete.data.osm.mapdata.MapDataApiImpl
 import de.westnordost.streetcomplete.data.osmnotes.NotesApi
 import de.westnordost.streetcomplete.data.osmnotes.NotesApiImpl
 import de.westnordost.streetcomplete.data.osmtracks.TracksApi
 import de.westnordost.streetcomplete.data.osmtracks.TracksApiImpl
+import de.westnordost.streetcomplete.data.preferences.Preferences
 import org.koin.androidx.workmanager.dsl.worker
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
@@ -29,7 +28,7 @@ val osmApiModule = module {
     single { OsmConnection(
         OSM_API_URL,
         ApplicationConstants.USER_AGENT,
-        get<ObservableSettings>().getStringOrNull(Prefs.OAUTH2_ACCESS_TOKEN)
+        get<Preferences>().oAuth2AccessToken
     ) }
     single { UnsyncedChangesCountSource(get(), get()) }
 

app/src/main/java/de/westnordost/streetcomplete/data/changelog/Changelog.kt

@@ -0,0 +1,39 @@
+package de.westnordost.streetcomplete.data.changelog
+
+import android.content.res.Resources
+import de.westnordost.streetcomplete.R
+import de.westnordost.streetcomplete.util.html.HtmlElementNode
+import de.westnordost.streetcomplete.util.html.HtmlNode
+import de.westnordost.streetcomplete.util.html.HtmlTextNode
+import de.westnordost.streetcomplete.util.html.parseHtml
+import de.westnordost.streetcomplete.util.ktx.getRawTextFile
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class Changelog(private val resources: Resources) {
+    /** Return the app's changelog, sorted descending by version.
+     *
+     *  @param sinceVersion optionally only return the changes since the given version
+     *  */
+    suspend fun getChangelog(sinceVersion: String? = null): Map<String, List<HtmlNode>> {
+        val text = withContext(Dispatchers.IO) { resources.getRawTextFile(R.raw.changelog) }
+        val html = withContext(Dispatchers.Default) { parseHtml(text) }
+        var currentVersion: String? = null
+        var versionHtml = ArrayList<HtmlNode>()
+        // LinkedHashMap so that order is preserved
+        val result = LinkedHashMap<String, List<HtmlNode>>()
+        for (node in html) {
+            if (node is HtmlElementNode && node.tag == "h2") {
+                if (currentVersion != null) {
+                    result[currentVersion] = versionHtml
+                    versionHtml = ArrayList()
+                }
+                currentVersion = (node.nodes.first() as HtmlTextNode).text.trim()
+                if (currentVersion == sinceVersion) return result
+            } else {
+                versionHtml.add(node)
+            }
+        }
+        return result
+    }
+}

app/src/main/java/de/westnordost/streetcomplete/data/changelog/ChangelogModule.kt

@@ -0,0 +1,7 @@
+package de.westnordost.streetcomplete.data.changelog
+
+import org.koin.dsl.module
+
+val changelogModule = module {
+    single { Changelog(get()) }
+}