merge fix
This commit is contained in:
@@ -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
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,6 @@ import androidx.navigation.compose.composable
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import ru.fincode.tsudesk.core.navigation.AppRoute
|
||||
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.feature.schedule.presentation.screen.ScheduleRoute
|
||||
import ru.fincode.tsudesk.feature.splash.presentation.screen.SplashRoute
|
||||
@@ -75,3 +74,8 @@ private fun MainTabsNavHost(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun NewsRoute(modifier: Modifier) {
|
||||
TODO("Not yet implemented")
|
||||
}
|
||||
Reference in New Issue
Block a user