try to fix predictive back crash and give up

kawaiiDango · Apr 2, 2024 · 0f325dc · 0f325dc
1 parent beecc35
commit 0f325dc
Show file tree

Hide file tree

Showing 30 changed files with 99 additions and 111 deletions.
diff --git a/app/src/main/java/com/arn/scrobble/RecFragment.kt b/app/src/main/java/com/arn/scrobble/RecFragment.kt
@@ -41,8 +41,6 @@ class RecFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setupAxisTransitions(MaterialSharedAxis.Y)
-
         micPermRequest =
             registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
                 if (isGranted) {
@@ -58,6 +56,8 @@ class RecFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.Y)
+
         _binding = ContentRecBinding.inflate(inflater, container, false)
         binding.root.setupInsets()
 //        if (!Stuff.isTv)

diff --git a/app/src/main/java/com/arn/scrobble/billing/BillingFragment.kt b/app/src/main/java/com/arn/scrobble/billing/BillingFragment.kt
@@ -37,16 +37,13 @@ class BillingFragment : Fragment() {
     private val binding
         get() = _binding!!
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupAxisTransitions(MaterialSharedAxis.Y, MaterialSharedAxis.X)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.Y, MaterialSharedAxis.X)
+
         _binding = ContentBillingBinding.inflate(inflater, container, false)
         return binding.root
     }

diff --git a/app/src/main/java/com/arn/scrobble/billing/BillingTroubleshootFragment.kt b/app/src/main/java/com/arn/scrobble/billing/BillingTroubleshootFragment.kt
@@ -18,17 +18,13 @@ class BillingTroubleshootFragment : Fragment() {
     private val binding
         get() = _binding!!
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setupAxisTransitions(MaterialSharedAxis.X)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.X)
+
         _binding = ContentBillingToubleshootBinding.inflate(inflater, container, false)
         binding.root.setupInsets()
 

diff --git a/app/src/main/java/com/arn/scrobble/charts/ChartsPagerFragment.kt b/app/src/main/java/com/arn/scrobble/charts/ChartsPagerFragment.kt
@@ -1,14 +1,27 @@
 package com.arn.scrobble.charts
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import com.arn.scrobble.R
 import com.arn.scrobble.main.BasePagerFragment
+import com.arn.scrobble.utils.UiUtils.setupAxisTransitions
+import com.google.android.material.transition.MaterialSharedAxis
 
 
 class ChartsPagerFragment : BasePagerFragment() {
     override val optionsMenuRes = R.menu.charts_menu
 
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        setupAxisTransitions(MaterialSharedAxis.X)
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         adapter = ChartsPagerAdapter(this)
         super.onViewCreated(view, savedInstanceState)

diff --git a/app/src/main/java/com/arn/scrobble/charts/RandomFragment.kt b/app/src/main/java/com/arn/scrobble/charts/RandomFragment.kt
@@ -58,16 +58,13 @@ class RandomFragment : ChartsPeriodFragment() {
         )
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupAxisTransitions(MaterialSharedAxis.X)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.X)
+
         _binding = ContentRandomBinding.inflate(inflater, container, false)
         _periodChipsBinding = binding.chipsChartsPeriod
         return binding.root

diff --git a/app/src/main/java/com/arn/scrobble/edits/BlockedMetadataFragment.kt b/app/src/main/java/com/arn/scrobble/edits/BlockedMetadataFragment.kt
@@ -36,16 +36,13 @@ class BlockedMetadataFragment : Fragment(), ItemClickListener<BlockedMetadata> {
     private lateinit var adapter: BlockedMetadataAdapter
     private val mainNotifierViewModel by activityViewModels<MainNotifierViewModel>()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupAxisTransitions(MaterialSharedAxis.X)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.X)
+
         _binding = ContentBlockedMetadataBinding.inflate(inflater, container, false)
         return binding.root
     }

diff --git a/app/src/main/java/com/arn/scrobble/edits/RegexEditsAddFragment.kt b/app/src/main/java/com/arn/scrobble/edits/RegexEditsAddFragment.kt
@@ -57,16 +57,13 @@ class RegexEditsAddFragment : Fragment() {
         get() = requireArguments().getBoolean(ARG_CHANGED, false)
         set(value) = requireArguments().putBoolean(ARG_CHANGED, value)
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupAxisTransitions(MaterialSharedAxis.X)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.X)
+
         _binding = ContentRegexEditAddBinding.inflate(layoutInflater)
         return binding.root
     }

