diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt index f8a0486ae..cc5b82a47 100644 --- a/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt +++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/InstallerFragment.kt @@ -24,6 +24,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.navigation.fragment.findNavController import com.aurora.extensions.isMIUI import com.aurora.extensions.isMiuiOptimizationDisabled import com.aurora.extensions.isOAndAbove @@ -42,7 +43,6 @@ import com.aurora.store.util.Preferences.PREFERENCE_INSTALLER_ID import com.aurora.store.util.save import com.aurora.store.view.epoxy.views.preference.InstallerViewModel_ import com.aurora.store.view.ui.commons.BaseFragment -import com.aurora.store.view.ui.sheets.DeviceMiuiSheet import com.google.gson.reflect.TypeToken import rikka.shizuku.Shizuku import java.nio.charset.StandardCharsets @@ -140,7 +140,9 @@ class InstallerFragment : BaseFragment() { } if (isMIUI() && !isMiuiOptimizationDisabled()) { - DeviceMiuiSheet.newInstance().show(childFragmentManager, DeviceMiuiSheet.TAG) + findNavController().navigate( + OnboardingFragmentDirections.actionOnboardingFragmentToDeviceMiuiSheet() + ) } } @@ -148,7 +150,9 @@ class InstallerFragment : BaseFragment() { when (installerId) { 0 -> { if (isMIUI() && !isMiuiOptimizationDisabled()) { - DeviceMiuiSheet.newInstance().show(childFragmentManager, DeviceMiuiSheet.TAG) + findNavController().navigate( + OnboardingFragmentDirections.actionOnboardingFragmentToDeviceMiuiSheet() + ) } this.installerId = installerId save(PREFERENCE_INSTALLER_ID, installerId) diff --git a/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceMiuiSheet.kt b/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceMiuiSheet.kt index 220b2878b..0278fed8c 100644 --- a/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceMiuiSheet.kt +++ b/app/src/main/java/com/aurora/store/view/ui/sheets/DeviceMiuiSheet.kt @@ -35,20 +35,6 @@ class DeviceMiuiSheet : BaseBottomSheet() { private lateinit var B: SheetDeviceMiuiBinding - companion object { - - const val TAG = "DeviceMiuiSheet" - - @JvmStatic - fun newInstance(): DeviceMiuiSheet { - return DeviceMiuiSheet().apply { - arguments = Bundle().apply { - - } - } - } - } - override fun onCreateContentView( inflater: LayoutInflater, container: ViewGroup, diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index afb5b6bbb..e33edf671 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -351,6 +351,9 @@ app:launchSingleTop="true" app:popUpTo="@id/mobile_navigation" app:popUpToInclusive="true" /> + +