-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
68b9a8f
commit 0f0cdf1
Showing
12 changed files
with
152 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
app/src/main/java/com/ashish/weighter/navigation/BackHandler.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| package com.ashish.weighter.navigation | ||
|
|
||
| import androidx.activity.OnBackPressedCallback | ||
| import androidx.activity.OnBackPressedDispatcher | ||
| import androidx.compose.runtime.* | ||
|
|
||
| /* | ||
| * An effect for handling presses of the device back button. | ||
| */ | ||
|
|
||
|
|
||
| @Composable | ||
| fun backHandler( | ||
| enabled: Boolean = true, | ||
| onBack: () -> Unit | ||
| ) { | ||
| // Safely update the current `onBack` lambda when a new one is provided | ||
| val currentOnBack by rememberUpdatedState(onBack) | ||
| // Remember in Composition a back callback that calls the `onBack` lambda | ||
| val backCallback = remember { | ||
| object : OnBackPressedCallback(enabled) { | ||
| override fun handleOnBackPressed() { | ||
| currentOnBack() | ||
| } | ||
| } | ||
| } | ||
| // On every successful composition, update the callback with the `enabled` value | ||
| SideEffect { | ||
| backCallback.isEnabled = enabled | ||
| } | ||
| val backDispatcher = LocalBackDispatcher.current | ||
| // If `backDispatcher` changes, dispose and reset the effect | ||
| DisposableEffect(backDispatcher) { | ||
| // Add callback to the backDispatcher | ||
| backDispatcher.addCallback(backCallback) | ||
| // When the effect leaves the Composition, remove the callback | ||
| onDispose { | ||
| backCallback.remove() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * An [androidx.compose.runtime.Ambient] providing the current [OnBackPressedDispatcher]. You must | ||
| * [provide][androidx.compose.runtime.Providers] a value before use. | ||
| */ | ||
| internal val LocalBackDispatcher = staticCompositionLocalOf<OnBackPressedDispatcher> { | ||
| error("No Back Dispatcher provided") | ||
| } |
23 changes: 11 additions & 12 deletions
23
app/src/main/java/com/ashish/weighter/navigation/NavGraph.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 0 additions & 62 deletions
62
app/src/main/java/com/ashish/weighter/ui/component/appcomopents/BottomBar.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 60 additions & 5 deletions
65
app/src/main/java/com/ashish/weighter/ui/screens/MainScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,74 @@ | ||
| package com.ashish.weighter.ui.screens | ||
|
|
||
| import androidx.compose.material.Scaffold | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material.* | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.MutableState | ||
| import androidx.compose.ui.ExperimentalComposeUiApi | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.navigation.NavHostController | ||
| import androidx.navigation.compose.rememberNavController | ||
| import com.ashish.weighter.ui.component.BottomNavigationBar | ||
| import com.ashish.weighter.navigation.AddScreen | ||
| import com.ashish.weighter.navigation.NavScreen | ||
| import com.ashish.weighter.navigation.backHandler | ||
| import com.ashish.weighter.ui.WeightViewmodel | ||
| import com.ashish.weighter.ui.screens.home.MyWeightScreen | ||
| import com.ashish.weighter.ui.screens.home.TargetScreen | ||
|
|
||
|
|
||
| @ExperimentalComposeUiApi | ||
| @Composable | ||
| fun MainScreen() { | ||
| fun MainScreen( | ||
| viewModel: WeightViewmodel, | ||
| action: MainActions, | ||
| selectedTab: MutableState<NavScreen>, | ||
| ) { | ||
| val navController = rememberNavController() | ||
|
|
||
| Scaffold( | ||
| bottomBar = { BottomNavigationBar(navController = navController) } | ||
| ) {} | ||
| bottomBar = { | ||
| BottomNavigation( | ||
| modifier = Modifier, | ||
| backgroundColor = MaterialTheme.colors.background | ||
| ) { | ||
| for (tab in NavScreen.values()) { | ||
| BottomNavigationItem( | ||
| selected = selectedTab.value == tab, | ||
| label = { tab.label }, | ||
| onClick = { | ||
| if (selectedTab.value == tab) return@BottomNavigationItem | ||
| selectedTab.value = tab | ||
| }, | ||
| icon = { | ||
| Icon(imageVector = tab.icon, contentDescription = null) | ||
| }, | ||
| unselectedContentColor = Color.LightGray, | ||
| selectedContentColor = MaterialTheme.colors.primary, | ||
| ) | ||
| } | ||
| } | ||
| }, | ||
| ) { | ||
| val modifier = Modifier.padding(it) | ||
| when (selectedTab.value) { | ||
| NavScreen.RECORD -> TargetScreen(viewModel, navController) | ||
| NavScreen.WEIGHT -> MyWeightScreen(viewModel, action , navController) | ||
|
|
||
| } | ||
|
|
||
| } | ||
| backHandler( | ||
| enabled = selectedTab.value != NavScreen.WEIGHT, | ||
| onBack = { selectedTab.value = NavScreen.WEIGHT } | ||
| ) | ||
|
|
||
| } | ||
|
|
||
|
|
||
| class MainActions(navController: NavHostController) { | ||
|
|
||
| val addWeight = { | ||
| navController.navigate(AddScreen.AddWeight.route) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...shish/weighter/ui/screens/TargetScreen.kt → .../weighter/ui/screens/home/RecordScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.