Rename
- PinnableSearchable -> SavableSearchable, - FavoritesItem -> SavedSearchable, - FavoritesItemEntity -> SavedSearchableEntity add type column to searchable table
This commit is contained in:
+3
-3
@@ -7,7 +7,7 @@ import de.mm20.launcher2.icons.StaticLauncherIcon
|
||||
import de.mm20.launcher2.ktx.romanize
|
||||
import java.text.Collator
|
||||
|
||||
interface PinnableSearchable : Searchable, Comparable<PinnableSearchable> {
|
||||
interface SavableSearchable : Searchable, Comparable<SavableSearchable> {
|
||||
|
||||
val domain: String
|
||||
val key: String
|
||||
@@ -16,7 +16,7 @@ interface PinnableSearchable : Searchable, Comparable<PinnableSearchable> {
|
||||
val labelOverride: String?
|
||||
get() = null
|
||||
|
||||
fun overrideLabel(label: String): PinnableSearchable
|
||||
fun overrideLabel(label: String): SavableSearchable
|
||||
|
||||
fun launch(context: Context, options: Bundle?): Boolean
|
||||
|
||||
@@ -34,7 +34,7 @@ interface PinnableSearchable : Searchable, Comparable<PinnableSearchable> {
|
||||
): LauncherIcon? = null
|
||||
|
||||
|
||||
override fun compareTo(other: PinnableSearchable): Int {
|
||||
override fun compareTo(other: SavableSearchable): Int {
|
||||
val label1 = labelOverride ?: label
|
||||
val label2 = other.labelOverride ?: other.label
|
||||
return Collator.getInstance().apply { strength = Collator.SECONDARY }
|
||||
@@ -1,11 +1,11 @@
|
||||
package de.mm20.launcher2.search
|
||||
|
||||
interface SearchableDeserializer {
|
||||
fun deserialize(serialized: String): PinnableSearchable?
|
||||
fun deserialize(serialized: String): SavableSearchable?
|
||||
}
|
||||
|
||||
class NullDeserializer: SearchableDeserializer {
|
||||
override fun deserialize(serialized: String): PinnableSearchable? {
|
||||
override fun deserialize(serialized: String): SavableSearchable? {
|
||||
return null
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package de.mm20.launcher2.search
|
||||
|
||||
interface SearchableSerializer {
|
||||
fun serialize(searchable: PinnableSearchable): String?
|
||||
fun serialize(searchable: SavableSearchable): String?
|
||||
val typePrefix: String
|
||||
}
|
||||
|
||||
class NullSerializer : SearchableSerializer {
|
||||
override fun serialize(searchable: PinnableSearchable): String? {
|
||||
override fun serialize(searchable: SavableSearchable): String? {
|
||||
return null
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user