Modify badge API

Pass searchable as argument instead of badgeKey which is now obsolete
This commit is contained in:
MM20
2022-03-05 15:25:57 +01:00
parent 9100af75bf
commit 47e7591975
25 changed files with 60 additions and 66 deletions
@@ -17,6 +17,8 @@ abstract class File(
) : Searchable() {
abstract val isStoredInCloud: Boolean
open val providerIconRes: Int? = null
override fun getPlaceholderIcon(context: Context): LauncherIcon {
val (resId, bgColor) = when {
isDirectory -> R.drawable.ic_file_folder to R.color.lightblue
@@ -23,11 +23,10 @@ class GDriveFile(
override val key: String = "gdrive://$fileId"
override val badgeKey: String
get() = "gdrive://"
override val isStoredInCloud = true
override val providerIconRes = R.drawable.ic_badge_gdrive
override fun getLaunchIntent(context: Context): Intent? {
return Intent(Intent.ACTION_VIEW).apply {
data = Uri.parse(viewUri)
@@ -4,6 +4,7 @@ import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
import android.net.Uri
import de.mm20.launcher2.files.R
class NextcloudFile(
fileId: Long,
@@ -15,13 +16,13 @@ class NextcloudFile(
val server: String,
metaData: List<Pair<Int, String>>
) : File(fileId, path, mimeType, size, isDirectory, metaData) {
override val badgeKey: String = "nextcloud://"
override val key: String = "nextcloud://$server/$fileId"
override val isStoredInCloud: Boolean
get() = true
override val providerIconRes = R.drawable.ic_badge_nextcloud
override fun getLaunchIntent(context: Context): Intent? {
return Intent(Intent.ACTION_VIEW).apply {
data = Uri.parse("$server/f/$id")
@@ -19,10 +19,10 @@ class OneDriveFile(
val webUrl: String
) : File(0, path, mimeType, size, isDirectory, metaData) {
override val badgeKey: String = "onedrive://"
override val key: String = "onedrive://$fileId"
override val providerIconRes = R.drawable.ic_badge_onedrive
override val isStoredInCloud = true
override fun getLaunchIntent(context: Context): Intent? {
@@ -17,13 +17,13 @@ class OwncloudFile(
val server: String,
metaData: List<Pair<Int, String>>
) : File(fileId, path, mimeType, size, isDirectory, metaData) {
override val badgeKey: String = "owncloud://"
override val key: String = "owncloud://$server/$fileId"
override val isStoredInCloud: Boolean
get() = true
override val providerIconRes = R.drawable.ic_badge_owncloud
override fun getLaunchIntent(context: Context): Intent? {
return Intent(Intent.ACTION_VIEW).apply {
data = Uri.parse("$server/f/$id")