|
@@ -9,9 +9,7 @@ import android.graphics.Color
|
|
|
import android.os.Build
|
|
|
import android.os.Bundle
|
|
|
import android.view.View
|
|
|
-import android.widget.Toast
|
|
|
import androidx.activity.ComponentActivity
|
|
|
-import androidx.activity.compose.BackHandler
|
|
|
import androidx.compose.foundation.isSystemInDarkTheme
|
|
|
import androidx.compose.foundation.layout.Box
|
|
|
import androidx.compose.foundation.layout.WindowInsets
|
|
@@ -32,7 +30,6 @@ import androidx.compose.runtime.collectAsState
|
|
|
import androidx.compose.runtime.getValue
|
|
|
import androidx.compose.runtime.mutableStateOf
|
|
|
import androidx.compose.runtime.remember
|
|
|
-import androidx.compose.runtime.rememberCoroutineScope
|
|
|
import androidx.compose.runtime.setValue
|
|
|
import androidx.compose.ui.Modifier
|
|
|
import androidx.compose.ui.graphics.luminance
|
|
@@ -80,10 +77,8 @@ import eu.kanade.tachiyomi.ui.more.NewUpdateScreen
|
|
|
import eu.kanade.tachiyomi.util.system.dpToPx
|
|
|
import eu.kanade.tachiyomi.util.system.isNavigationBarNeedsScrim
|
|
|
import eu.kanade.tachiyomi.util.system.openInBrowser
|
|
|
-import eu.kanade.tachiyomi.util.system.toast
|
|
|
import eu.kanade.tachiyomi.util.view.setComposeContent
|
|
|
import kotlinx.coroutines.channels.awaitClose
|
|
|
-import kotlinx.coroutines.delay
|
|
|
import kotlinx.coroutines.flow.callbackFlow
|
|
|
import kotlinx.coroutines.flow.collectLatest
|
|
|
import kotlinx.coroutines.flow.drop
|
|
@@ -100,7 +95,6 @@ import tachiyomi.presentation.core.components.material.Scaffold
|
|
|
import uy.kohesive.injekt.Injekt
|
|
|
import uy.kohesive.injekt.api.get
|
|
|
import uy.kohesive.injekt.injectLazy
|
|
|
-import kotlin.time.Duration.Companion.seconds
|
|
|
import androidx.compose.ui.graphics.Color.Companion as ComposeColor
|
|
|
|
|
|
class MainActivity : BaseActivity() {
|
|
@@ -192,10 +186,6 @@ class MainActivity : BaseActivity() {
|
|
|
screen = HomeScreen,
|
|
|
disposeBehavior = NavigatorDisposeBehavior(disposeNestedNavigators = false, disposeSteps = true),
|
|
|
) { navigator ->
|
|
|
- if (navigator.size == 1) {
|
|
|
- ConfirmExit()
|
|
|
- }
|
|
|
-
|
|
|
LaunchedEffect(navigator) {
|
|
|
[email protected] = navigator
|
|
|
|
|
@@ -288,22 +278,6 @@ class MainActivity : BaseActivity() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @Composable
|
|
|
- private fun ConfirmExit() {
|
|
|
- val scope = rememberCoroutineScope()
|
|
|
- val confirmExit by preferences.confirmExit().collectAsState()
|
|
|
- var waitingConfirmation by remember { mutableStateOf(false) }
|
|
|
- BackHandler(enabled = !waitingConfirmation && confirmExit) {
|
|
|
- scope.launch {
|
|
|
- waitingConfirmation = true
|
|
|
- val toast = toast(R.string.confirm_exit, Toast.LENGTH_LONG)
|
|
|
- delay(2.seconds)
|
|
|
- toast.cancel()
|
|
|
- waitingConfirmation = false
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
@Composable
|
|
|
fun HandleOnNewIntent(context: Context, navigator: Navigator) {
|
|
|
LaunchedEffect(Unit) {
|