From 5ba600cc094a4613a9b0ef936fba6a4efe7913a3 Mon Sep 17 00:00:00 2001 From: Shcherbatykh Oleg Date: Thu, 19 Feb 2026 16:54:49 +0300 Subject: [PATCH] clean project --- app/src/main/java/ru/fincode/tsudesk/ui/TSUDeskApp.kt | 4 +--- .../java/ru/fincode/tsudesk/ui/navigation/AppNavHost.kt | 6 ++---- .../schedule/presentation/navigation/ScheduleGraph.kt | 2 -- .../schedule/presentation/screen/ScheduleViewModel.kt | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/ru/fincode/tsudesk/ui/TSUDeskApp.kt b/app/src/main/java/ru/fincode/tsudesk/ui/TSUDeskApp.kt index c301c87..fb13721 100644 --- a/app/src/main/java/ru/fincode/tsudesk/ui/TSUDeskApp.kt +++ b/app/src/main/java/ru/fincode/tsudesk/ui/TSUDeskApp.kt @@ -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 ) } } diff --git a/app/src/main/java/ru/fincode/tsudesk/ui/navigation/AppNavHost.kt b/app/src/main/java/ru/fincode/tsudesk/ui/navigation/AppNavHost.kt index 1903778..d624f36 100644 --- a/app/src/main/java/ru/fincode/tsudesk/ui/navigation/AppNavHost.kt +++ b/app/src/main/java/ru/fincode/tsudesk/ui/navigation/AppNavHost.kt @@ -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( startDestination = AppRoute.Schedule ) { - scheduleGraph(navController) + scheduleGraph() // newsGraph(navController) // progressGraph(navController) } diff --git a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/presentation/navigation/ScheduleGraph.kt b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/presentation/navigation/ScheduleGraph.kt index 9d95dba..1f70f05 100644 --- a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/presentation/navigation/ScheduleGraph.kt +++ b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/presentation/navigation/ScheduleGraph.kt @@ -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 { ScheduleRoute() diff --git a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/presentation/screen/ScheduleViewModel.kt b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/presentation/screen/ScheduleViewModel.kt index 9f2df18..eabcea7 100644 --- a/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/presentation/screen/ScheduleViewModel.kt +++ b/feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/presentation/screen/ScheduleViewModel.kt @@ -27,7 +27,7 @@ class ScheduleViewModel @Inject constructor( val state: StateFlow = 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,