Skip to content

Commit c183baa

Browse files
ryan-conwayryan-conway
authored
Merge pull request #567 from nimblehq/release/3.26.0
[Release] 3.26.0
2 parents 1958f2a + df2fc0b commit c183baa

File tree

78 files changed

+183
-155
lines changed

Some content is hidden

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

78 files changed

+183
-155
lines changed

‎sample-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.sample.compose.data.request.** { *; }
25-
-keepclassmembers class co.nimblehq.sample.compose.data.response.** { *; }
24+
-keepclassmembers class co.nimblehq.sample.compose.data.remote.models.requests.** { *; }
25+
-keepclassmembers class co.nimblehq.sample.compose.data.remote.models.responses.** { *; }

‎sample-compose/app/src/main/java/co/nimblehq/sample/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.sample.compose.di.modules
22

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

‎sample-compose/app/src/main/java/co/nimblehq/sample/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.sample.compose.data.repository.AppPreferencesRepositoryImpl
9-
import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
8+
import co.nimblehq.sample.compose.data.repositories.AppPreferencesRepositoryImpl
9+
import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
1010
import dagger.*
1111
import dagger.hilt.InstallIn
1212
import dagger.hilt.android.qualifiers.ApplicationContext

‎sample-compose/app/src/main/java/co/nimblehq/sample/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.sample.compose.di.modules
22

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

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

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

33
import co.nimblehq.sample.compose.BuildConfig
4-
import co.nimblehq.sample.compose.data.service.ApiService
5-
import co.nimblehq.sample.compose.data.service.providers.ApiServiceProvider
6-
import co.nimblehq.sample.compose.data.service.providers.ConverterFactoryProvider
7-
import co.nimblehq.sample.compose.data.service.providers.RetrofitProvider
4+
import co.nimblehq.sample.compose.data.remote.providers.ApiServiceProvider
5+
import co.nimblehq.sample.compose.data.remote.providers.ConverterFactoryProvider
6+
import co.nimblehq.sample.compose.data.remote.providers.RetrofitProvider
7+
import co.nimblehq.sample.compose.data.remote.services.ApiService
88
import com.squareup.moshi.Moshi
99
import dagger.Module
1010
import dagger.Provides

‎sample-compose/app/src/main/java/co/nimblehq/sample/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.sample.compose.di.modules
22

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

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package co.nimblehq.sample.compose.ui
22

3-
import androidx.navigation.*
4-
import co.nimblehq.sample.compose.model.UiModel
3+
import androidx.navigation.NamedNavArgument
4+
import androidx.navigation.NavType
5+
import androidx.navigation.navArgument
6+
import co.nimblehq.sample.compose.ui.models.UiModel
57

68
const val KeyId = "id"
79
const val KeyModel = "model"

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
package co.nimblehq.sample.compose.ui
22

33
import androidx.compose.runtime.Composable
4-
import androidx.navigation.*
5-
import androidx.navigation.compose.*
6-
import co.nimblehq.sample.compose.model.UiModel
4+
import androidx.navigation.NavBackStackEntry
5+
import androidx.navigation.NavDeepLink
6+
import androidx.navigation.NavGraphBuilder
7+
import androidx.navigation.NavHostController
8+
import androidx.navigation.compose.NavHost
9+
import androidx.navigation.compose.composable
10+
import androidx.navigation.compose.rememberNavController
11+
import co.nimblehq.sample.compose.ui.models.UiModel
712
import co.nimblehq.sample.compose.ui.screens.home.HomeScreen
813
import co.nimblehq.sample.compose.ui.screens.second.SecondScreen
914
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package co.nimblehq.sample.compose.model
1+
package co.nimblehq.sample.compose.ui.models
22

33
import android.os.Parcelable
4-
import co.nimblehq.sample.compose.domain.model.Model
4+
import co.nimblehq.sample.compose.domain.models.Model
55
import kotlinx.parcelize.Parcelize
66

77
@Parcelize

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import co.nimblehq.sample.compose.R
1515
import co.nimblehq.sample.compose.extensions.collectAsEffect
1616
import co.nimblehq.sample.compose.extensions.showToast
1717
import co.nimblehq.sample.compose.lib.IsLoading
18-
import co.nimblehq.sample.compose.model.UiModel
1918
import co.nimblehq.sample.compose.ui.AppDestination
19+
import co.nimblehq.sample.compose.ui.models.UiModel
2020
import co.nimblehq.sample.compose.ui.screens.AppBar
2121
import co.nimblehq.sample.compose.ui.showToast
2222
import co.nimblehq.sample.compose.ui.theme.ComposeTheme

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
package co.nimblehq.sample.compose.ui.screens.home
22

