Merge pull request #536 from nimblehq/chore/refactor-project-packages

[#549] Refactor: data module packages

Author: ryan-conway

sample-compose/app/proguard-rules.pro

@@ -21,5 +21,5 @@
 #-renamesourcefileattribute SourceFile
 
 # Data class
--keepclassmembers class co.nimblehq.sample.compose.data.request.** { *; }
--keepclassmembers class co.nimblehq.sample.compose.data.response.** { *; }
+-keepclassmembers class co.nimblehq.sample.compose.data.remote.models.requests.** { *; }
+-keepclassmembers class co.nimblehq.sample.compose.data.remote.models.responses.** { *; }

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/MoshiModule.kt

@@ -1,6 +1,6 @@
 package co.nimblehq.sample.compose.di.modules
 
-import co.nimblehq.sample.compose.data.service.providers.MoshiBuilderProvider
+import co.nimblehq.sample.compose.data.remote.providers.MoshiBuilderProvider
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/PreferencesModule.kt

@@ -5,8 +5,8 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStoreFile
-import co.nimblehq.sample.compose.data.repository.AppPreferencesRepositoryImpl
-import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
+import co.nimblehq.sample.compose.data.repositories.AppPreferencesRepositoryImpl
+import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
 import dagger.*
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RepositoryModule.kt

@@ -1,8 +1,8 @@
 package co.nimblehq.sample.compose.di.modules
 
-import co.nimblehq.sample.compose.data.repository.RepositoryImpl
-import co.nimblehq.sample.compose.data.service.ApiService
-import co.nimblehq.sample.compose.domain.repository.Repository
+import co.nimblehq.sample.compose.data.remote.services.ApiService
+import co.nimblehq.sample.compose.data.repositories.RepositoryImpl
+import co.nimblehq.sample.compose.domain.repositories.Repository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RetrofitModule.kt

@@ -1,10 +1,10 @@
 package co.nimblehq.sample.compose.di.modules
 
 import co.nimblehq.sample.compose.BuildConfig
-import co.nimblehq.sample.compose.data.service.ApiService
-import co.nimblehq.sample.compose.data.service.providers.ApiServiceProvider
-import co.nimblehq.sample.compose.data.service.providers.ConverterFactoryProvider
-import co.nimblehq.sample.compose.data.service.providers.RetrofitProvider
+import co.nimblehq.sample.compose.data.remote.providers.ApiServiceProvider
+import co.nimblehq.sample.compose.data.remote.providers.ConverterFactoryProvider
+import co.nimblehq.sample.compose.data.remote.providers.RetrofitProvider
+import co.nimblehq.sample.compose.data.remote.services.ApiService
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/StorageModule.kt

@@ -1,7 +1,7 @@
 package co.nimblehq.sample.compose.di.modules
 
 import android.content.Context
-import co.nimblehq.sample.compose.data.storage.EncryptedSharedPreferences
+import co.nimblehq.sample.compose.data.local.preferences.EncryptedSharedPreferences
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppDestination.kt

@@ -1,7 +1,9 @@
 package co.nimblehq.sample.compose.ui
 
-import androidx.navigation.*
-import co.nimblehq.sample.compose.model.UiModel
+import androidx.navigation.NamedNavArgument
+import androidx.navigation.NavType
+import androidx.navigation.navArgument
+import co.nimblehq.sample.compose.ui.models.UiModel
 
 const val KeyId = "id"
 const val KeyModel = "model"

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppNavigation.kt

@@ -1,9 +1,14 @@
 package co.nimblehq.sample.compose.ui
 
 import androidx.compose.runtime.Composable
-import androidx.navigation.*
-import androidx.navigation.compose.*
-import co.nimblehq.sample.compose.model.UiModel
+import androidx.navigation.NavBackStackEntry
+import androidx.navigation.NavDeepLink
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.screens.home.HomeScreen
 import co.nimblehq.sample.compose.ui.screens.second.SecondScreen
 import co.nimblehq.sample.compose.ui.screens.third.ThirdScreen

sample-compose/app/src/main/java/co/nimblehq/sample/compose/model/UiModel.kt renamed to sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/models/UiModel.kt

@@ -1,7 +1,7 @@
-package co.nimblehq.sample.compose.model
+package co.nimblehq.sample.compose.ui.models
 
 import android.os.Parcelable
-import co.nimblehq.sample.compose.domain.model.Model
+import co.nimblehq.sample.compose.domain.models.Model
 import kotlinx.parcelize.Parcelize
 
 @Parcelize

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreen.kt

@@ -15,8 +15,8 @@ import co.nimblehq.sample.compose.R
 import co.nimblehq.sample.compose.extensions.collectAsEffect
 import co.nimblehq.sample.compose.extensions.showToast
 import co.nimblehq.sample.compose.lib.IsLoading
-import co.nimblehq.sample.compose.model.UiModel
 import co.nimblehq.sample.compose.ui.AppDestination
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.screens.AppBar
 import co.nimblehq.sample.compose.ui.showToast
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme