setting up network module

Author: jumaallan

app/src/main/java/com/hover/stax/di/Modules.kt

@@ -137,13 +137,6 @@ val ktorModule = module {
 
     single { EnvironmentProvider(androidApplication(), get()) }
 
-    single {
-        KtorClientFactory(get(), get()).create(
-            Android.create {
-                connectTimeout = TIMEOUT
-            }
-        )
-    }
 }
 
 val datastoreModule = module {

internal/datastore/src/main/java/com/hover/stax/datastore/di/DataStoreModule.kt

@@ -16,22 +16,24 @@
 package com.hover.stax.datastore.di
 
 import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
+import androidx.datastore.preferences.SharedPreferencesMigration
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.emptyPreferences
+import androidx.datastore.preferences.preferencesDataStoreFile
+import com.hover.stax.datastore.DefaultTokenProvider
+import com.hover.stax.datastore.TokenProvider
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import javax.inject.Singleton
-import androidx.datastore.core.DataStore
-import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
-import androidx.datastore.preferences.core.PreferenceDataStoreFactory
-import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.preferencesDataStoreFile
-import androidx.datastore.preferences.SharedPreferencesMigration
-import androidx.datastore.preferences.core.emptyPreferences
-import kotlinx.coroutines.Dispatchers
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -56,4 +58,9 @@ object DataStoreModule {
         ) {
             context.preferencesDataStoreFile(name = "stax.datastore")
         }
+
+    @Provides
+    @Singleton
+    fun provideTokenProvider(datastore: DataStore<Preferences>): TokenProvider =
+        DefaultTokenProvider(datastore)
 }

internal/network/build.gradle.kts

@@ -19,6 +19,9 @@ plugins {
 }
 
 dependencies {
+    implementation(project(":internal:datastore"))
+
     implementation(libs.core.ktx)
+
     api(libs.bundles.network)
 }

internal/network/src/main/java/com/hover/stax/network/di/NetworkModule.kt

@@ -0,0 +1,43 @@
+package com.hover.stax.network.di
+
+import android.content.Context
+import com.hover.stax.datastore.TokenProvider
+import com.hover.stax.network.ktor.EnvironmentProvider
+import com.hover.stax.network.ktor.KtorClientFactory
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.HttpClientEngine
+import io.ktor.client.engine.android.Android
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+
+    @Provides
+    @Singleton
+    fun provideHttpClientEngine(): HttpClientEngine = Android.create {
+        connectTimeout = 10_000
+    }
+
+    @Provides
+    @Singleton
+    fun providesEnvironmentProvider(
+        @ApplicationContext context: Context,
+    ): EnvironmentProvider = EnvironmentProvider(
+        context,
+    )
+
+    @Provides
+    @Singleton
+    fun provideHttpClient(
+        engine: HttpClientEngine,
+        tokenProvider: TokenProvider,
+        environmentProvider: EnvironmentProvider
+    ): HttpClient =
+        KtorClientFactory(tokenProvider, environmentProvider).create(engine)
+}

app/src/main/java/com/hover/stax/ktor/EnvironmentProvider.kt renamed to internal/network/src/main/java/com/hover/stax/network/ktor/EnvironmentProvider.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.hover.stax.ktor
+package com.hover.stax.network.ktor
 
 import android.content.Context
 import com.hover.stax.BuildConfig

app/src/main/java/com/hover/stax/ktor/KtorClientFactory.kt renamed to internal/network/src/main/java/com/hover/stax/network/ktor/KtorClientFactory.kt

@@ -1,22 +1,5 @@
-/*
- * Copyright 2022 Stax
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.hover.stax.ktor
-
-import com.hover.stax.data.remote.dto.authorization.TokenRefresh
-import com.hover.stax.data.remote.dto.authorization.TokenResponse
+package com.hover.stax.network.ktor
+
 import com.hover.stax.datastore.DefaultTokenProvider
 import com.hover.stax.datastore.TokenProvider
 import io.ktor.client.HttpClient
@@ -42,8 +25,6 @@ import io.ktor.serialization.kotlinx.json.json
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.serialization.json.Json
 
-private const val REFRESH = "refresh_token"
-
 class KtorClientFactory(
     private val tokenProvider: TokenProvider,
     private val environmentProvider: EnvironmentProvider