From bc61639773c046944a624670c72fcad170e16744 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 4 Sep 2023 14:18:12 +0530 Subject: [PATCH] BaseFragment: Explicity require packageName Signed-off-by: Aayush Gupta --- .../com/aurora/store/view/ui/all/InstalledAppsFragment.kt | 2 +- .../com/aurora/store/view/ui/all/LibraryAppsFragment.kt | 2 +- .../com/aurora/store/view/ui/all/PurchasedAppsFragment.kt | 2 +- .../java/com/aurora/store/view/ui/apps/TopChartFragment.kt | 2 +- .../java/com/aurora/store/view/ui/commons/BaseFragment.kt | 4 ++-- .../aurora/store/view/ui/commons/CategoryBrowseFragment.kt | 2 +- .../aurora/store/view/ui/commons/EarlyAccessFragment.kt | 2 +- .../store/view/ui/commons/EditorStreamBrowseFragment.kt | 6 +++--- .../store/view/ui/commons/ExpandedStreamBrowseFragment.kt | 2 +- .../com/aurora/store/view/ui/commons/ForYouFragment.kt | 2 +- .../aurora/store/view/ui/commons/StreamBrowseFragment.kt | 2 +- .../com/aurora/store/view/ui/details/AppDetailsFragment.kt | 2 +- .../aurora/store/view/ui/details/DetailsMoreFragment.kt | 2 +- .../com/aurora/store/view/ui/details/DevAppsFragment.kt | 2 +- .../com/aurora/store/view/ui/details/DevProfileFragment.kt | 2 +- .../com/aurora/store/view/ui/games/TopChartFragment.kt | 2 +- .../java/com/aurora/store/view/ui/sale/AppSalesFragment.kt | 2 +- .../aurora/store/view/ui/search/SearchResultsFragment.kt | 2 +- .../com/aurora/store/view/ui/updates/UpdatesFragment.kt | 7 ++++++- 19 files changed, 27 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt index 848ca350b..50fa62df8 100644 --- a/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/all/InstalledAppsFragment.kt @@ -100,7 +100,7 @@ class InstalledAppsFragment : BaseFragment() { AppListViewModel_() .id(app.id) .app(app) - .click { _ -> openDetailsFragment(app) } + .click { _ -> openDetailsFragment(app.packageName, app) } .longClick { _ -> openAppMenuSheet(app) false diff --git a/app/src/main/java/com/aurora/store/view/ui/all/LibraryAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/all/LibraryAppsFragment.kt index fe7a61afc..d472afd5a 100644 --- a/app/src/main/java/com/aurora/store/view/ui/all/LibraryAppsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/all/LibraryAppsFragment.kt @@ -114,7 +114,7 @@ class LibraryAppsFragment : BaseFragment() { AppListViewModel_() .id(app.id) .app(app) - .click { _ -> openDetailsFragment(app) } + .click { _ -> openDetailsFragment(app.packageName, app) } ) } diff --git a/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt index 5aca218d8..368f736a2 100644 --- a/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/all/PurchasedAppsFragment.kt @@ -114,7 +114,7 @@ class PurchasedAppsFragment : BaseFragment() { AppListViewModel_() .id(app.id) .app(app) - .click { _ -> openDetailsFragment(app) } + .click { _ -> openDetailsFragment(app.packageName, app) } .longClick { _ -> openAppMenuSheet(app) false diff --git a/app/src/main/java/com/aurora/store/view/ui/apps/TopChartFragment.kt b/app/src/main/java/com/aurora/store/view/ui/apps/TopChartFragment.kt index 558541a31..175db7309 100644 --- a/app/src/main/java/com/aurora/store/view/ui/apps/TopChartFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/apps/TopChartFragment.kt @@ -129,7 +129,7 @@ class TopChartFragment : BaseFragment() { AppListViewModel_() .id(app.id) .app(app) - .click { _ -> openDetailsFragment(app) } + .click { _ -> openDetailsFragment(app.packageName, app) } ) } diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BaseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BaseFragment.kt index 291631305..58992acdf 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/BaseFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/BaseFragment.kt @@ -39,9 +39,9 @@ open class BaseFragment : Fragment { Modifier.TRANSIENT ).create() - fun openDetailsFragment(app: App) { + fun openDetailsFragment(packageName: String, app: App? = null) { findNavController().navigate( - MobileNavigationDirections.actionGlobalAppDetailsFragment(app.packageName, app) + MobileNavigationDirections.actionGlobalAppDetailsFragment(packageName, app) ) } diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt index 74ba487cf..b487d233d 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryBrowseFragment.kt @@ -130,7 +130,7 @@ class CategoryBrowseFragment : BaseFragment(R.layout.activity_generic_recycler), } override fun onAppClick(app: App) { - openDetailsFragment(app) + openDetailsFragment(app.packageName, app) } override fun onAppLongClick(app: App) { diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/EarlyAccessFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/EarlyAccessFragment.kt index 130f784ab..d63e1fbe6 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/EarlyAccessFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/EarlyAccessFragment.kt @@ -130,7 +130,7 @@ class EarlyAccessFragment : BaseFragment(), GenericCarouselController.Callbacks } override fun onAppClick(app: App) { - openDetailsFragment(app) + openDetailsFragment(app.packageName, app) } override fun onAppLongClick(app: App) { diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseFragment.kt index 113558ed2..b9621e009 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/EditorStreamBrowseFragment.kt @@ -108,7 +108,7 @@ class EditorStreamBrowseFragment : BaseFragment(R.layout.activity_generic_recycl AppListViewModel_() .id("app_${app.id}") .app(app) - .click { _ -> openDetailsFragment(app) } + .click { _ -> openDetailsFragment(app.packageName, app) } ) app.editorReason?.let { editorReason -> @@ -120,7 +120,7 @@ class EditorStreamBrowseFragment : BaseFragment(R.layout.activity_generic_recycl .joinToString(transform = { "\n• $it" }) .substringAfter(delimiter = "\n") ) - .click { _ -> openDetailsFragment(app) } + .click { _ -> openDetailsFragment(app.packageName, app) } ) } @@ -138,7 +138,7 @@ class EditorStreamBrowseFragment : BaseFragment(R.layout.activity_generic_recycl EditorHeadViewModel_() .id("description_${app.id}") .title(editorReason.description) - .click { _ -> openDetailsFragment(app) } + .click { _ -> openDetailsFragment(app.packageName, app) } ) } } diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseFragment.kt index f4d8305b2..bb3e70ff4 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/ExpandedStreamBrowseFragment.kt @@ -136,7 +136,7 @@ class ExpandedStreamBrowseFragment : BaseFragment(R.layout.activity_generic_recy AppListViewModel_() .id(it.packageName.hashCode()) .app(it) - .click { _ -> openDetailsFragment(it) } + .click { _ -> openDetailsFragment(it.packageName, it) } ) } diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt index 38495d8d3..23f58218f 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/ForYouFragment.kt @@ -145,7 +145,7 @@ class ForYouFragment : BaseFragment(), GenericCarouselController.Callbacks { } override fun onAppClick(app: App) { - openDetailsFragment(app) + openDetailsFragment(app.packageName, app) } override fun onAppLongClick(app: App) { diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseFragment.kt index ea23eb4f1..79a3d0586 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/StreamBrowseFragment.kt @@ -103,7 +103,7 @@ class StreamBrowseFragment : BaseFragment(R.layout.activity_generic_recycler) { AppListViewModel_() .id(it.packageName.hashCode()) .app(it) - .click { _ -> openDetailsFragment(it) } + .click { _ -> openDetailsFragment(it.packageName, it) } ) } diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt index f6508b7eb..10dd8113c 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt @@ -1125,7 +1125,7 @@ class AppDetailsFragment : BaseFragment(R.layout.fragment_details) { } override fun onAppClick(app: App) { - openDetailsFragment(app) + openDetailsFragment(app.packageName, app) } override fun onAppLongClick(app: App) { diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreFragment.kt index 5ddac7a83..98049a2b2 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/DetailsMoreFragment.kt @@ -71,7 +71,7 @@ class DetailsMoreFragment : BaseFragment(R.layout.fragment_details_more) { AppDependentViewModel_() .id(it.id) .app(it) - .click { _ -> openDetailsFragment(it) } + .click { _ -> openDetailsFragment(it.packageName, it) } ) } } diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DevAppsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/DevAppsFragment.kt index af156784d..d139adf4b 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/DevAppsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/DevAppsFragment.kt @@ -88,7 +88,7 @@ class DevAppsFragment : BaseFragment(R.layout.activity_generic_recycler) { .id(app.id) .app(app) .click(View.OnClickListener { - openDetailsFragment(app) + openDetailsFragment(app.packageName, app) }) ) } diff --git a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt index 5f0bda4ae..fd122fd9b 100644 --- a/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/details/DevProfileFragment.kt @@ -117,7 +117,7 @@ class DevProfileFragment : BaseFragment(R.layout.fragment_dev_profile), } override fun onAppClick(app: App) { - openDetailsFragment(app) + openDetailsFragment(app.packageName, app) } override fun onAppLongClick(app: App) { diff --git a/app/src/main/java/com/aurora/store/view/ui/games/TopChartFragment.kt b/app/src/main/java/com/aurora/store/view/ui/games/TopChartFragment.kt index 9b45fc5e4..e8644f6fa 100644 --- a/app/src/main/java/com/aurora/store/view/ui/games/TopChartFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/games/TopChartFragment.kt @@ -143,7 +143,7 @@ class TopChartFragment : BaseFragment() { AppListViewModel_() .id(app.id) .app(app) - .click { _ -> openDetailsFragment(app) } + .click { _ -> openDetailsFragment(app.packageName, app) } ) } diff --git a/app/src/main/java/com/aurora/store/view/ui/sale/AppSalesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/sale/AppSalesFragment.kt index 66c14f73e..27482a7e0 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sale/AppSalesFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sale/AppSalesFragment.kt @@ -92,7 +92,7 @@ class AppSalesFragment : BaseFragment(R.layout.activity_generic_recycler) { AppListViewModel_() .id(it.packageName.hashCode()) .app(it) - .click { _ -> openDetailsFragment(it) } + .click { _ -> openDetailsFragment(it.packageName, it) } ) setFilterDuplicates(true) } diff --git a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt index 2a06f0a06..80c9bb76b 100644 --- a/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/search/SearchResultsFragment.kt @@ -227,7 +227,7 @@ class SearchResultsFragment : BaseFragment(R.layout.fragment_search_result), .id(app.id) .app(app) .click(View.OnClickListener { - openDetailsFragment(app) + openDetailsFragment(app.packageName, app) }) ) } diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt index 37fd2c3fc..0d32f3918 100644 --- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt @@ -242,7 +242,12 @@ class UpdatesFragment : BaseFragment() { AppUpdateViewModel_() .id(updateFile.hashCode()) .updateFile(updateFile) - .click { _ -> openDetailsFragment(updateFile.app) } + .click { _ -> + openDetailsFragment( + updateFile.app.packageName, + updateFile.app + ) + } .longClick { _ -> openAppMenuSheet(updateFile.app) false