megboyzz/MyDnevnik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Окончательная миграция на Kotlin DSL

Browse Source
This commit is contained in:
megboyzz
2023-04-08 01:17:02 +03:00
parent 481cd770f4
commit fe2acddc44
20 changed files with 111 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/megboyzz/dnevnik/navigation/AppNavHost.kt
+1 -3
View File
@@ -14,8 +14,6 @@ import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import com.google.accompanist.navigation.animation.AnimatedNavHost
import com.google.accompanist.navigation.animation.rememberAnimatedNavController
import ru.megboyzz.dnevnik.screens.*
sealed class BaseNavRote(open val route: String)
@@ -36,7 +34,7 @@ sealed class AppNavRoute(override val route: String): BaseNavRote(route){
fun AppNavHost(){
val scaffoldState = rememberScaffoldState()
val navController = rememberAnimatedNavController()
val navController = rememberNavController()
NavHost(
navController = navController,
app/src/main/java/ru/megboyzz/dnevnik/navigation/MarksSubScreenNavHost.kt
+2 -7
View File
@@ -7,14 +7,9 @@ import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.navigation.NavGraph
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavigatorProvider
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.createGraph
import com.google.accompanist.navigation.animation.rememberAnimatedNavController
import androidx.navigation.compose.rememberNavController
import ru.megboyzz.dnevnik.AsString
import ru.megboyzz.dnevnik.R
import ru.megboyzz.dnevnik.screens.*
@@ -35,7 +30,7 @@ sealed class MarksNavRoute(override val route: String): BaseNavRote(route){
@Composable
fun MarksSubScreenNavHost() {
val navController = rememberAnimatedNavController()
val navController = rememberNavController()
val list = listOf(
SubScreenData(
app/src/main/java/ru/megboyzz/dnevnik/screens/ui/Previews.kt
+1 -2
View File
@@ -19,7 +19,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.navigation.compose.rememberNavController
import com.google.accompanist.navigation.animation.rememberAnimatedNavController
import com.kizitonwose.calendar.core.daysOfWeek
import ru.megboyzz.dnevnik.screens.SettingsScreen
import ru.megboyzz.dnevnik.screens.ui.*
@@ -68,7 +67,7 @@ fun text() {
@Composable
fun DrawerPrev() {
val scaffoldState = rememberScaffoldState()
val navController = rememberAnimatedNavController()
val navController = rememberNavController()
Box(Modifier.background(mainBlue)) {
DrawerContent(navController = navController, scaffoldState = scaffoldState)
}