Change Icon and IconPack entities again

- move `themed` column from Icon to IconPack
This commit is contained in:
MM20
2023-02-14 22:02:48 +01:00
parent af858bfbbe
commit ebba36c384
6 changed files with 30 additions and 30 deletions
@@ -3,24 +3,27 @@ package de.mm20.launcher2.icons
import de.mm20.launcher2.database.entities.IconPackEntity
data class IconPack(
val name: String,
val packageName: String,
val version: String,
var scale: Float = 1f
) {
val name: String,
val packageName: String,
val version: String,
var scale: Float = 1f,
val themed: Boolean = false,
) {
constructor(entity: IconPackEntity) : this(
name = entity.name,
packageName = entity.packageName,
version = entity.packageName,
scale = entity.scale
name = entity.name,
packageName = entity.packageName,
version = entity.packageName,
scale = entity.scale,
themed = entity.themed,
)
fun toDatabaseEntity(): IconPackEntity {
return IconPackEntity(
name = name,
scale = scale,
version = version,
packageName = packageName
name = name,
scale = scale,
version = version,
packageName = packageName,
themed = themed,
)
}
}
@@ -8,7 +8,6 @@ data class IconPackIcon(
val componentName: ComponentName?,
val drawable: String?,
val iconPack: String,
val themed: Boolean = false,
val name: String? = null,
) {
constructor(entity: IconEntity) : this(
@@ -16,7 +15,6 @@ data class IconPackIcon(
componentName = entity.componentName,
drawable = entity.drawable,
iconPack = entity.iconPack,
themed = entity.themed,
name = entity.name,
)
@@ -26,7 +24,6 @@ data class IconPackIcon(
componentName = componentName,
drawable = drawable,
iconPack = iconPack,
themed = themed,
name = name,
)
}