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

Replace "Mealie" with "Mealient" everywhere

Browse Source
This commit is contained in:
Kirill Kamakin
2021-11-20 13:41:47 +03:00
parent d789bfcf97
commit 5866584d14
81 changed files with 283 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSource.kt
View File

@@ -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<GetRecipeSummaryResponse>
suspend fun requestRecipeInfo(slug: String): GetRecipeResponse
}

4
app/src/main/java/gq/kirmanak/mealie/MealieApp.kt → app/src/main/java/gq/kirmanak/mealient/App.kt
View File

@@ -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())

6
app/src/main/java/gq/kirmanak/mealie/MainActivity.kt → app/src/main/java/gq/kirmanak/mealient/MainActivity.kt
View File

@@ -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

10
app/src/main/java/gq/kirmanak/mealie/data/MealieDb.kt → app/src/main/java/gq/kirmanak/mealient/data/AppDb.kt
View File

@@ -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
}

8
app/src/main/java/gq/kirmanak/mealie/data/MealieModule.kt → app/src/main/java/gq/kirmanak/mealient/data/AppModule.kt
View File

@@ -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()
}
}
}

2
app/src/main/java/gq/kirmanak/mealie/data/auth/AuthDataSource.kt → app/src/main/java/gq/kirmanak/mealient/data/auth/AuthDataSource.kt
View File

