[feat] 네트워크 연결 상태 확인 (로딩,에러 뷰)

app/src/main/AndroidManifest.xml

@@ -14,6 +14,7 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <uses-permission
         android:name="android.permission.READ_EXTERNAL_STORAGE"

app/src/main/java/sopt/motivoo/data/datasource/remote/AuthInterceptor.kt → app/src/main/java/sopt/motivoo/data/datasource/remote/intercepter/AuthInterceptor.kt

@@ -1,4 +1,4 @@
-package sopt.motivoo.data.datasource.remote
+package sopt.motivoo.data.datasource.remote.intercepter
 
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json

app/src/main/java/sopt/motivoo/data/datasource/remote/intercepter/ErrorInterceptor.kt

@@ -0,0 +1,31 @@
+package sopt.motivoo.data.datasource.remote.intercepter
+
+import okhttp3.Interceptor
+import okhttp3.Response
+import sopt.motivoo.data.datasource.remote.listener.NetworkErrorListener
+import javax.inject.Inject
+
+class ErrorInterceptor @Inject constructor(
+    private val networkErrorListener: NetworkErrorListener,
+) : Interceptor {
+    override fun intercept(chain: Interceptor.Chain): Response {
+        val request = chain.request()
+        var response = chain.proceed(chain.request())
+
+        when (response.code) {
+
+            in SERVER_ERROR_START..SERVER_ERROR_END -> {
+                networkErrorListener.onApiCallFailed()
+
+                response.close()
+                response = chain.proceed(request)
+            }
+        }
+        return response
+    }
+
+    companion object {
+        private const val SERVER_ERROR_START = 500
+        private const val SERVER_ERROR_END = 599
+    }
+}

app/src/main/java/sopt/motivoo/data/datasource/remote/listener/AuthTokenRefreshListener.kt

@@ -2,4 +2,6 @@ package sopt.motivoo.data.datasource.remote.listener
 
 interface AuthTokenRefreshListener {
     fun onTokenRefreshFailed()
+    fun setOnTokenRefreshFailedCallback(callback: () -> Unit)
+    fun clearOnTokenRefreshFailedCallback()
 }

app/src/main/java/sopt/motivoo/data/datasource/remote/listener/AuthTokenRefreshListenerImpl.kt

@@ -3,11 +3,17 @@ package sopt.motivoo.data.datasource.remote.listener
 import javax.inject.Inject
 
 class AuthTokenRefreshListenerImpl @Inject constructor() : AuthTokenRefreshListener {
-    lateinit var onTokenRefreshFailedCallback: (() -> Unit)
+    private var onTokenRefreshFailedCallback: (() -> Unit)? = null
 
     override fun onTokenRefreshFailed() {
-        if (this::onTokenRefreshFailedCallback.isInitialized) {
-            onTokenRefreshFailedCallback()
-        }
+        onTokenRefreshFailedCallback?.invoke()
+    }
+
+    override fun setOnTokenRefreshFailedCallback(callback: () -> Unit) {
+        onTokenRefreshFailedCallback = callback
+    }
+
+    override fun clearOnTokenRefreshFailedCallback() {
+        onTokenRefreshFailedCallback = null
     }
 }

app/src/main/java/sopt/motivoo/data/datasource/remote/listener/NetworkErrorListener.kt

@@ -0,0 +1,7 @@
+package sopt.motivoo.data.datasource.remote.listener
+
+interface NetworkErrorListener {
+    fun onApiCallFailed()
+    fun setOnApiCallFailedCallback(callback: () -> Unit)
+    fun clearOnApiCallFailedCallback()
+}

app/src/main/java/sopt/motivoo/data/datasource/remote/listener/NetworkErrorListenerImpl.kt

@@ -0,0 +1,19 @@
+package sopt.motivoo.data.datasource.remote.listener
+
+import javax.inject.Inject
+
+class NetworkErrorListenerImpl @Inject constructor() : NetworkErrorListener {
+    private var onApiCallFailedCallback: (() -> Unit)? = null
+
+    override fun onApiCallFailed() {
+        onApiCallFailedCallback?.invoke()
+    }
+
+    override fun setOnApiCallFailedCallback(callback: () -> Unit) {
+        onApiCallFailedCallback = callback
+    }
+
+    override fun clearOnApiCallFailedCallback() {
+        onApiCallFailedCallback = null
+    }
+}

app/src/main/java/sopt/motivoo/data/repository/NetworkRepositoryImpl.kt

@@ -0,0 +1,21 @@
+package sopt.motivoo.data.repository
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import sopt.motivoo.domain.repository.NetworkRepository
+import sopt.motivoo.util.NetworkStateLiveData
+import javax.inject.Inject
+
+class NetworkRepositoryImpl @Inject constructor(
+    networkState: NetworkStateLiveData
+) : NetworkRepository {
+
+    override val networkStateLiveData = networkState
+
+    private val _isLoading = MutableLiveData<Boolean>()
+    override val isLoading: LiveData<Boolean> = _isLoading
+
+    override fun setLoading(isLoading: Boolean) {
+        _isLoading.value = isLoading
+    }
+}

app/src/main/java/sopt/motivoo/di/Logger.kt

@@ -4,4 +4,8 @@ import javax.inject.Qualifier
 
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
-annotation class Logger
+annotation class AuthInterceptorQualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class ErrorInterceptorQualifier

app/src/main/java/sopt/motivoo/di/NetworkModule.kt

