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

Merge branch 'develop' of https://github.com/finocd2la/TSUDesk into feature/news-ui

Browse Source
This commit is contained in:
Shcherbatykh Oleg
2026-02-27 11:32:55 +03:00
parent 2987289581 0482f03e09
commit c2efbd1f75
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ru/fincode/tsudesk/di/AppConfigModule.kt
View File

@@ -14,7 +14,7 @@ private const val BASE_TIMEOUT = 30L
@InstallIn(SingletonComponent::class) @InstallIn(SingletonComponent::class)
object AppConfigModule { object AppConfigModule {
private const val BASE_URL_PROD = "https://tulsu.ru/schedule/queries/" private const val BASE_URL_PROD = "https://tulsu.ru/"
private const val BASE_URL_DEVELOP = "https://scherbatykh.ru/app/tsudesk/" private const val BASE_URL_DEVELOP = "https://scherbatykh.ru/app/tsudesk/"
@Provides @Provides

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

@@ -9,7 +9,7 @@ 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.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
@@ -63,7 +63,7 @@ private fun MainTabsNavHost(
} }
composable<AppRoute.News> { composable<AppRoute.News> {
NewsRoute(modifier = Modifier.fillMaxSize()) // NewsRoute(modifier = Modifier.fillMaxSize())
} }
composable<AppRoute.Progress> { composable<AppRoute.Progress> {

2
feature/schedule/src/main/java/ru/fincode/tsudesk/feature/schedule/data/remote/Constants.kt
View File

@@ -3,7 +3,7 @@ package ru.fincode.tsudesk.feature.schedule.data.remote
object ScheduleApiContract { object ScheduleApiContract {
object Path { object Path {
const val GET_SCHEDULE_METHOD = "GetSchedule.php" const val GET_SCHEDULE_METHOD = "schedule/queries/GetSchedule.php"
} }
object Query { object Query {