[Chore] Refactor data module packages

nimblehq · Oct 5, 2023 · 2b09924 · 2b09924
1 parent 0a6b800
commit 2b09924
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 35 deletions.
diff --git a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/MoshiModule.kt b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/MoshiModule.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.template.compose.di.modules
 
-import co.nimblehq.template.compose.data.services.providers.MoshiBuilderProvider
+import co.nimblehq.template.compose.data.remote.providers.MoshiBuilderProvider
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides

diff --git a/...ate-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RepositoryModule.kt b/...ate-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RepositoryModule.kt
@@ -1,7 +1,7 @@
 package co.nimblehq.template.compose.di.modules
 
+import co.nimblehq.template.compose.data.remote.services.ApiService
 import co.nimblehq.template.compose.data.repositories.RepositoryImpl
-import co.nimblehq.template.compose.data.services.ApiService
 import co.nimblehq.template.compose.domain.repositories.Repository
 import dagger.Module
 import dagger.Provides

diff --git a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RetrofitModule.kt b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RetrofitModule.kt
@@ -1,8 +1,8 @@
 package co.nimblehq.template.compose.di.modules
 
 import co.nimblehq.template.compose.BuildConfig
-import co.nimblehq.template.compose.data.services.ApiService
-import co.nimblehq.template.compose.data.services.providers.*
+import co.nimblehq.template.compose.data.remote.providers.*
+import co.nimblehq.template.compose.data.remote.services.ApiService
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides

diff --git a/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/StorageModule.kt b/template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/StorageModule.kt
@@ -1,7 +1,7 @@
 package co.nimblehq.template.compose.di.modules
 
 import android.content.Context
-import co.nimblehq.template.compose.data.storages.EncryptedSharedPreferences
+import co.nimblehq.template.compose.data.local.storages.EncryptedSharedPreferences
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

diff --git a/...ompose/data/src/main/java/co/nimblehq/template/compose/data/extensions/ResponseMapping.kt b/...ompose/data/src/main/java/co/nimblehq/template/compose/data/extensions/ResponseMapping.kt
@@ -1,8 +1,8 @@
 package co.nimblehq.template.compose.data.extensions
 
-import co.nimblehq.template.compose.data.responses.ErrorResponse
-import co.nimblehq.template.compose.data.responses.toModel
-import co.nimblehq.template.compose.data.services.providers.MoshiBuilderProvider
+import co.nimblehq.template.compose.data.remote.models.responses.ErrorResponse
+import co.nimblehq.template.compose.data.remote.models.responses.toModel
+import co.nimblehq.template.compose.data.remote.providers.MoshiBuilderProvider
 import co.nimblehq.template.compose.domain.exceptions.ApiException
 import co.nimblehq.template.compose.domain.exceptions.NoConnectivityException
 import com.squareup.moshi.JsonDataException

diff --git a/...se/data/storages/BaseSharedPreferences.kt → ...a/local/storages/BaseSharedPreferences.kt b/...se/data/storages/BaseSharedPreferences.kt → ...a/local/storages/BaseSharedPreferences.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.storages
+package co.nimblehq.template.compose.data.local.storages
 
 import android.content.SharedPreferences
 

diff --git a/...ta/storages/EncryptedSharedPreferences.kt → ...al/storages/EncryptedSharedPreferences.kt b/...ta/storages/EncryptedSharedPreferences.kt → ...al/storages/EncryptedSharedPreferences.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.storages
+package co.nimblehq.template.compose.data.local.storages
 
 import android.content.Context
 import androidx.security.crypto.EncryptedSharedPreferences

diff --git a/...ose/data/storages/SharedPreferencesExt.kt → ...ta/local/storages/SharedPreferencesExt.kt b/...ose/data/storages/SharedPreferencesExt.kt → ...ta/local/storages/SharedPreferencesExt.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.storages
+package co.nimblehq.template.compose.data.local.storages
 
 import android.content.SharedPreferences
 

diff --git a/...lehq/template/compose/data/requests/.keep → .../compose/data/remote/authenticators/.keep b/...lehq/template/compose/data/requests/.keep → .../compose/data/remote/authenticators/.keep
diff --git a/...te-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/interceptors/.keep b/...te-compose/data/src/main/java/co/nimblehq/template/compose/data/remote/interceptors/.keep
diff --git a/...compose/data/src/main/java/co/nimblehq/template/compose/data/remote/models/requests/.keep b/...compose/data/src/main/java/co/nimblehq/template/compose/data/remote/models/requests/.keep
diff --git a/...e/compose/data/responses/ErrorResponse.kt → .../remote/models/responses/ErrorResponse.kt b/...e/compose/data/responses/ErrorResponse.kt → .../remote/models/responses/ErrorResponse.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.responses
+package co.nimblehq.template.compose.data.remote.models.responses
 
 import co.nimblehq.template.compose.domain.models.Error
 import com.squareup.moshi.Json

diff --git a/...mplate/compose/data/responses/Response.kt → .../data/remote/models/responses/Response.kt b/...mplate/compose/data/responses/Response.kt → .../data/remote/models/responses/Response.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.responses
+package co.nimblehq.template.compose.data.remote.models.responses
 
 import co.nimblehq.template.compose.domain.models.Model
 import com.squareup.moshi.Json

