Remove legacy data store

.gitignore

@@ -260,6 +260,7 @@ obj/
 .idea/sqlDataSources.xml
 .idea/dynamic.xml
 .idea/uiDesigner.xml
+.idea/runConfigurations.xml
 
 # OS-specific files
 .DS_Store?

app/ui/src/main/java/de/mm20/launcher2/ui/base/ProvideSettings.kt

@@ -2,7 +2,6 @@ package de.mm20.launcher2.ui.base
 
 import androidx.compose.runtime.*
 import de.mm20.launcher2.preferences.IconShape
-import de.mm20.launcher2.preferences.LegacySettings
 import de.mm20.launcher2.preferences.ui.CardStyle
 import de.mm20.launcher2.preferences.ui.GridSettings
 import de.mm20.launcher2.preferences.ui.UiSettings

app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/FailedGestureSheet.kt

@@ -15,7 +15,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import de.mm20.launcher2.preferences.GestureAction
-import de.mm20.launcher2.preferences.LegacySettings
 import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.component.BottomSheetDialog
 import de.mm20.launcher2.ui.component.MissingPermissionBanner

app/ui/src/main/java/de/mm20/launcher2/ui/settings/cards/CardsSettingsScreen.kt

@@ -15,7 +15,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import de.mm20.launcher2.preferences.LegacySettings
 import de.mm20.launcher2.preferences.SurfaceShape
 import de.mm20.launcher2.preferences.ui.CardStyle
 import de.mm20.launcher2.ui.R

app/ui/src/main/java/de/mm20/launcher2/ui/settings/gestures/GestureSettingsScreen.kt

@@ -29,7 +29,6 @@ import de.mm20.launcher2.icons.LauncherIcon
 import de.mm20.launcher2.ktx.isAtLeastApiLevel
 import de.mm20.launcher2.preferences.BaseLayout
 import de.mm20.launcher2.preferences.GestureAction
-import de.mm20.launcher2.preferences.LegacySettings.LayoutSettings.Layout
 import de.mm20.launcher2.search.SavableSearchable
 import de.mm20.launcher2.ui.R
 import de.mm20.launcher2.ui.common.SearchablePicker

app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreen.kt

@@ -26,7 +26,6 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.google.accompanist.pager.HorizontalPagerIndicator
-import de.mm20.launcher2.preferences.LegacySettings
 import de.mm20.launcher2.preferences.SearchBarColors
 import de.mm20.launcher2.preferences.SearchBarStyle
 import de.mm20.launcher2.preferences.SystemBarColors

app/ui/src/main/java/de/mm20/launcher2/ui/settings/homescreen/HomescreenSettingsScreenVM.kt

@@ -13,7 +13,6 @@ import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.initializer
 import androidx.lifecycle.viewmodel.viewModelFactory
 import de.mm20.launcher2.ktx.isAtLeastApiLevel
-import de.mm20.launcher2.preferences.LegacySettings
 import de.mm20.launcher2.preferences.ScreenOrientation
 import de.mm20.launcher2.preferences.SearchBarColors
 import de.mm20.launcher2.preferences.SearchBarStyle

app/ui/src/main/java/de/mm20/launcher2/ui/theme/colorscheme/Custom.kt

@@ -10,8 +10,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
 import androidx.core.content.ContextCompat
-import androidx.datastore.core.DataStore
-import de.mm20.launcher2.preferences.LegacySettings
 import de.mm20.launcher2.preferences.ui.UiSettings
 import de.mm20.launcher2.themes.CorePalette
 import de.mm20.launcher2.themes.DefaultDarkColorScheme
@@ -22,9 +20,7 @@ import de.mm20.launcher2.themes.Theme
 import de.mm20.launcher2.themes.get
 import de.mm20.launcher2.themes.merge
 import de.mm20.launcher2.ui.locals.LocalWallpaperColors
-import kotlinx.coroutines.flow.map
 import org.koin.androidx.compose.inject
-import org.koin.core.component.inject
 
 @Composable
 fun lightColorSchemeOf(theme: Theme): ColorScheme {
@@ -113,44 +109,3 @@ fun systemCorePalette(): CorePalette<Int> {
         )
     }
 }
-
-fun CustomColorScheme(colors: LegacySettings.AppearanceSettings.CustomColors.Scheme): ColorScheme {
-    return ColorScheme(
-        primary = Color(colors.primary),
-        onPrimary = Color(colors.onPrimary),
-        primaryContainer = Color(colors.primaryContainer),
-        onPrimaryContainer = Color(colors.onPrimaryContainer),
-        secondary = Color(colors.secondary),
-        onSecondary = Color(colors.onSecondary),
-        secondaryContainer = Color(colors.secondaryContainer),
-        onSecondaryContainer = Color(colors.onSecondaryContainer),
-        tertiary = Color(colors.tertiary),
-        onTertiary = Color(colors.onTertiary),
-        tertiaryContainer = Color(colors.tertiaryContainer),
-        onTertiaryContainer = Color(colors.onTertiaryContainer),
-        background = Color(colors.background),
-        onBackground = Color(colors.onBackground),
-        surface = Color(colors.surface),
-        onSurface = Color(colors.onSurface),
-        surfaceVariant = Color(colors.surfaceVariant),
-        onSurfaceVariant = Color(colors.onSurfaceVariant),
-        outline = Color(colors.outline),
-        inverseSurface = Color(colors.inverseSurface),
-        inverseOnSurface = Color(colors.inverseOnSurface),
-        inversePrimary = Color(colors.inversePrimary),
-        surfaceTint = Color(colors.surfaceTint),
-        error = Color(colors.error),
-        onError = Color(colors.onError),
-        errorContainer = Color(colors.errorContainer),
-        onErrorContainer = Color(colors.onErrorContainer),
-        outlineVariant = Color(colors.outlineVariant),
-        scrim = Color(colors.scrim),
-        surfaceBright = Color(colors.surfaceBright),
-        surfaceDim = Color(colors.surfaceDim),
-        surfaceContainer = Color(colors.surfaceContainer),
-        surfaceContainerHigh = Color(colors.surfaceContainerHigh),
-        surfaceContainerHighest = Color(colors.surfaceContainerHighest),
-        surfaceContainerLow = Color(colors.surfaceContainerLow),
-        surfaceContainerLowest = Color(colors.surfaceContainerLowest),
-    )
-}

build.gradle.kts

@@ -2,7 +2,6 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.plugin.serialization) apply false
     alias(libs.plugins.ksp) apply false
-    alias(libs.plugins.protobuf) apply false
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.dokka) apply true

core/preferences/build.gradle.kts

@@ -1,9 +1,6 @@
-import com.google.protobuf.gradle.*
-
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.protobuf)
     alias(libs.plugins.kotlin.plugin.serialization)
 }
 
@@ -37,32 +34,12 @@ android {
     namespace = "de.mm20.launcher2.preferences"
 }
 
-protobuf {
-    protoc {
-        artifact = libs.protobuf.protoc.get().toString()
-    }
-
-    // Generates the java Protobuf-lite code for the Protobufs in this project. See
-    // https://github.com/google/protobuf-gradle-plugin#customizing-protobuf-compilation
-    // for more information.
-    generateProtoTasks {
-        all().forEach { task ->
-            task.plugins {
-                create("java") {
-                    option("lite")
-                }
-            }
-        }
-    }
-}
-
 dependencies {
     implementation(libs.kotlin.stdlib)
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.androidx.core)
     implementation(libs.androidx.appcompat)
     api(libs.androidx.datastore)
-    api(libs.protobuf.javalite)
     implementation(libs.koin.android)
 
     implementation(project(":core:ktx"))