From edba1100b3359e8656c3f527d79224d61d7021d0 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Thu, 6 Jul 2023 10:39:10 +0530 Subject: [PATCH] Rename methods from activity to fragment Signed-off-by: Aayush Gupta --- .../store/view/ui/all/InstalledAppsFragment.kt | 2 +- .../aurora/store/view/ui/all/LibraryAppsFragment.kt | 2 +- .../store/view/ui/all/PurchasedAppsFragment.kt | 3 +-- .../aurora/store/view/ui/apps/TopChartFragment.kt | 2 +- .../com/aurora/store/view/ui/commons/BaseActivity.kt | 12 ------------ .../com/aurora/store/view/ui/commons/BaseFragment.kt | 6 +++--- .../store/view/ui/commons/CategoryBrowseFragment.kt | 2 +- .../aurora/store/view/ui/commons/CategoryFragment.kt | 2 +- .../store/view/ui/commons/EarlyAccessFragment.kt | 2 +- .../store/view/ui/commons/EditorChoiceFragment.kt | 2 +- .../view/ui/commons/EditorStreamBrowseFragment.kt | 6 +++--- .../view/ui/commons/ExpandedStreamBrowseFragment.kt | 2 +- .../aurora/store/view/ui/commons/ForYouFragment.kt | 2 +- .../store/view/ui/commons/StreamBrowseFragment.kt | 3 +-- .../store/view/ui/details/AppDetailsFragment.kt | 2 +- .../store/view/ui/details/DetailsMoreFragment.kt | 2 +- .../aurora/store/view/ui/details/DevAppsFragment.kt | 2 +- .../store/view/ui/details/DevProfileFragment.kt | 2 +- .../store/view/ui/downloads/DownloadFragment.kt | 2 +- .../aurora/store/view/ui/games/TopChartFragment.kt | 2 +- .../aurora/store/view/ui/sale/AppSalesFragment.kt | 2 +- .../store/view/ui/search/SearchResultsFragment.kt | 2 +- .../aurora/store/view/ui/updates/UpdatesFragment.kt | 2 +- 23 files changed, 26 insertions(+), 40 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 b6975b862..d56c4a307 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 @@ -102,7 +102,7 @@ class InstalledAppsFragment : BaseFragment() { AppListViewModel_() .id(app.id) .app(app) - .click { _ -> openDetailsActivity(app) } + .click { _ -> openDetailsFragment(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 275ca1311..1bbac23f5 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 { _ -> openDetailsActivity(app) } + .click { _ -> openDetailsFragment(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 34b28698d..da532c779 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 @@ -34,7 +34,6 @@ import com.aurora.store.view.epoxy.views.HeaderViewModel_ import com.aurora.store.view.epoxy.views.shimmer.AppListViewShimmerModel_ import com.aurora.store.view.ui.commons.BaseFragment import com.aurora.store.view.ui.sheets.AppMenuSheet -import com.aurora.store.viewmodel.all.InstalledViewModel import com.aurora.store.viewmodel.all.PurchasedViewModel class PurchasedAppsFragment : BaseFragment() { @@ -117,7 +116,7 @@ class PurchasedAppsFragment : BaseFragment() { AppListViewModel_() .id(app.id) .app(app) - .click { _ -> openDetailsActivity(app) } + .click { _ -> openDetailsFragment(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 5f1cbdbe9..2345f431f 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 @@ -125,7 +125,7 @@ class TopChartFragment : BaseFragment() { AppListViewModel_() .id(app.id) .app(app) - .click { _ -> openDetailsActivity(app) } + .click { _ -> openDetailsFragment(app) } ) } diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt index 18b2de853..eaba465f9 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/BaseActivity.kt @@ -19,18 +19,13 @@ package com.aurora.store.view.ui.commons -import android.app.ActivityOptions -import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.aurora.Constants import com.aurora.extensions.applyTheme -import com.aurora.gplayapi.data.models.App import com.aurora.store.data.providers.NetworkProvider import com.aurora.store.util.Preferences import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE -import com.aurora.store.view.ui.details.* import com.aurora.store.view.ui.sheets.NetworkDialogSheet import com.aurora.store.view.ui.sheets.TOSSheet import com.google.gson.Gson @@ -49,13 +44,6 @@ abstract class BaseActivity : AppCompatActivity(), NetworkProvider.NetworkListen super.onCreate(savedInstanceState) } - fun openDetailsActivity(app: App) { - val intent = Intent(this, AppDetailsFragment::class.java) - intent.putExtra(Constants.STRING_EXTRA, gson.toJson(app)) - val options = ActivityOptions.makeSceneTransitionAnimation(this) - startActivity(intent, options.toBundle()) - } - fun askToReadTOS() { runOnUiThread { if (!supportFragmentManager.isDestroyed) { 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 97b892ff4..47937a5c5 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,13 +39,13 @@ open class BaseFragment : Fragment { Modifier.TRANSIENT ).create() - fun openDetailsActivity(app: App) { + fun openDetailsFragment(app: App) { findNavController().navigate( MobileNavigationDirections.actionGlobalAppDetailsFragment(app.packageName) ) } - fun openCategoryBrowseActivity(category: Category) { + fun openCategoryBrowseFragment(category: Category) { findNavController().navigate( MobileNavigationDirections.actionGlobalCategoryBrowseFragment( category.title, @@ -79,7 +79,7 @@ open class BaseFragment : Fragment { } } - fun openEditorStreamBrowseActivity(browseUrl: String, title: String = "") { + fun openEditorStreamBrowseFragment(browseUrl: String, title: String = "") { findNavController().navigate( MobileNavigationDirections.actionGlobalEditorStreamBrowseFragment(title, browseUrl) ) 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 e96af5393..2e392b828 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 @@ -131,7 +131,7 @@ class CategoryBrowseFragment : BaseFragment(R.layout.activity_generic_recycler), } override fun onAppClick(app: App) { - openDetailsActivity(app) + openDetailsFragment(app) } override fun onAppLongClick(app: App) { diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryFragment.kt index 0d5eb5e4d..72a943bb0 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/CategoryFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/CategoryFragment.kt @@ -93,7 +93,7 @@ class CategoryFragment : BaseFragment() { CategoryViewModel_() .id(it.title) .category(it) - .click { _ -> openCategoryBrowseActivity(it) } + .click { _ -> openCategoryBrowseFragment(it) } ) } } 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 1c7791ada..130f784ab 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) { - openDetailsActivity(app) + openDetailsFragment(app) } override fun onAppLongClick(app: App) { diff --git a/app/src/main/java/com/aurora/store/view/ui/commons/EditorChoiceFragment.kt b/app/src/main/java/com/aurora/store/view/ui/commons/EditorChoiceFragment.kt index 4ecc92726..2011abc56 100644 --- a/app/src/main/java/com/aurora/store/view/ui/commons/EditorChoiceFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/commons/EditorChoiceFragment.kt @@ -96,7 +96,7 @@ class EditorChoiceFragment : BaseFragment(), EditorChoiceController.Callbacks { } override fun onClick(editorChoiceCluster: EditorChoiceCluster) { - openEditorStreamBrowseActivity( + openEditorStreamBrowseFragment( editorChoiceCluster.clusterBrowseUrl, editorChoiceCluster.clusterTitle ) 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 f03a530ab..113558ed2 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 { _ -> openDetailsActivity(app) } + .click { _ -> openDetailsFragment(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 { _ -> openDetailsActivity(app) } + .click { _ -> openDetailsFragment(app) } ) } @@ -138,7 +138,7 @@ class EditorStreamBrowseFragment : BaseFragment(R.layout.activity_generic_recycl EditorHeadViewModel_() .id("description_${app.id}") .title(editorReason.description) - .click { _ -> openDetailsActivity(app) } + .click { _ -> openDetailsFragment(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 650ddcd06..f4d8305b2 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 { _ -> openDetailsActivity(it) } + .click { _ -> openDetailsFragment(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 d0672da7d..38495d8d3 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) { - openDetailsActivity(app) + openDetailsFragment(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 340bce838..ea23eb4f1 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 @@ -24,7 +24,6 @@ import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs -import com.aurora.Constants import com.aurora.gplayapi.data.models.StreamCluster import com.aurora.store.R import com.aurora.store.databinding.ActivityGenericRecyclerBinding @@ -104,7 +103,7 @@ class StreamBrowseFragment : BaseFragment(R.layout.activity_generic_recycler) { AppListViewModel_() .id(it.packageName.hashCode()) .app(it) - .click { _ -> openDetailsActivity(it) } + .click { _ -> openDetailsFragment(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 53dcc3b06..399bbdc9b 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 @@ -1147,7 +1147,7 @@ class AppDetailsFragment : BaseFragment(R.layout.fragment_details) { } override fun onAppClick(app: App) { - openDetailsActivity(app) + openDetailsFragment(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 66f4ffe1e..f19378e7c 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 @@ -156,7 +156,7 @@ class DetailsMoreFragment : BaseFragment(R.layout.fragment_details_more) { AppDependentViewModel_() .id(it.id) .app(it) - .click { _ -> openDetailsActivity(it) } + .click { _ -> openDetailsFragment(it) } ) } } else { 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 127819fe4..af156784d 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 { - openDetailsActivity(app) + openDetailsFragment(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 d9628bf86..8bde9af3f 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) { - openDetailsActivity(app) + openDetailsFragment(app) } override fun onAppLongClick(app: App) { diff --git a/app/src/main/java/com/aurora/store/view/ui/downloads/DownloadFragment.kt b/app/src/main/java/com/aurora/store/view/ui/downloads/DownloadFragment.kt index b6ff92971..afaf821f7 100644 --- a/app/src/main/java/com/aurora/store/view/ui/downloads/DownloadFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/downloads/DownloadFragment.kt @@ -207,7 +207,7 @@ class DownloadFragment : BaseFragment(R.layout.fragment_download) { downloadFile.download.extras.getString(Constants.STRING_EXTRA, "{}"), App::class.java ) - openDetailsActivity(app) + openDetailsFragment(app) } private fun openDownloadMenuSheet(downloadFile: DownloadFile) { 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 c978eb328..9274ed010 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 @@ -135,7 +135,7 @@ class TopChartFragment : BaseFragment() { AppListViewModel_() .id(app.id) .app(app) - .click { _ -> openDetailsActivity(app) } + .click { _ -> openDetailsFragment(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 84ab1dd2e..66c14f73e 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 { _ -> openDetailsActivity(it) } + .click { _ -> openDetailsFragment(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 b12ac129c..c7c6d1544 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 @@ -228,7 +228,7 @@ class SearchResultsFragment : BaseFragment(R.layout.fragment_search_result), .id(app.id) .app(app) .click(View.OnClickListener { - openDetailsActivity(app) + openDetailsFragment(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 36ddc2c58..479361969 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 @@ -249,7 +249,7 @@ class UpdatesFragment : BaseFragment() { AppUpdateViewModel_() .id(updateFile.hashCode()) .updateFile(updateFile) - .click { _ -> openDetailsActivity(updateFile.app) } + .click { _ -> openDetailsFragment(updateFile.app) } .longClick { _ -> openAppMenuSheet(updateFile.app) false