Rename methods from activity to fragment
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
@@ -102,7 +102,7 @@ class InstalledAppsFragment : BaseFragment() {
|
|||||||
AppListViewModel_()
|
AppListViewModel_()
|
||||||
.id(app.id)
|
.id(app.id)
|
||||||
.app(app)
|
.app(app)
|
||||||
.click { _ -> openDetailsActivity(app) }
|
.click { _ -> openDetailsFragment(app) }
|
||||||
.longClick { _ ->
|
.longClick { _ ->
|
||||||
openAppMenuSheet(app)
|
openAppMenuSheet(app)
|
||||||
false
|
false
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ class LibraryAppsFragment : BaseFragment() {
|
|||||||
AppListViewModel_()
|
AppListViewModel_()
|
||||||
.id(app.id)
|
.id(app.id)
|
||||||
.app(app)
|
.app(app)
|
||||||
.click { _ -> openDetailsActivity(app) }
|
.click { _ -> openDetailsFragment(app) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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.epoxy.views.shimmer.AppListViewShimmerModel_
|
||||||
import com.aurora.store.view.ui.commons.BaseFragment
|
import com.aurora.store.view.ui.commons.BaseFragment
|
||||||
import com.aurora.store.view.ui.sheets.AppMenuSheet
|
import com.aurora.store.view.ui.sheets.AppMenuSheet
|
||||||
import com.aurora.store.viewmodel.all.InstalledViewModel
|
|
||||||
import com.aurora.store.viewmodel.all.PurchasedViewModel
|
import com.aurora.store.viewmodel.all.PurchasedViewModel
|
||||||
|
|
||||||
class PurchasedAppsFragment : BaseFragment() {
|
class PurchasedAppsFragment : BaseFragment() {
|
||||||
@@ -117,7 +116,7 @@ class PurchasedAppsFragment : BaseFragment() {
|
|||||||
AppListViewModel_()
|
AppListViewModel_()
|
||||||
.id(app.id)
|
.id(app.id)
|
||||||
.app(app)
|
.app(app)
|
||||||
.click { _ -> openDetailsActivity(app) }
|
.click { _ -> openDetailsFragment(app) }
|
||||||
.longClick { _ ->
|
.longClick { _ ->
|
||||||
openAppMenuSheet(app)
|
openAppMenuSheet(app)
|
||||||
false
|
false
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ class TopChartFragment : BaseFragment() {
|
|||||||
AppListViewModel_()
|
AppListViewModel_()
|
||||||
.id(app.id)
|
.id(app.id)
|
||||||
.app(app)
|
.app(app)
|
||||||
.click { _ -> openDetailsActivity(app) }
|
.click { _ -> openDetailsFragment(app) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,18 +19,13 @@
|
|||||||
|
|
||||||
package com.aurora.store.view.ui.commons
|
package com.aurora.store.view.ui.commons
|
||||||
|
|
||||||
import android.app.ActivityOptions
|
|
||||||
import android.content.Intent
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import com.aurora.Constants
|
|
||||||
import com.aurora.extensions.applyTheme
|
import com.aurora.extensions.applyTheme
|
||||||
import com.aurora.gplayapi.data.models.App
|
|
||||||
import com.aurora.store.data.providers.NetworkProvider
|
import com.aurora.store.data.providers.NetworkProvider
|
||||||
import com.aurora.store.util.Preferences
|
import com.aurora.store.util.Preferences
|
||||||
import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
|
import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT
|
||||||
import com.aurora.store.util.Preferences.PREFERENCE_THEME_TYPE
|
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.NetworkDialogSheet
|
||||||
import com.aurora.store.view.ui.sheets.TOSSheet
|
import com.aurora.store.view.ui.sheets.TOSSheet
|
||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
@@ -49,13 +44,6 @@ abstract class BaseActivity : AppCompatActivity(), NetworkProvider.NetworkListen
|
|||||||
super.onCreate(savedInstanceState)
|
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() {
|
fun askToReadTOS() {
|
||||||
runOnUiThread {
|
runOnUiThread {
|
||||||
if (!supportFragmentManager.isDestroyed) {
|
if (!supportFragmentManager.isDestroyed) {
|
||||||
|
|||||||
@@ -39,13 +39,13 @@ open class BaseFragment : Fragment {
|
|||||||
Modifier.TRANSIENT
|
Modifier.TRANSIENT
|
||||||
).create()
|
).create()
|
||||||
|
|
||||||
fun openDetailsActivity(app: App) {
|
fun openDetailsFragment(app: App) {
|
||||||
findNavController().navigate(
|
findNavController().navigate(
|
||||||
MobileNavigationDirections.actionGlobalAppDetailsFragment(app.packageName)
|
MobileNavigationDirections.actionGlobalAppDetailsFragment(app.packageName)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun openCategoryBrowseActivity(category: Category) {
|
fun openCategoryBrowseFragment(category: Category) {
|
||||||
findNavController().navigate(
|
findNavController().navigate(
|
||||||
MobileNavigationDirections.actionGlobalCategoryBrowseFragment(
|
MobileNavigationDirections.actionGlobalCategoryBrowseFragment(
|
||||||
category.title,
|
category.title,
|
||||||
@@ -79,7 +79,7 @@ open class BaseFragment : Fragment {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun openEditorStreamBrowseActivity(browseUrl: String, title: String = "") {
|
fun openEditorStreamBrowseFragment(browseUrl: String, title: String = "") {
|
||||||
findNavController().navigate(
|
findNavController().navigate(
|
||||||
MobileNavigationDirections.actionGlobalEditorStreamBrowseFragment(title, browseUrl)
|
MobileNavigationDirections.actionGlobalEditorStreamBrowseFragment(title, browseUrl)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -131,7 +131,7 @@ class CategoryBrowseFragment : BaseFragment(R.layout.activity_generic_recycler),
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onAppClick(app: App) {
|
override fun onAppClick(app: App) {
|
||||||
openDetailsActivity(app)
|
openDetailsFragment(app)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onAppLongClick(app: App) {
|
override fun onAppLongClick(app: App) {
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ class CategoryFragment : BaseFragment() {
|
|||||||
CategoryViewModel_()
|
CategoryViewModel_()
|
||||||
.id(it.title)
|
.id(it.title)
|
||||||
.category(it)
|
.category(it)
|
||||||
.click { _ -> openCategoryBrowseActivity(it) }
|
.click { _ -> openCategoryBrowseFragment(it) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -130,7 +130,7 @@ class EarlyAccessFragment : BaseFragment(), GenericCarouselController.Callbacks
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onAppClick(app: App) {
|
override fun onAppClick(app: App) {
|
||||||
openDetailsActivity(app)
|
openDetailsFragment(app)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onAppLongClick(app: App) {
|
override fun onAppLongClick(app: App) {
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ class EditorChoiceFragment : BaseFragment(), EditorChoiceController.Callbacks {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onClick(editorChoiceCluster: EditorChoiceCluster) {
|
override fun onClick(editorChoiceCluster: EditorChoiceCluster) {
|
||||||
openEditorStreamBrowseActivity(
|
openEditorStreamBrowseFragment(
|
||||||
editorChoiceCluster.clusterBrowseUrl,
|
editorChoiceCluster.clusterBrowseUrl,
|
||||||
editorChoiceCluster.clusterTitle
|
editorChoiceCluster.clusterTitle
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ class EditorStreamBrowseFragment : BaseFragment(R.layout.activity_generic_recycl
|
|||||||
AppListViewModel_()
|
AppListViewModel_()
|
||||||
.id("app_${app.id}")
|
.id("app_${app.id}")
|
||||||
.app(app)
|
.app(app)
|
||||||
.click { _ -> openDetailsActivity(app) }
|
.click { _ -> openDetailsFragment(app) }
|
||||||
)
|
)
|
||||||
|
|
||||||
app.editorReason?.let { editorReason ->
|
app.editorReason?.let { editorReason ->
|
||||||
@@ -120,7 +120,7 @@ class EditorStreamBrowseFragment : BaseFragment(R.layout.activity_generic_recycl
|
|||||||
.joinToString(transform = { "\n• $it" })
|
.joinToString(transform = { "\n• $it" })
|
||||||
.substringAfter(delimiter = "\n")
|
.substringAfter(delimiter = "\n")
|
||||||
)
|
)
|
||||||
.click { _ -> openDetailsActivity(app) }
|
.click { _ -> openDetailsFragment(app) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -138,7 +138,7 @@ class EditorStreamBrowseFragment : BaseFragment(R.layout.activity_generic_recycl
|
|||||||
EditorHeadViewModel_()
|
EditorHeadViewModel_()
|
||||||
.id("description_${app.id}")
|
.id("description_${app.id}")
|
||||||
.title(editorReason.description)
|
.title(editorReason.description)
|
||||||
.click { _ -> openDetailsActivity(app) }
|
.click { _ -> openDetailsFragment(app) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ class ExpandedStreamBrowseFragment : BaseFragment(R.layout.activity_generic_recy
|
|||||||
AppListViewModel_()
|
AppListViewModel_()
|
||||||
.id(it.packageName.hashCode())
|
.id(it.packageName.hashCode())
|
||||||
.app(it)
|
.app(it)
|
||||||
.click { _ -> openDetailsActivity(it) }
|
.click { _ -> openDetailsFragment(it) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -145,7 +145,7 @@ class ForYouFragment : BaseFragment(), GenericCarouselController.Callbacks {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onAppClick(app: App) {
|
override fun onAppClick(app: App) {
|
||||||
openDetailsActivity(app)
|
openDetailsFragment(app)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onAppLongClick(app: App) {
|
override fun onAppLongClick(app: App) {
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import android.view.View
|
|||||||
import androidx.lifecycle.ViewModelProvider
|
import androidx.lifecycle.ViewModelProvider
|
||||||
import androidx.navigation.fragment.findNavController
|
import androidx.navigation.fragment.findNavController
|
||||||
import androidx.navigation.fragment.navArgs
|
import androidx.navigation.fragment.navArgs
|
||||||
import com.aurora.Constants
|
|
||||||
import com.aurora.gplayapi.data.models.StreamCluster
|
import com.aurora.gplayapi.data.models.StreamCluster
|
||||||
import com.aurora.store.R
|
import com.aurora.store.R
|
||||||
import com.aurora.store.databinding.ActivityGenericRecyclerBinding
|
import com.aurora.store.databinding.ActivityGenericRecyclerBinding
|
||||||
@@ -104,7 +103,7 @@ class StreamBrowseFragment : BaseFragment(R.layout.activity_generic_recycler) {
|
|||||||
AppListViewModel_()
|
AppListViewModel_()
|
||||||
.id(it.packageName.hashCode())
|
.id(it.packageName.hashCode())
|
||||||
.app(it)
|
.app(it)
|
||||||
.click { _ -> openDetailsActivity(it) }
|
.click { _ -> openDetailsFragment(it) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1147,7 +1147,7 @@ class AppDetailsFragment : BaseFragment(R.layout.fragment_details) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onAppClick(app: App) {
|
override fun onAppClick(app: App) {
|
||||||
openDetailsActivity(app)
|
openDetailsFragment(app)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onAppLongClick(app: App) {
|
override fun onAppLongClick(app: App) {
|
||||||
|
|||||||
@@ -156,7 +156,7 @@ class DetailsMoreFragment : BaseFragment(R.layout.fragment_details_more) {
|
|||||||
AppDependentViewModel_()
|
AppDependentViewModel_()
|
||||||
.id(it.id)
|
.id(it.id)
|
||||||
.app(it)
|
.app(it)
|
||||||
.click { _ -> openDetailsActivity(it) }
|
.click { _ -> openDetailsFragment(it) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ class DevAppsFragment : BaseFragment(R.layout.activity_generic_recycler) {
|
|||||||
.id(app.id)
|
.id(app.id)
|
||||||
.app(app)
|
.app(app)
|
||||||
.click(View.OnClickListener {
|
.click(View.OnClickListener {
|
||||||
openDetailsActivity(app)
|
openDetailsFragment(app)
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ class DevProfileFragment : BaseFragment(R.layout.fragment_dev_profile),
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun onAppClick(app: App) {
|
override fun onAppClick(app: App) {
|
||||||
openDetailsActivity(app)
|
openDetailsFragment(app)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onAppLongClick(app: App) {
|
override fun onAppLongClick(app: App) {
|
||||||
|
|||||||
@@ -207,7 +207,7 @@ class DownloadFragment : BaseFragment(R.layout.fragment_download) {
|
|||||||
downloadFile.download.extras.getString(Constants.STRING_EXTRA, "{}"),
|
downloadFile.download.extras.getString(Constants.STRING_EXTRA, "{}"),
|
||||||
App::class.java
|
App::class.java
|
||||||
)
|
)
|
||||||
openDetailsActivity(app)
|
openDetailsFragment(app)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun openDownloadMenuSheet(downloadFile: DownloadFile) {
|
private fun openDownloadMenuSheet(downloadFile: DownloadFile) {
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ class TopChartFragment : BaseFragment() {
|
|||||||
AppListViewModel_()
|
AppListViewModel_()
|
||||||
.id(app.id)
|
.id(app.id)
|
||||||
.app(app)
|
.app(app)
|
||||||
.click { _ -> openDetailsActivity(app) }
|
.click { _ -> openDetailsFragment(app) }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -92,7 +92,7 @@ class AppSalesFragment : BaseFragment(R.layout.activity_generic_recycler) {
|
|||||||
AppListViewModel_()
|
AppListViewModel_()
|
||||||
.id(it.packageName.hashCode())
|
.id(it.packageName.hashCode())
|
||||||
.app(it)
|
.app(it)
|
||||||
.click { _ -> openDetailsActivity(it) }
|
.click { _ -> openDetailsFragment(it) }
|
||||||
)
|
)
|
||||||
setFilterDuplicates(true)
|
setFilterDuplicates(true)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -228,7 +228,7 @@ class SearchResultsFragment : BaseFragment(R.layout.fragment_search_result),
|
|||||||
.id(app.id)
|
.id(app.id)
|
||||||
.app(app)
|
.app(app)
|
||||||
.click(View.OnClickListener {
|
.click(View.OnClickListener {
|
||||||
openDetailsActivity(app)
|
openDetailsFragment(app)
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -249,7 +249,7 @@ class UpdatesFragment : BaseFragment() {
|
|||||||
AppUpdateViewModel_()
|
AppUpdateViewModel_()
|
||||||
.id(updateFile.hashCode())
|
.id(updateFile.hashCode())
|
||||||
.updateFile(updateFile)
|
.updateFile(updateFile)
|
||||||
.click { _ -> openDetailsActivity(updateFile.app) }
|
.click { _ -> openDetailsFragment(updateFile.app) }
|
||||||
.longClick { _ ->
|
.longClick { _ ->
|
||||||
openAppMenuSheet(updateFile.app)
|
openAppMenuSheet(updateFile.app)
|
||||||
false
|
false
|
||||||
|
|||||||
Reference in New Issue
Block a user