@@ -1,4 +1,4 @@
package gq.kirmanak.mealie.data.auth
package gq.kirmanak.mealient.data.auth
interface AuthDataSource {
/**

8
app/src/main/java/gq/kirmanak/mealie/data/auth/AuthModule.kt → app/src/main/java/gq/kirmanak/mealient/data/auth/AuthModule.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/auth/AuthRepo.kt → app/src/main/java/gq/kirmanak/mealient/data/auth/AuthRepo.kt
View File

@@ -1,4 +1,4 @@
package gq.kirmanak.mealie.data.auth
package gq.kirmanak.mealient.data.auth
import kotlinx.coroutines.flow.Flow

4
app/src/main/java/gq/kirmanak/mealie/data/auth/AuthService.kt → app/src/main/java/gq/kirmanak/mealient/data/auth/AuthService.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/auth/AuthStorage.kt → app/src/main/java/gq/kirmanak/mealient/data/auth/AuthStorage.kt
View File

@@ -1,4 +1,4 @@
package gq.kirmanak.mealie.data.auth
package gq.kirmanak.mealient.data.auth
import kotlinx.coroutines.flow.Flow

8
app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthDataSourceImpl.kt → app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthOkHttpInterceptor.kt → app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthOkHttpInterceptor.kt
View File

@@ -1,4 +1,4 @@
package gq.kirmanak.mealie.data.auth.impl
package gq.kirmanak.mealient.data.auth.impl
import okhttp3.Interceptor
import okhttp3.Response

8
app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthRepoImpl.kt → app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImpl.kt
View File

@@ -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

4
app/src/main/java/gq/kirmanak/mealie/data/auth/impl/AuthStorageImpl.kt → app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/auth/impl/GetTokenResponse.kt → app/src/main/java/gq/kirmanak/mealient/data/auth/impl/GetTokenResponse.kt
View File

@@ -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

6
app/src/main/java/gq/kirmanak/mealie/data/impl/OkHttpBuilder.kt → app/src/main/java/gq/kirmanak/mealient/data/impl/OkHttpBuilder.kt
View File

@@ -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

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

@@ -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

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

@@ -1,4 +1,4 @@
package gq.kirmanak.mealie.data.impl
package gq.kirmanak.mealient.data.impl
import androidx.room.TypeConverter
import kotlinx.datetime.*

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeImageLoader.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeImageLoader.kt
View File

@@ -1,4 +1,4 @@
package gq.kirmanak.mealie.data.recipes
package gq.kirmanak.mealient.data.recipes
import android.widget.ImageView

14
app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeModule.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeModule.kt
View File

@@ -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

6
app/src/main/java/gq/kirmanak/mealie/data/recipes/RecipeRepo.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeRepo.kt
View File

@@ -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<Int, RecipeSummaryEntity>

6
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeDao.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeDao.kt
View File

@@ -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 {

10
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeStorage.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorage.kt
View File

@@ -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<GetRecipeSummaryResponse>)

18
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/RecipeStorageImpl.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorageImpl.kt
View File

@@ -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() }

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/CategoryEntity.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/CategoryEntity.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/CategoryRecipeEntity.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/CategoryRecipeEntity.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeEntity.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeEntity.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeIngredientEntity.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeIngredientEntity.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeInstructionEntity.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeInstructionEntity.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/RecipeSummaryEntity.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/RecipeSummaryEntity.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/TagEntity.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/TagEntity.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/db/entity/TagRecipeEntity.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/db/entity/TagRecipeEntity.kt
View File

@@ -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

10
app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/FullRecipeInfo.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/FullRecipeInfo.kt
View File

@@ -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,

10
app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeImageLoaderImpl.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageLoaderImpl.kt
View File

@@ -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(

6
app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipePagingSourceFactory.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactory.kt
View File

@@ -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

10
app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipeRepoImpl.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImpl.kt
View File

@@ -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

8
app/src/main/java/gq/kirmanak/mealie/data/recipes/impl/RecipesRemoteMediator.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediator.kt
View File

@@ -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

10
app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSource.kt Normal file
View File

@@ -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<GetRecipeSummaryResponse>
suspend fun requestRecipeInfo(slug: String): GetRecipeResponse
}

10
app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeDataSourceImpl.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSourceImpl.kt
View File

@@ -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

6
app/src/main/java/gq/kirmanak/mealie/data/recipes/network/RecipeService.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeService.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeIngredientResponse.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeIngredientResponse.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeInstructionResponse.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeInstructionResponse.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeResponse.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeResponse.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/data/recipes/network/response/GetRecipeSummaryResponse.kt → app/src/main/java/gq/kirmanak/mealient/data/recipes/network/response/GetRecipeSummaryResponse.kt
View File

@@ -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

2
app/src/main/java/gq/kirmanak/mealie/ui/ImageLoader.kt → app/src/main/java/gq/kirmanak/mealient/ui/ImageLoader.kt
View File

@@ -1,4 +1,4 @@
package gq.kirmanak.mealie.ui
package gq.kirmanak.mealient.ui
import android.widget.ImageView
import androidx.annotation.DrawableRes

2
app/src/main/java/gq/kirmanak/mealie/ui/SwipeRefreshLayoutHelper.kt → app/src/main/java/gq/kirmanak/mealient/ui/SwipeRefreshLayoutHelper.kt
View File

@@ -1,4 +1,4 @@
package gq.kirmanak.mealie.ui
package gq.kirmanak.mealient.ui
import androidx.paging.PagingDataAdapter
import androidx.recyclerview.widget.RecyclerView

4
app/src/main/java/gq/kirmanak/mealie/ui/UiModule.kt → app/src/main/java/gq/kirmanak/mealient/ui/UiModule.kt
View File

@@ -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)

4
app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationFragment.kt → app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationFragment.kt
View File

@@ -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

6
app/src/main/java/gq/kirmanak/mealie/ui/auth/AuthenticationViewModel.kt → app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationViewModel.kt
View File

@@ -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

4
app/src/main/java/gq/kirmanak/mealie/ui/glide/ImageLoaderGlide.kt → app/src/main/java/gq/kirmanak/mealient/ui/glide/ImageLoaderGlide.kt
View File

@@ -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 {

4
app/src/main/java/gq/kirmanak/mealie/ui/glide/MealieGlideModule.kt → app/src/main/java/gq/kirmanak/mealient/ui/glide/MainGlideModule.kt
View File

@@ -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()
class MainGlideModule : AppGlideModule()

8
app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipeViewHolder.kt → app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewHolder.kt
View File

@@ -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,

8
app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipeViewModel.kt → app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipeViewModel.kt
View File

@@ -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

10
app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipesFragment.kt → app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt
View File

@@ -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

6
app/src/main/java/gq/kirmanak/mealie/ui/recipes/RecipesPagingAdapter.kt → app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesPagingAdapter.kt
View File

@@ -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(

6
app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInfoFragment.kt → app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoFragment.kt
View File

@@ -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

8
app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInfoViewModel.kt → app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt
View File

@@ -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

8
app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeIngredientsAdapter.kt → app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeIngredientsAdapter.kt
View File

@@ -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<RecipeIngredientEntity, RecipeIngredientViewHolder>(RecipeIngredientDiffCallback) {

6
app/src/main/java/gq/kirmanak/mealie/ui/recipes/info/RecipeInstructionsAdapter.kt → app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInstructionsAdapter.kt
View File

@@ -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<RecipeInstructionEntity, RecipeInstructionsAdapter.RecipeInstructionViewHolder>(