atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Move base url implementation to impl package

Browse Source
This commit is contained in:
Kirill Kamakin
2022-04-08 20:10:13 +05:00
parent 7c081c199a
commit 0a854947a9
10 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionInfo.kt
View File

@@ -4,4 +4,4 @@ data class VersionInfo(
val production: Boolean, val production: Boolean,
val version: String, val version: String,
val demoStatus: Boolean, val demoStatus: Boolean,
) )

3
app/src/main/java/gq/kirmanak/mealient/data/baseurl/BaseURLStorageImpl.kt → app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/BaseURLStorageImpl.kt
View File

@@ -1,6 +1,7 @@
package gq.kirmanak.mealient.data.baseurl package gq.kirmanak.mealient.data.baseurl.impl
import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.Preferences
import gq.kirmanak.mealient.data.baseurl.BaseURLStorage
import gq.kirmanak.mealient.data.storage.PreferencesStorage import gq.kirmanak.mealient.data.storage.PreferencesStorage
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

4
app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImpl.kt → app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionDataSourceImpl.kt
View File

@@ -1,5 +1,7 @@
package gq.kirmanak.mealient.data.baseurl package gq.kirmanak.mealient.data.baseurl.impl
import gq.kirmanak.mealient.data.baseurl.VersionDataSource
import gq.kirmanak.mealient.data.baseurl.VersionInfo
import gq.kirmanak.mealient.data.network.ServiceFactory import gq.kirmanak.mealient.data.network.ServiceFactory
import gq.kirmanak.mealient.extensions.mapToNetworkError import gq.kirmanak.mealient.extensions.mapToNetworkError
import gq.kirmanak.mealient.extensions.runCatchingExceptCancel import gq.kirmanak.mealient.extensions.runCatchingExceptCancel

4
app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionResponse.kt → app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionResponse.kt
View File

@@ -1,4 +1,4 @@
package gq.kirmanak.mealient.data.baseurl package gq.kirmanak.mealient.data.baseurl.impl
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
@@ -11,4 +11,4 @@ data class VersionResponse(
val version: String, val version: String,
@SerialName("demoStatus") @SerialName("demoStatus")
val demoStatus: Boolean, val demoStatus: Boolean,
) )

2
app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionService.kt → app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionService.kt
View File

@@ -1,4 +1,4 @@
package gq.kirmanak.mealient.data.baseurl package gq.kirmanak.mealient.data.baseurl.impl
import retrofit2.http.GET import retrofit2.http.GET

6
app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt
View File

@@ -5,7 +5,11 @@ import dagger.Module
import dagger.Provides import dagger.Provides
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent import dagger.hilt.components.SingletonComponent
import gq.kirmanak.mealient.data.baseurl.* import gq.kirmanak.mealient.data.baseurl.BaseURLStorage
import gq.kirmanak.mealient.data.baseurl.VersionDataSource
import gq.kirmanak.mealient.data.baseurl.impl.BaseURLStorageImpl
import gq.kirmanak.mealient.data.baseurl.impl.VersionDataSourceImpl
import gq.kirmanak.mealient.data.baseurl.impl.VersionService
import gq.kirmanak.mealient.data.network.RetrofitBuilder import gq.kirmanak.mealient.data.network.RetrofitBuilder
import gq.kirmanak.mealient.data.network.ServiceFactory import gq.kirmanak.mealient.data.network.ServiceFactory
import gq.kirmanak.mealient.data.network.createServiceFactory import gq.kirmanak.mealient.data.network.createServiceFactory

2
app/src/main/java/gq/kirmanak/mealient/extensions/RemoteToLocalMappings.kt
View File

@@ -1,7 +1,7 @@
package gq.kirmanak.mealient.extensions package gq.kirmanak.mealient.extensions
import gq.kirmanak.mealient.data.baseurl.VersionInfo import gq.kirmanak.mealient.data.baseurl.VersionInfo
import gq.kirmanak.mealient.data.baseurl.VersionResponse import gq.kirmanak.mealient.data.baseurl.impl.VersionResponse
import gq.kirmanak.mealient.data.recipes.db.entity.RecipeEntity import gq.kirmanak.mealient.data.recipes.db.entity.RecipeEntity
import gq.kirmanak.mealient.data.recipes.db.entity.RecipeIngredientEntity import gq.kirmanak.mealient.data.recipes.db.entity.RecipeIngredientEntity
import gq.kirmanak.mealient.data.recipes.db.entity.RecipeInstructionEntity import gq.kirmanak.mealient.data.recipes.db.entity.RecipeInstructionEntity

1
app/src/test/java/gq/kirmanak/mealient/data/baseurl/BaseURLStorageImplTest.kt
View File

@@ -2,6 +2,7 @@ package gq.kirmanak.mealient.data.baseurl
import androidx.datastore.preferences.core.stringPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import gq.kirmanak.mealient.data.baseurl.impl.BaseURLStorageImpl
import gq.kirmanak.mealient.data.storage.PreferencesStorage import gq.kirmanak.mealient.data.storage.PreferencesStorage
import io.mockk.MockKAnnotations import io.mockk.MockKAnnotations
import io.mockk.coEvery import io.mockk.coEvery

3
app/src/test/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImplTest.kt
View File

@@ -1,6 +1,9 @@
package gq.kirmanak.mealient.data.baseurl package gq.kirmanak.mealient.data.baseurl
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import gq.kirmanak.mealient.data.baseurl.impl.VersionDataSourceImpl
import gq.kirmanak.mealient.data.baseurl.impl.VersionResponse
import gq.kirmanak.mealient.data.baseurl.impl.VersionService
import gq.kirmanak.mealient.data.network.NetworkError import gq.kirmanak.mealient.data.network.NetworkError
import gq.kirmanak.mealient.data.network.ServiceFactory import gq.kirmanak.mealient.data.network.ServiceFactory
import gq.kirmanak.mealient.test.AuthImplTestData.TEST_BASE_URL import gq.kirmanak.mealient.test.AuthImplTestData.TEST_BASE_URL

2
app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt
View File

@@ -2,7 +2,7 @@ package gq.kirmanak.mealient.data.network
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import gq.kirmanak.mealient.data.baseurl.BaseURLStorage import gq.kirmanak.mealient.data.baseurl.BaseURLStorage
import gq.kirmanak.mealient.data.baseurl.VersionService import gq.kirmanak.mealient.data.baseurl.impl.VersionService
import gq.kirmanak.mealient.test.AuthImplTestData.TEST_BASE_URL import gq.kirmanak.mealient.test.AuthImplTestData.TEST_BASE_URL
import io.mockk.* import io.mockk.*
import io.mockk.impl.annotations.MockK import io.mockk.impl.annotations.MockK