Skip to content

Commit 0a6b800

Browse files
authored
Merge pull request #520 from nimblehq/feature/kmm-support-refactor-all-package-names
[#515] [KMM Support] Refactor package names (reopen)
2 parents 72a7df8 + 161f9e0 commit 0a6b800

File tree

42 files changed

+90
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+90
-92
lines changed

template-compose/app/proguard-rules.pro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
#-renamesourcefileattribute SourceFile
2222

2323
# Data class
24-
-keepclassmembers class co.nimblehq.template.compose.data.request.** { *; }
25-
-keepclassmembers class co.nimblehq.template.compose.data.response.** { *; }
24+
-keepclassmembers class co.nimblehq.template.compose.data.requests.** { *; }
25+
-keepclassmembers class co.nimblehq.template.compose.data.responses.** { *; }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package co.nimblehq.template.compose.di.modules
22

3-
import co.nimblehq.template.compose.data.service.providers.MoshiBuilderProvider
3+
import co.nimblehq.template.compose.data.services.providers.MoshiBuilderProvider
44
import com.squareup.moshi.Moshi
55
import dagger.Module
66
import dagger.Provides

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import androidx.datastore.core.DataStore
55
import androidx.datastore.preferences.core.PreferenceDataStoreFactory
66
import androidx.datastore.preferences.core.Preferences
77
import androidx.datastore.preferences.preferencesDataStoreFile
8-
import co.nimblehq.template.compose.data.repository.AppPreferencesRepositoryImpl
9-
import co.nimblehq.template.compose.domain.repository.AppPreferencesRepository
8+
import co.nimblehq.template.compose.data.repositories.AppPreferencesRepositoryImpl
9+
import co.nimblehq.template.compose.domain.repositories.AppPreferencesRepository
1010
import dagger.*
1111
import dagger.hilt.InstallIn
1212
import dagger.hilt.android.qualifiers.ApplicationContext

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package co.nimblehq.template.compose.di.modules
22

3-
import co.nimblehq.template.compose.data.repository.RepositoryImpl
4-
import co.nimblehq.template.compose.data.service.ApiService
5-
import co.nimblehq.template.compose.domain.repository.Repository
3+
import co.nimblehq.template.compose.data.repositories.RepositoryImpl
4+
import co.nimblehq.template.compose.data.services.ApiService
5+
import co.nimblehq.template.compose.domain.repositories.Repository
66
import dagger.Module
77
import dagger.Provides
88
import dagger.hilt.InstallIn

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package co.nimblehq.template.compose.di.modules
22

33
import co.nimblehq.template.compose.BuildConfig
4-
import co.nimblehq.template.compose.data.service.ApiService
5-
import co.nimblehq.template.compose.data.service.providers.ApiServiceProvider
6-
import co.nimblehq.template.compose.data.service.providers.ConverterFactoryProvider
7-
import co.nimblehq.template.compose.data.service.providers.RetrofitProvider
4+
import co.nimblehq.template.compose.data.services.ApiService
5+
import co.nimblehq.template.compose.data.services.providers.*
86
import com.squareup.moshi.Moshi
97
import dagger.Module
108
import dagger.Provides

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package co.nimblehq.template.compose.di.modules
22

33
import android.content.Context
4-
import co.nimblehq.template.compose.data.storage.EncryptedSharedPreferences
4+
import co.nimblehq.template.compose.data.storages.EncryptedSharedPreferences
55
import dagger.Module
66
import dagger.Provides
77
import dagger.hilt.InstallIn

template-compose/app/src/main/java/co/nimblehq/template/compose/model/UiModel.kt

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package co.nimblehq.template.compose.ui.models
2+
3+
import co.nimblehq.template.compose.domain.models.Model
4+
5+
data class UiModel(
6+
val id: Int
7+
)
8+
9+
fun Model.toUiModel() = UiModel(id = id ?: -1)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import androidx.hilt.navigation.compose.hiltViewModel
1313
import androidx.lifecycle.compose.collectAsStateWithLifecycle
1414
import co.nimblehq.template.compose.R
1515
import co.nimblehq.template.compose.extensions.collectAsEffect
16-
import co.nimblehq.template.compose.model.UiModel
1716
import co.nimblehq.template.compose.ui.AppDestination
17+
import co.nimblehq.template.compose.ui.models.UiModel
1818
import co.nimblehq.template.compose.ui.showToast
1919
import co.nimblehq.template.compose.ui.theme.AppTheme.dimensions
2020
import co.nimblehq.template.compose.ui.theme.ComposeTheme

template-compose/app/src/main/java/co/nimblehq/template/compose/ui/screens/home/HomeViewModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package co.nimblehq.template.compose.ui.screens.home
22

33
import androidx.lifecycle.viewModelScope
4-
import co.nimblehq.template.compose.domain.usecase.UseCase
5-
import co.nimblehq.template.compose.model.UiModel
6-
import co.nimblehq.template.compose.model.toUiModel
4+
import co.nimblehq.template.compose.domain.usecases.UseCase
75
import co.nimblehq.template.compose.ui.base.BaseViewModel
6+
import co.nimblehq.template.compose.ui.models.UiModel
7+
import co.nimblehq.template.compose.ui.models.toUiModel
88
import co.nimblehq.template.compose.util.DispatchersProvider
99
import dagger.hilt.android.lifecycle.HiltViewModel
1010
import kotlinx.coroutines.flow.*

0 commit comments

Comments
 (0)