Restore Base preferences

Signed-off-by: saulhdev <[email protected]>

Author: saulhdev

gradle/libs.versions.toml

@@ -1,29 +1,29 @@
 [versions]
-activity = "1.10.0"
+activity = "1.10.1"
 agp = "8.10.0-alpha08"
 alwan = "1.0.1"
 androidx-animation = "1.0.0"
-androidx-annotation = "1.7.1"
+androidx-annotation = "1.9.1"
 androidx-core = "1.15.0"
 androidx-runner = "1.6.2"
 androidx-rules = "1.6.1"
 androidx-test = "1.2.1"
 biometric = "1.2.0-alpha05"
 coil = "2.7.0"
-compose-bom = "2025.01.00"
+compose-bom = "2025.03.00"
 compose-accompanist = "0.36.0"
 coroutines = "1.9.0"
-constraint-layout = "2.2.0"
-coordinator-layout = "1.2.0"
-datastore = "1.1.2"
+constraint-layout = "2.2.1"
+coordinator-layout = "1.3.0"
+datastore = "1.1.3"
 dagger = "2.55"
 dynamic-animation = "1.1.0-alpha03"
 fuzzywuzzy = "1.4.0"
 hoko-blur = "1.5.3"
 immutables = "0.3.8"
 kotlin = "2.1.0"
-koin = "3.5.6"
-koin-ksp = "1.3.1"
+koin-bom = "4.1.0-Beta5"
+koin-compiler = "1.3.1"
 ksp = "2.1.0-1.0.29"
 lifecycle = "2.8.7"
 lifecycle-ext = "2.2.0"
@@ -55,37 +55,62 @@ uiautomator = "2.3.0"
 support-runner = "1.0.2"
 support-rules = "1.0.2"
 support-uiautomator = "2.1.3"
-annotation-jvm = "1.9.1"
 
 [libraries]
 gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 ksp = { module = "com.google.devtools.ksp:symbol-processing-api", version.ref = "ksp" }
-preference = { module = "androidx.preference:preference-ktx", version.ref = "preference" }
-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity" }
 collections-immutable = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version.ref = "immutables" }
 
 androidx-animation = { group = "androidx.core", name = "core-animation", version.ref = "androidx-animation" }
-androidx-annotation-jvm = { group = "androidx.annotation", name = "annotation-jvm", version.ref = "annotation-jvm" }
+androidx-dynamic-animation = { group = "androidx.dynamicanimation", name = "dynamicanimation", version.ref = "dynamic-animation" }
+androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
 androidx-biometric = { module = "androidx.biometric:biometric", version.ref = "biometric" }
-androidx-constraint-layout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraint-layout" }
-androidx-coordinator-layout = { group = "androidx.coordinatorlayout", name = "coordinatorlayout", version.ref = "coordinator-layout" }
 androidx-core = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core" }
-androidx-dynamic-animation = { group = "androidx.dynamicanimation", name = "dynamicanimation", version.ref = "dynamic-animation" }
 androidx-palette = { group = "androidx.palette", name = "palette-ktx", version.ref = "palette" }
+androidx-constraint-layout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraint-layout" }
+androidx-coordinator-layout = { group = "androidx.coordinatorlayout", name = "coordinatorlayout", version.ref = "coordinator-layout" }
 androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recycler-view" }
-androidx-annotation = { module = "androidx.annotation:annotation", version.ref = "androidx-annotation" }
+
+preference = { module = "androidx.preference:preference-ktx", version.ref = "preference" }
+datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
+
+compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
+compose-activity = { module = "androidx.activity:activity-compose", version.ref = "activity" }
+compose-runtime = { module = "androidx.compose.runtime:runtime" }
+compose-ui = { group = "androidx.compose.ui", name = "ui" }
+compose-foundation = { module = "androidx.compose.foundation:foundation" }
+compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
+compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
+
+compose-material3 = { module = "androidx.compose.material3:material3" }
+compose-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" }
+compose-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout", version.ref = "adaptive-layout" }
+compose-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation" }
+
+lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
+lifecycle-common = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "lifecycle" }
+lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
+lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
+lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "lifecycle-ext" }
+
+room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
+room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
+
 androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test" }
 androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-runner" }
 androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-rules" }
 
 material = { module = "com.google.android.material:material", version.ref = "material" }
+material-kolor = { module = "com.materialkolor:material-kolor", version.ref = "material-kolor" }
+
 coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" }
 serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }
-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
 slice = { module = "androidx.slice:slice-core", version.ref = "slice" }
 protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protobuf-lib" }
-
+compose-reorderable = { module = "sh.calvin.reorderable:reorderable", version.ref = "reorderable" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 owm = { module = "com.github.KwabenBerko:OpenWeatherMap-Android-Library", version.ref = "owm" }
 simple-storage = { module = "com.anggrayudi:storage", version.ref = "simple-storage" }
@@ -98,37 +123,20 @@ fuzzywuzzy = { module = "me.xdrop:fuzzywuzzy", version.ref = "fuzzywuzzy" }
 dagger-hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "dagger" }
 dagger-hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "dagger" }
 
-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "lifecycle" }
-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
-lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", version.ref = "lifecycle-ext" }
-
 coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "coroutines" }
 
-koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" }
-koin-workmanager = { group = "io.insert-koin", name = "koin-androidx-workmanager", version.ref = "koin" }
-koin-annotations = { group = "io.insert-koin", name = "koin-annotations", version.ref = "koin-ksp" }
-koin-compiler = { group = "io.insert-koin", name = "koin-ksp-compiler", version.ref = "koin-ksp" }
-
-room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
-room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
-room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
+koin-bom = { group = "io.insert-koin", name = "koin-bom", version.ref = "koin-bom" }
+koin-android = { group = "io.insert-koin", name = "koin-android" }
+koin-core = { group = "io.insert-koin", name = "koin-core" }
+koin-core-viewmodel = { group = "io.insert-koin", name = "koin-core-viewmodel" }
+koin-compose = { group = "io.insert-koin", name = "koin-compose" }
+koin-androidx-compose = { group = "io.insert-koin", name = "koin-androidx-compose" }
+koin-androidx-startup = { group = "io.insert-koin", name = "koin-androidx-startup" }
+koin-androidx-navigation = { group = "io.insert-koin", name = "koin-androidx-navigation" }
+koin-androidx-workmanager = { group = "io.insert-koin", name = "koin-androidx-workmanager" }
+koin-ksp-compiler = { group = "io.insert-koin", name = "koin-ksp-compiler", version.ref = "koin-compiler" }
 
-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "compose-bom" }
-compose-runtime = { module = "androidx.compose.runtime:runtime" }
-compose-ui = { group = "androidx.compose.ui", name = "ui" }
-compose-foundation = { module = "androidx.compose.foundation:foundation" }
-compose-material3 = { module = "androidx.compose.material3:material3" }
-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
-compose-navigation = { module = "androidx.navigation:navigation-compose", version.ref = "navigation" }
-compose-reorderable = { module = "sh.calvin.reorderable:reorderable", version.ref = "reorderable" }
-compose-adaptive = { module = "androidx.compose.material3.adaptive:adaptive" }
-compose-adaptive-layout = { module = "androidx.compose.material3.adaptive:adaptive-layout", version.ref = "adaptive-layout" }
-compose-adaptive-navigation = { module = "androidx.compose.material3.adaptive:adaptive-navigation" }
 accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "compose-accompanist" }
-material-kolor = { module = "com.materialkolor:material-kolor", version.ref = "material-kolor" }
 
 junit = { module = "junit:junit", version.ref = "junit" }
 junit5 = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }

neo_launcher/src/com/neoapps/launcher/NeoLauncher.kt

@@ -17,7 +17,23 @@
 
 package com.neoapps.launcher
 
+import android.content.Context
+import android.content.ContextWrapper
 import com.android.launcher3.Launcher
+import com.android.launcher3.LauncherAppState
+import com.neoapps.launcher.preferences.NeoPrefs
+import com.neoapps.launcher.util.CoreUtils
+
 
 class NeoLauncher: Launcher() {
+    val prefs: NeoPrefs by lazy { CoreUtils.getNeoPrefs() }
+
+    companion object {
+        @JvmStatic
+        fun getLauncher(context: Context): NeoLauncher {
+            return context as? NeoLauncher
+                ?: (context as ContextWrapper).baseContext as? NeoLauncher
+                ?: LauncherAppState.getInstance(context).launcher as NeoLauncher
+        }
+    }
 }

neo_launcher/src/com/neoapps/launcher/iconpack/IconPack.kt

@@ -0,0 +1,33 @@
+/*
+ * This file is part of Neo Launcher
+ * Copyright (c) 2021   Neo Launcher Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ */
+
+package com.neoapps.launcher.iconpack
+
+data class IconEntry(
+    val packPackageName: String,
+    val name: String,
+    val type: IconType
+) {
+    fun resolveDynamicCalendar(day: Int): IconEntry {
+        if (type != IconType.Calendar) throw IllegalStateException("type is not calendar")
+        return IconEntry(packPackageName, "$name${day + 1}", IconType.Normal)
+    }
+}
+
+enum class IconType {
+    Normal, Calendar
+}

neo_launcher/src/com/neoapps/launcher/preferences/BasePreferences.kt

