Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#515] [KMM Support] Refactor package names #511

Merged
merged 1 commit into from
Sep 22, 2023
Merged

[#515] [KMM Support] Refactor package names #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions template-compose/app/proguard-rules.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
#-renamesourcefileattribute SourceFile

# Data class
-keepclassmembers class co.nimblehq.template.compose.data.request.** { *; }
-keepclassmembers class co.nimblehq.template.compose.data.response.** { *; }
-keepclassmembers class co.nimblehq.template.compose.data.requests.** { *; }
-keepclassmembers class co.nimblehq.template.compose.data.responses.** { *; }
2 changes: 1 addition & 1 deletion template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/MoshiModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.template.compose.di.modules

import co.nimblehq.template.compose.data.service.providers.MoshiBuilderProvider
import co.nimblehq.template.compose.data.services.providers.MoshiBuilderProvider
import com.squareup.moshi.Moshi
import dagger.Module
import dagger.Provides
Expand Down
4 changes: 2 additions & 2 deletions ...te-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/PreferencesModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.template.compose.data.repository.AppPreferencesRepositoryImpl
import co.nimblehq.template.compose.domain.repository.AppPreferencesRepository
import co.nimblehq.template.compose.data.repositories.AppPreferencesRepositoryImpl
import co.nimblehq.template.compose.domain.repositories.AppPreferencesRepository
import dagger.*
import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext
Expand Down
6 changes: 3 additions & 3 deletions ...ate-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RepositoryModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package co.nimblehq.template.compose.di.modules

import co.nimblehq.template.compose.data.repository.RepositoryImpl
import co.nimblehq.template.compose.data.service.ApiService
import co.nimblehq.template.compose.domain.repository.Repository
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
import dagger.hilt.InstallIn
Expand Down
6 changes: 2 additions & 4 deletions template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/RetrofitModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package co.nimblehq.template.compose.di.modules

import co.nimblehq.template.compose.BuildConfig
import co.nimblehq.template.compose.data.service.ApiService
import co.nimblehq.template.compose.data.service.providers.ApiServiceProvider
import co.nimblehq.template.compose.data.service.providers.ConverterFactoryProvider
import co.nimblehq.template.compose.data.service.providers.RetrofitProvider
import co.nimblehq.template.compose.data.services.ApiService
import co.nimblehq.template.compose.data.services.providers.*
import com.squareup.moshi.Moshi
import dagger.Module
import dagger.Provides
Expand Down
2 changes: 1 addition & 1 deletion template-compose/app/src/main/java/co/nimblehq/template/compose/di/modules/StorageModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package co.nimblehq.template.compose.di.modules

import android.content.Context
import co.nimblehq.template.compose.data.storage.EncryptedSharedPreferences
import co.nimblehq.template.compose.data.storages.EncryptedSharedPreferences
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand Down
9 changes: 0 additions & 9 deletions template-compose/app/src/main/java/co/nimblehq/template/compose/model/UiModel.kt
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions template-compose/app/src/main/java/co/nimblehq/template/compose/ui/models/UiModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package co.nimblehq.template.compose.ui.models

import co.nimblehq.template.compose.domain.models.Model

data class UiModel(
val id: Int
)

fun Model.toUiModel() = UiModel(id = id ?: -1)
2 changes: 1 addition & 1 deletion ...late-compose/app/src/main/java/co/nimblehq/template/compose/ui/screens/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import co.nimblehq.template.compose.R
import co.nimblehq.template.compose.extensions.collectAsEffect
import co.nimblehq.template.compose.model.UiModel
import co.nimblehq.template.compose.ui.AppDestination
import co.nimblehq.template.compose.ui.models.UiModel
import co.nimblehq.template.compose.ui.showToast
import co.nimblehq.template.compose.ui.theme.AppTheme.dimensions
import co.nimblehq.template.compose.ui.theme.ComposeTheme
Expand Down
6 changes: 3 additions & 3 deletions ...e-compose/app/src/main/java/co/nimblehq/template/compose/ui/screens/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package co.nimblehq.template.compose.ui.screens.home

import androidx.lifecycle.viewModelScope
import co.nimblehq.template.compose.domain.usecase.UseCase
import co.nimblehq.template.compose.model.UiModel
import co.nimblehq.template.compose.model.toUiModel
import co.nimblehq.template.compose.domain.usecases.UseCase
import co.nimblehq.template.compose.ui.base.BaseViewModel
import co.nimblehq.template.compose.ui.models.UiModel
import co.nimblehq.template.compose.ui.models.toUiModel
import co.nimblehq.template.compose.util.DispatchersProvider
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.*
Expand Down
2 changes: 1 addition & 1 deletion template-compose/app/src/test/java/co/nimblehq/template/compose/test/MockUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.template.compose.test

import co.nimblehq.template.compose.domain.model.Model
import co.nimblehq.template.compose.domain.models.Model

object MockUtil {

Expand Down
2 changes: 1 addition & 1 deletion ...-compose/app/src/test/java/co/nimblehq/template/compose/ui/screens/home/HomeScreenTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import androidx.compose.ui.test.*
import androidx.compose.ui.test.junit4.*
import androidx.test.ext.junit.rules.ActivityScenarioRule
import co.nimblehq.template.compose.R
import co.nimblehq.template.compose.domain.usecase.UseCase
import co.nimblehq.template.compose.domain.usecases.UseCase
import co.nimblehq.template.compose.test.MockUtil
import co.nimblehq.template.compose.ui.AppDestination
import co.nimblehq.template.compose.ui.screens.BaseScreenTest
Expand Down
4 changes: 2 additions & 2 deletions ...mpose/app/src/test/java/co/nimblehq/template/compose/ui/screens/home/HomeViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package co.nimblehq.template.compose.ui.screens.home

import app.cash.turbine.test
import co.nimblehq.template.compose.domain.usecase.UseCase
import co.nimblehq.template.compose.model.toUiModel
import co.nimblehq.template.compose.domain.usecases.UseCase
import co.nimblehq.template.compose.test.CoroutineTestRule
import co.nimblehq.template.compose.test.MockUtil
import co.nimblehq.template.compose.ui.models.toUiModel
import co.nimblehq.template.compose.util.DispatchersProvider
import io.kotest.matchers.shouldBe
import io.mockk.every
Expand Down
6 changes: 3 additions & 3 deletions ...ompose/data/src/main/java/co/nimblehq/template/compose/data/extensions/ResponseMapping.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package co.nimblehq.template.compose.data.extensions

import co.nimblehq.template.compose.data.response.ErrorResponse
import co.nimblehq.template.compose.data.response.toModel
import co.nimblehq.template.compose.data.service.providers.MoshiBuilderProvider
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.domain.exceptions.ApiException
import co.nimblehq.template.compose.domain.exceptions.NoConnectivityException
import com.squareup.moshi.JsonDataException
Expand Down
4 changes: 2 additions & 2 deletions ...epository/AppPreferencesRepositoryImpl.kt → ...ositories/AppPreferencesRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package co.nimblehq.template.compose.data.repository
package co.nimblehq.template.compose.data.repositories

import android.util.Log
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.*
import co.nimblehq.template.compose.domain.repository.AppPreferencesRepository
import co.nimblehq.template.compose.domain.repositories.AppPreferencesRepository
import kotlinx.coroutines.flow.*
import java.io.IOException
import javax.inject.Inject
Expand Down
10 changes: 5 additions & 5 deletions ...compose/data/repository/RepositoryImpl.kt → ...mpose/data/repositories/RepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package co.nimblehq.template.compose.data.repository
package co.nimblehq.template.compose.data.repositories

import co.nimblehq.template.compose.data.extensions.flowTransform
import co.nimblehq.template.compose.data.response.toModels
import co.nimblehq.template.compose.data.service.ApiService
import co.nimblehq.template.compose.domain.model.Model
import co.nimblehq.template.compose.domain.repository.Repository
import co.nimblehq.template.compose.data.responses.toModels
import co.nimblehq.template.compose.data.services.ApiService
import co.nimblehq.template.compose.domain.models.Model
import co.nimblehq.template.compose.domain.repositories.Repository
import kotlinx.coroutines.flow.Flow

class RepositoryImpl constructor(
Expand Down
Empty file added template-compose/data/src/main/java/co/nimblehq/template/compose/data/requests/.keep
View file
Open in desktop
ryan-conway marked this conversation as resolved.
Show resolved Hide resolved
Empty file.
4 changes: 2 additions & 2 deletions ...te/compose/data/response/ErrorResponse.kt → ...e/compose/data/responses/ErrorResponse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.template.compose.data.response
package co.nimblehq.template.compose.data.responses

import co.nimblehq.template.compose.domain.model.Error
import co.nimblehq.template.compose.domain.models.Error
import com.squareup.moshi.Json

data class ErrorResponse(
Expand Down
4 changes: 2 additions & 2 deletions ...emplate/compose/data/response/Response.kt → ...mplate/compose/data/responses/Response.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.template.compose.data.response
package co.nimblehq.template.compose.data.responses

import co.nimblehq.template.compose.domain.model.Model
import co.nimblehq.template.compose.domain.models.Model
import com.squareup.moshi.Json

data class Response(
Expand Down
4 changes: 2 additions & 2 deletions ...mplate/compose/data/service/ApiService.kt → ...plate/compose/data/services/ApiService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.template.compose.data.service
package co.nimblehq.template.compose.data.services

import co.nimblehq.template.compose.data.response.Response
import co.nimblehq.template.compose.data.responses.Response
import retrofit2.http.GET

interface ApiService {
Expand Down
4 changes: 2 additions & 2 deletions ...a/service/providers/ApiServiceProvider.kt → .../services/providers/ApiServiceProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.template.compose.data.service.providers
package co.nimblehq.template.compose.data.services.providers

import co.nimblehq.template.compose.data.service.ApiService
import co.nimblehq.template.compose.data.services.ApiService
import retrofit2.Retrofit

object ApiServiceProvider {
Expand Down
2 changes: 1 addition & 1 deletion ...ice/providers/ConverterFactoryProvider.kt → ...ces/providers/ConverterFactoryProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package co.nimblehq.template.compose.data.service.providers
package co.nimblehq.template.compose.data.services.providers

import com.squareup.moshi.Moshi
import retrofit2.Converter
Expand Down
4 changes: 2 additions & 2 deletions ...service/providers/MoshiBuilderProvider.kt → ...ervices/providers/MoshiBuilderProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package co.nimblehq.template.compose.data.service.providers
package co.nimblehq.template.compose.data.services.providers

import com.squareup.moshi.Moshi
import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import java.util.*
import java.util.Date

object MoshiBuilderProvider {

Expand Down
2 changes: 1 addition & 1 deletion ...ata/service/providers/RetrofitProvider.kt → ...ta/services/providers/RetrofitProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package co.nimblehq.template.compose.data.service.providers
package co.nimblehq.template.compose.data.services.providers

import okhttp3.OkHttpClient
import retrofit2.Converter
Expand Down
2 changes: 1 addition & 1 deletion ...ose/data/storage/BaseSharedPreferences.kt → ...se/data/storages/BaseSharedPreferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package co.nimblehq.template.compose.data.storage
package co.nimblehq.template.compose.data.storages

import android.content.SharedPreferences

Expand Down
2 changes: 1 addition & 1 deletion ...ata/storage/EncryptedSharedPreferences.kt → ...ta/storages/EncryptedSharedPreferences.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package co.nimblehq.template.compose.data.storage
package co.nimblehq.template.compose.data.storages

import android.content.Context
import androidx.security.crypto.EncryptedSharedPreferences
Expand Down
2 changes: 1 addition & 1 deletion ...pose/data/storage/SharedPreferencesExt.kt → ...ose/data/storages/SharedPreferencesExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package co.nimblehq.template.compose.data.storage
package co.nimblehq.template.compose.data.storages

import android.content.SharedPreferences

Expand Down
4 changes: 2 additions & 2 deletions ...se/data/src/test/java/co/nimblehq/template/compose/data/extensions/ResponseMappingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package co.nimblehq.template.compose.data.extensions

import co.nimblehq.template.compose.data.response.toModel
import co.nimblehq.template.compose.data.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
import co.nimblehq.template.compose.domain.model.Model
import co.nimblehq.template.compose.domain.models.Model
import io.kotest.matchers.shouldBe
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.catch
Expand Down
4 changes: 2 additions & 2 deletions ...itory/AppPreferencesRepositoryImplTest.kt → ...ories/AppPreferencesRepositoryImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package co.nimblehq.template.compose.data.repository
package co.nimblehq.template.compose.data.repositories

import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.*
import androidx.datastore.preferences.preferencesDataStoreFile
import androidx.test.core.app.ApplicationProvider
import app.cash.turbine.test
import co.nimblehq.template.compose.domain.repository.AppPreferencesRepository
import co.nimblehq.template.compose.domain.repositories.AppPreferencesRepository
import io.kotest.matchers.shouldBe
import io.mockk.every
import io.mockk.mockk
Expand Down
8 changes: 4 additions & 4 deletions ...compose/data/repository/RepositoryTest.kt → ...mpose/data/repositories/RepositoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package co.nimblehq.template.compose.data.repository
package co.nimblehq.template.compose.data.repositories

import co.nimblehq.template.compose.data.response.toModels
import co.nimblehq.template.compose.data.service.ApiService
import co.nimblehq.template.compose.data.responses.toModels
import co.nimblehq.template.compose.data.services.ApiService
import co.nimblehq.template.compose.data.test.MockUtil
import co.nimblehq.template.compose.domain.repository.Repository
import co.nimblehq.template.compose.domain.repositories.Repository
import io.kotest.matchers.shouldBe
import io.mockk.coEvery
import io.mockk.mockk
Expand Down
4 changes: 2 additions & 2 deletions template-compose/data/src/test/java/co/nimblehq/template/compose/data/test/MockUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.template.compose.data.test

import co.nimblehq.template.compose.data.response.ErrorResponse
import co.nimblehq.template.compose.data.responses.ErrorResponse
import io.mockk.every
import io.mockk.mockk
import okhttp3.ResponseBody
Expand Down Expand Up @@ -31,6 +31,6 @@ object MockUtil {
)

val responses = listOf(
co.nimblehq.template.compose.data.response.Response(id = 1)
co.nimblehq.template.compose.data.responses.Response(id = 1)
)
}
2 changes: 1 addition & 1 deletion ...compose/domain/src/main/java/co/nimblehq/template/compose/domain/exceptions/Exceptions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.template.compose.domain.exceptions

import co.nimblehq.template.compose.domain.model.Error
import co.nimblehq.template.compose.domain.models.Error

object NoConnectivityException : RuntimeException()

Expand Down
5 changes: 0 additions & 5 deletions template-compose/domain/src/main/java/co/nimblehq/template/compose/domain/model/Error.kt
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions template-compose/domain/src/main/java/co/nimblehq/template/compose/domain/model/Model.kt
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions template-compose/domain/src/main/java/co/nimblehq/template/compose/domain/models/Error.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package co.nimblehq.template.compose.domain.models

data class Error(
val message: String
)
5 changes: 5 additions & 0 deletions template-compose/domain/src/main/java/co/nimblehq/template/compose/domain/models/Model.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package co.nimblehq.template.compose.domain.models

data class Model(
val id: Int?
)
2 changes: 1 addition & 1 deletion ...in/repository/AppPreferencesRepository.kt → .../repositories/AppPreferencesRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package co.nimblehq.template.compose.domain.repository
package co.nimblehq.template.compose.domain.repositories

import kotlinx.coroutines.flow.Flow

Expand Down
9 changes: 9 additions & 0 deletions ...mpose/domain/src/main/java/co/nimblehq/template/compose/domain/repositories/Repository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package co.nimblehq.template.compose.domain.repositories

import co.nimblehq.template.compose.domain.models.Model
import kotlinx.coroutines.flow.Flow

interface Repository {

fun getModels(): Flow<List<Model>>
}
9 changes: 0 additions & 9 deletions ...compose/domain/src/main/java/co/nimblehq/template/compose/domain/repository/Repository.kt
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...emplate/compose/domain/usecase/UseCase.kt → ...mplate/compose/domain/usecases/UseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package co.nimblehq.template.compose.domain.usecase
package co.nimblehq.template.compose.domain.usecases

import co.nimblehq.template.compose.domain.model.Model
import co.nimblehq.template.compose.domain.repository.Repository
import co.nimblehq.template.compose.domain.models.Model
import co.nimblehq.template.compose.domain.repositories.Repository
import kotlinx.coroutines.flow.Flow
import javax.inject.Inject

Expand Down
2 changes: 1 addition & 1 deletion template-compose/domain/src/test/java/co/nimblehq/template/compose/domain/test/MockUtil.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.template.compose.domain.test

import co.nimblehq.template.compose.domain.model.Model
import co.nimblehq.template.compose.domain.models.Model

object MockUtil {

Expand Down
4 changes: 2 additions & 2 deletions ...ate/compose/domain/usecase/UseCaseTest.kt → ...te/compose/domain/usecases/UseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.template.compose.domain.usecase
package co.nimblehq.template.compose.domain.usecases

import co.nimblehq.template.compose.domain.repository.Repository
import co.nimblehq.template.compose.domain.repositories.Repository
import co.nimblehq.template.compose.domain.test.MockUtil
import io.kotest.matchers.shouldBe
import io.mockk.every
Expand Down
Loading