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

Rename

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

add type column to searchable table
This commit is contained in:
MM20
2022-10-16 15:53:22 +02:00
parent 7e6a4466ca
commit f88f71e5ee
61 changed files with 717 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wikipedia/src/main/java/de/mm20/launcher2/search/data/Wikipedia.kt
+2 -3
View File
@@ -11,8 +11,7 @@ import de.mm20.launcher2.icons.ColorLayer
import de.mm20.launcher2.icons.StaticLauncherIcon
import de.mm20.launcher2.icons.TintedIconLayer
import de.mm20.launcher2.ktx.tryStartActivity
import de.mm20.launcher2.search.PinnableSearchable
import de.mm20.launcher2.search.Searchable
import de.mm20.launcher2.search.SavableSearchable
import de.mm20.launcher2.wikipedia.R
data class Wikipedia(
@@ -22,7 +21,7 @@ data class Wikipedia(
val image: String?,
val wikipediaUrl: String,
override val labelOverride: String? = null,
) : PinnableSearchable {
) : SavableSearchable {
override val domain: String = Domain
wikipedia/src/main/java/de/mm20/launcher2/wikipedia/WikipediaSerialization.kt
+3 -4
View File
@@ -1,15 +1,14 @@
package de.mm20.launcher2.wikipedia
import android.content.Context
import de.mm20.launcher2.search.PinnableSearchable
import de.mm20.launcher2.search.SavableSearchable
import de.mm20.launcher2.search.SearchableDeserializer
import de.mm20.launcher2.search.SearchableSerializer
import de.mm20.launcher2.search.Searchable
import de.mm20.launcher2.search.data.Wikipedia
import org.json.JSONObject
class WikipediaSerializer : SearchableSerializer {
override fun serialize(searchable: PinnableSearchable): String {
override fun serialize(searchable: SavableSearchable): String {
searchable as Wikipedia
val json = JSONObject()
json.put("label", searchable.label)
@@ -25,7 +24,7 @@ class WikipediaSerializer : SearchableSerializer {
}
class WikipediaDeserializer(val context: Context) : SearchableDeserializer {
override fun deserialize(serialized: String): PinnableSearchable? {
override fun deserialize(serialized: String): SavableSearchable? {
val json = JSONObject(serialized)
return Wikipedia(
label = json.getString("label"),