Rename

- PinnableSearchable -> SavableSearchable,
- FavoritesItem -> SavedSearchable,
- FavoritesItemEntity -> SavedSearchableEntity

add type column to searchable table

database/schemas/de.mm20.launcher2.database.AppDatabase/18.json

@@ -0,0 +1,456 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 18,
+    "identityHash": "4ae30e68d30e179ef6d30b562bbc3011",
+    "entities": [
+      {
+        "tableName": "forecasts",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`timestamp` INTEGER NOT NULL, `temperature` REAL NOT NULL, `minTemp` REAL NOT NULL, `maxTemp` REAL NOT NULL, `pressure` REAL NOT NULL, `humidity` REAL NOT NULL, `icon` INTEGER NOT NULL, `condition` TEXT NOT NULL, `clouds` INTEGER NOT NULL, `windSpeed` REAL NOT NULL, `windDirection` REAL NOT NULL, `rain` REAL NOT NULL, `snow` REAL NOT NULL, `night` INTEGER NOT NULL, `location` TEXT NOT NULL, `provider` TEXT NOT NULL, `providerUrl` TEXT NOT NULL, `rainProbability` INTEGER NOT NULL, `snowProbability` INTEGER NOT NULL, `updateTime` INTEGER NOT NULL, PRIMARY KEY(`timestamp`))",
+        "fields": [
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "temperature",
+            "columnName": "temperature",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minTemp",
+            "columnName": "minTemp",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maxTemp",
+            "columnName": "maxTemp",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pressure",
+            "columnName": "pressure",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "humidity",
+            "columnName": "humidity",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "condition",
+            "columnName": "condition",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "clouds",
+            "columnName": "clouds",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "windSpeed",
+            "columnName": "windSpeed",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "windDirection",
+            "columnName": "windDirection",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "precipitation",
+            "columnName": "rain",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "snow",
+            "columnName": "snow",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "night",
+            "columnName": "night",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "location",
+            "columnName": "location",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "provider",
+            "columnName": "provider",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "providerUrl",
+            "columnName": "providerUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "precipProbability",
+            "columnName": "rainProbability",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "snowProbability",
+            "columnName": "snowProbability",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "updateTime",
+            "columnName": "updateTime",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "timestamp"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Searchable",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `type` TEXT NOT NULL, `searchable` TEXT NOT NULL, `launchCount` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `hidden` INTEGER NOT NULL, PRIMARY KEY(`key`))",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "serializedSearchable",
+            "columnName": "searchable",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "launchCount",
+            "columnName": "launchCount",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "pinPosition",
+            "columnName": "pinned",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "hidden",
+            "columnName": "hidden",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Websearch",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`urlTemplate` TEXT NOT NULL, `label` TEXT NOT NULL, `color` INTEGER NOT NULL, `icon` TEXT, `encoding` INTEGER, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
+        "fields": [
+          {
+            "fieldPath": "urlTemplate",
+            "columnName": "urlTemplate",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "color",
+            "columnName": "color",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "icon",
+            "columnName": "icon",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "encoding",
+            "columnName": "encoding",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Currency",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`symbol` TEXT NOT NULL, `value` REAL NOT NULL, `lastUpdate` INTEGER NOT NULL, PRIMARY KEY(`symbol`))",
+        "fields": [
+          {
+            "fieldPath": "symbol",
+            "columnName": "symbol",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "lastUpdate",
+            "columnName": "lastUpdate",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "symbol"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Icons",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`type` TEXT NOT NULL, `componentName` TEXT, `drawable` TEXT, `iconPack` TEXT NOT NULL, `scale` REAL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
+        "fields": [
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "componentName",
+            "columnName": "componentName",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "drawable",
+            "columnName": "drawable",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "iconPack",
+            "columnName": "iconPack",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scale",
+            "columnName": "scale",
+            "affinity": "REAL",
+            "notNull": false
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "IconPack",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `packageName` TEXT NOT NULL, `version` TEXT NOT NULL, `scale` REAL NOT NULL, PRIMARY KEY(`packageName`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "packageName",
+            "columnName": "packageName",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "version",
+            "columnName": "version",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "scale",
+            "columnName": "scale",
+            "affinity": "REAL",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "packageName"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "Widget",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`type` TEXT NOT NULL, `data` TEXT NOT NULL, `height` INTEGER NOT NULL, `position` INTEGER NOT NULL, `label` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
+        "fields": [
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "data",
+            "columnName": "data",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "height",
+            "columnName": "height",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "label",
+            "columnName": "label",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "CustomAttributes",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `type` TEXT NOT NULL, `value` TEXT NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '4ae30e68d30e179ef6d30b562bbc3011')"
+    ]
+  }
+}

database/src/main/java/de/mm20/launcher2/database/AppDatabase.kt

@@ -12,13 +12,13 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import de.mm20.launcher2.database.entities.*
 
 @Database(entities = [ForecastEntity::class,
-    FavoritesItemEntity::class,
+    SavedSearchableEntity::class,
     WebsearchEntity::class,
     CurrencyEntity::class,
     IconEntity::class,
     IconPackEntity::class,
     WidgetEntity::class,
-    CustomAttributeEntity::class], version = 17, exportSchema = true)
+    CustomAttributeEntity::class], version = 18, exportSchema = true)
 @TypeConverters(ComponentNameConverter::class, StringListConverter::class)
 abstract class AppDatabase : RoomDatabase() {
 
@@ -62,6 +62,7 @@ abstract class AppDatabase : RoomDatabase() {
                                     Migration_14_15(),
                                     Migration_15_16(),
                                     Migration_16_17(),
+                                    Migration_17_18(),
                             ).build()
             if (_instance == null) _instance = instance
             return instance
@@ -172,5 +173,15 @@ class Migration_16_17 : Migration(16, 17) {
     override fun migrate(database: SupportSQLiteDatabase) {
         database.execSQL("ALTER TABLE Websearch ADD COLUMN encoding INTEGER")
     }
+}
 
+class Migration_17_18: Migration(17, 18) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("ALTER TABLE Searchable ADD COLUMN type TEXT NOT NULL DEFAULT ''")
+        database.execSQL("""
+            UPDATE Searchable
+            SET type = SUBSTR(`key`, 0, INSTR(`key`, '://')),
+            searchable = SUBSTR(`searchable`, INSTR(`searchable`, '#') + 1)
+            """.trimIndent())
+    }
 }

database/src/main/java/de/mm20/launcher2/database/BackupRestoreDao.kt

@@ -5,7 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import de.mm20.launcher2.database.entities.CustomAttributeEntity
-import de.mm20.launcher2.database.entities.FavoritesItemEntity
+import de.mm20.launcher2.database.entities.SavedSearchableEntity
 import de.mm20.launcher2.database.entities.WebsearchEntity
 import de.mm20.launcher2.database.entities.WidgetEntity
 
@@ -16,10 +16,10 @@ interface BackupRestoreDao {
     suspend fun wipeFavorites()
 
     @Query("SELECT * FROM Searchable LIMIT :limit OFFSET :offset")
-    suspend fun exportFavorites(limit: Int, offset: Int): List<FavoritesItemEntity>
+    suspend fun exportFavorites(limit: Int, offset: Int): List<SavedSearchableEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun importFavorites(items: List<FavoritesItemEntity>)
+    suspend fun importFavorites(items: List<SavedSearchableEntity>)
 
     @Query("DELETE FROM Widget")
     suspend fun wipeWidgets()

database/src/main/java/de/mm20/launcher2/database/SearchDao.kt

@@ -1,7 +1,7 @@
 package de.mm20.launcher2.database
 
 import androidx.room.*
-import de.mm20.launcher2.database.entities.FavoritesItemEntity
+import de.mm20.launcher2.database.entities.SavedSearchableEntity
 import de.mm20.launcher2.database.entities.WebsearchEntity
 import kotlinx.coroutines.flow.Flow
 
@@ -9,16 +9,16 @@ import kotlinx.coroutines.flow.Flow
 interface SearchDao {
 
     @Insert()
-    fun insertAll(items: List<FavoritesItemEntity>)
+    fun insertAll(items: List<SavedSearchableEntity>)
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
-    fun insertAllSkipExisting(items: List<FavoritesItemEntity>)
+    fun insertAllSkipExisting(items: List<SavedSearchableEntity>)
 
     @Insert(onConflict = OnConflictStrategy.IGNORE)
-    fun insertSkipExisting(items: FavoritesItemEntity)
+    fun insertSkipExisting(items: SavedSearchableEntity)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertAllReplaceExisting(items: List<FavoritesItemEntity>)
+    fun insertAllReplaceExisting(items: List<SavedSearchableEntity>)
 
 
     @Query("SELECT * FROM Searchable " +
@@ -31,7 +31,7 @@ interface SearchDao {
         automaticallySorted: Boolean = false,
         frequentlyUsed: Boolean = false,
         limit: Int,
-    ): Flow<List<FavoritesItemEntity>>
+    ): Flow<List<SavedSearchableEntity>>
 
     @Query("SELECT * FROM Searchable " +
             "WHERE SUBSTR(`key`, 0, INSTR(`key`, '://')) IN (:includeTypes) AND (" +
@@ -45,10 +45,10 @@ interface SearchDao {
         automaticallySorted: Boolean = false,
         frequentlyUsed: Boolean = false,
         limit: Int,
-    ): Flow<List<FavoritesItemEntity>>
+    ): Flow<List<SavedSearchableEntity>>
 
     @Query("SELECT * FROM Searchable " +
-            "WHERE SUBSTR(`key`, 0, INSTR(`key`, '://')) NOT IN (:excludeTypes) AND (" +
+            "WHERE `type` NOT IN (:excludeTypes) AND (" +
             "(:manuallySorted AND pinned > 1) OR " +
             "(:automaticallySorted AND pinned = 1) OR" +
             "(:frequentlyUsed AND pinned = 0 AND launchCount > 0)" +
@@ -59,7 +59,7 @@ interface SearchDao {
         automaticallySorted: Boolean = false,
         frequentlyUsed: Boolean = false,
         limit: Int,
-    ): Flow<List<FavoritesItemEntity>>
+    ): Flow<List<SavedSearchableEntity>>
 
     @Query("SELECT `key` FROM Searchable WHERE hidden = 1 AND `key` LIKE 'calendar://%'")
     fun getHiddenCalendarEventKeys(): Flow<List<String>>
@@ -69,7 +69,7 @@ interface SearchDao {
     fun getPinCount(): Int
 
     @Query("SELECT * FROM Searchable WHERE pinned = 0 AND launchCount > 0 AND hidden = 0 AND NOT `key` LIKE 'calendar://%' ORDER BY launchCount DESC LIMIT :count")
-    fun getAutoFavorites(count: Int): List<FavoritesItemEntity>
+    fun getAutoFavorites(count: Int): List<SavedSearchableEntity>
 
     @Query("DELETE FROM Searchable WHERE `key` IN (:keys)")
     fun deleteAll(keys: List<String>)
@@ -79,7 +79,7 @@ interface SearchDao {
     fun pinExistingItem(key: String)
 
     @Transaction
-    fun pinToFavorites(item: FavoritesItemEntity) {
+    fun pinToFavorites(item: SavedSearchableEntity) {
         pinExistingItem(item.key)
         insertSkipExisting(item)
     }
@@ -102,7 +102,7 @@ interface SearchDao {
     fun hideExistingItem(key: String)
 
     @Transaction
-    fun hideItem(item: FavoritesItemEntity) {
+    fun hideItem(item: SavedSearchableEntity) {
         hideExistingItem(item.key)
         insertSkipExisting(item)
     }
@@ -117,7 +117,7 @@ interface SearchDao {
     fun getHiddenItemKeys(): Flow<List<String>>
 
     @Query("SELECT * FROM SEARCHABLE WHERE hidden = 1")
-    fun getHiddenItems(): Flow<List<FavoritesItemEntity>>
+    fun getHiddenItems(): Flow<List<SavedSearchableEntity>>
 
     @Query("SELECT * FROM Websearch ORDER BY label ASC")
     fun getWebSearches(): Flow<List<WebsearchEntity>>
@@ -135,22 +135,22 @@ interface SearchDao {
     fun incrementExistingLaunchCount(key: String)
 
     @Transaction
-    fun incrementLaunchCount(item: FavoritesItemEntity) {
+    fun incrementLaunchCount(item: SavedSearchableEntity) {
         incrementExistingLaunchCount(item.key)
         insertSkipExisting(item)
     }
 
     @Query("SELECT * FROM Searchable WHERE `key` = :key")
-    fun getFavorite(key: String): FavoritesItemEntity?
+    fun getFavorite(key: String): SavedSearchableEntity?
 
     @Query("SELECT * FROM Searchable WHERE `key` IN (:keys)")
-    suspend fun getFromKeys(keys: List<String>): List<FavoritesItemEntity>
+    suspend fun getFromKeys(keys: List<String>): List<SavedSearchableEntity>
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertReplaceExisting(toDatabaseEntity: FavoritesItemEntity)
+    fun insertReplaceExisting(toDatabaseEntity: SavedSearchableEntity)
 
     @Transaction
-    fun saveFavorites(favorites: List<FavoritesItemEntity>) {
+    fun saveFavorites(favorites: List<SavedSearchableEntity>) {
         deleteAllFavorites()
         insertAll(favorites)
     }

database/src/main/java/de/mm20/launcher2/database/entities/SavedSearchableEntity.kt

@@ -5,8 +5,9 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "Searchable")
-data class FavoritesItemEntity(
+data class SavedSearchableEntity(
         @PrimaryKey val key: String,
+        val type: String,
         @ColumnInfo(name = "searchable") val serializedSearchable: String,
         var launchCount: Int,
         @ColumnInfo(name = "pinned") var pinPosition: Int,