33
import androidx.lifecycle.viewModelScope
4-
import co.nimblehq.sample.compose.domain.usecase.GetModelsUseCase
5-
import co.nimblehq.sample.compose.domain.usecase.IsFirstTimeLaunchPreferencesUseCase
6-
import co.nimblehq.sample.compose.domain.usecase.UpdateFirstTimeLaunchPreferencesUseCase
7-
import co.nimblehq.sample.compose.model.UiModel
8-
import co.nimblehq.sample.compose.model.toUiModel
4+
import co.nimblehq.sample.compose.domain.usecases.GetModelsUseCase
5+
import co.nimblehq.sample.compose.domain.usecases.IsFirstTimeLaunchPreferencesUseCase
6+
import co.nimblehq.sample.compose.domain.usecases.UpdateFirstTimeLaunchPreferencesUseCase
97
import co.nimblehq.sample.compose.ui.AppDestination
108
import co.nimblehq.sample.compose.ui.base.BaseViewModel
9+
import co.nimblehq.sample.compose.ui.models.UiModel
10+
import co.nimblehq.sample.compose.ui.models.toUiModel
1111
import co.nimblehq.sample.compose.util.DispatchersProvider
1212
import dagger.hilt.android.lifecycle.HiltViewModel
13-
import kotlinx.coroutines.flow.*
13+
import kotlinx.coroutines.flow.MutableStateFlow
14+
import kotlinx.coroutines.flow.asStateFlow
15+
import kotlinx.coroutines.flow.catch
16+
import kotlinx.coroutines.flow.flowOn
17+
import kotlinx.coroutines.flow.launchIn
18+
import kotlinx.coroutines.flow.onEach
1419
import javax.inject.Inject
1520

1621
@HiltViewModel

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import androidx.compose.ui.Modifier
88
import androidx.compose.ui.res.stringResource
99
import androidx.compose.ui.tooling.preview.Preview
1010
import co.nimblehq.sample.compose.R
11-
import co.nimblehq.sample.compose.model.UiModel
11+
import co.nimblehq.sample.compose.ui.models.UiModel
1212
import co.nimblehq.sample.compose.ui.theme.*
1313
import co.nimblehq.sample.compose.ui.theme.AppTheme.dimensions
1414

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import androidx.compose.material.Divider
66
import androidx.compose.runtime.Composable
77
import androidx.compose.ui.Modifier
88
import androidx.compose.ui.tooling.preview.Preview
9-
import co.nimblehq.sample.compose.model.UiModel
9+
import co.nimblehq.sample.compose.ui.models.UiModel
1010
import co.nimblehq.sample.compose.ui.theme.ComposeTheme
1111

1212
@Composable

‎sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/third/ThirdScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import androidx.compose.ui.text.style.TextAlign
1313
import androidx.compose.ui.tooling.preview.Preview
1414
import androidx.hilt.navigation.compose.hiltViewModel
1515
import co.nimblehq.sample.compose.R
16-
import co.nimblehq.sample.compose.model.UiModel
1716
import co.nimblehq.sample.compose.ui.AppDestination
17+
import co.nimblehq.sample.compose.ui.models.UiModel
1818
import co.nimblehq.sample.compose.ui.screens.AppBar
1919
import co.nimblehq.sample.compose.ui.theme.ComposeTheme
2020

‎sample-compose/app/src/test/java/co/nimblehq/sample/compose/test/MockUtil.kt

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

3-
import co.nimblehq.sample.compose.domain.model.Model
3+
import co.nimblehq.sample.compose.domain.models.Model
44

