fincode/TSUDesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean project

Browse Source
This commit is contained in:
Shcherbatykh Oleg
2026-02-19 16:54:49 +03:00
parent 6a45abf297
commit 5ba600cc09
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ru/fincode/tsudesk/ui/TSUDeskApp.kt
View File

@@ -1,6 +1,5 @@
package ru.fincode.tsudesk.ui package ru.fincode.tsudesk.ui
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@@ -18,8 +17,7 @@ fun TSUDeskApp() {
color = MaterialTheme.colorScheme.background color = MaterialTheme.colorScheme.background
) { ) {
AppNavHost( AppNavHost(
navController = navController, navController = navController
contentPadding = PaddingValues()
) )
} }
} }

6
app/src/main/java/ru/fincode/tsudesk/ui/navigation/AppNavHost.kt
View File

@@ -1,6 +1,5 @@
package ru.fincode.tsudesk.ui.navigation package ru.fincode.tsudesk.ui.navigation
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost import androidx.navigation.compose.NavHost
@@ -11,8 +10,7 @@ import ru.fincode.tsudesk.feature.splash.presentation.navigation.splashGraph
@Composable @Composable
fun AppNavHost( fun AppNavHost(
navController: NavHostController, navController: NavHostController
contentPadding: PaddingValues
) { ) {
NavHost( NavHost(
navController = navController, navController = navController,
@@ -23,7 +21,7 @@ fun AppNavHost(
navigation<AppRoute.Main>( navigation<AppRoute.Main>(
startDestination = AppRoute.Schedule startDestination = AppRoute.Schedule
) { ) {
scheduleGraph(navController) scheduleGraph()
// newsGraph(navController) // newsGraph(navController)
// progressGraph(navController) // progressGraph(navController)
} }

2
feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/presentation/navigation/ScheduleGraph.kt
View File

@@ -1,13 +1,11 @@
package ru.fincode.tsudesk.feature.schedule.presentation.navigation package ru.fincode.tsudesk.feature.schedule.presentation.navigation
import androidx.navigation.NavGraphBuilder import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
import ru.fincode.tsudesk.core.navigation.AppRoute import ru.fincode.tsudesk.core.navigation.AppRoute
import ru.fincode.tsudesk.feature.schedule.presentation.screen.ScheduleRoute import ru.fincode.tsudesk.feature.schedule.presentation.screen.ScheduleRoute
fun NavGraphBuilder.scheduleGraph( fun NavGraphBuilder.scheduleGraph(
navController: NavHostController
) { ) {
composable<AppRoute.Schedule> { composable<AppRoute.Schedule> {
ScheduleRoute() ScheduleRoute()

2
feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/presentation/screen/ScheduleViewModel.kt
View File

@@ -27,7 +27,7 @@ class ScheduleViewModel @Inject constructor(
val state: StateFlow<ScheduleUiState> = observeScheduleUseCase(scheduleType).map { result -> val state: StateFlow<ScheduleUiState> = observeScheduleUseCase(scheduleType).map { result ->
when (result) { when (result) {
is DataResult.Data -> { is DataResult.Data -> {
logD("${if (result.refreshedFromNetwork) "NETWORK" else "CACHE"}: ${result.data ?: "null"}") logD("${if (result.refreshedFromNetwork) "NETWORK" else "CACHE"}: ${result.data}")
ScheduleUiState( ScheduleUiState(
isLoading = false, isLoading = false,
data = result.data, data = result.data,