diff --git a/app/src/main/java/com/arn/scrobble/edits/RegexEditsFragment.kt b/app/src/main/java/com/arn/scrobble/edits/RegexEditsFragment.kt
@@ -48,16 +48,13 @@ class RegexEditsFragment : Fragment(), ItemClickListener<RegexEdit> {
     private val prefs = App.prefs
     private val mainNotifierViewModel by activityViewModels<MainNotifierViewModel>()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupAxisTransitions(MaterialSharedAxis.X)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.X)
+
         _binding = ContentRegexEditBinding.inflate(inflater, container, false)
         return binding.root
     }

diff --git a/app/src/main/java/com/arn/scrobble/edits/RegexEditsTestFragment.kt b/app/src/main/java/com/arn/scrobble/edits/RegexEditsTestFragment.kt
@@ -35,16 +35,13 @@ class RegexEditsTestFragment : Fragment() {
     private val binding get() = _binding!!
     private val viewModel by viewModels<RegexEditsTestVM>()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupAxisTransitions(MaterialSharedAxis.X)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.X)
+
         _binding = ContentRegexTestBinding.inflate(layoutInflater)
         return binding.root
     }

diff --git a/app/src/main/java/com/arn/scrobble/edits/SimpleEditsFragment.kt b/app/src/main/java/com/arn/scrobble/edits/SimpleEditsFragment.kt
@@ -52,15 +52,15 @@ class SimpleEditsFragment : Fragment(), ItemClickListener<SimpleEdit> {
                 bundle.getParcelable<SimpleEdit>(Stuff.ARG_EDIT) ?: return@setFragmentResultListener
             viewModel.upsert(edit)
         }
-
-        setupAxisTransitions(MaterialSharedAxis.X)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.X)
+
         _binding = ContentSimpleEditsBinding.inflate(inflater, container, false)
         return binding.root
     }

diff --git a/app/src/main/java/com/arn/scrobble/friends/LoadingFragment.kt b/app/src/main/java/com/arn/scrobble/friends/LoadingFragment.kt
@@ -23,16 +23,13 @@ class LoadingFragment : Fragment() {
     private val viewModel by viewModels<UserLoaderVM>()
     private val args by navArgs<LoadingFragmentArgs>()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupAxisTransitions(MaterialSharedAxis.Z)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.Z)
+
         _binding = ContentLoadingBinding.inflate(inflater, container, false)
         return binding.root
     }

diff --git a/app/src/main/java/com/arn/scrobble/info/InfoPagerFragment.kt b/app/src/main/java/com/arn/scrobble/info/InfoPagerFragment.kt
@@ -1,14 +1,27 @@
 package com.arn.scrobble.info
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import com.arn.scrobble.R
 import com.arn.scrobble.main.BasePagerFragment
