This commit is contained in:
machiav3lli 2022-02-18 00:12:36 +01:00
parent b38dd1b77c
commit 148e3fcc27
5 changed files with 25 additions and 59 deletions

View File

@ -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,
)

View File

@ -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}")
}
}
}

View File

@ -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}")
}
}
}

View File

@ -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}")
}
}
}

View File

@ -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()