55
object MockUtil {
66

‎sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreenTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
77
import androidx.test.ext.junit.rules.ActivityScenarioRule
88
import androidx.test.rule.GrantPermissionRule
99
import co.nimblehq.sample.compose.R
10-
import co.nimblehq.sample.compose.domain.usecase.*
10+
import co.nimblehq.sample.compose.domain.usecases.*
1111
import co.nimblehq.sample.compose.test.MockUtil
1212
import co.nimblehq.sample.compose.ui.AppDestination
1313
import co.nimblehq.sample.compose.ui.screens.BaseScreenTest

‎sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModelTest.kt

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
package co.nimblehq.sample.compose.ui.screens.home
22

33
import app.cash.turbine.test
4-
import co.nimblehq.sample.compose.domain.usecase.GetModelsUseCase
5-
import co.nimblehq.sample.compose.domain.usecase.IsFirstTimeLaunchPreferencesUseCase
6-
import co.nimblehq.sample.compose.domain.usecase.UpdateFirstTimeLaunchPreferencesUseCase
7-
import co.nimblehq.sample.compose.model.toUiModel
4+
import co.nimblehq.sample.compose.domain.usecases.GetModelsUseCase
5+
import co.nimblehq.sample.compose.domain.usecases.IsFirstTimeLaunchPreferencesUseCase
6+
import co.nimblehq.sample.compose.domain.usecases.UpdateFirstTimeLaunchPreferencesUseCase
87
import co.nimblehq.sample.compose.test.CoroutineTestRule
98
import co.nimblehq.sample.compose.test.MockUtil
109
import co.nimblehq.sample.compose.ui.AppDestination
10+
import co.nimblehq.sample.compose.ui.models.toUiModel
1111
import co.nimblehq.sample.compose.util.DispatchersProvider
1212
import io.kotest.matchers.shouldBe
13-
import io.mockk.*
13+
import io.mockk.Runs
14+
import io.mockk.coEvery
15+
import io.mockk.coVerify
16+
import io.mockk.every
17+
import io.mockk.just
18+
import io.mockk.mockk
1419
import kotlinx.coroutines.ExperimentalCoroutinesApi
15-
import kotlinx.coroutines.flow.*
20+
import kotlinx.coroutines.flow.first
21+
import kotlinx.coroutines.flow.flow
22+
import kotlinx.coroutines.flow.flowOf
1623
import kotlinx.coroutines.test.StandardTestDispatcher
1724
import kotlinx.coroutines.test.advanceUntilIdle
1825
import kotlinx.coroutines.test.runTest

‎sample-compose/buildSrc/src/main/java/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Versions {
66
const val ANDROID_TARGET_SDK_VERSION = 33
77

88
const val ANDROID_VERSION_CODE = 1
9-
const val ANDROID_VERSION_NAME = "3.25.0"
9+
const val ANDROID_VERSION_NAME = "3.26.0"
1010

1111
// Dependencies (Alphabet sorted)
1212
const val ACCOMPANIST_PERMISSIONS_VERSION = "0.30.1"

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/extensions/ResponseMapping.kt

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

3-
import co.nimblehq.sample.compose.data.response.ErrorResponse
4-
import co.nimblehq.sample.compose.data.response.toModel
5-
import co.nimblehq.sample.compose.data.service.providers.MoshiBuilderProvider
3+
import co.nimblehq.sample.compose.data.remote.models.responses.ErrorResponse
4+
import co.nimblehq.sample.compose.data.remote.models.responses.toModel
5+
import co.nimblehq.sample.compose.data.remote.providers.MoshiBuilderProvider
66
import co.nimblehq.sample.compose.domain.exceptions.ApiException
77
import co.nimblehq.sample.compose.domain.exceptions.NoConnectivityException
88
import com.squareup.moshi.JsonDataException

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/BaseSharedPreferences.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/BaseSharedPreferences.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.nimblehq.sample.compose.data.storage
1+
package co.nimblehq.sample.compose.data.local.preferences
22

33
import android.content.SharedPreferences
44

‎template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/EncryptedSharedPreferences.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/EncryptedSharedPreferences.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.nimblehq.template.compose.data.storages
1+
package co.nimblehq.sample.compose.data.local.preferences
22

33
import android.content.Context
44
import androidx.security.crypto.EncryptedSharedPreferences

‎template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/SharedPreferencesExt.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/SharedPreferencesExt.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.nimblehq.template.compose.data.storages
1+
package co.nimblehq.sample.compose.data.local.preferences
22

33
import android.content.SharedPreferences
44

‎template-compose/data/src/main/java/co/nimblehq/template/compose/data/requests/.keep renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/authenticators/.keep

File renamed without changes.

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/interceptors/.keep

Whitespace-only changes.

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/requests/.keep

Whitespace-only changes.

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/response/ErrorResponse.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/responses/ErrorResponse.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package co.nimblehq.sample.compose.data.response
1+
package co.nimblehq.sample.compose.data.remote.models.responses
22

3-
import co.nimblehq.sample.compose.domain.model.Error
3+
import co.nimblehq.sample.compose.domain.models.Error
44
import com.squareup.moshi.Json
55

66
data class ErrorResponse(

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/response/Response.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/responses/Response.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package co.nimblehq.sample.compose.data.response
1+
package co.nimblehq.sample.compose.data.remote.models.responses
22

3-
import co.nimblehq.sample.compose.domain.model.Model
3+
import co.nimblehq.sample.compose.domain.models.Model
44
import com.squareup.moshi.Json
55

66
data class Response(

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/ApiServiceProvider.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/ApiServiceProvider.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package co.nimblehq.sample.compose.data.service.providers
1+
package co.nimblehq.sample.compose.data.remote.providers
22

3-
import co.nimblehq.sample.compose.data.service.ApiService
3+
import co.nimblehq.sample.compose.data.remote.services.ApiService
44
import retrofit2.Retrofit
55

66
object ApiServiceProvider {

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/ConverterFactoryProvider.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/ConverterFactoryProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.nimblehq.sample.compose.data.service.providers
1+
package co.nimblehq.sample.compose.data.remote.providers
22

33
import com.squareup.moshi.Moshi
44
import retrofit2.Converter

‎template-compose/data/src/main/java/co/nimblehq/template/compose/data/services/providers/MoshiBuilderProvider.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/MoshiBuilderProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.nimblehq.template.compose.data.services.providers
1+
package co.nimblehq.sample.compose.data.remote.providers
22

33
import com.squareup.moshi.Moshi
44
import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/providers/RetrofitProvider.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/providers/RetrofitProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package co.nimblehq.sample.compose.data.service.providers
1+
package co.nimblehq.sample.compose.data.remote.providers
22

33
import okhttp3.OkHttpClient
44
import retrofit2.Converter

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/services/ApiService.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package co.nimblehq.sample.compose.data.remote.services
2+
3+
import co.nimblehq.sample.compose.data.remote.models.responses.Response
4+
import retrofit2.http.GET
5+
6+
interface ApiService {
7+
8+
@GET("users")
9+
suspend fun getResponses(): List<Response>
10+
}

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repository/AppPreferencesRepositoryImpl.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repositories/AppPreferencesRepositoryImpl.kt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
package co.nimblehq.sample.compose.data.repository
1+
package co.nimblehq.sample.compose.data.repositories
22

33
import android.util.Log
44
import androidx.datastore.core.DataStore
5-
import androidx.datastore.preferences.core.*
6-
import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
7-
import kotlinx.coroutines.flow.*
5+
import androidx.datastore.preferences.core.Preferences
6+
import androidx.datastore.preferences.core.booleanPreferencesKey
7+
import androidx.datastore.preferences.core.edit
8+
import androidx.datastore.preferences.core.emptyPreferences
9+
import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
10+
import kotlinx.coroutines.flow.Flow
11+
import kotlinx.coroutines.flow.catch
12+
import kotlinx.coroutines.flow.map
813
import java.io.IOException
914
import javax.inject.Inject
1015

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repository/RepositoryImpl.kt renamed to ‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/repositories/RepositoryImpl.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package co.nimblehq.sample.compose.data.repository
1+
package co.nimblehq.sample.compose.data.repositories
22

33
import co.nimblehq.sample.compose.data.extensions.flowTransform
4-
import co.nimblehq.sample.compose.data.response.toModels
5-
import co.nimblehq.sample.compose.data.service.ApiService
6-
import co.nimblehq.sample.compose.domain.model.Model
7-
import co.nimblehq.sample.compose.domain.repository.Repository
4+
import co.nimblehq.sample.compose.data.remote.models.responses.toModels
5+
import co.nimblehq.sample.compose.data.remote.services.ApiService
6+
import co.nimblehq.sample.compose.domain.models.Model
7+
import co.nimblehq.sample.compose.domain.repositories.Repository
88
import kotlinx.coroutines.flow.Flow
99

1010
class RepositoryImpl constructor(

‎sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/service/ApiService.kt

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/extensions/ResponseMappingTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package co.nimblehq.sample.compose.data.extensions
22

3-
import co.nimblehq.sample.compose.data.response.toModel
3+
import co.nimblehq.sample.compose.data.remote.models.responses.toModel
44
import co.nimblehq.sample.compose.data.test.MockUtil
55
import co.nimblehq.sample.compose.domain.exceptions.ApiException
66
import co.nimblehq.sample.compose.domain.exceptions.NoConnectivityException
7-
import co.nimblehq.sample.compose.domain.model.Model
7+
import co.nimblehq.sample.compose.domain.models.Model
88
import io.kotest.matchers.shouldBe
99
import kotlinx.coroutines.ExperimentalCoroutinesApi
1010
import kotlinx.coroutines.flow.catch

‎sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repository/AppPreferencesRepositoryImplTest.kt renamed to ‎sample-compose/data/src/test/java/co/nimblehq/sample/compose/data/repositories/AppPreferencesRepositoryImplTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package co.nimblehq.sample.compose.data.repository
1+
package co.nimblehq.sample.compose.data.repositories
22

33
import android.content.Context
44
import androidx.datastore.core.DataStore
55
import androidx.datastore.preferences.core.*
66
import androidx.datastore.preferences.preferencesDataStoreFile
77
import androidx.test.core.app.ApplicationProvider
88
import app.cash.turbine.test
9-
import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
9+
import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
1010
import io.kotest.matchers.shouldBe
1111
import io.mockk.every
1212
import io.mockk.mockk

0 commit comments

Comments
 (0)