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

merge fix

Browse Source
This commit is contained in:
Shcherbatykh Oleg
2026-02-27 11:01:47 +03:00
parent 1f6e7b8ac0
commit 993ab0a0b1
2 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/ru/fincode/tsudesk/di/NetworkDebugModule.kt
View File

@@ -1,28 +0,0 @@
package ru.fincode.tsudesk.di
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import ru.fincode.tsudesk.BuildConfig
import ru.fincode.tsudesk.core.common.app.AppConfig
import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
object AppConfigModule {
private const val BASE_URL_PROD = "https://tulsu.ru/schedule/queries/"
private const val BASE_URL_DEVELOP = "https://scherbatykh.ru/app/tsudesk/"
@Provides
@Singleton
fun provideAppConfig(): AppConfig {
val baseUrl = if (BuildConfig.DEBUG) BASE_URL_PROD else BASE_URL_PROD
return AppConfig(
isDebug = BuildConfig.DEBUG,
baseUrl = baseUrl,
networkTimeoutSec = 30L
)
}
}

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

@@ -9,7 +9,6 @@ import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController import androidx.navigation.compose.rememberNavController
import ru.fincode.tsudesk.core.navigation.AppRoute import ru.fincode.tsudesk.core.navigation.AppRoute
import ru.fincode.tsudesk.core.navigation.navigateRoute import ru.fincode.tsudesk.core.navigation.navigateRoute
import ru.fincode.tsudesk.feature.news.presentation.screen.NewsRoute
import ru.fincode.tsudesk.presentation.main.MainScaffold import ru.fincode.tsudesk.presentation.main.MainScaffold
import ru.fincode.tsudesk.feature.schedule.presentation.screen.ScheduleRoute import ru.fincode.tsudesk.feature.schedule.presentation.screen.ScheduleRoute
import ru.fincode.tsudesk.feature.splash.presentation.screen.SplashRoute import ru.fincode.tsudesk.feature.splash.presentation.screen.SplashRoute
@@ -74,4 +73,9 @@ private fun MainTabsNavHost(
// SettingsRoute(modifier = Modifier) // SettingsRoute(modifier = Modifier)
} }
} }
}
@Composable
fun NewsRoute(modifier: Modifier) {
TODO("Not yet implemented")
} }