diff --git a/app/src/main/java/gq/kirmanak/mealie/data/MealieDb.kt b/app/src/main/java/gq/kirmanak/mealie/data/MealieDb.kt index 0092b86..653239a 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/MealieDb.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/MealieDb.kt @@ -3,6 +3,7 @@ package gq.kirmanak.mealie.data import androidx.room.Database import androidx.room.RoomDatabase import androidx.room.TypeConverters +import gq.kirmanak.mealie.data.impl.RoomTypeConverters import gq.kirmanak.mealie.data.recipes.db.* import javax.inject.Singleton diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthModule.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthModule.kt index 9bce83c..60c0734 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthModule.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthModule.kt @@ -4,6 +4,9 @@ import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.android.components.ViewModelComponent +import gq.kirmanak.mealie.data.auth.impl.AuthDataSourceImpl +import gq.kirmanak.mealie.data.auth.impl.AuthRepoImpl +import gq.kirmanak.mealie.data.auth.impl.AuthStorageImpl import kotlinx.serialization.ExperimentalSerializationApi @ExperimentalSerializationApi diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthService.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthService.kt index 8524c0d..d06164c 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthService.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthService.kt @@ -1,5 +1,6 @@ package gq.kirmanak.mealie.data.auth +import gq.kirmanak.mealie.data.auth.impl.GetTokenResponse import retrofit2.http.Field import retrofit2.http.FormUrlEncoded import retrofit2.http.POST diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSourceImpl.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthDataSourceImpl.kt similarity index 83% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSourceImpl.kt rename to app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthDataSourceImpl.kt index 0eddad1..57c1b91 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSourceImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthDataSourceImpl.kt @@ -1,6 +1,8 @@ -package gq.kirmanak.mealie.data.auth +package gq.kirmanak.mealie.data.auth.impl -import gq.kirmanak.mealie.data.RetrofitBuilder +import gq.kirmanak.mealie.data.impl.RetrofitBuilder +import gq.kirmanak.mealie.data.auth.AuthDataSource +import gq.kirmanak.mealie.data.auth.AuthService import kotlinx.serialization.ExperimentalSerializationApi import retrofit2.create import timber.log.Timber diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthOkHttpInterceptor.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthOkHttpInterceptor.kt similarity index 90% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/AuthOkHttpInterceptor.kt rename to app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthOkHttpInterceptor.kt index 0900d42..0c3b8fc 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthOkHttpInterceptor.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthOkHttpInterceptor.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.auth +package gq.kirmanak.mealie.data.auth.impl import okhttp3.Interceptor import okhttp3.Response diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthRepoImpl.kt similarity index 87% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepoImpl.kt rename to app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthRepoImpl.kt index 62711eb..987c952 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepoImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthRepoImpl.kt @@ -1,5 +1,8 @@ -package gq.kirmanak.mealie.data.auth +package gq.kirmanak.mealie.data.auth.impl +import gq.kirmanak.mealie.data.auth.AuthDataSource +import gq.kirmanak.mealie.data.auth.AuthRepo +import gq.kirmanak.mealie.data.auth.AuthStorage import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorageImpl.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthStorageImpl.kt similarity index 94% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorageImpl.kt rename to app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthStorageImpl.kt index f59f5b6..786b53f 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorageImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthStorageImpl.kt @@ -1,9 +1,10 @@ -package gq.kirmanak.mealie.data.auth +package gq.kirmanak.mealie.data.auth.impl import android.content.Context import android.content.SharedPreferences import androidx.preference.PreferenceManager import dagger.hilt.android.qualifiers.ApplicationContext +import gq.kirmanak.mealie.data.auth.AuthStorage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import timber.log.Timber diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/GetTokenResponse.kt b/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/GetTokenResponse.kt similarity index 84% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/GetTokenResponse.kt rename to app/src/main/java/gq/kirmanak/mealie/data/auth/impl/GetTokenResponse.kt index 372615d..1fa92ff 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/GetTokenResponse.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/GetTokenResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.auth +package gq.kirmanak.mealie.data.auth.impl import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/gq/kirmanak/mealie/data/OkHttpBuilder.kt b/app/src/main/java/gq/kirmanak/mealie/data/impl/OkHttpBuilder.kt similarity index 88% rename from app/src/main/java/gq/kirmanak/mealie/data/OkHttpBuilder.kt rename to app/src/main/java/gq/kirmanak/mealie/data/impl/OkHttpBuilder.kt index 2c66ceb..2c39f21 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/OkHttpBuilder.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/impl/OkHttpBuilder.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealie.data +package gq.kirmanak.mealie.data.impl -import gq.kirmanak.mealie.data.auth.AuthOkHttpInterceptor +import gq.kirmanak.mealie.data.auth.impl.AuthOkHttpInterceptor import okhttp3.Interceptor import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor diff --git a/app/src/main/java/gq/kirmanak/mealie/data/RetrofitBuilder.kt b/app/src/main/java/gq/kirmanak/mealie/data/impl/RetrofitBuilder.kt similarity index 95% rename from app/src/main/java/gq/kirmanak/mealie/data/RetrofitBuilder.kt rename to app/src/main/java/gq/kirmanak/mealie/data/impl/RetrofitBuilder.kt index d8d699d..2ddadff 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/RetrofitBuilder.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/impl/RetrofitBuilder.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data +package gq.kirmanak.mealie.data.impl import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory import kotlinx.serialization.ExperimentalSerializationApi diff --git a/app/src/main/java/gq/kirmanak/mealie/data/RoomTypeConverters.kt b/app/src/main/java/gq/kirmanak/mealie/data/impl/RoomTypeConverters.kt similarity index 94% rename from app/src/main/java/gq/kirmanak/mealie/data/RoomTypeConverters.kt rename to app/src/main/java/gq/kirmanak/mealie/data/impl/RoomTypeConverters.kt index bfd5626..7db45a7 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/RoomTypeConverters.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/impl/RoomTypeConverters.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data +package gq.kirmanak.mealie.data.impl import androidx.room.TypeConverter import kotlinx.datetime.* diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeModule.kt b/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeModule.kt index 937e542..7c81c31 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeModule.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeModule.kt @@ -7,6 +7,8 @@ import dagger.hilt.InstallIn import dagger.hilt.android.components.ViewModelComponent import gq.kirmanak.mealie.data.recipes.db.RecipeStorage import gq.kirmanak.mealie.data.recipes.db.RecipeStorageImpl +import gq.kirmanak.mealie.data.recipes.impl.RecipeImageLoaderImpl +import gq.kirmanak.mealie.data.recipes.impl.RecipeRepoImpl import gq.kirmanak.mealie.data.recipes.network.RecipeDataSource import gq.kirmanak.mealie.data.recipes.network.RecipeDataSourceImpl import kotlinx.serialization.ExperimentalSerializationApi diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeImageLoaderImpl.kt b/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeImageLoaderImpl.kt similarity index 86% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeImageLoaderImpl.kt rename to app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeImageLoaderImpl.kt index c478bf2..0a7385a 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeImageLoaderImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeImageLoaderImpl.kt @@ -1,8 +1,9 @@ -package gq.kirmanak.mealie.data.recipes +package gq.kirmanak.mealie.data.recipes.impl import android.widget.ImageView import gq.kirmanak.mealie.R import gq.kirmanak.mealie.data.auth.AuthRepo +import gq.kirmanak.mealie.data.recipes.RecipeImageLoader import gq.kirmanak.mealie.ui.ImageLoader import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeRepoImpl.kt similarity index 87% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeRepoImpl.kt rename to app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeRepoImpl.kt index dfcb17d..41bc3c2 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeRepoImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeRepoImpl.kt @@ -1,8 +1,9 @@ -package gq.kirmanak.mealie.data.recipes +package gq.kirmanak.mealie.data.recipes.impl import androidx.paging.ExperimentalPagingApi import androidx.paging.Pager import androidx.paging.PagingConfig +import gq.kirmanak.mealie.data.recipes.RecipeRepo import gq.kirmanak.mealie.data.recipes.db.RecipeEntity import gq.kirmanak.mealie.data.recipes.db.RecipeStorage import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipesRemoteMediator.kt b/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipesRemoteMediator.kt similarity index 97% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipesRemoteMediator.kt rename to app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipesRemoteMediator.kt index afb7db7..45adb9f 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipesRemoteMediator.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipesRemoteMediator.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes +package gq.kirmanak.mealie.data.recipes.impl import androidx.paging.ExperimentalPagingApi import androidx.paging.LoadType diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSourceImpl.kt b/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSourceImpl.kt index 05ee4f0..f3814b1 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSourceImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSourceImpl.kt @@ -1,6 +1,6 @@ package gq.kirmanak.mealie.data.recipes.network -import gq.kirmanak.mealie.data.RetrofitBuilder +import gq.kirmanak.mealie.data.impl.RetrofitBuilder import gq.kirmanak.mealie.data.auth.AuthRepo import kotlinx.serialization.ExperimentalSerializationApi import timber.log.Timber