lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Custom color schemes v2 - Part 2

Browse Source 
Add database entity and migrations
This commit is contained in:
MM20 2023-08-22 21:34:46 +02:00
parent 6723e14beb
commit 46f2f47cda
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
4 changed files with 348 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/database/build.gradle.kts
View File

@ -53,5 +53,6 @@ dependencies {
implementation(project(":core:i18n")) implementation(project(":core:i18n"))
implementation(project(":core:ktx")) implementation(project(":core:ktx"))
implementation(project(":core:preferences"))
} }

61
core/database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt
View File

@ -8,7 +8,15 @@ import androidx.room.Room
import androidx.room.RoomDatabase import androidx.room.RoomDatabase
import androidx.room.TypeConverters import androidx.room.TypeConverters
import androidx.sqlite.db.SupportSQLiteDatabase import androidx.sqlite.db.SupportSQLiteDatabase
import de.mm20.launcher2.database.entities.* import de.mm20.launcher2.database.entities.CurrencyEntity
import de.mm20.launcher2.database.entities.CustomAttributeEntity
import de.mm20.launcher2.database.entities.ForecastEntity
import de.mm20.launcher2.database.entities.IconEntity
import de.mm20.launcher2.database.entities.IconPackEntity
import de.mm20.launcher2.database.entities.SavedSearchableEntity
import de.mm20.launcher2.database.entities.SearchActionEntity
import de.mm20.launcher2.database.entities.ThemeEntity
import de.mm20.launcher2.database.entities.WidgetEntity
import de.mm20.launcher2.database.migrations.Migration_10_11 import de.mm20.launcher2.database.migrations.Migration_10_11
import de.mm20.launcher2.database.migrations.Migration_11_12 import de.mm20.launcher2.database.migrations.Migration_11_12
import de.mm20.launcher2.database.migrations.Migration_12_13 import de.mm20.launcher2.database.migrations.Migration_12_13
@ -23,6 +31,7 @@ import de.mm20.launcher2.database.migrations.Migration_20_21
import de.mm20.launcher2.database.migrations.Migration_21_22 import de.mm20.launcher2.database.migrations.Migration_21_22
import de.mm20.launcher2.database.migrations.Migration_22_23 import de.mm20.launcher2.database.migrations.Migration_22_23
import de.mm20.launcher2.database.migrations.Migration_23_24 import de.mm20.launcher2.database.migrations.Migration_23_24
import de.mm20.launcher2.database.migrations.Migration_24_25
import de.mm20.launcher2.database.migrations.Migration_6_7 import de.mm20.launcher2.database.migrations.Migration_6_7
import de.mm20.launcher2.database.migrations.Migration_7_8 import de.mm20.launcher2.database.migrations.Migration_7_8
import de.mm20.launcher2.database.migrations.Migration_8_9 import de.mm20.launcher2.database.migrations.Migration_8_9
@ -39,8 +48,9 @@ import java.util.UUID
IconPackEntity::class, IconPackEntity::class,
WidgetEntity::class, WidgetEntity::class,
CustomAttributeEntity::class, CustomAttributeEntity::class,
SearchActionEntity::class SearchActionEntity::class,
], version = 24, exportSchema = true ThemeEntity::class,
], version = 25, exportSchema = true
) )
@TypeConverters(ComponentNameConverter::class) @TypeConverters(ComponentNameConverter::class)
abstract class AppDatabase : RoomDatabase() { abstract class AppDatabase : RoomDatabase() {
@ -65,23 +75,39 @@ abstract class AppDatabase : RoomDatabase() {
.addCallback(object : Callback() { .addCallback(object : Callback() {
override fun onCreate(db: SupportSQLiteDatabase) { override fun onCreate(db: SupportSQLiteDatabase) {
super.onCreate(db) super.onCreate(db)
db.execSQL("INSERT INTO `SearchAction` (`position`, `type`) VALUES" + db.execSQL(
"(0, 'call')," + "INSERT INTO `SearchAction` (`position`, `type`) VALUES" +
"(1, 'message')," + "(0, 'call')," +
"(2, 'email')," + "(1, 'message')," +
"(3, 'contact')," + "(2, 'email')," +
"(4, 'alarm')," + "(3, 'contact')," +
"(5, 'timer')," + "(4, 'alarm')," +
"(6, 'calendar')," + "(5, 'timer')," +
"(7, 'website')," + "(6, 'calendar')," +
"(8, 'websearch')" "(7, 'website')," +
"(8, 'websearch')"
) )
db.execSQL("INSERT INTO `SearchAction` (`position`, `type`, `data`, `label`, `color`, `icon`, `customIcon`, `options`) " + db.execSQL(
"VALUES (?, ?, ?, ?, ?, ?, ?, ?), (?, ?, ?, ?, ?, ?, ?, ?)", "INSERT INTO `SearchAction` (`position`, `type`, `data`, `label`, `color`, `icon`, `customIcon`, `options`) " +
"VALUES (?, ?, ?, ?, ?, ?, ?, ?), (?, ?, ?, ?, ?, ?, ?, ?)",
arrayOf( arrayOf(
9, "url", context.getString(R.string.default_websearch_2_url), context.getString(R.string.default_websearch_2_name), 0, 0, null, null, 9,
10, "url", context.getString(R.string.default_websearch_3_url), context.getString(R.string.default_websearch_3_name), 0, 0, null, null, "url",
context.getString(R.string.default_websearch_2_url),
context.getString(R.string.default_websearch_2_name),
0,
0,
null,
null,
10,
"url",
context.getString(R.string.default_websearch_3_url),
context.getString(R.string.default_websearch_3_name),
0,
0,
null,
null,
) )
) )
@ -117,6 +143,7 @@ abstract class AppDatabase : RoomDatabase() {
Migration_21_22(), Migration_21_22(),
Migration_22_23(), Migration_22_23(),
Migration_23_24(), Migration_23_24(),
Migration_24_25(context),
).build() ).build()
if (_instance == null) _instance = instance if (_instance == null) _instance = instance
return instance return instance

90
core/database/src/main/java/de/mm20/launcher2/database/entities/ThemeEntity.kt Normal file
View File

@ -0,0 +1,90 @@
package de.mm20.launcher2.database.entities
import androidx.room.Entity
import androidx.room.PrimaryKey
import java.util.UUID
@Entity(tableName = "Theme")
data class ThemeEntity(
@PrimaryKey val id: UUID,
val corePaletteA1: Int?,
val corePaletteA2: Int?,
val corePaletteA3: Int?,
val corePaletteN1: Int?,
val corePaletteN2: Int?,
val corePaletteE: Int?,
val lightPrimary: String?,
val lightOnPrimary: String?,
val lightPrimaryContainer: String?,
val lightOnPrimaryContainer: String?,
val lightSecondary: String?,
val lightOnSecondary: String?,
val lightSecondaryContainer: String?,
val lightOnSecondaryContainer: String?,
val lightTertiary: String?,
val lightOnTertiary: String?,
val lightTertiaryContainer: String?,
val lightOnTertiaryContainer: String?,
val lightError: String?,
val lightOnError: String?,
val lightErrorContainer: String?,
val lightOnErrorContainer: String?,
val lightSurface: String?,
val lightOnSurface: String?,
val lightOnSurfaceVariant: String?,
val lightOutline: String?,
val lightOutlineVariant: String?,
val lightInverseSurface: String?,
val lightInverseOnSurface: String?,
val lightInversePrimary: String?,
val lightSurfaceDim: String?,
val lightSurfaceBright: String?,
val lightSurfaceContainerLowest: String?,
val lightSurfaceContainerLow: String?,
val lightSurfaceContainer: String?,
val lightSurfaceContainerHigh: String?,
val lightSurfaceContainerHighest: String?,
val lightBackground: String?,
val lightOnBackground: String?,
val lightSurfaceTint: String?,
val lightScrim: String?,
val lightSurfaceVariant: String?,
val darkPrimary: String?,
val darkOnPrimary: String?,
val darkPrimaryContainer: String?,
val darkOnPrimaryContainer: String?,
val darkSecondary: String?,
val darkOnSecondary: String?,
val darkSecondaryContainer: String?,
val darkOnSecondaryContainer: String?,
val darkTertiary: String?,
val darkOnTertiary: String?,
val darkTertiaryContainer: String?,
val darkOnTertiaryContainer: String?,
val darkError: String?,
val darkOnError: String?,
val darkErrorContainer: String?,
val darkOnErrorContainer: String?,
val darkSurface: String?,
val darkOnSurface: String?,
val darkOnSurfaceVariant: String?,
val darkOutline: String?,
val darkOutlineVariant: String?,
val darkInverseSurface: String?,
val darkInverseOnSurface: String?,
val darkInversePrimary: String?,
val darkSurfaceDim: String?,
val darkSurfaceBright: String?,
val darkSurfaceContainerLowest: String?,
val darkSurfaceContainerLow: String?,
val darkSurfaceContainer: String?,
val darkSurfaceContainerHigh: String?,
val darkSurfaceContainerHighest: String?,
val darkBackground: String?,
val darkOnBackground: String?,
val darkSurfaceTint: String?,
val darkScrim: String?,
val darkSurfaceVariant: String?,
)

213
core/database/src/main/java/de/mm20/launcher2/database/migrations/Migration_24_25.kt Normal file
View File

@ -0,0 +1,213 @@
package de.mm20.launcher2.database.migrations
import android.content.Context
import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase
import de.mm20.launcher2.ktx.toBytes
import de.mm20.launcher2.preferences.LauncherDataStore
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.runBlocking
import org.koin.core.component.KoinComponent
import org.koin.core.component.inject
import java.util.UUID
class Migration_24_25(
private val context: Context,
) : Migration(24, 25), KoinComponent {
private val dataStore: LauncherDataStore by inject()
override fun migrate(database: SupportSQLiteDatabase) {
database.execSQL(
"""
CREATE TABLE IF NOT EXISTS `Theme` (
`id` BLOB NOT NULL,
`corePaletteA1` INTEGER,
`corePaletteA2` INTEGER,
`corePaletteA3` INTEGER,
`corePaletteN1` INTEGER,
`corePaletteN2` INTEGER,
`corePaletteE` INTEGER,
`lightPrimary` TEXT,
`lightOnPrimary` TEXT,
`lightPrimaryContainer` TEXT,
`lightOnPrimaryContainer` TEXT,
`lightSecondary` TEXT,
`lightOnSecondary` TEXT,
`lightSecondaryContainer` TEXT,
`lightOnSecondaryContainer` TEXT,
`lightTertiary` TEXT,
`lightOnTertiary` TEXT,
`lightTertiaryContainer` TEXT,
`lightOnTertiaryContainer` TEXT,
`lightError` TEXT,
`lightOnError` TEXT,
`lightErrorContainer` TEXT,
`lightOnErrorContainer` TEXT,
`lightSurface` TEXT,
`lightOnSurface` TEXT,
`lightOnSurfaceVariant` TEXT,
`lightOutline` TEXT,
`lightOutlineVariant` TEXT,
`lightInverseSurface` TEXT,
`lightInverseOnSurface` TEXT,
`lightInversePrimary` TEXT,
`lightSurfaceDim` TEXT,
`lightSurfaceBright` TEXT,
`lightSurfaceContainerLowest` TEXT,
`lightSurfaceContainerLow` TEXT,
`lightSurfaceContainer` TEXT,
`lightSurfaceContainerHigh` TEXT,
`lightSurfaceContainerHighest` TEXT,
`lightBackground` TEXT,
`lightOnBackground` TEXT,
`lightSurfaceTint` TEXT,
`lightScrim` TEXT,
`lightSurfaceVariant` TEXT,
`darkPrimary` TEXT,
`darkOnPrimary` TEXT,
`darkPrimaryContainer` TEXT,
`darkOnPrimaryContainer` TEXT,
`darkSecondary` TEXT,
`darkOnSecondary` TEXT,
`darkSecondaryContainer` TEXT,
`darkOnSecondaryContainer` TEXT,
`darkTertiary` TEXT,
`darkOnTertiary` TEXT,
`darkTertiaryContainer` TEXT,
`darkOnTertiaryContainer` TEXT,
`darkError` TEXT,
`darkOnError` TEXT,
`darkErrorContainer` TEXT,
`darkOnErrorContainer` TEXT,
`darkSurface` TEXT,
`darkOnSurface` TEXT,
`darkOnSurfaceVariant` TEXT,
`darkOutline` TEXT,
`darkOutlineVariant` TEXT,
`darkInverseSurface` TEXT,
`darkInverseOnSurface` TEXT,
`darkInversePrimary` TEXT,
`darkSurfaceDim` TEXT,
`darkSurfaceBright` TEXT,
`darkSurfaceContainerLowest` TEXT,
`darkSurfaceContainerLow` TEXT,
`darkSurfaceContainer` TEXT,
`darkSurfaceContainerHigh` TEXT,
`darkSurfaceContainerHighest` TEXT,
`darkBackground` TEXT,
`darkOnBackground` TEXT,
`darkSurfaceTint` TEXT,
`darkScrim` TEXT,
`darkSurfaceVariant` TEXT,
PRIMARY KEY(`id`)
)
""".trimIndent()
)
// Special UUID for migrated custom color scheme. Same UUID is used in data store migration 16..17
val uuid = UUID(1L, 1L)
val customColors = runBlocking {
dataStore.data.map { it.appearance.customColors }.first()
}
database.execSQL("""INSERT INTO `Theme` VALUES (
?,?,?,?,?,?,?,?,?,?,
?,?,?,?,?,?,?,?,?,?,
?,?,?,?,?,?,?,?,?,?,
?,?,?,?,?,?,?,?,?,?,
?,?,?,?,?,?,?,?,?,?,
?,?,?,?,?,?,?,?,?,?,
?,?,?,?,?,?,?,?,?,?,
?,?,?,?,?,?,?,?,?
)
""".trimIndent(),
arrayOf(
uuid.toBytes(),
customColors.baseColors.accent1.toHexColor(),
customColors.baseColors.accent2.toHexColor(),
customColors.baseColors.accent3.toHexColor(),
customColors.baseColors.neutral1.toHexColor(),
customColors.baseColors.neutral2.toHexColor(),
customColors.baseColors.error.toHexColor(),
customColors.lightScheme.primary.toHexColor(),
customColors.lightScheme.onPrimary.toHexColor(),
customColors.lightScheme.primaryContainer.toHexColor(),
customColors.lightScheme.onPrimaryContainer.toHexColor(),
customColors.lightScheme.secondary.toHexColor(),
customColors.lightScheme.onSecondary.toHexColor(),
customColors.lightScheme.secondaryContainer.toHexColor(),
customColors.lightScheme.onSecondaryContainer.toHexColor(),
customColors.lightScheme.tertiary.toHexColor(),
customColors.lightScheme.onTertiary.toHexColor(),
customColors.lightScheme.tertiaryContainer.toHexColor(),
customColors.lightScheme.onTertiaryContainer.toHexColor(),
customColors.lightScheme.error.toHexColor(),
customColors.lightScheme.onError.toHexColor(),
customColors.lightScheme.errorContainer.toHexColor(),
customColors.lightScheme.onErrorContainer.toHexColor(),
customColors.lightScheme.surface.toHexColor(),
customColors.lightScheme.onSurface.toHexColor(),
customColors.lightScheme.onSurfaceVariant.toHexColor(),
customColors.lightScheme.outline.toHexColor(),
customColors.lightScheme.outlineVariant.toHexColor(),
customColors.lightScheme.inverseSurface.toHexColor(),
customColors.lightScheme.inverseOnSurface.toHexColor(),
customColors.lightScheme.inversePrimary.toHexColor(),
customColors.lightScheme.surfaceDim.toHexColor(),
customColors.lightScheme.surfaceBright.toHexColor(),
customColors.lightScheme.surfaceContainerLowest.toHexColor(),
customColors.lightScheme.surfaceContainerLow.toHexColor(),
customColors.lightScheme.surfaceContainer.toHexColor(),
customColors.lightScheme.surfaceContainerHigh.toHexColor(),
customColors.lightScheme.surfaceContainerHighest.toHexColor(),
customColors.lightScheme.background.toHexColor(),
customColors.lightScheme.onBackground.toHexColor(),
customColors.lightScheme.surfaceTint.toHexColor(),
customColors.lightScheme.scrim.toHexColor(),
customColors.lightScheme.surfaceVariant.toHexColor(),
customColors.darkScheme.primary.toHexColor(),
customColors.darkScheme.onPrimary.toHexColor(),
customColors.darkScheme.primaryContainer.toHexColor(),
customColors.darkScheme.onPrimaryContainer.toHexColor(),
customColors.darkScheme.secondary.toHexColor(),
customColors.darkScheme.onSecondary.toHexColor(),
customColors.darkScheme.secondaryContainer.toHexColor(),
customColors.darkScheme.onSecondaryContainer.toHexColor(),
customColors.darkScheme.tertiary.toHexColor(),
customColors.darkScheme.onTertiary.toHexColor(),
customColors.darkScheme.tertiaryContainer.toHexColor(),
customColors.darkScheme.onTertiaryContainer.toHexColor(),
customColors.darkScheme.error.toHexColor(),
customColors.darkScheme.onError.toHexColor(),
customColors.darkScheme.errorContainer.toHexColor(),
customColors.darkScheme.onErrorContainer.toHexColor(),
customColors.darkScheme.surface.toHexColor(),
customColors.darkScheme.onSurface.toHexColor(),
customColors.darkScheme.onSurfaceVariant.toHexColor(),
customColors.darkScheme.outline.toHexColor(),
customColors.darkScheme.outlineVariant.toHexColor(),
customColors.darkScheme.inverseSurface.toHexColor(),
customColors.darkScheme.inverseOnSurface.toHexColor(),
customColors.darkScheme.inversePrimary.toHexColor(),
customColors.darkScheme.surfaceDim.toHexColor(),
customColors.darkScheme.surfaceBright.toHexColor(),
customColors.darkScheme.surfaceContainerLowest.toHexColor(),
customColors.darkScheme.surfaceContainerLow.toHexColor(),
customColors.darkScheme.surfaceContainer.toHexColor(),
customColors.darkScheme.surfaceContainerHigh.toHexColor(),
customColors.darkScheme.surfaceContainerHighest.toHexColor(),
customColors.darkScheme.background.toHexColor(),
customColors.darkScheme.onBackground.toHexColor(),
customColors.darkScheme.surfaceTint.toHexColor(),
customColors.darkScheme.scrim.toHexColor(),
customColors.darkScheme.surfaceVariant.toHexColor(),
)
)
}
fun Int.toHexColor(): String {
return "#${toUInt().toString(16).padStart(6, '0')}"
}
}