+import com.arn.scrobble.utils.UiUtils.setupAxisTransitions
+import com.google.android.material.transition.MaterialSharedAxis
 
 class InfoPagerFragment : BasePagerFragment() {
 
     override val optionsMenuRes = R.menu.into_extra_full_menu
 
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        setupAxisTransitions(MaterialSharedAxis.Z)
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         adapter = InfoPagerAdapter(this)
         super.onViewCreated(view, savedInstanceState)

diff --git a/app/src/main/java/com/arn/scrobble/main/BasePagerFragment.kt b/app/src/main/java/com/arn/scrobble/main/BasePagerFragment.kt
@@ -13,8 +13,6 @@ import androidx.fragment.app.activityViewModels
 import com.arn.scrobble.databinding.ContentPagerBinding
 import com.arn.scrobble.ui.OptionsMenuVM
 import com.arn.scrobble.utils.NavUtils.setupWithNavUi
-import com.arn.scrobble.utils.UiUtils.setupAxisTransitions
-import com.google.android.material.transition.MaterialSharedAxis
 import kotlin.math.abs
 
 
@@ -30,12 +28,6 @@ open class BasePagerFragment : Fragment() {
     var isReady = false
         private set
 
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupAxisTransitions(MaterialSharedAxis.Z)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

diff --git a/app/src/main/java/com/arn/scrobble/main/HomePagerFragment.kt b/app/src/main/java/com/arn/scrobble/main/HomePagerFragment.kt
@@ -1,7 +1,9 @@
 package com.arn.scrobble.main
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.os.bundleOf
 import androidx.navigation.fragment.findNavController
@@ -12,9 +14,11 @@ import com.arn.scrobble.api.Scrobblables
 import com.arn.scrobble.utils.BugReportUtils
 import com.arn.scrobble.utils.Stuff
 import com.arn.scrobble.utils.UiUtils.collectLatestLifecycleFlow
+import com.arn.scrobble.utils.UiUtils.setupAxisTransitions
 import com.arn.scrobble.utils.UiUtils.showWithIcons
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.navigation.NavigationView
+import com.google.android.material.transition.MaterialSharedAxis
 
 
 class HomePagerFragment : BasePagerFragment() {
@@ -32,6 +36,16 @@ class HomePagerFragment : BasePagerFragment() {
         }
     }
 
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        setupAxisTransitions(MaterialSharedAxis.Z)
+
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         if (savedInstanceState == null && findNavController().currentDestination?.id == R.id.myHomePagerFragment)
             arguments = bundleOf(Stuff.ARG_TAB to prefs.lastHomePagerTab)

diff --git a/app/src/main/java/com/arn/scrobble/main/MainActivity.kt b/app/src/main/java/com/arn/scrobble/main/MainActivity.kt
@@ -23,6 +23,7 @@ import androidx.core.view.children
 import androidx.core.view.isVisible
 import androidx.core.view.setMargins
 import androidx.core.view.updateLayoutParams
+import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
@@ -76,6 +77,9 @@ class MainActivity : AppCompatActivity(),
 
         super.onCreate(savedInstanceState)
 
+        // until they fix IllegalStateException: setCurrentPlayTimeMillis() called after animation has been started
+        FragmentManager.enablePredictiveBack(false)
+
         ColorPatchUtils.setTheme(this, billingViewModel.proStatus.value)
         UiUtils.isTabletUi = resources.getBoolean(R.bool.is_tablet_ui)
 

diff --git a/app/src/main/java/com/arn/scrobble/onboarding/LoginFileScrobblable.kt b/app/src/main/java/com/arn/scrobble/onboarding/LoginFileScrobblable.kt
@@ -12,9 +12,9 @@ import androidx.navigation.fragment.findNavController
 import com.arn.scrobble.R
 import com.arn.scrobble.api.file.FileScrobblable
 import com.arn.scrobble.databinding.ContentLoginFileScrobblableBinding
+import com.arn.scrobble.utils.Stuff
 import com.arn.scrobble.utils.UiUtils.setupAxisTransitions
 import com.arn.scrobble.utils.UiUtils.toast
-import com.arn.scrobble.utils.Stuff
 import com.google.android.material.transition.MaterialSharedAxis
 
 class LoginFileScrobblable : Fragment() {
@@ -25,7 +25,6 @@ class LoginFileScrobblable : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setupAxisTransitions(MaterialSharedAxis.X)
 
         fileScrobblableCreate =
             registerForActivityResult(ActivityResultContracts.CreateDocument()) { uri ->
@@ -46,6 +45,7 @@ class LoginFileScrobblable : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         _binding = ContentLoginFileScrobblableBinding.inflate(inflater, container, false)
+        setupAxisTransitions(MaterialSharedAxis.X)
         return binding.root
     }
 

diff --git a/app/src/main/java/com/arn/scrobble/onboarding/LoginFragment.kt b/app/src/main/java/com/arn/scrobble/onboarding/LoginFragment.kt
@@ -51,16 +51,13 @@ open class LoginFragment : DialogFragment() {
         get() = _binding!!
     private val args by navArgs<LoginFragmentArgs>()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setupAxisTransitions(MaterialSharedAxis.X)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
+        setupAxisTransitions(MaterialSharedAxis.X)
+
         showsDialog = false
         _binding = ContentLoginBinding.inflate(inflater, container, false)
         args.infoText?.let {

diff --git a/app/src/main/java/com/arn/scrobble/onboarding/OnboardingFragment.kt b/app/src/main/java/com/arn/scrobble/onboarding/OnboardingFragment.kt
@@ -57,15 +57,15 @@ class OnboardingFragment : Fragment() {
                 if (isGranted && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
                     adapter.checkIfStepsCompleted()
             }
-
-        setupAxisTransitions(MaterialSharedAxis.Y, MaterialSharedAxis.X)
     }
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
+        setupAxisTransitions(MaterialSharedAxis.Y, MaterialSharedAxis.X)
+
         _binding = ContentOnboardingStepperBinding.inflate(inflater, container, false)
         return binding.root
     }