fix: onBackPressed not worked.

oxyroid · Jan 28, 2024 · ad4c193 · ad4c193
1 parent 76d668b
commit ad4c193
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/androidApp/src/main/java/com/m3u/androidApp/ui/App.kt b/androidApp/src/main/java/com/m3u/androidApp/ui/App.kt
@@ -1,5 +1,6 @@
 package com.m3u.androidApp.ui
 
+import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
@@ -19,6 +20,7 @@ fun App(
     viewModel: AppViewModel = hiltViewModel(),
 ) {
     val helper = LocalHelper.current
+    val onBackPressedDispatcherOwner = LocalOnBackPressedDispatcherOwner.current
 
     val navController = rememberNavController()
     val entry by navController.currentBackStackEntryAsState()
@@ -42,7 +44,7 @@ fun App(
     val deep by viewModel.deep.collectAsStateWithLifecycle()
 
     val onBackPressed: (() -> Unit)? = {
-        navController.popBackStack()
+        onBackPressedDispatcherOwner?.onBackPressedDispatcher?.onBackPressed()
         Unit
     }.takeIf { deep > 0 }
 

diff --git a/material/src/main/java/com/m3u/material/components/Preferences.kt b/material/src/main/java/com/m3u/material/components/Preferences.kt
@@ -294,7 +294,6 @@ fun TextPreference(
         },
         modifier = modifier,
         trailing = {
-
             if (!isTelevision()) {
                 Text(
                     text = trailing.uppercase(),