From 673b0981310c468b90742ade7ce95b347b2e0b33 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Fri, 13 May 2022 01:30:02 +0200 Subject: [PATCH] Update: Use MainActivityX to launch AppSheet --- .../droidify/ui/fragments/ExploreFragment.kt | 3 +-- .../droidify/ui/fragments/InstalledFragment.kt | 14 +++----------- .../looker/droidify/ui/fragments/LatestFragment.kt | 6 ++---- 3 files changed, 6 insertions(+), 17 deletions(-) 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 c177690f..b4642fe1 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/ExploreFragment.kt @@ -129,8 +129,7 @@ class ExploreFragment : MainNavFragmentX() { .fillMaxWidth() .weight(1f), onUserClick = { item -> - AppSheetX(item.packageName) - .showNow(parentFragmentManager, "Product ${item.packageName}") + mainActivityX.navigateProduct(item.packageName) }, onFavouriteClick = {}, onInstallClick = { 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 f75fb18d..9096cf77 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/InstalledFragment.kt @@ -182,15 +182,8 @@ class InstalledFragment : MainNavFragmentX() { } } AnimatedVisibility(visible = updatesVisible) { - ProductsHorizontalRecycler( - secondaryList, - repositories - ) { item -> - AppSheetX(item.packageName) - .showNow( - parentFragmentManager, - "Product ${item.packageName}" - ) + ProductsHorizontalRecycler(secondaryList, repositories) { item -> + mainActivityX.navigateProduct(item.packageName) } } } @@ -226,8 +219,7 @@ class InstalledFragment : MainNavFragmentX() { .fillMaxWidth() .weight(1f), onUserClick = { item -> - AppSheetX(item.packageName) - .showNow(parentFragmentManager, "Product ${item.packageName}") + mainActivityX.navigateProduct(item.packageName) }, onFavouriteClick = {}, onInstallClick = { 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 a64d4f17..db199354 100644 --- a/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt +++ b/src/main/kotlin/com/looker/droidify/ui/fragments/LatestFragment.kt @@ -125,8 +125,7 @@ class LatestFragment : MainNavFragmentX() { modifier = Modifier.padding(8.dp) ) ProductsHorizontalRecycler(secondaryList, repositories) { item -> - AppSheetX(item.packageName) - .showNow(parentFragmentManager, "Product ${item.packageName}") + mainActivityX.navigateProduct(item.packageName) } Row( modifier = Modifier.padding(horizontal = 8.dp, vertical = 4.dp), @@ -158,8 +157,7 @@ class LatestFragment : MainNavFragmentX() { .fillMaxWidth() .weight(1f), onUserClick = { item -> - AppSheetX(item.packageName) - .showNow(parentFragmentManager, "Product ${item.packageName}") + mainActivityX.navigateProduct(item.packageName) }, onFavouriteClick = {}, onInstallClick = {