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 febbff23f..1252ed740 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 @@ -91,7 +91,6 @@ import com.aurora.store.view.epoxy.views.details.ScreenshotView import com.aurora.store.view.epoxy.views.details.ScreenshotViewModel_ import com.aurora.store.view.ui.commons.BaseFragment import com.aurora.store.view.ui.sheets.InstallErrorDialogSheet -import com.aurora.store.view.ui.sheets.PermissionBottomSheet import com.aurora.store.viewmodel.details.AppDetailsViewModel import com.aurora.store.viewmodel.details.DetailsClusterViewModel import com.bumptech.glide.load.resource.bitmap.RoundedCorners @@ -1163,8 +1162,11 @@ class AppDetailsFragment : BaseFragment(R.layout.fragment_details) { private fun inflateAppPermission(B: LayoutDetailsPermissionsBinding, app: App) { B.headerPermission.addClickListener { if (app.permissions.size > 0) { - PermissionBottomSheet.newInstance(app) - .show(childFragmentManager, PermissionBottomSheet.TAG) + findNavController().navigate( + AppDetailsFragmentDirections.actionAppDetailsFragmentToPermissionBottomSheet( + app + ) + ) } } B.txtPermissionCount.text = ("${app.permissions.size} permissions") diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt index 0a41ea15b..b8ae18746 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/PermissionBottomSheet.kt @@ -27,10 +27,9 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.LinearLayout -import com.aurora.Constants +import androidx.navigation.fragment.navArgs import com.aurora.extensions.hide import com.aurora.extensions.show -import com.aurora.gplayapi.data.models.App import com.aurora.store.R import com.aurora.store.databinding.SheetPermissionsBinding import com.aurora.store.view.custom.layouts.PermissionGroup @@ -39,24 +38,9 @@ import java.util.* class PermissionBottomSheet : BaseBottomSheet() { private lateinit var B: SheetPermissionsBinding - private lateinit var app: App private lateinit var packageManager: PackageManager - companion object { - - const val TAG = "PermissionBottomSheet" - - @JvmStatic - fun newInstance( - app: App - ): PermissionBottomSheet { - return PermissionBottomSheet().apply { - arguments = Bundle().apply { - putString(Constants.STRING_APP, gson.toJson(app)) - } - } - } - } + private val args: PermissionBottomSheetArgs by navArgs() override fun onCreateContentView( inflater: LayoutInflater, @@ -69,16 +53,7 @@ class PermissionBottomSheet : BaseBottomSheet() { override fun onContentViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val bundle = arguments - bundle?.let { - val rawApp = bundle.getString(Constants.STRING_APP, "{}") - app = gson.fromJson(rawApp, App::class.java) - if (app.packageName.isNotEmpty()) { - inflateData() - } else { - dismissAllowingStateLoss() - } - } + inflateData() } private fun inflateData() { @@ -86,7 +61,7 @@ class PermissionBottomSheet : BaseBottomSheet() { val permissionGroupWidgets: MutableMap = HashMap() - for (permissionName in app.permissions) { + for (permissionName in args.app.permissions) { val permissionInfo = getPermissionInfo(permissionName) ?: continue val permissionGroupInfo = getPermissionGroupInfo(permissionInfo) @@ -162,4 +137,4 @@ class PermissionBottomSheet : BaseBottomSheet() { } return permissionGroupInfo } -} \ No newline at end of file +} diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index bec258699..8cea5d6d9 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -189,6 +189,9 @@ + + + +