From 5866584d143baaaa9bfa5c689d599ccdcc3fa090 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 20 Nov 2021 13:41:47 +0300 Subject: [PATCH] Replace "Mealie" with "Mealient" everywhere --- .gitlab-ci.yml | 13 ++-- README.md | 2 +- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 6 +- .../data/recipes/network/RecipeDataSource.kt | 10 --- .../{mealie/MealieApp.kt => mealient/App.kt} | 4 +- .../{mealie => mealient}/MainActivity.kt | 6 +- .../MealieDb.kt => mealient/data/AppDb.kt} | 10 +-- .../data/AppModule.kt} | 8 +-- .../data/auth/AuthDataSource.kt | 2 +- .../data/auth/AuthModule.kt | 8 +-- .../data/auth/AuthRepo.kt | 2 +- .../data/auth/AuthService.kt | 4 +- .../data/auth/AuthStorage.kt | 2 +- .../data/auth/impl/AuthDataSourceImpl.kt | 8 +-- .../data/auth/impl/AuthOkHttpInterceptor.kt | 2 +- .../data/auth/impl/AuthRepoImpl.kt | 8 +-- .../data/auth/impl/AuthStorageImpl.kt | 4 +- .../data/auth/impl/GetTokenResponse.kt | 2 +- .../data/impl/OkHttpBuilder.kt | 6 +- .../data/impl/RetrofitBuilder.kt | 2 +- .../data/impl/RoomTypeConverters.kt | 2 +- .../data/recipes/RecipeImageLoader.kt | 2 +- .../data/recipes/RecipeModule.kt | 14 ++-- .../data/recipes/RecipeRepo.kt | 6 +- .../data/recipes/db/RecipeDao.kt | 6 +- .../data/recipes/db/RecipeStorage.kt | 10 +-- .../data/recipes/db/RecipeStorageImpl.kt | 18 ++--- .../data/recipes/db/entity/CategoryEntity.kt | 2 +- .../recipes/db/entity/CategoryRecipeEntity.kt | 2 +- .../data/recipes/db/entity/RecipeEntity.kt | 2 +- .../db/entity/RecipeIngredientEntity.kt | 2 +- .../db/entity/RecipeInstructionEntity.kt | 2 +- .../recipes/db/entity/RecipeSummaryEntity.kt | 2 +- .../data/recipes/db/entity/TagEntity.kt | 2 +- .../data/recipes/db/entity/TagRecipeEntity.kt | 2 +- .../data/recipes/impl/FullRecipeInfo.kt | 10 +-- .../recipes/impl/RecipeImageLoaderImpl.kt | 10 +-- .../recipes/impl/RecipePagingSourceFactory.kt | 6 +- .../data/recipes/impl/RecipeRepoImpl.kt | 10 +-- .../recipes/impl/RecipesRemoteMediator.kt | 8 +-- .../data/recipes/network/RecipeDataSource.kt | 10 +++ .../recipes/network/RecipeDataSourceImpl.kt | 10 +-- .../data/recipes/network/RecipeService.kt | 6 +- .../response/GetRecipeIngredientResponse.kt | 2 +- .../response/GetRecipeInstructionResponse.kt | 2 +- .../network/response/GetRecipeResponse.kt | 2 +- .../response/GetRecipeSummaryResponse.kt | 2 +- .../{mealie => mealient}/ui/ImageLoader.kt | 2 +- .../ui/SwipeRefreshLayoutHelper.kt | 2 +- .../{mealie => mealient}/ui/UiModule.kt | 4 +- .../ui/auth/AuthenticationFragment.kt | 4 +- .../ui/auth/AuthenticationViewModel.kt | 6 +- .../ui/glide/ImageLoaderGlide.kt | 4 +- .../ui/glide/MainGlideModule.kt} | 4 +- .../ui/recipes/RecipeViewHolder.kt | 8 +-- .../ui/recipes/RecipeViewModel.kt | 8 +-- .../ui/recipes/RecipesFragment.kt | 10 +-- .../ui/recipes/RecipesPagingAdapter.kt | 6 +- .../ui/recipes/info/RecipeInfoFragment.kt | 6 +- .../ui/recipes/info/RecipeInfoViewModel.kt | 8 +-- .../recipes/info/RecipeIngredientsAdapter.kt | 8 +-- .../recipes/info/RecipeInstructionsAdapter.kt | 6 +- app/src/main/res/navigation/nav_graph.xml | 8 +-- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/themes.xml | 2 +- .../data/auth/impl/AuthDataSourceImplTest.kt | 16 ++--- .../data/auth/impl/AuthRepoImplTest.kt | 14 ++-- .../data/auth/impl/AuthStorageImplTest.kt | 8 +-- .../data/impl/OkHttpBuilderTest.kt | 8 +-- .../data/impl/RoomTypeConvertersTest.kt | 2 +- .../data/recipes/db/RecipeStorageImplTest.kt | 72 +++++++++---------- .../data/recipes/impl/RecipeRepoImplTest.kt | 22 +++--- .../recipes/impl/RecipesRemoteMediatorTest.kt | 24 +++---- .../data/test/AuthImplTestData.kt | 2 +- .../data/test/HiltRobolectricTest.kt | 2 +- .../data/test/MockServerTest.kt | 2 +- .../data/test/MockServerWithAuthTest.kt | 10 +-- .../data/test/RecipeImplTestData.kt | 20 +++--- settings.gradle | 2 +- 81 files changed, 283 insertions(+), 284 deletions(-) delete mode 100644 app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSource.kt rename app/src/main/java/gq/kirmanak/{mealie/MealieApp.kt => mealient/App.kt} (82%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/MainActivity.kt (93%) rename app/src/main/java/gq/kirmanak/{mealie/data/MealieDb.kt => mealient/data/AppDb.kt} (67%) rename app/src/main/java/gq/kirmanak/{mealie/data/MealieModule.kt => mealient/data/AppModule.kt} (60%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/auth/AuthDataSource.kt (85%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/auth/AuthModule.kt (73%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/auth/AuthRepo.kt (87%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/auth/AuthService.kt (84%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/auth/AuthStorage.kt (86%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/auth/impl/AuthDataSourceImpl.kt (79%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/auth/impl/AuthOkHttpInterceptor.kt (91%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/auth/impl/AuthRepoImpl.kt (86%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/auth/impl/AuthStorageImpl.kt (96%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/auth/impl/GetTokenResponse.kt (84%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/impl/OkHttpBuilder.kt (85%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/impl/RetrofitBuilder.kt (96%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/impl/RoomTypeConverters.kt (94%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/RecipeImageLoader.kt (75%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/RecipeModule.kt (63%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/RecipeRepo.kt (56%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/RecipeDao.kt (94%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/RecipeStorage.kt (56%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/RecipeStorageImpl.kt (90%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/entity/CategoryEntity.kt (87%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/entity/CategoryRecipeEntity.kt (94%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/entity/RecipeEntity.kt (84%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/entity/RecipeIngredientEntity.kt (92%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/entity/RecipeInstructionEntity.kt (89%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/entity/RecipeSummaryEntity.kt (94%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/entity/TagEntity.kt (87%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/entity/TagRecipeEntity.kt (93%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/impl/FullRecipeInfo.kt (63%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/impl/RecipeImageLoaderImpl.kt (72%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/impl/RecipePagingSourceFactory.kt (82%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/impl/RecipeRepoImpl.kt (83%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/impl/RecipesRemoteMediator.kt (90%) create mode 100644 app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSource.kt rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/network/RecipeDataSourceImpl.kt (85%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/network/RecipeService.kt (67%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/network/response/GetRecipeIngredientResponse.kt (88%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/network/response/GetRecipeInstructionResponse.kt (79%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/network/response/GetRecipeResponse.kt (94%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/data/recipes/network/response/GetRecipeSummaryResponse.kt (93%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/ImageLoader.kt (85%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/SwipeRefreshLayoutHelper.kt (97%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/UiModule.kt (76%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/auth/AuthenticationFragment.kt (97%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/auth/AuthenticationViewModel.kt (88%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/glide/ImageLoaderGlide.kt (83%) rename app/src/main/java/gq/kirmanak/{mealie/ui/glide/MealieGlideModule.kt => mealient/ui/glide/MainGlideModule.kt} (58%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/recipes/RecipeViewHolder.kt (76%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/recipes/RecipeViewModel.kt (74%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/recipes/RecipesFragment.kt (91%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/recipes/RecipesPagingAdapter.kt (89%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/recipes/info/RecipeInfoFragment.kt (95%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/recipes/info/RecipeInfoViewModel.kt (86%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/recipes/info/RecipeIngredientsAdapter.kt (84%) rename app/src/main/java/gq/kirmanak/{mealie => mealient}/ui/recipes/info/RecipeInstructionsAdapter.kt (89%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/auth/impl/AuthDataSourceImplTest.kt (77%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/auth/impl/AuthRepoImplTest.kt (78%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/auth/impl/AuthStorageImplTest.kt (91%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/impl/OkHttpBuilderTest.kt (83%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/impl/RoomTypeConvertersTest.kt (96%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/recipes/db/RecipeStorageImplTest.kt (69%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/recipes/impl/RecipeRepoImplTest.kt (67%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/recipes/impl/RecipesRemoteMediatorTest.kt (83%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/test/AuthImplTestData.kt (96%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/test/HiltRobolectricTest.kt (96%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/test/MockServerTest.kt (92%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/test/MockServerWithAuthTest.kt (57%) rename app/src/test/java/gq/kirmanak/{mealie => mealient}/data/test/RecipeImplTestData.kt (94%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c1355f..ff4992d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,6 @@ before_script: - export GRADLE_USER_HOME=`pwd`/.gradle cache: - key: "mealie-android" paths: - .gradle @@ -19,10 +18,10 @@ assembleDebug: needs: [ ] script: - ./gradlew assembleDebug - - cp app/build/outputs/apk/debug/*.apk mealie-debug.apk + - cp app/build/outputs/apk/debug/*.apk mealient-debug.apk artifacts: paths: - - mealie-debug.apk + - mealient-debug.apk checkApp: interruptible: true @@ -40,15 +39,15 @@ assembleRelease: stage: build needs: [ "checkApp" ] script: - - echo "$MEALIE_KEY_STORE" | base64 -d > app/mealie-release-key.jks - - echo "storeFile=mealie-release-key.jks" > keystore.properties + - echo "$MEALIE_KEY_STORE" | base64 -d > app/mealient-release-key.jks + - echo "storeFile=mealient-release-key.jks" > keystore.properties - echo "storePassword=$MEALIE_KEY_STORE_PASSWORD" >> keystore.properties - echo "keyAlias=$MEALIE_KEY_ALIAS" >> keystore.properties - echo "keyPassword=$MEALIE_KEY_PASSWORD" >> keystore.properties - ./gradlew assembleRelease - - cp app/build/outputs/apk/release/*.apk mealie-release.apk + - cp app/build/outputs/apk/release/*.apk mealient-release.apk artifacts: paths: - - mealie-release.apk + - mealient-release.apk rules: - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' \ No newline at end of file diff --git a/README.md b/README.md index 0c592b2..2346c9d 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,6 @@ If you face any issues using the application or have a feature request DO NOT se Instead, report a new issue in this repository. THAT IS NOT AN OFFICIAL CLIENT. -# Mealie Android Application +# Mealient Android Application An Android client for [Mealie](https://hay-kot.github.io/mealie/). Easily access your recipes using your phone. \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8ff8134..25aad67 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { compileSdk 31 defaultConfig { - applicationId "gq.kirmanak.mealie" + applicationId "gq.kirmanak.mealient" minSdk 21 targetSdk 31 versionCode 1 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 88e2dbf..865d459 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,18 +1,18 @@ + package="gq.kirmanak.mealient"> + android:theme="@style/Theme.Mealient"> diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSource.kt b/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSource.kt deleted file mode 100644 index a97bd83..0000000 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSource.kt +++ /dev/null @@ -1,10 +0,0 @@ -package gq.kirmanak.mealie.data.recipes.network - -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeResponse -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeSummaryResponse - -interface RecipeDataSource { - suspend fun requestRecipes(start: Int = 0, limit: Int = 9999): List - - suspend fun requestRecipeInfo(slug: String): GetRecipeResponse -} \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealie/MealieApp.kt b/app/src/main/java/gq/kirmanak/mealient/App.kt similarity index 82% rename from app/src/main/java/gq/kirmanak/mealie/MealieApp.kt rename to app/src/main/java/gq/kirmanak/mealient/App.kt index 1aaeb06..7a28e6f 100644 --- a/app/src/main/java/gq/kirmanak/mealie/MealieApp.kt +++ b/app/src/main/java/gq/kirmanak/mealient/App.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealie +package gq.kirmanak.mealient import android.app.Application import dagger.hilt.android.HiltAndroidApp import timber.log.Timber @HiltAndroidApp -class MealieApp : Application() { +class App : Application() { override fun onCreate() { super.onCreate() if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree()) diff --git a/app/src/main/java/gq/kirmanak/mealie/MainActivity.kt b/app/src/main/java/gq/kirmanak/mealient/MainActivity.kt similarity index 93% rename from app/src/main/java/gq/kirmanak/mealie/MainActivity.kt rename to app/src/main/java/gq/kirmanak/mealient/MainActivity.kt index d3d09e6..33ef85e 100644 --- a/app/src/main/java/gq/kirmanak/mealie/MainActivity.kt +++ b/app/src/main/java/gq/kirmanak/mealient/MainActivity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie +package gq.kirmanak.mealient import android.os.Bundle import android.view.Menu @@ -7,8 +7,8 @@ import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope import dagger.hilt.android.AndroidEntryPoint -import gq.kirmanak.mealie.databinding.MainActivityBinding -import gq.kirmanak.mealie.ui.auth.AuthenticationViewModel +import gq.kirmanak.mealient.databinding.MainActivityBinding +import gq.kirmanak.mealient.ui.auth.AuthenticationViewModel import kotlinx.coroutines.flow.collectLatest import timber.log.Timber diff --git a/app/src/main/java/gq/kirmanak/mealie/data/MealieDb.kt b/app/src/main/java/gq/kirmanak/mealient/data/AppDb.kt similarity index 67% rename from app/src/main/java/gq/kirmanak/mealie/data/MealieDb.kt rename to app/src/main/java/gq/kirmanak/mealient/data/AppDb.kt index f19da74..67c20d2 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/MealieDb.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/AppDb.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealie.data +package gq.kirmanak.mealient.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.RecipeDao -import gq.kirmanak.mealie.data.recipes.db.entity.* +import gq.kirmanak.mealient.data.impl.RoomTypeConverters +import gq.kirmanak.mealient.data.recipes.db.RecipeDao +import gq.kirmanak.mealient.data.recipes.db.entity.* import javax.inject.Singleton @Database( @@ -15,6 +15,6 @@ import javax.inject.Singleton ) @TypeConverters(RoomTypeConverters::class) @Singleton -abstract class MealieDb : RoomDatabase() { +abstract class AppDb : RoomDatabase() { abstract fun recipeDao(): RecipeDao } \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealie/data/MealieModule.kt b/app/src/main/java/gq/kirmanak/mealient/data/AppModule.kt similarity index 60% rename from app/src/main/java/gq/kirmanak/mealie/data/MealieModule.kt rename to app/src/main/java/gq/kirmanak/mealient/data/AppModule.kt index a83e079..1a5b32d 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/MealieModule.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/AppModule.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data +package gq.kirmanak.mealient.data import android.content.Context import androidx.room.Room @@ -10,11 +10,11 @@ import dagger.hilt.components.SingletonComponent @Module @InstallIn(SingletonComponent::class) -interface MealieModule { +interface AppModule { companion object { @Provides - fun createDb(@ApplicationContext context: Context): MealieDb { - return Room.databaseBuilder(context, MealieDb::class.java, "mealie.db").build() + fun createDb(@ApplicationContext context: Context): AppDb { + return Room.databaseBuilder(context, AppDb::class.java, "app.db").build() } } } \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSource.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthDataSource.kt similarity index 85% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSource.kt rename to app/src/main/java/gq/kirmanak/mealient/data/auth/AuthDataSource.kt index c5187cc..e97ad2a 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSource.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthDataSource.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.auth +package gq.kirmanak.mealient.data.auth interface AuthDataSource { /** diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthModule.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthModule.kt similarity index 73% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/AuthModule.kt rename to app/src/main/java/gq/kirmanak/mealient/data/auth/AuthModule.kt index 6825c79..2465ff7 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthModule.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthModule.kt @@ -1,12 +1,12 @@ -package gq.kirmanak.mealie.data.auth +package gq.kirmanak.mealient.data.auth import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -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 gq.kirmanak.mealient.data.auth.impl.AuthDataSourceImpl +import gq.kirmanak.mealient.data.auth.impl.AuthRepoImpl +import gq.kirmanak.mealient.data.auth.impl.AuthStorageImpl import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.serialization.ExperimentalSerializationApi diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepo.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthRepo.kt similarity index 87% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepo.kt rename to app/src/main/java/gq/kirmanak/mealient/data/auth/AuthRepo.kt index 0889203..5240fe8 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepo.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthRepo.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.auth +package gq.kirmanak.mealient.data.auth import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthService.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthService.kt similarity index 84% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/AuthService.kt rename to app/src/main/java/gq/kirmanak/mealient/data/auth/AuthService.kt index d06164c..4de62b4 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthService.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthService.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealie.data.auth +package gq.kirmanak.mealient.data.auth -import gq.kirmanak.mealie.data.auth.impl.GetTokenResponse +import gq.kirmanak.mealient.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/AuthStorage.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthStorage.kt similarity index 86% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorage.kt rename to app/src/main/java/gq/kirmanak/mealient/data/auth/AuthStorage.kt index 1ae6dc0..79d46cc 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorage.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthStorage.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.auth +package gq.kirmanak.mealient.data.auth import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthDataSourceImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt similarity index 79% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthDataSourceImpl.kt rename to app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt index 63097ce..1346ad9 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthDataSourceImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealie.data.auth.impl +package gq.kirmanak.mealient.data.auth.impl -import gq.kirmanak.mealie.data.auth.AuthDataSource -import gq.kirmanak.mealie.data.auth.AuthService -import gq.kirmanak.mealie.data.impl.RetrofitBuilder +import gq.kirmanak.mealient.data.auth.AuthDataSource +import gq.kirmanak.mealient.data.auth.AuthService +import gq.kirmanak.mealient.data.impl.RetrofitBuilder import kotlinx.serialization.ExperimentalSerializationApi import retrofit2.create import timber.log.Timber diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthOkHttpInterceptor.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthOkHttpInterceptor.kt similarity index 91% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthOkHttpInterceptor.kt rename to app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthOkHttpInterceptor.kt index 1742dab..d5c910f 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthOkHttpInterceptor.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthOkHttpInterceptor.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.auth.impl +package gq.kirmanak.mealient.data.auth.impl import okhttp3.Interceptor import okhttp3.Response diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImpl.kt similarity index 86% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthRepoImpl.kt rename to app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImpl.kt index 9592358..85c4909 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthRepoImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImpl.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealie.data.auth.impl +package gq.kirmanak.mealient.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 gq.kirmanak.mealient.data.auth.AuthDataSource +import gq.kirmanak.mealient.data.auth.AuthRepo +import gq.kirmanak.mealient.data.auth.AuthStorage import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import timber.log.Timber diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthStorageImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt similarity index 96% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthStorageImpl.kt rename to app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt index e79f709..f9a6e0c 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthStorageImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt @@ -1,10 +1,10 @@ -package gq.kirmanak.mealie.data.auth.impl +package gq.kirmanak.mealient.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 gq.kirmanak.mealient.data.auth.AuthStorage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.channels.awaitClose diff --git a/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/GetTokenResponse.kt b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/GetTokenResponse.kt similarity index 84% rename from app/src/main/java/gq/kirmanak/mealie/data/auth/impl/GetTokenResponse.kt rename to app/src/main/java/gq/kirmanak/mealient/data/auth/impl/GetTokenResponse.kt index 1fa92ff..a73e4cf 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/auth/impl/GetTokenResponse.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/GetTokenResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.auth.impl +package gq.kirmanak.mealient.data.auth.impl import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/gq/kirmanak/mealie/data/impl/OkHttpBuilder.kt b/app/src/main/java/gq/kirmanak/mealient/data/impl/OkHttpBuilder.kt similarity index 85% rename from app/src/main/java/gq/kirmanak/mealie/data/impl/OkHttpBuilder.kt rename to app/src/main/java/gq/kirmanak/mealient/data/impl/OkHttpBuilder.kt index 4646619..a0b5805 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/impl/OkHttpBuilder.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/impl/OkHttpBuilder.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealie.data.impl +package gq.kirmanak.mealient.data.impl -import gq.kirmanak.mealie.BuildConfig -import gq.kirmanak.mealie.data.auth.impl.AuthOkHttpInterceptor +import gq.kirmanak.mealient.BuildConfig +import gq.kirmanak.mealient.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/impl/RetrofitBuilder.kt b/app/src/main/java/gq/kirmanak/mealient/data/impl/RetrofitBuilder.kt similarity index 96% rename from app/src/main/java/gq/kirmanak/mealie/data/impl/RetrofitBuilder.kt rename to app/src/main/java/gq/kirmanak/mealient/data/impl/RetrofitBuilder.kt index 98c8878..e408ae3 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/impl/RetrofitBuilder.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/impl/RetrofitBuilder.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.impl +package gq.kirmanak.mealient.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/impl/RoomTypeConverters.kt b/app/src/main/java/gq/kirmanak/mealient/data/impl/RoomTypeConverters.kt similarity index 94% rename from app/src/main/java/gq/kirmanak/mealie/data/impl/RoomTypeConverters.kt rename to app/src/main/java/gq/kirmanak/mealient/data/impl/RoomTypeConverters.kt index 7db45a7..6177735 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/impl/RoomTypeConverters.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/impl/RoomTypeConverters.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.impl +package gq.kirmanak.mealient.data.impl import androidx.room.TypeConverter import kotlinx.datetime.* diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeImageLoader.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeImageLoader.kt similarity index 75% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeImageLoader.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeImageLoader.kt index 53647ec..0604e72 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeImageLoader.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeImageLoader.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes +package gq.kirmanak.mealient.data.recipes import android.widget.ImageView diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeModule.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeModule.kt similarity index 63% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeModule.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeModule.kt index 2aa5f1f..6659867 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeModule.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeModule.kt @@ -1,16 +1,16 @@ -package gq.kirmanak.mealie.data.recipes +package gq.kirmanak.mealient.data.recipes import androidx.paging.ExperimentalPagingApi import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -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 gq.kirmanak.mealient.data.recipes.db.RecipeStorage +import gq.kirmanak.mealient.data.recipes.db.RecipeStorageImpl +import gq.kirmanak.mealient.data.recipes.impl.RecipeImageLoaderImpl +import gq.kirmanak.mealient.data.recipes.impl.RecipeRepoImpl +import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource +import gq.kirmanak.mealient.data.recipes.network.RecipeDataSourceImpl import kotlinx.serialization.ExperimentalSerializationApi @ExperimentalPagingApi diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeRepo.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeRepo.kt similarity index 56% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeRepo.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeRepo.kt index 35cfe46..56f3086 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeRepo.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeRepo.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealie.data.recipes +package gq.kirmanak.mealient.data.recipes import androidx.paging.Pager -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeSummaryEntity -import gq.kirmanak.mealie.data.recipes.impl.FullRecipeInfo +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity +import gq.kirmanak.mealient.data.recipes.impl.FullRecipeInfo interface RecipeRepo { fun createPager(): Pager diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeDao.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeDao.kt similarity index 94% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeDao.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeDao.kt index f836c52..4313bb5 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeDao.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeDao.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealie.data.recipes.db +package gq.kirmanak.mealient.data.recipes.db import androidx.paging.PagingSource import androidx.room.* -import gq.kirmanak.mealie.data.recipes.db.entity.* -import gq.kirmanak.mealie.data.recipes.impl.FullRecipeInfo +import gq.kirmanak.mealient.data.recipes.db.entity.* +import gq.kirmanak.mealient.data.recipes.impl.FullRecipeInfo @Dao interface RecipeDao { diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeStorage.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorage.kt similarity index 56% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeStorage.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorage.kt index b009869..16928e1 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeStorage.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorage.kt @@ -1,10 +1,10 @@ -package gq.kirmanak.mealie.data.recipes.db +package gq.kirmanak.mealient.data.recipes.db import androidx.paging.PagingSource -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeSummaryEntity -import gq.kirmanak.mealie.data.recipes.impl.FullRecipeInfo -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeResponse -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeSummaryResponse +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity +import gq.kirmanak.mealient.data.recipes.impl.FullRecipeInfo +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeResponse +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeSummaryResponse interface RecipeStorage { suspend fun saveRecipes(recipes: List) diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeStorageImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorageImpl.kt similarity index 90% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeStorageImpl.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorageImpl.kt index 9bddb44..5fe7305 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeStorageImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorageImpl.kt @@ -1,19 +1,19 @@ -package gq.kirmanak.mealie.data.recipes.db +package gq.kirmanak.mealient.data.recipes.db import androidx.paging.PagingSource import androidx.room.withTransaction -import gq.kirmanak.mealie.data.MealieDb -import gq.kirmanak.mealie.data.recipes.db.entity.* -import gq.kirmanak.mealie.data.recipes.impl.FullRecipeInfo -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeIngredientResponse -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeInstructionResponse -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeResponse -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeSummaryResponse +import gq.kirmanak.mealient.data.AppDb +import gq.kirmanak.mealient.data.recipes.db.entity.* +import gq.kirmanak.mealient.data.recipes.impl.FullRecipeInfo +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeIngredientResponse +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeInstructionResponse +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeResponse +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeSummaryResponse import timber.log.Timber import javax.inject.Inject class RecipeStorageImpl @Inject constructor( - private val db: MealieDb + private val db: AppDb ) : RecipeStorage { private val recipeDao: RecipeDao by lazy { db.recipeDao() } diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/CategoryEntity.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/CategoryEntity.kt similarity index 87% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/CategoryEntity.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/CategoryEntity.kt index 270ab18..fc40158 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/CategoryEntity.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/CategoryEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.db.entity +package gq.kirmanak.mealient.data.recipes.db.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/CategoryRecipeEntity.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/CategoryRecipeEntity.kt similarity index 94% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/CategoryRecipeEntity.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/CategoryRecipeEntity.kt index 14a9c2e..9c6ed30 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/CategoryRecipeEntity.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/CategoryRecipeEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.db.entity +package gq.kirmanak.mealient.data.recipes.db.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeEntity.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeEntity.kt similarity index 84% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeEntity.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeEntity.kt index 9a56321..025afcf 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeEntity.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.db.entity +package gq.kirmanak.mealient.data.recipes.db.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeIngredientEntity.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeIngredientEntity.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeIngredientEntity.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeIngredientEntity.kt index bc8b97b..86f75e1 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeIngredientEntity.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeIngredientEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.db.entity +package gq.kirmanak.mealient.data.recipes.db.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeInstructionEntity.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeInstructionEntity.kt similarity index 89% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeInstructionEntity.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeInstructionEntity.kt index f655df9..d4f9dfb 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeInstructionEntity.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeInstructionEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.db.entity +package gq.kirmanak.mealient.data.recipes.db.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeSummaryEntity.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeSummaryEntity.kt similarity index 94% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeSummaryEntity.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeSummaryEntity.kt index c64a7ed..50dc819 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeSummaryEntity.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeSummaryEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.db.entity +package gq.kirmanak.mealient.data.recipes.db.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/TagEntity.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/TagEntity.kt similarity index 87% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/TagEntity.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/TagEntity.kt index 61eb920..29207a8 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/TagEntity.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/TagEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.db.entity +package gq.kirmanak.mealient.data.recipes.db.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/TagRecipeEntity.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/TagRecipeEntity.kt similarity index 93% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/TagRecipeEntity.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/TagRecipeEntity.kt index d69ecd7..04743c8 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/TagRecipeEntity.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/TagRecipeEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.db.entity +package gq.kirmanak.mealient.data.recipes.db.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/FullRecipeInfo.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/FullRecipeInfo.kt similarity index 63% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/FullRecipeInfo.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/FullRecipeInfo.kt index 08f8c70..7b5a86f 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/FullRecipeInfo.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/FullRecipeInfo.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealie.data.recipes.impl +package gq.kirmanak.mealient.data.recipes.impl import androidx.room.Embedded import androidx.room.Relation -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeEntity -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeIngredientEntity -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeInstructionEntity -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeSummaryEntity +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.RecipeInstructionEntity +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity data class FullRecipeInfo( @Embedded val recipeEntity: RecipeEntity, diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeImageLoaderImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImpl.kt similarity index 72% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeImageLoaderImpl.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImpl.kt index f3870d9..1c15bd7 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeImageLoaderImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImpl.kt @@ -1,10 +1,10 @@ -package gq.kirmanak.mealie.data.recipes.impl +package gq.kirmanak.mealient.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 gq.kirmanak.mealient.R +import gq.kirmanak.mealient.data.auth.AuthRepo +import gq.kirmanak.mealient.data.recipes.RecipeImageLoader +import gq.kirmanak.mealient.ui.ImageLoader import javax.inject.Inject class RecipeImageLoaderImpl @Inject constructor( diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipePagingSourceFactory.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactory.kt similarity index 82% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipePagingSourceFactory.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactory.kt index 86ede64..2070107 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipePagingSourceFactory.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactory.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealie.data.recipes.impl +package gq.kirmanak.mealient.data.recipes.impl import androidx.paging.PagingSource -import gq.kirmanak.mealie.data.recipes.db.RecipeStorage -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeSummaryEntity +import gq.kirmanak.mealient.data.recipes.db.RecipeStorage +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity import timber.log.Timber import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeRepoImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImpl.kt similarity index 83% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeRepoImpl.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImpl.kt index 3609405..260dbef 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeRepoImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImpl.kt @@ -1,12 +1,12 @@ -package gq.kirmanak.mealie.data.recipes.impl +package gq.kirmanak.mealient.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.RecipeStorage -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeSummaryEntity -import gq.kirmanak.mealie.data.recipes.network.RecipeDataSource +import gq.kirmanak.mealient.data.recipes.RecipeRepo +import gq.kirmanak.mealient.data.recipes.db.RecipeStorage +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity +import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource import kotlinx.coroutines.CancellationException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipesRemoteMediator.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediator.kt similarity index 90% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipesRemoteMediator.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediator.kt index eaeddcf..809b0d5 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipesRemoteMediator.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediator.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.impl +package gq.kirmanak.mealient.data.recipes.impl import androidx.annotation.VisibleForTesting import androidx.paging.ExperimentalPagingApi @@ -7,9 +7,9 @@ import androidx.paging.LoadType.PREPEND import androidx.paging.LoadType.REFRESH import androidx.paging.PagingState import androidx.paging.RemoteMediator -import gq.kirmanak.mealie.data.recipes.db.RecipeStorage -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeSummaryEntity -import gq.kirmanak.mealie.data.recipes.network.RecipeDataSource +import gq.kirmanak.mealient.data.recipes.db.RecipeStorage +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity +import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource import kotlinx.coroutines.CancellationException import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSource.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSource.kt new file mode 100644 index 0000000..28e785c --- /dev/null +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSource.kt @@ -0,0 +1,10 @@ +package gq.kirmanak.mealient.data.recipes.network + +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeResponse +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeSummaryResponse + +interface RecipeDataSource { + suspend fun requestRecipes(start: Int = 0, limit: Int = 9999): List + + suspend fun requestRecipeInfo(slug: String): GetRecipeResponse +} \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSourceImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSourceImpl.kt similarity index 85% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSourceImpl.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSourceImpl.kt index cf5bf25..e35e377 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSourceImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSourceImpl.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealie.data.recipes.network +package gq.kirmanak.mealient.data.recipes.network -import gq.kirmanak.mealie.data.auth.AuthRepo -import gq.kirmanak.mealie.data.impl.RetrofitBuilder -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeResponse -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeSummaryResponse +import gq.kirmanak.mealient.data.auth.AuthRepo +import gq.kirmanak.mealient.data.impl.RetrofitBuilder +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeResponse +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeSummaryResponse import kotlinx.serialization.ExperimentalSerializationApi import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeService.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeService.kt similarity index 67% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeService.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeService.kt index b2881e5..56d3791 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeService.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeService.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealie.data.recipes.network +package gq.kirmanak.mealient.data.recipes.network -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeResponse -import gq.kirmanak.mealie.data.recipes.network.response.GetRecipeSummaryResponse +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeResponse +import gq.kirmanak.mealient.data.recipes.network.response.GetRecipeSummaryResponse import retrofit2.http.GET import retrofit2.http.Path import retrofit2.http.Query diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeIngredientResponse.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeIngredientResponse.kt similarity index 88% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeIngredientResponse.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeIngredientResponse.kt index ca037d2..090c00a 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeIngredientResponse.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeIngredientResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.network.response +package gq.kirmanak.mealient.data.recipes.network.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeInstructionResponse.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeInstructionResponse.kt similarity index 79% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeInstructionResponse.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeInstructionResponse.kt index 372cc22..edbedce 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeInstructionResponse.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeInstructionResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.network.response +package gq.kirmanak.mealient.data.recipes.network.response import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeResponse.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeResponse.kt similarity index 94% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeResponse.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeResponse.kt index 9db0908..11df57c 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeResponse.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.network.response +package gq.kirmanak.mealient.data.recipes.network.response import kotlinx.datetime.LocalDate import kotlinx.datetime.LocalDateTime diff --git a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeSummaryResponse.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeSummaryResponse.kt similarity index 93% rename from app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeSummaryResponse.kt rename to app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeSummaryResponse.kt index c5c4875..75c33d5 100644 --- a/app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeSummaryResponse.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeSummaryResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.data.recipes.network.response +package gq.kirmanak.mealient.data.recipes.network.response import kotlinx.datetime.LocalDate import kotlinx.datetime.LocalDateTime diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/ImageLoader.kt b/app/src/main/java/gq/kirmanak/mealient/ui/ImageLoader.kt similarity index 85% rename from app/src/main/java/gq/kirmanak/mealie/ui/ImageLoader.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/ImageLoader.kt index d258df7..2658f1b 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/ImageLoader.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/ImageLoader.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.ui +package gq.kirmanak.mealient.ui import android.widget.ImageView import androidx.annotation.DrawableRes diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/SwipeRefreshLayoutHelper.kt b/app/src/main/java/gq/kirmanak/mealient/ui/SwipeRefreshLayoutHelper.kt similarity index 97% rename from app/src/main/java/gq/kirmanak/mealie/ui/SwipeRefreshLayoutHelper.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/SwipeRefreshLayoutHelper.kt index 7d200ac..5f318d7 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/SwipeRefreshLayoutHelper.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/SwipeRefreshLayoutHelper.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.ui +package gq.kirmanak.mealient.ui import androidx.paging.PagingDataAdapter import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/UiModule.kt b/app/src/main/java/gq/kirmanak/mealient/ui/UiModule.kt similarity index 76% rename from app/src/main/java/gq/kirmanak/mealie/ui/UiModule.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/UiModule.kt index 69b29b4..d60601a 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/UiModule.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/UiModule.kt @@ -1,10 +1,10 @@ -package gq.kirmanak.mealie.ui +package gq.kirmanak.mealient.ui import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealie.ui.glide.ImageLoaderGlide +import gq.kirmanak.mealient.ui.glide.ImageLoaderGlide @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationFragment.kt similarity index 97% rename from app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationFragment.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationFragment.kt index 964aa6c..9866880 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationFragment.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationFragment.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.ui.auth +package gq.kirmanak.mealient.ui.auth import android.os.Bundle import android.view.LayoutInflater @@ -11,7 +11,7 @@ import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import com.google.android.material.textfield.TextInputLayout import dagger.hilt.android.AndroidEntryPoint -import gq.kirmanak.mealie.databinding.FragmentAuthenticationBinding +import gq.kirmanak.mealient.databinding.FragmentAuthenticationBinding import kotlinx.coroutines.flow.collectLatest import timber.log.Timber diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationViewModel.kt similarity index 88% rename from app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationViewModel.kt index e0d7ba2..de03fad 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationViewModel.kt @@ -1,10 +1,10 @@ -package gq.kirmanak.mealie.ui.auth +package gq.kirmanak.mealient.ui.auth import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealie.data.auth.AuthRepo -import gq.kirmanak.mealie.data.recipes.RecipeRepo +import gq.kirmanak.mealient.data.auth.AuthRepo +import gq.kirmanak.mealient.data.recipes.RecipeRepo import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.launch import timber.log.Timber diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/glide/ImageLoaderGlide.kt b/app/src/main/java/gq/kirmanak/mealient/ui/glide/ImageLoaderGlide.kt similarity index 83% rename from app/src/main/java/gq/kirmanak/mealie/ui/glide/ImageLoaderGlide.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/glide/ImageLoaderGlide.kt index 8632ae6..3db5c8c 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/glide/ImageLoaderGlide.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/glide/ImageLoaderGlide.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealie.ui.glide +package gq.kirmanak.mealient.ui.glide import android.widget.ImageView import androidx.annotation.DrawableRes -import gq.kirmanak.mealie.ui.ImageLoader +import gq.kirmanak.mealient.ui.ImageLoader import javax.inject.Inject class ImageLoaderGlide @Inject constructor() : ImageLoader { diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/glide/MealieGlideModule.kt b/app/src/main/java/gq/kirmanak/mealient/ui/glide/MainGlideModule.kt similarity index 58% rename from app/src/main/java/gq/kirmanak/mealie/ui/glide/MealieGlideModule.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/glide/MainGlideModule.kt index 55f7d6b..c3131bf 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/glide/MealieGlideModule.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/glide/MainGlideModule.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealie.ui.glide +package gq.kirmanak.mealient.ui.glide import com.bumptech.glide.annotation.GlideModule import com.bumptech.glide.module.AppGlideModule @GlideModule -class MealieGlideModule : AppGlideModule() \ No newline at end of file +class MainGlideModule : AppGlideModule() \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipeViewHolder.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewHolder.kt similarity index 76% rename from app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipeViewHolder.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewHolder.kt index f8d332f..092c8ba 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipeViewHolder.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewHolder.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealie.ui.recipes +package gq.kirmanak.mealient.ui.recipes import androidx.recyclerview.widget.RecyclerView -import gq.kirmanak.mealie.R -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeSummaryEntity -import gq.kirmanak.mealie.databinding.ViewHolderRecipeBinding +import gq.kirmanak.mealient.R +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity +import gq.kirmanak.mealient.databinding.ViewHolderRecipeBinding class RecipeViewHolder( private val binding: ViewHolderRecipeBinding, diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipeViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt similarity index 74% rename from app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipeViewModel.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt index 41afa39..95d8646 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipeViewModel.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt @@ -1,12 +1,12 @@ -package gq.kirmanak.mealie.ui.recipes +package gq.kirmanak.mealient.ui.recipes import android.widget.ImageView import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealie.data.recipes.RecipeImageLoader -import gq.kirmanak.mealie.data.recipes.RecipeRepo -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeSummaryEntity +import gq.kirmanak.mealient.data.recipes.RecipeImageLoader +import gq.kirmanak.mealient.data.recipes.RecipeRepo +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipesFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt similarity index 91% rename from app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipesFragment.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt index b7e4c4a..917ea66 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipesFragment.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.ui.recipes +package gq.kirmanak.mealient.ui.recipes import android.os.Bundle import android.view.LayoutInflater @@ -10,10 +10,10 @@ import androidx.lifecycle.lifecycleScope import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.LinearLayoutManager import dagger.hilt.android.AndroidEntryPoint -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeSummaryEntity -import gq.kirmanak.mealie.databinding.FragmentRecipesBinding -import gq.kirmanak.mealie.ui.SwipeRefreshLayoutHelper.listenToRefreshRequests -import gq.kirmanak.mealie.ui.auth.AuthenticationViewModel +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity +import gq.kirmanak.mealient.databinding.FragmentRecipesBinding +import gq.kirmanak.mealient.ui.SwipeRefreshLayoutHelper.listenToRefreshRequests +import gq.kirmanak.mealient.ui.auth.AuthenticationViewModel import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipesPagingAdapter.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesPagingAdapter.kt similarity index 89% rename from app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipesPagingAdapter.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesPagingAdapter.kt index 9fb463a..87af20d 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipesPagingAdapter.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesPagingAdapter.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealie.ui.recipes +package gq.kirmanak.mealient.ui.recipes import android.view.LayoutInflater import android.view.ViewGroup import androidx.paging.PagingDataAdapter import androidx.recyclerview.widget.DiffUtil -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeSummaryEntity -import gq.kirmanak.mealie.databinding.ViewHolderRecipeBinding +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity +import gq.kirmanak.mealient.databinding.ViewHolderRecipeBinding import timber.log.Timber class RecipesPagingAdapter( diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInfoFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoFragment.kt similarity index 95% rename from app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInfoFragment.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoFragment.kt index fecf86b..26a2cc4 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInfoFragment.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoFragment.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.ui.recipes.info +package gq.kirmanak.mealient.ui.recipes.info import android.os.Bundle import android.view.LayoutInflater @@ -11,8 +11,8 @@ import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.LinearLayoutManager import dagger.hilt.android.AndroidEntryPoint -import gq.kirmanak.mealie.databinding.FragmentRecipeInfoBinding -import gq.kirmanak.mealie.ui.auth.AuthenticationViewModel +import gq.kirmanak.mealient.databinding.FragmentRecipeInfoBinding +import gq.kirmanak.mealient.ui.auth.AuthenticationViewModel import kotlinx.coroutines.flow.collectLatest import timber.log.Timber diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInfoViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt similarity index 86% rename from app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInfoViewModel.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt index 7cfd002..bf13a7d 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInfoViewModel.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealie.ui.recipes.info +package gq.kirmanak.mealient.ui.recipes.info import android.widget.ImageView import androidx.lifecycle.LiveData @@ -6,9 +6,9 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealie.data.recipes.RecipeImageLoader -import gq.kirmanak.mealie.data.recipes.RecipeRepo -import gq.kirmanak.mealie.data.recipes.impl.FullRecipeInfo +import gq.kirmanak.mealient.data.recipes.RecipeImageLoader +import gq.kirmanak.mealient.data.recipes.RecipeRepo +import gq.kirmanak.mealient.data.recipes.impl.FullRecipeInfo import kotlinx.coroutines.launch import timber.log.Timber import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeIngredientsAdapter.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeIngredientsAdapter.kt similarity index 84% rename from app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeIngredientsAdapter.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeIngredientsAdapter.kt index 3300ce2..2a6677c 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeIngredientsAdapter.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeIngredientsAdapter.kt @@ -1,13 +1,13 @@ -package gq.kirmanak.mealie.ui.recipes.info +package gq.kirmanak.mealient.ui.recipes.info import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeIngredientEntity -import gq.kirmanak.mealie.databinding.ViewHolderIngredientBinding -import gq.kirmanak.mealie.ui.recipes.info.RecipeIngredientsAdapter.RecipeIngredientViewHolder +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeIngredientEntity +import gq.kirmanak.mealient.databinding.ViewHolderIngredientBinding +import gq.kirmanak.mealient.ui.recipes.info.RecipeIngredientsAdapter.RecipeIngredientViewHolder class RecipeIngredientsAdapter() : ListAdapter(RecipeIngredientDiffCallback) { diff --git a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInstructionsAdapter.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInstructionsAdapter.kt similarity index 89% rename from app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInstructionsAdapter.kt rename to app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInstructionsAdapter.kt index e60f3c2..cd2ff00 100644 --- a/app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInstructionsAdapter.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInstructionsAdapter.kt @@ -1,12 +1,12 @@ -package gq.kirmanak.mealie.ui.recipes.info +package gq.kirmanak.mealient.ui.recipes.info import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView -import gq.kirmanak.mealie.data.recipes.db.entity.RecipeInstructionEntity -import gq.kirmanak.mealie.databinding.ViewHolderInstructionBinding +import gq.kirmanak.mealient.data.recipes.db.entity.RecipeInstructionEntity +import gq.kirmanak.mealient.databinding.ViewHolderInstructionBinding class RecipeInstructionsAdapter : ListAdapter( diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml index 6927100..71d12bc 100644 --- a/app/src/main/res/navigation/nav_graph.xml +++ b/app/src/main/res/navigation/nav_graph.xml @@ -7,8 +7,8 @@ + android:name="gq.kirmanak.mealient.ui.auth.AuthenticationFragment" + android:label="AuthenticationFragment"> -