@@ -0,0 +1,21 @@
+package sopt.motivoo.di
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import sopt.motivoo.util.NetworkStateLiveData
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+
+    @Provides
+    @Singleton
+    fun provideNetworkStateLiveData(@ApplicationContext context: Context): NetworkStateLiveData {
+        return NetworkStateLiveData(context)
+    }
+}

app/src/main/java/sopt/motivoo/di/RepositoryModule.kt

@@ -6,12 +6,14 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import sopt.motivoo.data.repository.AuthRepositoryImpl
 import sopt.motivoo.data.repository.DummyRepositoryImpl
-import sopt.motivoo.data.repository.OnboardingRepositoryImpl
 import sopt.motivoo.data.repository.HomeRepositoryImpl
+import sopt.motivoo.data.repository.NetworkRepositoryImpl
+import sopt.motivoo.data.repository.OnboardingRepositoryImpl
 import sopt.motivoo.domain.repository.AuthRepository
 import sopt.motivoo.domain.repository.DummyRepository
-import sopt.motivoo.domain.repository.OnboardingRepository
 import sopt.motivoo.domain.repository.HomeRepository
+import sopt.motivoo.domain.repository.NetworkRepository
+import sopt.motivoo.domain.repository.OnboardingRepository
 import javax.inject.Singleton
 
 @Module
@@ -37,4 +39,9 @@ object RepositoryModule {
     @Singleton
     fun providesOnboardingRepository(onboardingRepositoryImpl: OnboardingRepositoryImpl): OnboardingRepository =
         onboardingRepositoryImpl
+
+    @Provides
+    @Singleton
+    fun providesNetworkRepository(networkRepositoryImpl: NetworkRepositoryImpl): NetworkRepository =
+        networkRepositoryImpl
 }

app/src/main/java/sopt/motivoo/di/RetrofitModule.kt

@@ -14,9 +14,12 @@ import retrofit2.Retrofit
 import sopt.motivoo.BuildConfig.BASE_URL
 import sopt.motivoo.BuildConfig.DEBUG
 import sopt.motivoo.data.datasource.local.MotivooStorageImpl
-import sopt.motivoo.data.datasource.remote.AuthInterceptor
+import sopt.motivoo.data.datasource.remote.intercepter.AuthInterceptor
+import sopt.motivoo.data.datasource.remote.intercepter.ErrorInterceptor
 import sopt.motivoo.data.datasource.remote.listener.AuthTokenRefreshListener
 import sopt.motivoo.data.datasource.remote.listener.AuthTokenRefreshListenerImpl
+import sopt.motivoo.data.datasource.remote.listener.NetworkErrorListener
+import sopt.motivoo.data.datasource.remote.listener.NetworkErrorListenerImpl
 import sopt.motivoo.domain.entity.MotivooStorage
 import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
@@ -32,14 +35,36 @@ object RetrofitModule {
 
     @Provides
     @Singleton
-    @Logger
-    fun provideAuthInterceptor(interceptor: AuthInterceptor): Interceptor = interceptor
+    @AuthInterceptorQualifier
+    fun provideAuthInterceptor(authInterceptor: AuthInterceptor): Interceptor = authInterceptor
 
     @Provides
     @Singleton
     fun provideRefreshListener(authTokenRefreshListenerImpl: AuthTokenRefreshListenerImpl): AuthTokenRefreshListener =
         authTokenRefreshListenerImpl
 
+    @Provides
+    @Singleton
+    @ErrorInterceptorQualifier
+    fun provideErrorInterceptor(errorInterceptor: ErrorInterceptor): Interceptor = errorInterceptor
+
+    @Provides
+    @Singleton
+    fun provideNetworkErrorListener(networkErrorListenerImpl: NetworkErrorListenerImpl): NetworkErrorListener =
+        networkErrorListenerImpl
+
+    @Provides
+    @Singleton
+    fun providesLoggingInterceptor(): HttpLoggingInterceptor {
+        return HttpLoggingInterceptor().apply {
+            level = if (DEBUG) {
+                HttpLoggingInterceptor.Level.BODY
+            } else {
+                HttpLoggingInterceptor.Level.NONE
+            }
+        }
+    }
+
     @Provides
     @Singleton
     fun provideJson(): Json = Json {
@@ -52,22 +77,17 @@ object RetrofitModule {
     @Provides
     @Singleton
     fun providesOkHttpClient(
-        @Logger loggingInterceptor: Interceptor,
+        loggingInterceptor: HttpLoggingInterceptor,
+        @AuthInterceptorQualifier authInterceptor: Interceptor,
+        @ErrorInterceptorQualifier errorInterceptor: Interceptor,
     ): OkHttpClient =
         OkHttpClient.Builder().apply {
             connectTimeout(10, TimeUnit.SECONDS)
             writeTimeout(10, TimeUnit.SECONDS)
             readTimeout(10, TimeUnit.SECONDS)
+            addInterceptor(authInterceptor)
+            addInterceptor(errorInterceptor)
             addInterceptor(loggingInterceptor)
-            if (DEBUG) {
-                addInterceptor(
-                    HttpLoggingInterceptor().apply {
-                        level = HttpLoggingInterceptor.Level.BODY
-                    },
-                )
-            } else {
-                HttpLoggingInterceptor.Level.NONE
-            }
         }.build()
 
     @Provides

app/src/main/java/sopt/motivoo/domain/repository/NetworkRepository.kt

@@ -0,0 +1,10 @@
+package sopt.motivoo.domain.repository
+
+import androidx.lifecycle.LiveData
+
+interface NetworkRepository {
+
+    val networkStateLiveData: LiveData<Boolean>
+    val isLoading: LiveData<Boolean>
+    fun setLoading(isLoading: Boolean)
+}