clean project
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
package ru.fincode.tsudesk.ui
|
||||
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.runtime.Composable
|
||||
@@ -18,8 +17,7 @@ fun TSUDeskApp() {
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
AppNavHost(
|
||||
navController = navController,
|
||||
contentPadding = PaddingValues()
|
||||
navController = navController
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package ru.fincode.tsudesk.ui.navigation
|
||||
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.navigation.NavHostController
|
||||
import androidx.navigation.compose.NavHost
|
||||
@@ -11,8 +10,7 @@ import ru.fincode.tsudesk.feature.splash.presentation.navigation.splashGraph
|
||||
|
||||
@Composable
|
||||
fun AppNavHost(
|
||||
navController: NavHostController,
|
||||
contentPadding: PaddingValues
|
||||
navController: NavHostController
|
||||
) {
|
||||
NavHost(
|
||||
navController = navController,
|
||||
@@ -23,7 +21,7 @@ fun AppNavHost(
|
||||
navigation<AppRoute.Main>(
|
||||
startDestination = AppRoute.Schedule
|
||||
) {
|
||||
scheduleGraph(navController)
|
||||
scheduleGraph()
|
||||
// newsGraph(navController)
|
||||
// progressGraph(navController)
|
||||
}
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
package ru.fincode.tsudesk.feature.schedule.presentation.navigation
|
||||
|
||||
import androidx.navigation.NavGraphBuilder
|
||||
import androidx.navigation.NavHostController
|
||||
import androidx.navigation.compose.composable
|
||||
import ru.fincode.tsudesk.core.navigation.AppRoute
|
||||
import ru.fincode.tsudesk.feature.schedule.presentation.screen.ScheduleRoute
|
||||
|
||||
fun NavGraphBuilder.scheduleGraph(
|
||||
navController: NavHostController
|
||||
) {
|
||||
composable<AppRoute.Schedule> {
|
||||
ScheduleRoute()
|
||||
|
||||
@@ -27,7 +27,7 @@ class ScheduleViewModel @Inject constructor(
|
||||
val state: StateFlow<ScheduleUiState> = observeScheduleUseCase(scheduleType).map { result ->
|
||||
when (result) {
|
||||
is DataResult.Data -> {
|
||||
logD("${if (result.refreshedFromNetwork) "NETWORK" else "CACHE"}: ${result.data ?: "null"}")
|
||||
logD("${if (result.refreshedFromNetwork) "NETWORK" else "CACHE"}: ${result.data}")
|
||||
ScheduleUiState(
|
||||
isLoading = false,
|
||||
data = result.data,
|
||||
|
||||
Reference in New Issue
Block a user