Skip to content

Commit ca68cda

Browse files
author
Velord
committed
Refactor: clean up
1 parent 2d2566d commit ca68cda

3 files changed

Lines changed: 3 additions & 19 deletions

File tree

app/src/main/java/com/velord/composemultiplebackstackdemo/ui/main/bottomNavigation/BottomNavFragment.kt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,23 @@
11
package com.velord.composemultiplebackstackdemo.ui.main.bottomNavigation
22

3-
import android.content.Context
43
import android.os.Bundle
5-
import android.util.Log
64
import android.view.View
7-
import androidx.activity.OnBackPressedCallback
8-
import androidx.activity.compose.BackHandler
9-
import androidx.activity.compose.LocalOnBackPressedDispatcherOwner
105
import androidx.compose.foundation.layout.*
116
import androidx.compose.material3.*
12-
import androidx.compose.runtime.*
7+
import androidx.compose.runtime.Composable
138
import androidx.compose.ui.Alignment
149
import androidx.compose.ui.Modifier
1510
import androidx.compose.ui.draw.scale
1611
import androidx.compose.ui.graphics.Color
17-
import androidx.compose.ui.platform.LocalLifecycleOwner
1812
import androidx.compose.ui.res.stringResource
13+
import androidx.compose.ui.tooling.preview.Preview
1914
import androidx.compose.ui.unit.dp
20-
import androidx.core.view.forEach
2115
import androidx.fragment.app.Fragment
2216
import androidx.fragment.app.viewModels
2317
import androidx.lifecycle.Lifecycle
2418
import androidx.lifecycle.compose.collectAsStateWithLifecycle
2519
import androidx.lifecycle.repeatOnLifecycle
26-
import androidx.navigation.NavController
2720
import androidx.navigation.fragment.findNavController
28-
import androidx.navigation.ui.NavigationUI
2921
import com.velord.composemultiplebackstackdemo.R
3022
import com.velord.composemultiplebackstackdemo.databinding.FragmentBottomNavBinding
3123
import com.velord.composemultiplebackstackdemo.ui.compose.theme.setContentWithTheme
@@ -167,6 +159,7 @@ private fun Content(
167159
}
168160
}
169161

162+
@Preview
170163
@Composable
171164
private fun BottomNavContentPreview() {
172165
Content(

app/src/main/java/com/velord/composemultiplebackstackdemo/ui/main/bottomNavigation/BottomNavViewModel.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.velord.composemultiplebackstackdemo.ui.main.bottomNavigation
22

3-
import android.util.Log
43
import androidx.lifecycle.ViewModel
54
import androidx.lifecycle.viewModelScope
65
import androidx.navigation.NavDestination
@@ -29,7 +28,6 @@ class BottomNavViewModel : ViewModel() {
2928

3029
fun updateBackHandling(currentNavigationDestination: NavDestination?) {
3130
val isStart = currentNavigationDestination.isCurrentStartDestination(getNavigationItems())
32-
Log.d("@@@", "isStart: $isStart; current: ${currentNavigationDestination?.label}")
3331
isBackHandlingEnabledFlow.value = isStart
3432
}
3533
}

multiplebackstackapplier/src/main/java/com/velord/multiplebackstackapplier/MultipleBackstackApplier.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ package com.velord.multiplebackstackapplier
22

33
import android.annotation.SuppressLint
44
import android.content.Context
5-
import android.os.Bundle
6-
import android.util.Log
75
import android.view.MenuItem
8-
import android.view.View
96
import androidx.annotation.IdRes
107
import androidx.core.view.forEach
118
import androidx.lifecycle.*
@@ -14,12 +11,9 @@ import androidx.navigation.NavDestination
1411
import androidx.navigation.NavDestination.Companion.hierarchy
1512
import androidx.navigation.ui.NavigationUI
1613
import com.google.android.material.navigation.NavigationBarMenu
17-
import com.velord.multiplebackstackapplier.MultipleBackstackApplier.matchDestination
18-
import kotlinx.coroutines.CoroutineScope
1914
import kotlinx.coroutines.flow.Flow
2015
import kotlinx.coroutines.flow.collectLatest
2116
import kotlinx.coroutines.launch
22-
import java.lang.ref.WeakReference
2317

2418
object MultipleBackstackApplier {
2519

@@ -89,7 +83,6 @@ class MultipleBackstack(
8983
lifecycleOwner.lifecycleScope.launch {
9084
lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
9185
flowOnSelect.collectLatest { navItem ->
92-
Log.d("@@@", "onSelect: ${navItem.navigationGraphId}")
9386
val menu = MultipleBackstackApplier.createNavigationBarMenu(context, items)
9487
val menuItem = menu.findItem(navItem.navigationGraphId)
9588
NavigationUI.onNavDestinationSelected(

0 commit comments

Comments
 (0)