@@ -0,0 +1,162 @@
+/*
+ * This file is part of Neo Launcher
+ * Copyright (c) 2023   Neo Launcher Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ */
+
+package com.neoapps.launcher.preferences
+
+import androidx.annotation.StringRes
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.edit
+import com.neoapps.launcher.navigation.NavRoute
+import com.neoapps.launcher.theme.AccentColorOption
+import com.neoapps.launcher.util.runOnMainThread
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runBlocking
+
+open class BooleanPref(
+    @StringRes titleId: Int,
+    @StringRes summaryId: Int = -1,
+    dataStore: DataStore<Preferences>,
+    key: Preferences.Key<Boolean>,
+    defaultValue: Boolean = false,
+    onChange: (Boolean) -> Unit = {}
+) : BasePreference<Boolean>(titleId, summaryId, dataStore, key, defaultValue, onChange)
+
+open class IntSelectionPref(
+    @StringRes titleId: Int,
+    @StringRes summaryId: Int = -1,
+    dataStore: DataStore<Preferences>,
+    key: Preferences.Key<Int>,
+    val defaultValue: Int = 0,
+    val entries: Map<Int, Int>,
+    onChange: (Int) -> Unit = {}
+) : BasePreference<Int>(titleId, summaryId, dataStore, key, defaultValue, onChange)
+
+open class LongMultiSelectionPref(
+    @StringRes titleId: Int,
+    @StringRes summaryId: Int = -1,
+    private val dataStore: DataStore<Preferences>,
+    private val key: Preferences.Key<Set<String>>,
+    val defaultValue: Set<Long> = emptySet(),
+    val entries: () -> Map<Long, String>,
+    onChange: (Set<Long>) -> Unit = { }
+) : BasePreference<Set<String>>(
+    titleId,
+    summaryId,
+    dataStore,
+    key,
+    defaultValue.mapTo(mutableSetOf()) { it.toString() },
+    { set -> onChange(set.mapTo(mutableSetOf()) { it.toLong() }) }
+) {
+    private val valueList = arrayListOf<String>()
+
+    init {
+        runBlocking(Dispatchers.IO) {
+            valueList.addAll(getValue())
+        }
+    }
+
+    fun getAll(): List<Long> = valueList.map { it.toLong() }
+
+    fun setAll(value: List<Long>) {
+        valueList.clear()
+        valueList.addAll(value.map { it.toString() })
+        return runBlocking(Dispatchers.IO) {
+            saveChanges()
+        }
+    }
+
+    private suspend fun saveChanges() {
+        dataStore.edit { it[key] = valueList.toSet() }
+    }
+}
+
+open class ColorIntPref(
+    @StringRes titleId: Int,
+    @StringRes summaryId: Int = -1,
+    dataStore: DataStore<Preferences>,
+    val defaultValue: String = "system_accent",
+    key: Preferences.Key<String>,
+    val navRoute: NavRoute,
+    onChange: (String) -> Unit = {}
+) : BasePreference<String>(titleId, summaryId, dataStore, key, defaultValue, onChange) {
+
+    fun getColor(): Int {
+        return runBlocking(Dispatchers.IO) {
+            AccentColorOption.fromString(getValue()).accentColor
+        }
+    }
+
+    @Composable
+    fun getColorFromState(): Int {
+        return AccentColorOption.fromString(getState().value).accentColor
+    }
+}
+
+open class StringSetPref(
+    @StringRes titleId: Int,
+    @StringRes summaryId: Int = -1,
+    dataStore: DataStore<Preferences>,
+    key: Preferences.Key<Set<String>>,
+    val navRoute: NavRoute,
+    val defaultValue: Set<String> = emptySet(),
+    onChange: (Set<String>) -> Unit = {}
+) : BasePreference<Set<String>>(titleId, summaryId, dataStore, key, defaultValue, onChange)
+
+abstract class BasePreference<T : Any>(
+    @StringRes var titleId: Int,
+    @StringRes var summaryId: Int = -1,
+    private val dataStore: DataStore<Preferences>,
+    private val key: Preferences.Key<T>,
+    private val defaultValue: T,
+    val onChange: (T) -> Unit
+) {
+    fun getValue(): T {
+        return runBlocking(Dispatchers.IO) {
+            get().firstOrNull() ?: defaultValue
+        }
+    }
+
+    @Composable
+    fun getState(): State<T> {
+        return get().collectAsState(initial = defaultValue)
+    }
+
+    fun setValue(value: T) {
+        return runBlocking(Dispatchers.IO) {
+            set(value)
+        }
+    }
+
+    open fun get(): Flow<T> {
+        return dataStore.data.map { prefs -> prefs[key] ?: defaultValue }
+    }
+
+    protected open suspend fun set(value: T) {
+        if (getValue() == value) return
+        dataStore.edit { prefs -> prefs[key] = value }
+        runOnMainThread {
+            onChange(value)
+        }
+    }
+}