diff --git a/.../services/providers/ApiServiceProvider.kt → ...ta/remote/providers/ApiServiceProvider.kt b/.../services/providers/ApiServiceProvider.kt → ...ta/remote/providers/ApiServiceProvider.kt
@@ -1,6 +1,6 @@
-package co.nimblehq.template.compose.data.services.providers
+package co.nimblehq.template.compose.data.remote.providers
 
-import co.nimblehq.template.compose.data.services.ApiService
+import co.nimblehq.template.compose.data.remote.services.ApiService
 import retrofit2.Retrofit
 
 object ApiServiceProvider {

diff --git a/...ces/providers/ConverterFactoryProvider.kt → ...ote/providers/ConverterFactoryProvider.kt b/...ces/providers/ConverterFactoryProvider.kt → ...ote/providers/ConverterFactoryProvider.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.services.providers
+package co.nimblehq.template.compose.data.remote.providers
 
 import com.squareup.moshi.Moshi
 import retrofit2.Converter

diff --git a/...ervices/providers/MoshiBuilderProvider.kt → .../remote/providers/MoshiBuilderProvider.kt b/...ervices/providers/MoshiBuilderProvider.kt → .../remote/providers/MoshiBuilderProvider.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.services.providers
+package co.nimblehq.template.compose.data.remote.providers
 
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter

diff --git a/...ta/services/providers/RetrofitProvider.kt → ...data/remote/providers/RetrofitProvider.kt b/...ta/services/providers/RetrofitProvider.kt → ...data/remote/providers/RetrofitProvider.kt
@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.services.providers
+package co.nimblehq.template.compose.data.remote.providers
 
 import okhttp3.OkHttpClient
 import retrofit2.Converter

diff --git a/...ompose/data/src/main/java/co/nimblehq/template/compose/data/remote/services/ApiService.kt b/...ompose/data/src/main/java/co/nimblehq/template/compose/data/remote/services/ApiService.kt
@@ -0,0 +1,10 @@
+package co.nimblehq.template.compose.data.remote.services
+
+import co.nimblehq.template.compose.data.remote.models.responses.Response
+import retrofit2.http.GET
+
+interface ApiService {
+
+    @GET("users")
+    suspend fun getResponses(): List<Response>
+}
diff --git a/...mpose/data/src/main/java/co/nimblehq/template/compose/data/repositories/RepositoryImpl.kt b/...mpose/data/src/main/java/co/nimblehq/template/compose/data/repositories/RepositoryImpl.kt
@@ -1,8 +1,8 @@
 package co.nimblehq.template.compose.data.repositories
 
 import co.nimblehq.template.compose.data.extensions.flowTransform
-import co.nimblehq.template.compose.data.responses.toModels
-import co.nimblehq.template.compose.data.services.ApiService
+import co.nimblehq.template.compose.data.remote.models.responses.toModels
+import co.nimblehq.template.compose.data.remote.services.ApiService
 import co.nimblehq.template.compose.domain.models.Model
 import co.nimblehq.template.compose.domain.repositories.Repository
 import kotlinx.coroutines.flow.Flow

diff --git a/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/ApiService.kt b/template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/ApiService.kt
diff --git a/...se/data/src/test/java/co/nimblehq/template/compose/data/extensions/ResponseMappingTest.kt b/...se/data/src/test/java/co/nimblehq/template/compose/data/extensions/ResponseMappingTest.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.template.compose.data.extensions
 
-import co.nimblehq.template.compose.data.responses.toModel
+import co.nimblehq.template.compose.data.remote.models.responses.toModel
 import co.nimblehq.template.compose.data.test.MockUtil
 import co.nimblehq.template.compose.domain.exceptions.ApiException
 import co.nimblehq.template.compose.domain.exceptions.NoConnectivityException

diff --git a/...mpose/data/src/test/java/co/nimblehq/template/compose/data/repositories/RepositoryTest.kt b/...mpose/data/src/test/java/co/nimblehq/template/compose/data/repositories/RepositoryTest.kt
@@ -1,7 +1,7 @@
 package co.nimblehq.template.compose.data.repositories
 
-import co.nimblehq.template.compose.data.responses.toModels
-import co.nimblehq.template.compose.data.services.ApiService
+import co.nimblehq.template.compose.data.remote.models.responses.toModels
+import co.nimblehq.template.compose.data.remote.services.ApiService
 import co.nimblehq.template.compose.data.test.MockUtil
 import co.nimblehq.template.compose.domain.repositories.Repository
 import io.kotest.matchers.shouldBe

diff --git a/template-compose/data/src/test/java/co/nimblehq/template/compose/data/test/MockUtil.kt b/template-compose/data/src/test/java/co/nimblehq/template/compose/data/test/MockUtil.kt
@@ -1,6 +1,6 @@
 package co.nimblehq.template.compose.data.test
 
-import co.nimblehq.template.compose.data.responses.ErrorResponse
+import co.nimblehq.template.compose.data.remote.models.responses.ErrorResponse
 import io.mockk.every
 import io.mockk.mockk
 import okhttp3.ResponseBody
@@ -31,6 +31,6 @@ object MockUtil {
     )
 
     val responses = listOf(
-        co.nimblehq.template.compose.data.responses.Response(id = 1)
+        co.nimblehq.template.compose.data.remote.models.responses.Response(id = 1)
     )
 }