diff --git a/src/main/kotlin/com/looker/droidify/entity/ProductItem.kt b/src/main/kotlin/com/looker/droidify/entity/ProductItem.kt index b0311e48..d9f163aa 100644 --- a/src/main/kotlin/com/looker/droidify/entity/ProductItem.kt +++ b/src/main/kotlin/com/looker/droidify/entity/ProductItem.kt @@ -1,15 +1,15 @@ package com.looker.droidify.entity data class ProductItem( - var repositoryId: Long, - var packageName: String, - var name: String, - var summary: String, - val icon: String, - val metadataIcon: String, - val version: String, - var installedVersion: String, - var compatible: Boolean, - var canUpdate: Boolean, - var matchRank: Int, + var repositoryId: Long = 0, + var packageName: String = "com.looker.droidify", + var name: String = "Droid-ify", + var summary: String = "A great F-Droid client", + val icon: String = "", + val metadataIcon: String = "", + val version: String = "69", + var installedVersion: String = "69", + var compatible: Boolean = false, + var canUpdate: Boolean = false, + var matchRank: Int = 0, ) diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt index 516283b3..5d7dc346 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt @@ -55,11 +55,9 @@ class ExploreFragment : MainNavFragmentX() { } ) { Scaffold { _ -> - ProductsVerticalRecycler(it, repositories) { - it.let { - AppSheetX(it.packageName) - .showNow(parentFragmentManager, "Product ${it.packageName}") - } + ProductsVerticalRecycler(it, repositories) { item -> + AppSheetX(item.packageName) + .showNow(parentFragmentManager, "Product ${item.packageName}") } } } diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt index eebedfa1..652696c0 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt @@ -52,11 +52,9 @@ class InstalledFragment : MainNavFragmentX() { } ) { Scaffold { _ -> - ProductsVerticalRecycler(it, repositories) { - it.let { - AppSheetX(it.packageName) - .showNow(parentFragmentManager, "Product ${it.packageName}") - } + ProductsVerticalRecycler(it, repositories) { item -> + AppSheetX(item.packageName) + .showNow(parentFragmentManager, "Product ${item.packageName}") } } } @@ -74,10 +72,8 @@ class InstalledFragment : MainNavFragmentX() { ) { MdcTheme { ProductsHorizontalRecycler(it, repositories) { item -> - item.let { - AppSheetX(it.packageName) - .showNow(parentFragmentManager, "Product ${it.packageName}") - } + AppSheetX(item.packageName) + .showNow(parentFragmentManager, "Product ${item.packageName}") } } } diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt index 9bf23900..5f36657c 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt @@ -53,11 +53,9 @@ class LatestFragment : MainNavFragmentX() { } ) { Scaffold { _ -> - ProductsVerticalRecycler(it, repositories) { - it.let { - AppSheetX(it.packageName) - .showNow(parentFragmentManager, "Product ${it.packageName}") - } + ProductsVerticalRecycler(it, repositories) { item -> + AppSheetX(item.packageName) + .showNow(parentFragmentManager, "Product ${item.packageName}") } } } @@ -73,11 +71,9 @@ class LatestFragment : MainNavFragmentX() { } ) { MdcTheme { - ProductsHorizontalRecycler(it, repositories) { - it.let { - AppSheetX(it.packageName) - .showNow(parentFragmentManager, "Product ${it.packageName}") - } + ProductsHorizontalRecycler(it, repositories) { item -> + AppSheetX(item.packageName) + .showNow(parentFragmentManager, "Product ${item.packageName}") } } } diff --git a/src/main/kotlin/com/looker/droidify/ui/fragments/MainNavFragmentX.kt b/src/main/kotlin/com/looker/droidify/ui/fragments/MainNavFragmentX.kt index 9719ee28..30de6f98 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/MainNavFragmentX.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/MainNavFragmentX.kt @@ -19,30 +19,6 @@ abstract class MainNavFragmentX : BaseNavFragment() { open fun onBackPressed(): Boolean = false - internal fun setSearchQuery(searchQuery: String) { - viewModel.setSearchQuery(searchQuery) { - if (view != null) { - //viewModel.fillList(source) - } - } - } - - internal fun setSection(section: Section) { - viewModel.setSection(section) { - if (view != null) { - //viewModel.fillList(source) - } - } - } - - internal fun setOrder(order: Order) { - viewModel.setOrder(order) { - if (view != null) { - //viewModel.fillList(source) - } - } - } - protected fun launchFragment(fragment: Fragment): Boolean { requireActivity().supportFragmentManager .beginTransaction()