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

Add build type params, fix network module structure

Browse Source
This commit is contained in:
Shcherbatykh Oleg
2026-02-13 10:34:09 +03:00
parent 314adaff43
commit 6a41e301d9
14 changed files with 88 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@@ -29,6 +29,9 @@ android {
)
}
}
buildFeatures {
buildConfig = true
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
@@ -51,6 +54,7 @@ dependencies {
implementation(libs.okhttp)
implementation(libs.retrofit)
implementation(project(":core:common"))
implementation(project(":core:network"))
implementation(project(":core:database"))

24
app/src/main/java/ru/fincode/tsudesk/di/NetworkDebugModule.kt Normal file
View File

@@ -0,0 +1,24 @@
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.config.AppConfig
import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
object AppConfigModule {
const val BASE_URL = "https://tulsu.ru/schedule/queries/"
@Provides
@Singleton
fun provideAppConfig(): AppConfig =
AppConfig(
isDebug = BuildConfig.DEBUG,
baseUrl = BASE_URL,
networkTimeoutSec = 30L
)
}

4
core/common/src/main/AndroidManifest.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>

7
core/common/src/main/java/ru/fincode/tsudesk/core/common/config/AppConfig.kt Normal file
View File

@@ -0,0 +1,7 @@
package ru.fincode.tsudesk.core.common.config
data class AppConfig(
val isDebug: Boolean,
val baseUrl: String,
val networkTimeoutSec: Long
)

4
core/database/src/main/AndroidManifest.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>

2
core/network/build.gradle.kts
View File

@@ -48,4 +48,6 @@ dependencies {
api(libs.moshi)
api(libs.moshiKotlin)
api(libs.retrofitMoshi)
implementation(project(":core:common"))
}

4
core/network/src/main/AndroidManifest.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>

2
core/network/src/main/java/ru/fincode/tsudesk/core/network/Constants.kt
View File

@@ -1,5 +1,5 @@
package ru.fincode.tsudesk.core.network
object Constants {
const val BASE_URL = "https://tulsu.ru/schedule/queries/"
}

29
core/network/src/main/java/ru/fincode/tsudesk/core/network/OkHttpClientFactory.kt Normal file
View File

@@ -0,0 +1,29 @@
package ru.fincode.tsudesk.core.network
import okhttp3.OkHttpClient
import ru.fincode.tsudesk.core.common.config.AppConfig
import ru.fincode.tsudesk.core.network.interceptor.DebugInterceptor
import java.util.concurrent.TimeUnit
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
class OkHttpClientFactory @Inject constructor(
private val appConfig: AppConfig,
private val debugInterceptor: DebugInterceptor
) {
fun create(): OkHttpClient {
val builder = OkHttpClient.Builder()
.connectTimeout(appConfig.networkTimeoutSec, TimeUnit.SECONDS)
.readTimeout(appConfig.networkTimeoutSec, TimeUnit.SECONDS)
.writeTimeout(appConfig.networkTimeoutSec, TimeUnit.SECONDS)
.retryOnConnectionFailure(true)
if (appConfig.isDebug) {
builder.addInterceptor(debugInterceptor)
}
return builder.build()
}
}

8
core/network/src/main/java/ru/fincode/tsudesk/core/network/RetrofitProvider.kt → core/network/src/main/java/ru/fincode/tsudesk/core/network/RetrofitFactory.kt
View File

@@ -1,21 +1,21 @@
package ru.fincode.tsudesk.core.network
import com.squareup.moshi.Moshi
import okhttp3.OkHttpClient
import retrofit2.Retrofit
import retrofit2.converter.moshi.MoshiConverterFactory
import javax.inject.Inject
import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import javax.inject.Inject
import javax.inject.Singleton
@Singleton
class RetrofitProvider @Inject constructor() {
class RetrofitFactory @Inject constructor() {
private val moshi: Moshi = Moshi.Builder()
.add(KotlinJsonAdapterFactory())
.build()
fun execute(baseUrl: String, client: OkHttpClient): Retrofit =
fun create(baseUrl: String, client: OkHttpClient): Retrofit =
Retrofit.Builder()
.baseUrl(baseUrl)
.client(client)

17
core/network/src/main/java/ru/fincode/tsudesk/core/network/di/OkHttpModule.kt
View File

@@ -5,26 +5,15 @@ import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import okhttp3.OkHttpClient
import ru.fincode.tsudesk.core.network.interceptor.DebugInterceptor
import java.util.concurrent.TimeUnit
import ru.fincode.tsudesk.core.network.OkHttpClientFactory
import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
object OkHttpModule {
private const val TIMEOUT = 30L
@Provides
@Singleton
fun provideOkHttpClient(
): OkHttpClient {
return OkHttpClient.Builder()
.connectTimeout(TIMEOUT, TimeUnit.SECONDS)
.readTimeout(TIMEOUT, TimeUnit.SECONDS)
.writeTimeout(TIMEOUT, TimeUnit.SECONDS)
.retryOnConnectionFailure(true)
.addInterceptor(DebugInterceptor())
.build()
}
fun provideOkHttpClient(factory: OkHttpClientFactory): OkHttpClient =
factory.create()
}

14
core/network/src/main/java/ru/fincode/tsudesk/core/network/di/RetrofitModule.kt
View File

@@ -6,8 +6,8 @@ import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import okhttp3.OkHttpClient
import retrofit2.Retrofit
import ru.fincode.tsudesk.core.network.Constants
import ru.fincode.tsudesk.core.network.RetrofitProvider
import ru.fincode.tsudesk.core.common.config.AppConfig
import ru.fincode.tsudesk.core.network.RetrofitFactory
import javax.inject.Singleton
@Module
@@ -17,8 +17,12 @@ object RetrofitModule {
@Provides
@Singleton
fun provideRetrofit(
provider: RetrofitProvider,
client: OkHttpClient
factory: RetrofitFactory,
client: OkHttpClient,
appConfig: AppConfig
): Retrofit =
provider.execute(Constants.BASE_URL, client)
factory.create(
baseUrl = appConfig.baseUrl,
client = client
)
}

6
core/network/src/main/java/ru/fincode/tsudesk/core/network/interceptor/DebugInterceptor.kt
View File

@@ -3,17 +3,19 @@ package ru.fincode.tsudesk.core.network.interceptor
import android.util.Log
import okhttp3.Interceptor
import okhttp3.Response
import javax.inject.Inject
import javax.inject.Singleton
private const val TAG = "NETWORK_DEBUG"
class DebugInterceptor : Interceptor {
@Singleton
class DebugInterceptor @Inject constructor() : Interceptor {
override fun intercept(chain: Interceptor.Chain): Response {
val request = chain.request()
Log.d(TAG, "URL: ${request.url}")
Log.d(TAG, "Method: ${request.method}")
Log.d(TAG, "Headers: ${request.headers}")
return chain.proceed(request)
}

4
core/ui/src/main/AndroidManifest.xml
View File

@@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
</manifest>