Migrated subscriptions list screen to Compose

app/build.gradle

@@ -123,6 +123,7 @@ dependencies {
     implementation 'androidx.compose.material:material'
     debugImplementation "androidx.compose.ui:ui-tooling"
     implementation "androidx.compose.ui:ui-tooling-preview"
+    implementation "androidx.compose.runtime:runtime-livedata:1.4.3"
     implementation 'com.google.accompanist:accompanist-themeadapter-material:0.30.1'
     implementation 'io.github.vanpra.compose-material-dialogs:color:0.9.0'
 

app/src/main/AndroidManifest.xml

@@ -70,6 +70,7 @@
 
         <activity
             android:name=".ui.CalendarListActivity"
+            android:theme="@style/AppTheme.NoActionBar"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/at/bitfire/icsdroid/AppAccount.kt

@@ -14,7 +14,7 @@ import android.util.Log
 object AppAccount {
 
     private const val DEFAULT_SYNC_INTERVAL = 24*3600L   // 1 day
-    private const val SYNC_INTERVAL_MANUALLY = -1L
+    const val SYNC_INTERVAL_MANUALLY = -1L
 
     private const val PREF_ACCOUNT = "account"
     private const val KEY_SYNC_INTERVAL = "syncInterval"

app/src/main/java/at/bitfire/icsdroid/MyApp.kt

@@ -6,16 +6,28 @@ package at.bitfire.icsdroid
 
 import android.app.Application
 import androidx.appcompat.app.AppCompatDelegate
-import at.bitfire.icsdroid.ui.Settings
 
 class MyApp: Application() {
 
+    companion object {
+
+        fun setNightMode(forceDarkMode: Boolean) {
+            AppCompatDelegate.setDefaultNightMode(
+                if (forceDarkMode)
+                    AppCompatDelegate.MODE_NIGHT_YES
+                else
+                    AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
+            )
+        }
+
+    }
+
+
     override fun onCreate() {
         super.onCreate()
 
         // dark mode is not persisted over app restarts
-        if (Settings(this).forceDarkMode())
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+        setNightMode(Settings(this).forceDarkMode())
     }
 
 }

app/src/main/java/at/bitfire/icsdroid/Settings.kt

@@ -0,0 +1,50 @@
+/***************************************************************************************************
+ * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.
+ **************************************************************************************************/
+
+package at.bitfire.icsdroid
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.lifecycle.LiveData
+
+class Settings(context: Context) {
+
+    companion object {
+        private const val FORCE_DARK_MODE = "forceDarkMode"
+    }
+
+
+    private val prefs: SharedPreferences = context.getSharedPreferences("icsx5", 0)
+
+    fun forceDarkMode(): Boolean = prefs.getBoolean(FORCE_DARK_MODE, false)
+
+    fun forceDarkModeLive(): LiveData<Boolean> = object: LiveData<Boolean>() {
+        val listener = SharedPreferences.OnSharedPreferenceChangeListener { prefs, key ->
+            if (key == FORCE_DARK_MODE) {
+                val forceDarkMode = prefs.getBoolean(key, false)
+                postValue(forceDarkMode)
+            }
+        }
+
+        override fun onActive() {
+            prefs.registerOnSharedPreferenceChangeListener(listener)
+            listener.onSharedPreferenceChanged(prefs, FORCE_DARK_MODE)
+        }
+
+        override fun onInactive() {
+            prefs.unregisterOnSharedPreferenceChangeListener(listener)
+        }
+    }
+
+    fun forceDarkMode(force: Boolean) {
+        // save setting
+        prefs.edit()
+            .putBoolean(FORCE_DARK_MODE, force)
+            .apply()
+
+        // actually set dark mode
+        MyApp.setNightMode(force)
+    }
+
+}