-
Notifications
You must be signed in to change notification settings - Fork 3
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
babichev.a
committed
Aug 5, 2024
1 parent
abeed5f
commit 79c94da
Showing
22 changed files
with
179 additions
and
144 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
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
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
5 changes: 5 additions & 0 deletions
5
sample/src/commonMain/kotlin/com/softartdev/shared/AppNavGraph.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,5 @@ | ||
| package com.softartdev.shared | ||
|
|
||
| enum class AppNavGraph { | ||
| Settings, NoteDetail, ThemeDialog | ||
| } |
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
42 changes: 34 additions & 8 deletions
42
sample/src/commonMain/kotlin/com/softartdev/shared/material/MaterialApp.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,20 +1,46 @@ | ||
| package com.softartdev.shared.material | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.remember | ||
| import com.softartdev.shared.AppState | ||
| import androidx.navigation.NavHostController | ||
| import androidx.navigation.compose.NavHost | ||
| import androidx.navigation.compose.composable | ||
| import androidx.navigation.compose.dialog | ||
| import androidx.navigation.compose.rememberNavController | ||
| import com.softartdev.shared.AppNavGraph | ||
| import com.softartdev.theme.material.PreferableMaterialTheme | ||
| import com.softartdev.theme.material.ThemeDialog | ||
| import com.softartdev.theme.pref.PreferenceHelper | ||
| import kotlin.experimental.ExperimentalObjCRefinement | ||
| import kotlin.native.HiddenFromObjC | ||
|
|
||
| @OptIn(ExperimentalObjCRefinement::class) | ||
| @HiddenFromObjC | ||
| @Composable | ||
| fun MaterialApp() = PreferableMaterialTheme { // provides composition locals | ||
| val showNote: Boolean by remember(AppState::showNote) | ||
| when(showNote) { | ||
| true -> NoteDetailBody() | ||
| else -> SettingsBody() | ||
| fun MaterialApp( | ||
| navController: NavHostController = rememberNavController() | ||
| ) = PreferableMaterialTheme { // provides composition locals | ||
| NavHost( | ||
| navController = navController, | ||
| startDestination = AppNavGraph.Settings.name, | ||
| ) { | ||
| composable(route = AppNavGraph.Settings.name) { | ||
| SettingsBody( | ||
| onBackClick = { navController.navigate(route = AppNavGraph.NoteDetail.name) }, | ||
| onThemeClick = { navController.navigate(route = AppNavGraph.ThemeDialog.name) } | ||
| ) | ||
| } | ||
| composable(route = AppNavGraph.NoteDetail.name) { | ||
| NoteDetailBody( | ||
| onBackClick = { navController.navigate(route = AppNavGraph.Settings.name) } | ||
| ) | ||
| } | ||
| dialog(route = AppNavGraph.ThemeDialog.name) { | ||
| val preferenceHelper: PreferenceHelper = themePrefs.preferenceHelper | ||
| ThemeDialog( | ||
| darkThemeState = themePrefs.darkThemeState, | ||
| writePref = preferenceHelper::themeEnum::set, | ||
| dismissDialog = navController::navigateUp, | ||
| ) | ||
| } | ||
| } | ||
| } |
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
42 changes: 34 additions & 8 deletions
42
sample/src/commonMain/kotlin/com/softartdev/shared/material3/Material3App.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,20 +1,46 @@ | ||
| package com.softartdev.shared.material3 | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.remember | ||
| import com.softartdev.shared.AppState | ||
| import androidx.navigation.NavHostController | ||
| import androidx.navigation.compose.NavHost | ||
| import androidx.navigation.compose.composable | ||
| import androidx.navigation.compose.dialog | ||
| import androidx.navigation.compose.rememberNavController | ||
| import com.softartdev.shared.AppNavGraph | ||
| import com.softartdev.theme.material3.PreferableMaterialTheme | ||
| import com.softartdev.theme.material3.ThemeDialog | ||
| import com.softartdev.theme.pref.PreferenceHelper | ||
| import kotlin.experimental.ExperimentalObjCRefinement | ||
| import kotlin.native.HiddenFromObjC | ||
|
|
||
| @OptIn(ExperimentalObjCRefinement::class) | ||
| @HiddenFromObjC | ||
| @Composable | ||
| fun Material3App() = PreferableMaterialTheme { // provides composition locals | ||
| val showNote: Boolean by remember(AppState::showNote) // provides composition locals | ||
| when(showNote) { | ||
| true -> NoteDetailBody() | ||
| else -> SettingsBody() | ||
| fun Material3App( | ||
| navController: NavHostController = rememberNavController() | ||
| ) = PreferableMaterialTheme { // provides composition locals | ||
| NavHost( | ||
| navController = navController, | ||
| startDestination = AppNavGraph.Settings.name, | ||
| ) { | ||
| composable(route = AppNavGraph.Settings.name) { | ||
| SettingsBody( | ||
| onBackClick = { navController.navigate(route = AppNavGraph.NoteDetail.name) }, | ||
| onThemeClick = { navController.navigate(route = AppNavGraph.ThemeDialog.name) } | ||
| ) | ||
| } | ||
| composable(route = AppNavGraph.NoteDetail.name) { | ||
| NoteDetailBody( | ||
| onBackClick = { navController.navigate(route = AppNavGraph.Settings.name) } | ||
| ) | ||
| } | ||
| dialog(route = AppNavGraph.ThemeDialog.name) { | ||
| val preferenceHelper: PreferenceHelper = themePrefs.preferenceHelper | ||
| ThemeDialog( | ||
| darkThemeState = themePrefs.darkThemeState, | ||
| writePref = preferenceHelper::themeEnum::set, | ||
| dismissDialog = navController::navigateUp, | ||
| ) | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.