From 6b49062093505fa37e9f8d3c265b8e26f96ad9ae Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Sun, 26 Dec 2021 02:40:37 +0100 Subject: [PATCH] Update: Allow creating V/HAppItems without repo (no icon downloaded) --- .../com/looker/droidify/ui/items/HAppItem.kt | 22 ++++++++++-------- .../com/looker/droidify/ui/items/VAppItem.kt | 23 +++++++++++-------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/ui/items/HAppItem.kt b/src/main/kotlin/com/looker/droidify/ui/items/HAppItem.kt index 9e804367..5d12bb58 100644 --- a/src/main/kotlin/com/looker/droidify/ui/items/HAppItem.kt +++ b/src/main/kotlin/com/looker/droidify/ui/items/HAppItem.kt @@ -13,7 +13,7 @@ import com.looker.droidify.utility.Utils import com.looker.droidify.utility.extension.resources.toPx import com.mikepenz.fastadapter.binding.AbstractBindingItem -class HAppItem(val item: ProductItem, val repository: Repository) : +class HAppItem(val item: ProductItem, val repository: Repository?) : AbstractBindingItem() { override val type: Int get() = R.id.fastadapter_item @@ -25,15 +25,17 @@ class HAppItem(val item: ProductItem, val repository: Repository) : val (progressIcon, defaultIcon) = Utils.getDefaultApplicationIcons(binding.icon.context) binding.name.text = item.name - binding.icon.load( - CoilDownloader.createIconUri( - binding.icon, item.packageName, - item.icon, item.metadataIcon, repository - ) - ) { - transformations(RoundedCornersTransformation(4.toPx)) - placeholder(progressIcon) - error(defaultIcon) + repository?.let { + binding.icon.load( + CoilDownloader.createIconUri( + binding.icon, item.packageName, + item.icon, item.metadataIcon, repository + ) + ) { + transformations(RoundedCornersTransformation(4.toPx)) + placeholder(progressIcon) + error(defaultIcon) + } } binding.version.text = if (item.canUpdate) item.version else item.installedVersion } diff --git a/src/main/kotlin/com/looker/droidify/ui/items/VAppItem.kt b/src/main/kotlin/com/looker/droidify/ui/items/VAppItem.kt index ea810272..2a9a63b9 100644 --- a/src/main/kotlin/com/looker/droidify/ui/items/VAppItem.kt +++ b/src/main/kotlin/com/looker/droidify/ui/items/VAppItem.kt @@ -18,7 +18,7 @@ import com.looker.droidify.utility.extension.resources.toPx import com.looker.droidify.utility.extension.text.nullIfEmpty import com.mikepenz.fastadapter.binding.AbstractBindingItem -class VAppItem(val item: ProductItem, val repository: Repository) : +class VAppItem(val item: ProductItem, val repository: Repository?) : AbstractBindingItem() { override val type: Int get() = R.id.fastadapter_item @@ -34,15 +34,18 @@ class VAppItem(val item: ProductItem, val repository: Repository) : if (item.name == item.summary) "" else item.summary binding.summary.visibility = if (binding.summary.text.isNotEmpty()) View.VISIBLE else View.GONE - binding.icon.load( - CoilDownloader.createIconUri( - binding.icon, item.packageName, - item.icon, item.metadataIcon, repository - ) - ) { - transformations(RoundedCornersTransformation(4.toPx)) - placeholder(progressIcon) - error(defaultIcon) + + repository?.let { + binding.icon.load( + CoilDownloader.createIconUri( + binding.icon, item.packageName, + item.icon, item.metadataIcon, it + ) + ) { + transformations(RoundedCornersTransformation(4.toPx)) + placeholder(progressIcon) + error(defaultIcon) + } } binding.status.apply { if (item.canUpdate) {