Skip to content

Commit ba85b21

Browse files
committed
fix: back to home from explore
1 parent 00bdb67 commit ba85b21

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

app/src/main/java/org/nqmgaming/aneko/presentation/ANekoActivity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ class ANekoActivity : AppCompatActivity() {
7171
) {
7272
val backStack = rememberNavBackStack(PermissionKey)
7373

74+
7475
NavDisplay(
7576
backStack = backStack,
7677
onBack = { if (backStack.size > 1) backStack.removeLastOrNull() },

app/src/main/java/org/nqmgaming/aneko/presentation/app/HomeAppScreen.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
44
import android.content.Intent
55
import android.net.Uri
66
import android.widget.Toast
7+
import androidx.activity.compose.BackHandler
78
import androidx.activity.compose.rememberLauncherForActivityResult
89
import androidx.activity.result.contract.ActivityResultContracts
910
import androidx.compose.material.icons.Icons
@@ -27,8 +28,6 @@ import androidx.navigation3.ui.NavDisplay
2728
import kotlinx.coroutines.Dispatchers
2829
import kotlinx.coroutines.launch
2930
import kotlinx.coroutines.withContext
30-
import org.nqmgaming.aneko.core.service.AnimationService
31-
import org.nqmgaming.aneko.core.util.extension.checkNotificationPermission
3231
import org.nqmgaming.aneko.presentation.AnekoViewModel
3332
import org.nqmgaming.aneko.presentation.BottomTab
3433
import org.nqmgaming.aneko.presentation.ExploreKey
@@ -41,7 +40,6 @@ import org.nqmgaming.aneko.presentation.home.HomeScreen
4140
import org.nqmgaming.aneko.presentation.setting.LanguageScreen
4241
import org.nqmgaming.aneko.presentation.setting.ThemeScreen
4342
import timber.log.Timber
44-
import kotlin.collections.forEach
4543

4644
@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
4745
@Composable
@@ -103,6 +101,11 @@ fun HomeAppScreen(
103101
}
104102
)
105103

104+
BackHandler(enabled = currentTab != BottomTab.HOME && currentBackStack.size <= 1) {
105+
currentTab = BottomTab.HOME
106+
showBottomBar = true
107+
}
108+
106109
Scaffold(
107110
bottomBar = {
108111
if (!showBottomBar) return@Scaffold

0 commit comments

Comments
 (0)