diff --git a/PRIVACY_POLICY.md b/PRIVACY_POLICY.md index b54e6bb..3880065 100644 --- a/PRIVACY_POLICY.md +++ b/PRIVACY_POLICY.md @@ -2,7 +2,7 @@ Welcome to the Mealient app for Android! -This is an open source Android app developed by Kirill Kamakin. The source code is available on +This is an open source Android app developed by Kirill Kamakin and forked by Atridad Lahiji. The source code is available on GitHub under the MIT license; the app is also available on Google Play. I hereby state, to the best of my knowledge and belief, that I have not programmed this app to @@ -10,7 +10,5 @@ collect any personally identifiable information. All data created by the you (th the Mealie server(s) that you connect to. It can be removed by the administrator(s) of this (these) server(s). -Yours sincerely, -Kirill Kamakin. -Stockholm, Sweden -mealient@gmail.com \ No newline at end of file +Yours sincerely, +Kirill Kamakin and Atridad Lahiji diff --git a/README.md b/README.md index 5401c35..2b6f720 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,5 @@ -[![Crowdin](https://badges.crowdin.net/mealient/localized.svg)](https://crowdin.com/project/mealient) - -Get it on Google Play - - Get it on F-Droid - - - # Mealient -## DEPRECATION - -Thank you for your interest in Mealient! This project is no longer maintained, so feel free to fork and develop it independently. - ## DISCLAIMER This project is developed independently from the core Mealie project. It is NOT associated with the @@ -34,16 +20,9 @@ Displays the list of recipes, some information about each of the recipes, even r available! The list of shopping lists is also available, each shopping list can be viewed and modified. -## Screenshots - - - ## How to install -There are three ways: -1. Install it with Google Play using the badge above. -2. Install it with F-droid using the badge above. -3. Download the latest apk from the releases page. +Download the latest apk from the releases page. ## Contribution diff --git a/app/build.gradle.kts b/app/build.gradle.kts index be5dcb6..5a8930e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,18 +4,18 @@ import java.io.FileInputStream import java.util.Properties plugins { - id("gq.kirmanak.mealient.application") + id("com.atridad.mealient.application") id("dagger.hilt.android.plugin") alias(libs.plugins.ksp) - id("gq.kirmanak.mealient.compose.app") + id("com.atridad.mealient.compose.app") } android { defaultConfig { - applicationId = "gq.kirmanak.mealient" + applicationId = "com.atridad.mealient" versionCode = 37 versionName = "0.4.8" - testInstrumentationRunner = "gq.kirmanak.mealient.MealientTestRunner" + testInstrumentationRunner = "com.atridad.mealient.MealientTestRunner" testInstrumentationRunnerArguments += mapOf("clearPackageData" to "true") resourceConfigurations += listOf("en", "es", "ru", "fr", "nl", "pt", "de") } @@ -50,7 +50,7 @@ android { } } - namespace = "gq.kirmanak.mealient" + namespace = "com.atridad.mealient" packaging { resources.excludes += "DebugProbesKt.bin" @@ -145,25 +145,25 @@ kover { filters { excludes { classes( - "gq.kirmanak.mealient.datastore.recipe.AddRecipeInput*", // generated by data store + "com.atridad.mealient.datastore.recipe.AddRecipeInput*", // generated by data store "*ComposableSingletons*", // generated by Compose - "gq.kirmanak.mealient.database.AppDb_Impl*", // generated by Room + "com.atridad.mealient.database.AppDb_Impl*", // generated by Room "*Dao_Impl*", // generated by Room "*Hilt_*", // generated by Hilt ) packages( - "gq.kirmanak.mealient*.destinations", // generated by Compose destinations + "com.atridad.mealient*.destinations", // generated by Compose destinations ) annotatedBy( "androidx.compose.ui.tooling.preview.Preview", - "gq.kirmanak.mealient.ui.preview.ColorSchemePreview", + "com.atridad.mealient.ui.preview.ColorSchemePreview", "androidx.compose.runtime.Composable", "dagger.Module", "dagger.internal.DaggerGenerated", ) } includes { - packages("gq.kirmanak.mealient") + packages("com.atridad.mealient") } } variant("release") { diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/BaseTestCase.kt b/app/src/androidTest/kotlin/com/atridad/mealient/BaseTestCase.kt similarity index 91% rename from app/src/androidTest/kotlin/gq/kirmanak/mealient/BaseTestCase.kt rename to app/src/androidTest/kotlin/com/atridad/mealient/BaseTestCase.kt index d57d819..0268603 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/BaseTestCase.kt +++ b/app/src/androidTest/kotlin/com/atridad/mealient/BaseTestCase.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient +package com.atridad.mealient import androidx.compose.ui.test.junit4.createAndroidComposeRule import com.kaspersky.components.composesupport.config.withComposeSupport import com.kaspersky.kaspresso.kaspresso.Kaspresso import com.kaspersky.kaspresso.testcases.api.testcase.TestCase import dagger.hilt.android.testing.HiltAndroidRule -import gq.kirmanak.mealient.ui.activity.MainActivity +import com.atridad.mealient.ui.activity.MainActivity import okhttp3.mockwebserver.MockWebServer import org.junit.After import org.junit.Before diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt b/app/src/androidTest/kotlin/com/atridad/mealient/FirstSetUpTest.kt similarity index 94% rename from app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt rename to app/src/androidTest/kotlin/com/atridad/mealient/FirstSetUpTest.kt index e9eb09d..19b629f 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt +++ b/app/src/androidTest/kotlin/com/atridad/mealient/FirstSetUpTest.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient +package com.atridad.mealient import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.screen.AuthenticationScreen -import gq.kirmanak.mealient.screen.BaseUrlScreen -import gq.kirmanak.mealient.screen.DisclaimerScreen -import gq.kirmanak.mealient.screen.RecipesListScreen -import gq.kirmanak.mealient.ui.disclaimer.DisclaimerViewModel +import com.atridad.mealient.screen.AuthenticationScreen +import com.atridad.mealient.screen.BaseUrlScreen +import com.atridad.mealient.screen.DisclaimerScreen +import com.atridad.mealient.screen.RecipesListScreen +import com.atridad.mealient.ui.disclaimer.DisclaimerViewModel import io.github.kakaocup.compose.node.element.ComposeScreen.Companion.onComposeScreen import io.github.kakaocup.kakao.common.utilities.getResourceString import org.junit.Before diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/MealientTestRunner.kt b/app/src/androidTest/kotlin/com/atridad/mealient/MealientTestRunner.kt similarity index 93% rename from app/src/androidTest/kotlin/gq/kirmanak/mealient/MealientTestRunner.kt rename to app/src/androidTest/kotlin/com/atridad/mealient/MealientTestRunner.kt index 4352422..5c43afe 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/MealientTestRunner.kt +++ b/app/src/androidTest/kotlin/com/atridad/mealient/MealientTestRunner.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient +package com.atridad.mealient import android.app.Application import android.content.Context diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/MockResponse.kt b/app/src/androidTest/kotlin/com/atridad/mealient/MockResponse.kt similarity index 98% rename from app/src/androidTest/kotlin/gq/kirmanak/mealient/MockResponse.kt rename to app/src/androidTest/kotlin/com/atridad/mealient/MockResponse.kt index 2db4c76..4fa0208 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/MockResponse.kt +++ b/app/src/androidTest/kotlin/com/atridad/mealient/MockResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient +package com.atridad.mealient import android.util.Log import okhttp3.mockwebserver.Dispatcher diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/AuthenticationScreen.kt b/app/src/androidTest/kotlin/com/atridad/mealient/screen/AuthenticationScreen.kt similarity index 94% rename from app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/AuthenticationScreen.kt rename to app/src/androidTest/kotlin/com/atridad/mealient/screen/AuthenticationScreen.kt index 430e5a7..c7e4522 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/AuthenticationScreen.kt +++ b/app/src/androidTest/kotlin/com/atridad/mealient/screen/AuthenticationScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.screen +package com.atridad.mealient.screen import androidx.compose.ui.test.SemanticsNodeInteractionsProvider import io.github.kakaocup.compose.node.element.ComposeScreen diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/BaseUrlScreen.kt b/app/src/androidTest/kotlin/com/atridad/mealient/screen/BaseUrlScreen.kt similarity index 95% rename from app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/BaseUrlScreen.kt rename to app/src/androidTest/kotlin/com/atridad/mealient/screen/BaseUrlScreen.kt index b3e0f8b..ebe39b9 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/BaseUrlScreen.kt +++ b/app/src/androidTest/kotlin/com/atridad/mealient/screen/BaseUrlScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.screen +package com.atridad.mealient.screen import androidx.compose.ui.test.SemanticsNodeInteractionsProvider import io.github.kakaocup.compose.node.element.ComposeScreen diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/DisclaimerScreen.kt b/app/src/androidTest/kotlin/com/atridad/mealient/screen/DisclaimerScreen.kt similarity index 94% rename from app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/DisclaimerScreen.kt rename to app/src/androidTest/kotlin/com/atridad/mealient/screen/DisclaimerScreen.kt index 71ae6ad..e429c41 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/DisclaimerScreen.kt +++ b/app/src/androidTest/kotlin/com/atridad/mealient/screen/DisclaimerScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.screen +package com.atridad.mealient.screen import androidx.compose.ui.test.SemanticsNodeInteractionsProvider import io.github.kakaocup.compose.node.element.ComposeScreen diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/Extensions.kt b/app/src/androidTest/kotlin/com/atridad/mealient/screen/Extensions.kt similarity index 88% rename from app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/Extensions.kt rename to app/src/androidTest/kotlin/com/atridad/mealient/screen/Extensions.kt index 1e5f8ab..edcc5d7 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/Extensions.kt +++ b/app/src/androidTest/kotlin/com/atridad/mealient/screen/Extensions.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.screen +package com.atridad.mealient.screen import io.github.kakaocup.compose.node.builder.ViewBuilder import io.github.kakaocup.compose.node.core.BaseNode diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/RecipesListScreen.kt b/app/src/androidTest/kotlin/com/atridad/mealient/screen/RecipesListScreen.kt similarity index 94% rename from app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/RecipesListScreen.kt rename to app/src/androidTest/kotlin/com/atridad/mealient/screen/RecipesListScreen.kt index 8767632..e1a8398 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/screen/RecipesListScreen.kt +++ b/app/src/androidTest/kotlin/com/atridad/mealient/screen/RecipesListScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.screen +package com.atridad.mealient.screen import androidx.compose.ui.test.SemanticsNodeInteractionsProvider import io.github.kakaocup.compose.node.element.ComposeScreen diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f15fe3f..8f519d0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ - \ No newline at end of file + diff --git a/app/src/main/java/gq/kirmanak/mealient/App.kt b/app/src/main/java/com/atridad/mealient/App.kt similarity index 83% rename from app/src/main/java/gq/kirmanak/mealient/App.kt rename to app/src/main/java/com/atridad/mealient/App.kt index 1368d87..a674de6 100644 --- a/app/src/main/java/gq/kirmanak/mealient/App.kt +++ b/app/src/main/java/com/atridad/mealient/App.kt @@ -1,13 +1,13 @@ -package gq.kirmanak.mealient +package com.atridad.mealient import android.app.Application import coil.Coil import coil.ImageLoader import com.google.android.material.color.DynamicColors import dagger.hilt.android.HiltAndroidApp -import gq.kirmanak.mealient.architecture.configuration.BuildConfiguration -import gq.kirmanak.mealient.data.migration.MigrationDetector -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.architecture.configuration.BuildConfiguration +import com.atridad.mealient.data.migration.MigrationDetector +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/app/src/main/java/com/atridad/mealient/data/add/AddRecipeDataSource.kt b/app/src/main/java/com/atridad/mealient/data/add/AddRecipeDataSource.kt new file mode 100644 index 0000000..3477d5b --- /dev/null +++ b/app/src/main/java/com/atridad/mealient/data/add/AddRecipeDataSource.kt @@ -0,0 +1,8 @@ +package com.atridad.mealient.data.add + +import com.atridad.mealient.datasource.models.AddRecipeInfo + +interface AddRecipeDataSource { + + suspend fun addRecipe(recipe: AddRecipeInfo): String +} \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealient/data/add/AddRecipeRepo.kt b/app/src/main/java/com/atridad/mealient/data/add/AddRecipeRepo.kt similarity index 69% rename from app/src/main/java/gq/kirmanak/mealient/data/add/AddRecipeRepo.kt rename to app/src/main/java/com/atridad/mealient/data/add/AddRecipeRepo.kt index b682ae4..e11f625 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/add/AddRecipeRepo.kt +++ b/app/src/main/java/com/atridad/mealient/data/add/AddRecipeRepo.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.data.add +package com.atridad.mealient.data.add -import gq.kirmanak.mealient.datasource.models.AddRecipeInfo +import com.atridad.mealient.datasource.models.AddRecipeInfo import kotlinx.coroutines.flow.Flow interface AddRecipeRepo { diff --git a/app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt b/app/src/main/java/com/atridad/mealient/data/add/impl/AddRecipeRepoImpl.kt similarity index 73% rename from app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt rename to app/src/main/java/com/atridad/mealient/data/add/impl/AddRecipeRepoImpl.kt index cd580c8..e9fcaf9 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/add/impl/AddRecipeRepoImpl.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient.data.add.impl +package com.atridad.mealient.data.add.impl -import gq.kirmanak.mealient.data.add.AddRecipeDataSource -import gq.kirmanak.mealient.data.add.AddRecipeRepo -import gq.kirmanak.mealient.datasource.models.AddRecipeInfo -import gq.kirmanak.mealient.datastore.recipe.AddRecipeStorage -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.model_mapper.ModelMapper +import com.atridad.mealient.data.add.AddRecipeDataSource +import com.atridad.mealient.data.add.AddRecipeRepo +import com.atridad.mealient.datasource.models.AddRecipeInfo +import com.atridad.mealient.datastore.recipe.AddRecipeStorage +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.model_mapper.ModelMapper import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthDataSource.kt b/app/src/main/java/com/atridad/mealient/data/auth/AuthDataSource.kt similarity index 86% rename from app/src/main/java/gq/kirmanak/mealient/data/auth/AuthDataSource.kt rename to app/src/main/java/com/atridad/mealient/data/auth/AuthDataSource.kt index 8ea9b20..5e0b0a5 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthDataSource.kt +++ b/app/src/main/java/com/atridad/mealient/data/auth/AuthDataSource.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.auth +package com.atridad.mealient.data.auth interface AuthDataSource { /** diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthRepo.kt b/app/src/main/java/com/atridad/mealient/data/auth/AuthRepo.kt similarity index 72% rename from app/src/main/java/gq/kirmanak/mealient/data/auth/AuthRepo.kt rename to app/src/main/java/com/atridad/mealient/data/auth/AuthRepo.kt index 55a48dc..58b2b8a 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthRepo.kt +++ b/app/src/main/java/com/atridad/mealient/data/auth/AuthRepo.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.data.auth +package com.atridad.mealient.data.auth -import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsAuthRepo +import com.atridad.mealient.shopping_lists.repo.ShoppingListsAuthRepo import kotlinx.coroutines.flow.Flow interface AuthRepo : ShoppingListsAuthRepo { diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthStorage.kt b/app/src/main/java/com/atridad/mealient/data/auth/AuthStorage.kt similarity index 83% rename from app/src/main/java/gq/kirmanak/mealient/data/auth/AuthStorage.kt rename to app/src/main/java/com/atridad/mealient/data/auth/AuthStorage.kt index f1ffcbf..770415c 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/auth/AuthStorage.kt +++ b/app/src/main/java/com/atridad/mealient/data/auth/AuthStorage.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.auth +package com.atridad.mealient.data.auth import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt b/app/src/main/java/com/atridad/mealient/data/auth/impl/AuthDataSourceImpl.kt similarity index 67% rename from app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt rename to app/src/main/java/com/atridad/mealient/data/auth/impl/AuthDataSourceImpl.kt index f71c6e6..1ef4cf6 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/auth/impl/AuthDataSourceImpl.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.data.auth.impl +package com.atridad.mealient.data.auth.impl -import gq.kirmanak.mealient.data.auth.AuthDataSource -import gq.kirmanak.mealient.datasource.MealieDataSource -import gq.kirmanak.mealient.datasource.models.CreateApiTokenRequest +import com.atridad.mealient.data.auth.AuthDataSource +import com.atridad.mealient.datasource.MealieDataSource +import com.atridad.mealient.datasource.models.CreateApiTokenRequest import javax.inject.Inject class AuthDataSourceImpl @Inject constructor( diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImpl.kt b/app/src/main/java/com/atridad/mealient/data/auth/impl/AuthRepoImpl.kt similarity index 80% rename from app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImpl.kt rename to app/src/main/java/com/atridad/mealient/data/auth/impl/AuthRepoImpl.kt index e489317..d0c86ae 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/auth/impl/AuthRepoImpl.kt @@ -1,10 +1,10 @@ -package gq.kirmanak.mealient.data.auth.impl +package com.atridad.mealient.data.auth.impl -import gq.kirmanak.mealient.data.auth.AuthDataSource -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.data.auth.AuthStorage -import gq.kirmanak.mealient.datasource.AuthenticationProvider -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.data.auth.AuthDataSource +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.data.auth.AuthStorage +import com.atridad.mealient.datasource.AuthenticationProvider +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt b/app/src/main/java/com/atridad/mealient/data/auth/impl/AuthStorageImpl.kt similarity index 85% rename from app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt rename to app/src/main/java/com/atridad/mealient/data/auth/impl/AuthStorageImpl.kt index 8976444..6536352 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/auth/impl/AuthStorageImpl.kt @@ -1,13 +1,13 @@ -package gq.kirmanak.mealient.data.auth.impl +package com.atridad.mealient.data.auth.impl import android.content.SharedPreferences import androidx.annotation.VisibleForTesting import androidx.core.content.edit -import gq.kirmanak.mealient.data.auth.AuthStorage -import gq.kirmanak.mealient.datasource.TokenChangeListener -import gq.kirmanak.mealient.datastore.DataStoreModule.Companion.ENCRYPTED -import gq.kirmanak.mealient.extensions.prefsChangeFlow -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.data.auth.AuthStorage +import com.atridad.mealient.datasource.TokenChangeListener +import com.atridad.mealient.datastore.DataStoreModule.Companion.ENCRYPTED +import com.atridad.mealient.extensions.prefsChangeFlow +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/CredentialsLogRedactor.kt b/app/src/main/java/com/atridad/mealient/data/auth/impl/CredentialsLogRedactor.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/data/auth/impl/CredentialsLogRedactor.kt rename to app/src/main/java/com/atridad/mealient/data/auth/impl/CredentialsLogRedactor.kt index e73f779..280022f 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/auth/impl/CredentialsLogRedactor.kt +++ b/app/src/main/java/com/atridad/mealient/data/auth/impl/CredentialsLogRedactor.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.data.auth.impl +package com.atridad.mealient.data.auth.impl -import gq.kirmanak.mealient.logging.LogRedactor +import com.atridad.mealient.logging.LogRedactor import kotlinx.coroutines.flow.MutableStateFlow import java.net.URLEncoder import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepo.kt b/app/src/main/java/com/atridad/mealient/data/baseurl/ServerInfoRepo.kt similarity index 66% rename from app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepo.kt rename to app/src/main/java/com/atridad/mealient/data/baseurl/ServerInfoRepo.kt index 8cbfe49..2545871 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepo.kt +++ b/app/src/main/java/com/atridad/mealient/data/baseurl/ServerInfoRepo.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.data.baseurl +package com.atridad.mealient.data.baseurl -import gq.kirmanak.mealient.datasource.models.VersionResponse +import com.atridad.mealient.datasource.models.VersionResponse import kotlinx.coroutines.flow.Flow interface ServerInfoRepo { diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepoImpl.kt b/app/src/main/java/com/atridad/mealient/data/baseurl/ServerInfoRepoImpl.kt similarity index 79% rename from app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepoImpl.kt rename to app/src/main/java/com/atridad/mealient/data/baseurl/ServerInfoRepoImpl.kt index bad2370..7d35e37 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepoImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/baseurl/ServerInfoRepoImpl.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.data.baseurl +package com.atridad.mealient.data.baseurl -import gq.kirmanak.mealient.datasource.ServerUrlProvider -import gq.kirmanak.mealient.datasource.models.VersionResponse -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.datasource.ServerUrlProvider +import com.atridad.mealient.datasource.models.VersionResponse +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.flow.Flow import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoStorage.kt b/app/src/main/java/com/atridad/mealient/data/baseurl/ServerInfoStorage.kt similarity index 82% rename from app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoStorage.kt rename to app/src/main/java/com/atridad/mealient/data/baseurl/ServerInfoStorage.kt index c8d2e2f..50f23b8 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/ServerInfoStorage.kt +++ b/app/src/main/java/com/atridad/mealient/data/baseurl/ServerInfoStorage.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.baseurl +package com.atridad.mealient.data.baseurl import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/com/atridad/mealient/data/baseurl/VersionDataSource.kt b/app/src/main/java/com/atridad/mealient/data/baseurl/VersionDataSource.kt new file mode 100644 index 0000000..76f974e --- /dev/null +++ b/app/src/main/java/com/atridad/mealient/data/baseurl/VersionDataSource.kt @@ -0,0 +1,8 @@ +package com.atridad.mealient.data.baseurl + +import com.atridad.mealient.datasource.models.VersionResponse + +interface VersionDataSource { + + suspend fun requestVersion(baseURL: String): VersionResponse +} \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImpl.kt b/app/src/main/java/com/atridad/mealient/data/baseurl/VersionDataSourceImpl.kt similarity index 63% rename from app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImpl.kt rename to app/src/main/java/com/atridad/mealient/data/baseurl/VersionDataSourceImpl.kt index a9f28e4..5a1a5b0 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/baseurl/VersionDataSourceImpl.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.data.baseurl +package com.atridad.mealient.data.baseurl -import gq.kirmanak.mealient.datasource.MealieDataSource -import gq.kirmanak.mealient.datasource.models.VersionResponse +import com.atridad.mealient.datasource.MealieDataSource +import com.atridad.mealient.datasource.models.VersionResponse import javax.inject.Inject class VersionDataSourceImpl @Inject constructor( diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/BaseUrlLogRedactor.kt b/app/src/main/java/com/atridad/mealient/data/baseurl/impl/BaseUrlLogRedactor.kt similarity index 87% rename from app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/BaseUrlLogRedactor.kt rename to app/src/main/java/com/atridad/mealient/data/baseurl/impl/BaseUrlLogRedactor.kt index 88532c2..a702679 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/BaseUrlLogRedactor.kt +++ b/app/src/main/java/com/atridad/mealient/data/baseurl/impl/BaseUrlLogRedactor.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.data.baseurl.impl +package com.atridad.mealient.data.baseurl.impl import androidx.core.net.toUri -import gq.kirmanak.mealient.architecture.configuration.AppDispatchers -import gq.kirmanak.mealient.data.storage.PreferencesStorage -import gq.kirmanak.mealient.logging.LogRedactor +import com.atridad.mealient.architecture.configuration.AppDispatchers +import com.atridad.mealient.data.storage.PreferencesStorage +import com.atridad.mealient.logging.LogRedactor import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/ServerInfoStorageImpl.kt b/app/src/main/java/com/atridad/mealient/data/baseurl/impl/ServerInfoStorageImpl.kt similarity index 84% rename from app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/ServerInfoStorageImpl.kt rename to app/src/main/java/com/atridad/mealient/data/baseurl/impl/ServerInfoStorageImpl.kt index 84c32eb..2871746 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/ServerInfoStorageImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/baseurl/impl/ServerInfoStorageImpl.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.data.baseurl.impl +package com.atridad.mealient.data.baseurl.impl import androidx.datastore.preferences.core.Preferences -import gq.kirmanak.mealient.data.baseurl.ServerInfoStorage -import gq.kirmanak.mealient.data.storage.PreferencesStorage +import com.atridad.mealient.data.baseurl.ServerInfoStorage +import com.atridad.mealient.data.storage.PreferencesStorage import kotlinx.coroutines.flow.Flow import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealient/data/configuration/BuildConfigurationImpl.kt b/app/src/main/java/com/atridad/mealient/data/configuration/BuildConfigurationImpl.kt similarity index 60% rename from app/src/main/java/gq/kirmanak/mealient/data/configuration/BuildConfigurationImpl.kt rename to app/src/main/java/com/atridad/mealient/data/configuration/BuildConfigurationImpl.kt index b4e5784..0211d0b 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/configuration/BuildConfigurationImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/configuration/BuildConfigurationImpl.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.data.configuration +package com.atridad.mealient.data.configuration -import gq.kirmanak.mealient.BuildConfig -import gq.kirmanak.mealient.architecture.configuration.BuildConfiguration +import com.atridad.mealient.BuildConfig +import com.atridad.mealient.architecture.configuration.BuildConfiguration import javax.inject.Inject class BuildConfigurationImpl @Inject constructor() : BuildConfiguration { diff --git a/app/src/main/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorage.kt b/app/src/main/java/com/atridad/mealient/data/disclaimer/DisclaimerStorage.kt similarity index 81% rename from app/src/main/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorage.kt rename to app/src/main/java/com/atridad/mealient/data/disclaimer/DisclaimerStorage.kt index b72c110..b15e1dd 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorage.kt +++ b/app/src/main/java/com/atridad/mealient/data/disclaimer/DisclaimerStorage.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.disclaimer +package com.atridad.mealient.data.disclaimer import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImpl.kt b/app/src/main/java/com/atridad/mealient/data/disclaimer/DisclaimerStorageImpl.kt similarity index 87% rename from app/src/main/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImpl.kt rename to app/src/main/java/com/atridad/mealient/data/disclaimer/DisclaimerStorageImpl.kt index b592e35..db6ad42 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/disclaimer/DisclaimerStorageImpl.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.data.disclaimer +package com.atridad.mealient.data.disclaimer import androidx.datastore.preferences.core.Preferences -import gq.kirmanak.mealient.data.storage.PreferencesStorage -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.data.storage.PreferencesStorage +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealient/data/migration/From24AuthMigrationExecutor.kt b/app/src/main/java/com/atridad/mealient/data/migration/From24AuthMigrationExecutor.kt similarity index 81% rename from app/src/main/java/gq/kirmanak/mealient/data/migration/From24AuthMigrationExecutor.kt rename to app/src/main/java/com/atridad/mealient/data/migration/From24AuthMigrationExecutor.kt index 5358ac9..f32b628 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/migration/From24AuthMigrationExecutor.kt +++ b/app/src/main/java/com/atridad/mealient/data/migration/From24AuthMigrationExecutor.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient.data.migration +package com.atridad.mealient.data.migration import android.content.SharedPreferences import androidx.core.content.edit -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.datastore.DataStoreModule.Companion.ENCRYPTED -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.datastore.DataStoreModule.Companion.ENCRYPTED +import com.atridad.mealient.logging.Logger import javax.inject.Inject import javax.inject.Named diff --git a/app/src/main/java/gq/kirmanak/mealient/data/migration/From30MigrationExecutor.kt b/app/src/main/java/com/atridad/mealient/data/migration/From30MigrationExecutor.kt similarity index 91% rename from app/src/main/java/gq/kirmanak/mealient/data/migration/From30MigrationExecutor.kt rename to app/src/main/java/com/atridad/mealient/data/migration/From30MigrationExecutor.kt index 7a30289..a3161fe 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/migration/From30MigrationExecutor.kt +++ b/app/src/main/java/com/atridad/mealient/data/migration/From30MigrationExecutor.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.migration +package com.atridad.mealient.data.migration import android.content.SharedPreferences import androidx.core.content.edit @@ -6,7 +6,7 @@ import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.stringPreferencesKey -import gq.kirmanak.mealient.datastore.DataStoreModule +import com.atridad.mealient.datastore.DataStoreModule import javax.inject.Inject import javax.inject.Named diff --git a/app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationDetector.kt b/app/src/main/java/com/atridad/mealient/data/migration/MigrationDetector.kt similarity index 61% rename from app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationDetector.kt rename to app/src/main/java/com/atridad/mealient/data/migration/MigrationDetector.kt index ee9ec4a..b71990c 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationDetector.kt +++ b/app/src/main/java/com/atridad/mealient/data/migration/MigrationDetector.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.migration +package com.atridad.mealient.data.migration interface MigrationDetector { diff --git a/app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationDetectorImpl.kt b/app/src/main/java/com/atridad/mealient/data/migration/MigrationDetectorImpl.kt similarity index 83% rename from app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationDetectorImpl.kt rename to app/src/main/java/com/atridad/mealient/data/migration/MigrationDetectorImpl.kt index 0f241d0..14bda83 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationDetectorImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/migration/MigrationDetectorImpl.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.data.migration +package com.atridad.mealient.data.migration -import gq.kirmanak.mealient.architecture.configuration.BuildConfiguration -import gq.kirmanak.mealient.data.storage.PreferencesStorage -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.architecture.configuration.BuildConfiguration +import com.atridad.mealient.data.storage.PreferencesStorage +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.logging.Logger import javax.inject.Inject class MigrationDetectorImpl @Inject constructor( diff --git a/app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationExecutor.kt b/app/src/main/java/com/atridad/mealient/data/migration/MigrationExecutor.kt similarity index 68% rename from app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationExecutor.kt rename to app/src/main/java/com/atridad/mealient/data/migration/MigrationExecutor.kt index aeb9249..097fec9 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/migration/MigrationExecutor.kt +++ b/app/src/main/java/com/atridad/mealient/data/migration/MigrationExecutor.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.migration +package com.atridad.mealient.data.migration interface MigrationExecutor { diff --git a/app/src/main/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapper.kt b/app/src/main/java/com/atridad/mealient/data/network/MealieDataSourceWrapper.kt similarity index 74% rename from app/src/main/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapper.kt rename to app/src/main/java/com/atridad/mealient/data/network/MealieDataSourceWrapper.kt index 99bede7..2e6f3af 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapper.kt +++ b/app/src/main/java/com/atridad/mealient/data/network/MealieDataSourceWrapper.kt @@ -1,14 +1,14 @@ -package gq.kirmanak.mealient.data.network +package com.atridad.mealient.data.network -import gq.kirmanak.mealient.data.add.AddRecipeDataSource -import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource -import gq.kirmanak.mealient.data.share.ParseRecipeDataSource -import gq.kirmanak.mealient.datasource.MealieDataSource -import gq.kirmanak.mealient.datasource.models.AddRecipeInfo -import gq.kirmanak.mealient.datasource.models.GetRecipeResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse -import gq.kirmanak.mealient.datasource.models.ParseRecipeURLRequest -import gq.kirmanak.mealient.model_mapper.ModelMapper +import com.atridad.mealient.data.add.AddRecipeDataSource +import com.atridad.mealient.data.recipes.network.RecipeDataSource +import com.atridad.mealient.data.share.ParseRecipeDataSource +import com.atridad.mealient.datasource.MealieDataSource +import com.atridad.mealient.datasource.models.AddRecipeInfo +import com.atridad.mealient.datasource.models.GetRecipeResponse +import com.atridad.mealient.datasource.models.GetRecipeSummaryResponse +import com.atridad.mealient.datasource.models.ParseRecipeURLRequest +import com.atridad.mealient.model_mapper.ModelMapper import javax.inject.Inject class MealieDataSourceWrapper @Inject constructor( diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeRepo.kt b/app/src/main/java/com/atridad/mealient/data/recipes/RecipeRepo.kt similarity index 77% rename from app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeRepo.kt rename to app/src/main/java/com/atridad/mealient/data/recipes/RecipeRepo.kt index dffd4dc..a419a0f 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/RecipeRepo.kt +++ b/app/src/main/java/com/atridad/mealient/data/recipes/RecipeRepo.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.data.recipes +package com.atridad.mealient.data.recipes import androidx.paging.Pager -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions interface RecipeRepo { diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProvider.kt b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipeImageUrlProvider.kt similarity index 67% rename from app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProvider.kt rename to app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipeImageUrlProvider.kt index deaad20..c309fc7 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProvider.kt +++ b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipeImageUrlProvider.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.recipes.impl +package com.atridad.mealient.data.recipes.impl interface RecipeImageUrlProvider { diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProviderImpl.kt b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipeImageUrlProviderImpl.kt similarity index 86% rename from app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProviderImpl.kt rename to app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipeImageUrlProviderImpl.kt index c27c086..d08a4e2 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProviderImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipeImageUrlProviderImpl.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.data.recipes.impl +package com.atridad.mealient.data.recipes.impl import android.net.Uri -import gq.kirmanak.mealient.data.baseurl.ServerInfoRepo -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.data.baseurl.ServerInfoRepo +import com.atridad.mealient.logging.Logger import javax.inject.Inject class RecipeImageUrlProviderImpl @Inject constructor( diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactory.kt b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipePagingSourceFactory.kt similarity index 62% rename from app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactory.kt rename to app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipePagingSourceFactory.kt index 62ff23e..7d47c9f 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactory.kt +++ b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipePagingSourceFactory.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.data.recipes.impl +package com.atridad.mealient.data.recipes.impl import androidx.paging.PagingSource -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity interface RecipePagingSourceFactory : () -> PagingSource { fun setQuery(newQuery: String?) diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactoryImpl.kt b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipePagingSourceFactoryImpl.kt similarity index 85% rename from app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactoryImpl.kt rename to app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipePagingSourceFactoryImpl.kt index c65b80e..2e92fbf 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactoryImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipePagingSourceFactoryImpl.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.data.recipes.impl +package com.atridad.mealient.data.recipes.impl import androidx.paging.InvalidatingPagingSourceFactory -import gq.kirmanak.mealient.database.recipe.RecipeStorage -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.database.recipe.RecipeStorage +import com.atridad.mealient.logging.Logger import java.util.concurrent.atomic.AtomicReference import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImpl.kt b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipeRepoImpl.kt similarity index 88% rename from app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImpl.kt rename to app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipeRepoImpl.kt index 5a9b37a..9ba6a7a 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipeRepoImpl.kt @@ -1,17 +1,17 @@ -package gq.kirmanak.mealient.data.recipes.impl +package com.atridad.mealient.data.recipes.impl import androidx.paging.ExperimentalPagingApi import androidx.paging.Pager import androidx.paging.PagingConfig -import gq.kirmanak.mealient.data.recipes.RecipeRepo -import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource -import gq.kirmanak.mealient.database.recipe.RecipeStorage -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.model_mapper.ModelMapper +import com.atridad.mealient.data.recipes.RecipeRepo +import com.atridad.mealient.data.recipes.network.RecipeDataSource +import com.atridad.mealient.database.recipe.RecipeStorage +import com.atridad.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.model_mapper.ModelMapper import javax.inject.Inject @OptIn(ExperimentalPagingApi::class) diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediator.kt b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipesRemoteMediator.kt similarity index 87% rename from app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediator.kt rename to app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipesRemoteMediator.kt index 26921f2..7bfcd7c 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediator.kt +++ b/app/src/main/java/com/atridad/mealient/data/recipes/impl/RecipesRemoteMediator.kt @@ -1,16 +1,16 @@ -package gq.kirmanak.mealient.data.recipes.impl +package com.atridad.mealient.data.recipes.impl import androidx.annotation.VisibleForTesting import androidx.paging.* import androidx.paging.LoadType.PREPEND import androidx.paging.LoadType.REFRESH -import gq.kirmanak.mealient.architecture.configuration.AppDispatchers -import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource -import gq.kirmanak.mealient.database.recipe.RecipeStorage -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.model_mapper.ModelMapper +import com.atridad.mealient.architecture.configuration.AppDispatchers +import com.atridad.mealient.data.recipes.network.RecipeDataSource +import com.atridad.mealient.database.recipe.RecipeStorage +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.model_mapper.ModelMapper import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.withContext diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSource.kt b/app/src/main/java/com/atridad/mealient/data/recipes/network/RecipeDataSource.kt similarity index 67% rename from app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSource.kt rename to app/src/main/java/com/atridad/mealient/data/recipes/network/RecipeDataSource.kt index 011219d..88f6998 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/network/RecipeDataSource.kt +++ b/app/src/main/java/com/atridad/mealient/data/recipes/network/RecipeDataSource.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.data.recipes.network +package com.atridad.mealient.data.recipes.network -import gq.kirmanak.mealient.datasource.models.GetRecipeResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse +import com.atridad.mealient.datasource.models.GetRecipeResponse +import com.atridad.mealient.datasource.models.GetRecipeSummaryResponse interface RecipeDataSource { suspend fun requestRecipes(start: Int, limit: Int): List diff --git a/app/src/main/java/gq/kirmanak/mealient/data/share/ParseRecipeDataSource.kt b/app/src/main/java/com/atridad/mealient/data/share/ParseRecipeDataSource.kt similarity index 55% rename from app/src/main/java/gq/kirmanak/mealient/data/share/ParseRecipeDataSource.kt rename to app/src/main/java/com/atridad/mealient/data/share/ParseRecipeDataSource.kt index 8b87b69..8022059 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/share/ParseRecipeDataSource.kt +++ b/app/src/main/java/com/atridad/mealient/data/share/ParseRecipeDataSource.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.data.share +package com.atridad.mealient.data.share -import gq.kirmanak.mealient.datasource.models.ParseRecipeURLRequest +import com.atridad.mealient.datasource.models.ParseRecipeURLRequest interface ParseRecipeDataSource { diff --git a/app/src/main/java/gq/kirmanak/mealient/data/share/ShareRecipeRepo.kt b/app/src/main/java/com/atridad/mealient/data/share/ShareRecipeRepo.kt similarity index 69% rename from app/src/main/java/gq/kirmanak/mealient/data/share/ShareRecipeRepo.kt rename to app/src/main/java/com/atridad/mealient/data/share/ShareRecipeRepo.kt index 4475f28..5fc37b5 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/share/ShareRecipeRepo.kt +++ b/app/src/main/java/com/atridad/mealient/data/share/ShareRecipeRepo.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.share +package com.atridad.mealient.data.share interface ShareRecipeRepo { diff --git a/app/src/main/java/gq/kirmanak/mealient/data/share/ShareRecipeRepoImpl.kt b/app/src/main/java/com/atridad/mealient/data/share/ShareRecipeRepoImpl.kt similarity index 82% rename from app/src/main/java/gq/kirmanak/mealient/data/share/ShareRecipeRepoImpl.kt rename to app/src/main/java/com/atridad/mealient/data/share/ShareRecipeRepoImpl.kt index 9570d1a..65f77b4 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/share/ShareRecipeRepoImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/share/ShareRecipeRepoImpl.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.data.share +package com.atridad.mealient.data.share import androidx.core.util.PatternsCompat -import gq.kirmanak.mealient.datasource.models.ParseRecipeURLRequest -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.datasource.models.ParseRecipeURLRequest +import com.atridad.mealient.logging.Logger import javax.inject.Inject class ShareRecipeRepoImpl @Inject constructor( diff --git a/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorage.kt b/app/src/main/java/com/atridad/mealient/data/storage/PreferencesStorage.kt similarity index 93% rename from app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorage.kt rename to app/src/main/java/com/atridad/mealient/data/storage/PreferencesStorage.kt index 4c83a0e..4d89c36 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorage.kt +++ b/app/src/main/java/com/atridad/mealient/data/storage/PreferencesStorage.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.storage +package com.atridad.mealient.data.storage import androidx.datastore.preferences.core.Preferences import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImpl.kt b/app/src/main/java/com/atridad/mealient/data/storage/PreferencesStorageImpl.kt similarity index 96% rename from app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImpl.kt rename to app/src/main/java/com/atridad/mealient/data/storage/PreferencesStorageImpl.kt index b5a0055..ffbb9dc 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImpl.kt +++ b/app/src/main/java/com/atridad/mealient/data/storage/PreferencesStorageImpl.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.storage +package com.atridad.mealient.data.storage import androidx.datastore.core.DataStore import androidx.datastore.preferences.core.Preferences @@ -6,7 +6,7 @@ import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.edit import androidx.datastore.preferences.core.intPreferencesKey import androidx.datastore.preferences.core.stringPreferencesKey -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.first diff --git a/app/src/main/java/gq/kirmanak/mealient/di/AddRecipeModule.kt b/app/src/main/java/com/atridad/mealient/di/AddRecipeModule.kt similarity index 56% rename from app/src/main/java/gq/kirmanak/mealient/di/AddRecipeModule.kt rename to app/src/main/java/com/atridad/mealient/di/AddRecipeModule.kt index 6c1ad10..fb661c3 100644 --- a/app/src/main/java/gq/kirmanak/mealient/di/AddRecipeModule.kt +++ b/app/src/main/java/com/atridad/mealient/di/AddRecipeModule.kt @@ -1,15 +1,15 @@ -package gq.kirmanak.mealient.di +package com.atridad.mealient.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealient.data.add.AddRecipeDataSource -import gq.kirmanak.mealient.data.add.AddRecipeRepo -import gq.kirmanak.mealient.data.add.impl.AddRecipeRepoImpl -import gq.kirmanak.mealient.data.network.MealieDataSourceWrapper -import gq.kirmanak.mealient.datastore.recipe.AddRecipeStorage -import gq.kirmanak.mealient.datastore.recipe.AddRecipeStorageImpl +import com.atridad.mealient.data.add.AddRecipeDataSource +import com.atridad.mealient.data.add.AddRecipeRepo +import com.atridad.mealient.data.add.impl.AddRecipeRepoImpl +import com.atridad.mealient.data.network.MealieDataSourceWrapper +import com.atridad.mealient.datastore.recipe.AddRecipeStorage +import com.atridad.mealient.datastore.recipe.AddRecipeStorageImpl @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/gq/kirmanak/mealient/di/AppModule.kt b/app/src/main/java/com/atridad/mealient/di/AppModule.kt similarity index 89% rename from app/src/main/java/gq/kirmanak/mealient/di/AppModule.kt rename to app/src/main/java/com/atridad/mealient/di/AppModule.kt index f2d0b9a..67e7c53 100644 --- a/app/src/main/java/gq/kirmanak/mealient/di/AppModule.kt +++ b/app/src/main/java/com/atridad/mealient/di/AppModule.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.di +package com.atridad.mealient.di import android.content.Context import androidx.datastore.core.DataStore @@ -12,8 +12,8 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealient.data.storage.PreferencesStorage -import gq.kirmanak.mealient.data.storage.PreferencesStorageImpl +import com.atridad.mealient.data.storage.PreferencesStorage +import com.atridad.mealient.data.storage.PreferencesStorageImpl import okhttp3.OkHttpClient import javax.inject.Singleton diff --git a/app/src/main/java/gq/kirmanak/mealient/di/ArchitectureModule.kt b/app/src/main/java/com/atridad/mealient/di/ArchitectureModule.kt similarity index 67% rename from app/src/main/java/gq/kirmanak/mealient/di/ArchitectureModule.kt rename to app/src/main/java/com/atridad/mealient/di/ArchitectureModule.kt index d2d8454..0f754e1 100644 --- a/app/src/main/java/gq/kirmanak/mealient/di/ArchitectureModule.kt +++ b/app/src/main/java/com/atridad/mealient/di/ArchitectureModule.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient.di +package com.atridad.mealient.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealient.architecture.configuration.BuildConfiguration -import gq.kirmanak.mealient.data.configuration.BuildConfigurationImpl +import com.atridad.mealient.architecture.configuration.BuildConfiguration +import com.atridad.mealient.data.configuration.BuildConfigurationImpl @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/gq/kirmanak/mealient/di/AuthModule.kt b/app/src/main/java/com/atridad/mealient/di/AuthModule.kt similarity index 55% rename from app/src/main/java/gq/kirmanak/mealient/di/AuthModule.kt rename to app/src/main/java/com/atridad/mealient/di/AuthModule.kt index a93544c..3fc3273 100644 --- a/app/src/main/java/gq/kirmanak/mealient/di/AuthModule.kt +++ b/app/src/main/java/com/atridad/mealient/di/AuthModule.kt @@ -1,20 +1,20 @@ -package gq.kirmanak.mealient.di +package com.atridad.mealient.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import dagger.multibindings.IntoSet -import gq.kirmanak.mealient.data.auth.AuthDataSource -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.data.auth.AuthStorage -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 gq.kirmanak.mealient.data.auth.impl.CredentialsLogRedactor -import gq.kirmanak.mealient.datasource.AuthenticationProvider -import gq.kirmanak.mealient.logging.LogRedactor -import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsAuthRepo +import com.atridad.mealient.data.auth.AuthDataSource +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.data.auth.AuthStorage +import com.atridad.mealient.data.auth.impl.AuthDataSourceImpl +import com.atridad.mealient.data.auth.impl.AuthRepoImpl +import com.atridad.mealient.data.auth.impl.AuthStorageImpl +import com.atridad.mealient.data.auth.impl.CredentialsLogRedactor +import com.atridad.mealient.datasource.AuthenticationProvider +import com.atridad.mealient.logging.LogRedactor +import com.atridad.mealient.shopping_lists.repo.ShoppingListsAuthRepo @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt b/app/src/main/java/com/atridad/mealient/di/BaseURLModule.kt similarity index 70% rename from app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt rename to app/src/main/java/com/atridad/mealient/di/BaseURLModule.kt index 9840377..e5870f1 100644 --- a/app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt +++ b/app/src/main/java/com/atridad/mealient/di/BaseURLModule.kt @@ -1,15 +1,15 @@ -package gq.kirmanak.mealient.di +package com.atridad.mealient.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import dagger.multibindings.IntoSet -import gq.kirmanak.mealient.data.baseurl.* -import gq.kirmanak.mealient.data.baseurl.impl.BaseUrlLogRedactor -import gq.kirmanak.mealient.data.baseurl.impl.ServerInfoStorageImpl -import gq.kirmanak.mealient.datasource.ServerUrlProvider -import gq.kirmanak.mealient.logging.LogRedactor +import com.atridad.mealient.data.baseurl.* +import com.atridad.mealient.data.baseurl.impl.BaseUrlLogRedactor +import com.atridad.mealient.data.baseurl.impl.ServerInfoStorageImpl +import com.atridad.mealient.datasource.ServerUrlProvider +import com.atridad.mealient.logging.LogRedactor @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/gq/kirmanak/mealient/di/DisclaimerModule.kt b/app/src/main/java/com/atridad/mealient/di/DisclaimerModule.kt similarity index 66% rename from app/src/main/java/gq/kirmanak/mealient/di/DisclaimerModule.kt rename to app/src/main/java/com/atridad/mealient/di/DisclaimerModule.kt index 8128e4f..696be99 100644 --- a/app/src/main/java/gq/kirmanak/mealient/di/DisclaimerModule.kt +++ b/app/src/main/java/com/atridad/mealient/di/DisclaimerModule.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient.di +package com.atridad.mealient.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorage -import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorageImpl +import com.atridad.mealient.data.disclaimer.DisclaimerStorage +import com.atridad.mealient.data.disclaimer.DisclaimerStorageImpl @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/gq/kirmanak/mealient/di/MigrationModule.kt b/app/src/main/java/com/atridad/mealient/di/MigrationModule.kt similarity index 63% rename from app/src/main/java/gq/kirmanak/mealient/di/MigrationModule.kt rename to app/src/main/java/com/atridad/mealient/di/MigrationModule.kt index fd5dfb8..6725260 100644 --- a/app/src/main/java/gq/kirmanak/mealient/di/MigrationModule.kt +++ b/app/src/main/java/com/atridad/mealient/di/MigrationModule.kt @@ -1,15 +1,15 @@ -package gq.kirmanak.mealient.di +package com.atridad.mealient.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import dagger.multibindings.IntoSet -import gq.kirmanak.mealient.data.migration.From24AuthMigrationExecutor -import gq.kirmanak.mealient.data.migration.From30MigrationExecutor -import gq.kirmanak.mealient.data.migration.MigrationDetector -import gq.kirmanak.mealient.data.migration.MigrationDetectorImpl -import gq.kirmanak.mealient.data.migration.MigrationExecutor +import com.atridad.mealient.data.migration.From24AuthMigrationExecutor +import com.atridad.mealient.data.migration.From30MigrationExecutor +import com.atridad.mealient.data.migration.MigrationDetector +import com.atridad.mealient.data.migration.MigrationDetectorImpl +import com.atridad.mealient.data.migration.MigrationExecutor @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/gq/kirmanak/mealient/di/RecipeModule.kt b/app/src/main/java/com/atridad/mealient/di/RecipeModule.kt similarity index 71% rename from app/src/main/java/gq/kirmanak/mealient/di/RecipeModule.kt rename to app/src/main/java/com/atridad/mealient/di/RecipeModule.kt index 7c0156f..54e5937 100644 --- a/app/src/main/java/gq/kirmanak/mealient/di/RecipeModule.kt +++ b/app/src/main/java/com/atridad/mealient/di/RecipeModule.kt @@ -1,13 +1,13 @@ -package gq.kirmanak.mealient.di +package com.atridad.mealient.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealient.data.network.MealieDataSourceWrapper -import gq.kirmanak.mealient.data.recipes.RecipeRepo -import gq.kirmanak.mealient.data.recipes.impl.* -import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource +import com.atridad.mealient.data.network.MealieDataSourceWrapper +import com.atridad.mealient.data.recipes.RecipeRepo +import com.atridad.mealient.data.recipes.impl.* +import com.atridad.mealient.data.recipes.network.RecipeDataSource @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/gq/kirmanak/mealient/di/ShareRecipeModule.kt b/app/src/main/java/com/atridad/mealient/di/ShareRecipeModule.kt similarity index 60% rename from app/src/main/java/gq/kirmanak/mealient/di/ShareRecipeModule.kt rename to app/src/main/java/com/atridad/mealient/di/ShareRecipeModule.kt index ed0e138..e46126a 100644 --- a/app/src/main/java/gq/kirmanak/mealient/di/ShareRecipeModule.kt +++ b/app/src/main/java/com/atridad/mealient/di/ShareRecipeModule.kt @@ -1,13 +1,13 @@ -package gq.kirmanak.mealient.di +package com.atridad.mealient.di import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealient.data.network.MealieDataSourceWrapper -import gq.kirmanak.mealient.data.share.ParseRecipeDataSource -import gq.kirmanak.mealient.data.share.ShareRecipeRepo -import gq.kirmanak.mealient.data.share.ShareRecipeRepoImpl +import com.atridad.mealient.data.network.MealieDataSourceWrapper +import com.atridad.mealient.data.share.ParseRecipeDataSource +import com.atridad.mealient.data.share.ShareRecipeRepo +import com.atridad.mealient.data.share.ShareRecipeRepoImpl @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/gq/kirmanak/mealient/extensions/ContextExtensions.kt b/app/src/main/java/com/atridad/mealient/extensions/ContextExtensions.kt similarity index 88% rename from app/src/main/java/gq/kirmanak/mealient/extensions/ContextExtensions.kt rename to app/src/main/java/com/atridad/mealient/extensions/ContextExtensions.kt index 5c3c909..b02fbb1 100644 --- a/app/src/main/java/gq/kirmanak/mealient/extensions/ContextExtensions.kt +++ b/app/src/main/java/com/atridad/mealient/extensions/ContextExtensions.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.extensions +package com.atridad.mealient.extensions import android.app.Activity import android.content.Context diff --git a/app/src/main/java/gq/kirmanak/mealient/extensions/ViewExtensions.kt b/app/src/main/java/com/atridad/mealient/extensions/ViewExtensions.kt similarity index 95% rename from app/src/main/java/gq/kirmanak/mealient/extensions/ViewExtensions.kt rename to app/src/main/java/com/atridad/mealient/extensions/ViewExtensions.kt index dbcb784..27fcadd 100644 --- a/app/src/main/java/gq/kirmanak/mealient/extensions/ViewExtensions.kt +++ b/app/src/main/java/com/atridad/mealient/extensions/ViewExtensions.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.extensions +package com.atridad.mealient.extensions import android.content.Context import android.content.SharedPreferences @@ -7,7 +7,7 @@ import android.content.res.Configuration.UI_MODE_NIGHT_YES import android.os.Build import android.widget.Toast import androidx.annotation.StringRes -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.channels.ChannelResult import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.channels.onClosed diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/NavGraphs.kt b/app/src/main/java/com/atridad/mealient/ui/NavGraphs.kt similarity index 74% rename from app/src/main/java/gq/kirmanak/mealient/ui/NavGraphs.kt rename to app/src/main/java/com/atridad/mealient/ui/NavGraphs.kt index 7433421..1bb28e6 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/NavGraphs.kt +++ b/app/src/main/java/com/atridad/mealient/ui/NavGraphs.kt @@ -1,16 +1,16 @@ -package gq.kirmanak.mealient.ui +package com.atridad.mealient.ui import com.ramcosta.composedestinations.spec.DestinationSpec import com.ramcosta.composedestinations.spec.NavGraphSpec import com.ramcosta.composedestinations.spec.Route -import gq.kirmanak.mealient.shopping_lists.ui.destinations.ShoppingListScreenDestination -import gq.kirmanak.mealient.shopping_lists.ui.destinations.ShoppingListsScreenDestination -import gq.kirmanak.mealient.ui.destinations.AddRecipeScreenDestination -import gq.kirmanak.mealient.ui.destinations.AuthenticationScreenDestination -import gq.kirmanak.mealient.ui.destinations.BaseURLScreenDestination -import gq.kirmanak.mealient.ui.destinations.DisclaimerScreenDestination -import gq.kirmanak.mealient.ui.destinations.RecipeScreenDestination -import gq.kirmanak.mealient.ui.destinations.RecipesListDestination +import com.atridad.mealient.shopping_lists.ui.destinations.ShoppingListScreenDestination +import com.atridad.mealient.shopping_lists.ui.destinations.ShoppingListsScreenDestination +import com.atridad.mealient.ui.destinations.AddRecipeScreenDestination +import com.atridad.mealient.ui.destinations.AuthenticationScreenDestination +import com.atridad.mealient.ui.destinations.BaseURLScreenDestination +import com.atridad.mealient.ui.destinations.DisclaimerScreenDestination +import com.atridad.mealient.ui.destinations.RecipeScreenDestination +import com.atridad.mealient.ui.destinations.RecipesListDestination internal object NavGraphs { diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/activity/DrawerContent.kt b/app/src/main/java/com/atridad/mealient/ui/activity/DrawerContent.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/ui/activity/DrawerContent.kt rename to app/src/main/java/com/atridad/mealient/ui/activity/DrawerContent.kt index c39b47b..e0e5d9f 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/activity/DrawerContent.kt +++ b/app/src/main/java/com/atridad/mealient/ui/activity/DrawerContent.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.activity +package com.atridad.mealient.ui.activity import androidx.annotation.StringRes import androidx.compose.material.icons.Icons @@ -22,12 +22,12 @@ import com.ramcosta.composedestinations.spec.Direction import com.ramcosta.composedestinations.spec.NavGraphSpec import com.ramcosta.composedestinations.utils.contains import com.ramcosta.composedestinations.utils.currentDestinationAsState -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.NavGraphs -import gq.kirmanak.mealient.ui.components.DrawerItem -import gq.kirmanak.mealient.ui.destinations.AddRecipeScreenDestination -import gq.kirmanak.mealient.ui.destinations.BaseURLScreenDestination -import gq.kirmanak.mealient.ui.destinations.RecipesListDestination +import com.atridad.mealient.R +import com.atridad.mealient.ui.NavGraphs +import com.atridad.mealient.ui.components.DrawerItem +import com.atridad.mealient.ui.destinations.AddRecipeScreenDestination +import com.atridad.mealient.ui.destinations.BaseURLScreenDestination +import com.atridad.mealient.ui.destinations.RecipesListDestination import kotlinx.coroutines.launch @Composable diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt b/app/src/main/java/com/atridad/mealient/ui/activity/MainActivity.kt similarity index 87% rename from app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt rename to app/src/main/java/com/atridad/mealient/ui/activity/MainActivity.kt index 8263b29..5f99a72 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/atridad/mealient/ui/activity/MainActivity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.activity +package com.atridad.mealient.ui.activity import android.os.Bundle import androidx.activity.ComponentActivity @@ -7,9 +7,9 @@ import androidx.activity.viewModels import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.core.view.WindowInsetsControllerCompat import dagger.hilt.android.AndroidEntryPoint -import gq.kirmanak.mealient.extensions.isDarkThemeOn -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.ui.AppTheme +import com.atridad.mealient.extensions.isDarkThemeOn +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.ui.AppTheme import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt b/app/src/main/java/com/atridad/mealient/ui/activity/MainActivityViewModel.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt rename to app/src/main/java/com/atridad/mealient/ui/activity/MainActivityViewModel.kt index b7012a6..3de606c 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MainActivityViewModel.kt +++ b/app/src/main/java/com/atridad/mealient/ui/activity/MainActivityViewModel.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.activity +package com.atridad.mealient.ui.activity import android.app.Application import android.content.Intent @@ -7,16 +7,16 @@ import androidx.core.content.FileProvider import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.data.baseurl.ServerInfoRepo -import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorage -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.logging.getLogFile -import gq.kirmanak.mealient.ui.destinations.AuthenticationScreenDestination -import gq.kirmanak.mealient.ui.destinations.BaseURLScreenDestination -import gq.kirmanak.mealient.ui.destinations.DirectionDestination -import gq.kirmanak.mealient.ui.destinations.DisclaimerScreenDestination +import com.atridad.mealient.R +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.data.baseurl.ServerInfoRepo +import com.atridad.mealient.data.disclaimer.DisclaimerStorage +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.logging.getLogFile +import com.atridad.mealient.ui.destinations.AuthenticationScreenDestination +import com.atridad.mealient.ui.destinations.BaseURLScreenDestination +import com.atridad.mealient.ui.destinations.DirectionDestination +import com.atridad.mealient.ui.destinations.DisclaimerScreenDestination import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MealientApp.kt b/app/src/main/java/com/atridad/mealient/ui/activity/MealientApp.kt similarity index 97% rename from app/src/main/java/gq/kirmanak/mealient/ui/activity/MealientApp.kt rename to app/src/main/java/com/atridad/mealient/ui/activity/MealientApp.kt index 65c8a44..cfd44bb 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/activity/MealientApp.kt +++ b/app/src/main/java/com/atridad/mealient/ui/activity/MealientApp.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.activity +package com.atridad.mealient.ui.activity import android.content.Intent import androidx.compose.material3.AlertDialog @@ -21,8 +21,8 @@ import com.ramcosta.composedestinations.spec.DestinationSpec import com.ramcosta.composedestinations.spec.NavHostEngine import com.ramcosta.composedestinations.spec.Route import com.ramcosta.composedestinations.utils.currentDestinationAsState -import gq.kirmanak.mealient.ui.NavGraphs -import gq.kirmanak.mealient.ui.components.rememberBaseScreenState +import com.atridad.mealient.ui.NavGraphs +import com.atridad.mealient.ui.components.rememberBaseScreenState @Composable internal fun MealientApp( diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeScreen.kt b/app/src/main/java/com/atridad/mealient/ui/add/AddRecipeScreen.kt similarity index 95% rename from app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeScreen.kt rename to app/src/main/java/com/atridad/mealient/ui/add/AddRecipeScreen.kt index 48e6fd7..b5a65cb 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeScreen.kt +++ b/app/src/main/java/com/atridad/mealient/ui/add/AddRecipeScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.add +package com.atridad.mealient.ui.add import androidx.annotation.StringRes import androidx.compose.foundation.layout.Arrangement @@ -29,14 +29,14 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.ImeAction import androidx.hilt.navigation.compose.hiltViewModel import com.ramcosta.composedestinations.annotation.Destination -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.components.BaseScreenState -import gq.kirmanak.mealient.ui.components.BaseScreenWithNavigation -import gq.kirmanak.mealient.ui.components.TopProgressIndicator -import gq.kirmanak.mealient.ui.components.previewBaseScreenState -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.R +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.components.BaseScreenState +import com.atridad.mealient.ui.components.BaseScreenWithNavigation +import com.atridad.mealient.ui.components.TopProgressIndicator +import com.atridad.mealient.ui.components.previewBaseScreenState +import com.atridad.mealient.ui.preview.ColorSchemePreview @Destination @Composable diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeScreenEvent.kt b/app/src/main/java/com/atridad/mealient/ui/add/AddRecipeScreenEvent.kt similarity index 97% rename from app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeScreenEvent.kt rename to app/src/main/java/com/atridad/mealient/ui/add/AddRecipeScreenEvent.kt index 1ae0a55..4c7adcc 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeScreenEvent.kt +++ b/app/src/main/java/com/atridad/mealient/ui/add/AddRecipeScreenEvent.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.add +package com.atridad.mealient.ui.add internal sealed interface AddRecipeScreenEvent { diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeScreenState.kt b/app/src/main/java/com/atridad/mealient/ui/add/AddRecipeScreenState.kt similarity index 93% rename from app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeScreenState.kt rename to app/src/main/java/com/atridad/mealient/ui/add/AddRecipeScreenState.kt index b3978b2..586cc81 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeScreenState.kt +++ b/app/src/main/java/com/atridad/mealient/ui/add/AddRecipeScreenState.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.add +package com.atridad.mealient.ui.add internal data class AddRecipeScreenState( val snackbarMessage: AddRecipeSnackbarMessage? = null, diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeSnackbarMessage.kt b/app/src/main/java/com/atridad/mealient/ui/add/AddRecipeSnackbarMessage.kt similarity index 81% rename from app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeSnackbarMessage.kt rename to app/src/main/java/com/atridad/mealient/ui/add/AddRecipeSnackbarMessage.kt index dc8f824..7cb4cfc 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeSnackbarMessage.kt +++ b/app/src/main/java/com/atridad/mealient/ui/add/AddRecipeSnackbarMessage.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.add +package com.atridad.mealient.ui.add internal sealed interface AddRecipeSnackbarMessage { diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeViewModel.kt b/app/src/main/java/com/atridad/mealient/ui/add/AddRecipeViewModel.kt similarity index 94% rename from app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeViewModel.kt rename to app/src/main/java/com/atridad/mealient/ui/add/AddRecipeViewModel.kt index 6ac8514..fe66694 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/add/AddRecipeViewModel.kt +++ b/app/src/main/java/com/atridad/mealient/ui/add/AddRecipeViewModel.kt @@ -1,16 +1,16 @@ -package gq.kirmanak.mealient.ui.add +package com.atridad.mealient.ui.add import androidx.annotation.VisibleForTesting import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealient.data.add.AddRecipeRepo -import gq.kirmanak.mealient.datasource.models.AddRecipeInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeIngredientInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeInstructionInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeSettingsInfo -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.data.add.AddRecipeRepo +import com.atridad.mealient.datasource.models.AddRecipeInfo +import com.atridad.mealient.datasource.models.AddRecipeIngredientInfo +import com.atridad.mealient.datasource.models.AddRecipeInstructionInfo +import com.atridad.mealient.datasource.models.AddRecipeSettingsInfo +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationScreen.kt b/app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationScreen.kt similarity index 93% rename from app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationScreen.kt rename to app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationScreen.kt index c30c7f5..c7518f5 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationScreen.kt +++ b/app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.auth +package com.atridad.mealient.ui.auth import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -25,12 +25,12 @@ import androidx.compose.ui.text.input.ImeAction import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController import com.ramcosta.composedestinations.annotation.Destination -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.components.BaseScreen -import gq.kirmanak.mealient.ui.components.TopProgressIndicator -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.R +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.components.BaseScreen +import com.atridad.mealient.ui.components.TopProgressIndicator +import com.atridad.mealient.ui.preview.ColorSchemePreview @Destination @Composable diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationScreenEvent.kt b/app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationScreenEvent.kt similarity index 90% rename from app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationScreenEvent.kt rename to app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationScreenEvent.kt index 67bd7ac..9d2c05b 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationScreenEvent.kt +++ b/app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationScreenEvent.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.auth +package com.atridad.mealient.ui.auth internal sealed interface AuthenticationScreenEvent { diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationScreenState.kt b/app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationScreenState.kt similarity index 89% rename from app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationScreenState.kt rename to app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationScreenState.kt index 0d9429f..4e84828 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationScreenState.kt +++ b/app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationScreenState.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.auth +package com.atridad.mealient.ui.auth internal data class AuthenticationScreenState( val isLoading: Boolean = false, diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationViewModel.kt b/app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationViewModel.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationViewModel.kt rename to app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationViewModel.kt index cf7e8bc..424e538 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticationViewModel.kt +++ b/app/src/main/java/com/atridad/mealient/ui/auth/AuthenticationViewModel.kt @@ -1,14 +1,14 @@ -package gq.kirmanak.mealient.ui.auth +package com.atridad.mealient.ui.auth import android.app.Application import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.datasource.NetworkError -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.R +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.datasource.NetworkError +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/auth/Extensions.kt b/app/src/main/java/com/atridad/mealient/ui/auth/Extensions.kt similarity index 96% rename from app/src/main/java/gq/kirmanak/mealient/ui/auth/Extensions.kt rename to app/src/main/java/com/atridad/mealient/ui/auth/Extensions.kt index cefbb4e..22c8d4d 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/auth/Extensions.kt +++ b/app/src/main/java/com/atridad/mealient/ui/auth/Extensions.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.auth +package com.atridad.mealient.ui.auth import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/auth/PasswordInput.kt b/app/src/main/java/com/atridad/mealient/ui/auth/PasswordInput.kt similarity index 98% rename from app/src/main/java/gq/kirmanak/mealient/ui/auth/PasswordInput.kt rename to app/src/main/java/com/atridad/mealient/ui/auth/PasswordInput.kt index 020d7c8..ddb57c3 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/auth/PasswordInput.kt +++ b/app/src/main/java/com/atridad/mealient/ui/auth/PasswordInput.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.auth +package com.atridad.mealient.ui.auth import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.text.KeyboardActions @@ -21,7 +21,7 @@ import androidx.compose.ui.semantics.testTag import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.PasswordVisualTransformation import androidx.compose.ui.text.input.VisualTransformation -import gq.kirmanak.mealient.R +import com.atridad.mealient.R @OptIn(ExperimentalComposeUiApi::class) @Composable diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLScreen.kt b/app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLScreen.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLScreen.kt rename to app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLScreen.kt index 41b8cba..3ac95dc 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLScreen.kt +++ b/app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.baseurl +package com.atridad.mealient.ui.baseurl import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -27,15 +27,15 @@ import androidx.compose.ui.text.input.ImeAction import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController import com.ramcosta.composedestinations.annotation.Destination -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.components.BaseScreen -import gq.kirmanak.mealient.ui.components.BaseScreenState -import gq.kirmanak.mealient.ui.components.BaseScreenWithNavigation -import gq.kirmanak.mealient.ui.components.TopProgressIndicator -import gq.kirmanak.mealient.ui.components.previewBaseScreenState -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.R +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.components.BaseScreen +import com.atridad.mealient.ui.components.BaseScreenState +import com.atridad.mealient.ui.components.BaseScreenWithNavigation +import com.atridad.mealient.ui.components.TopProgressIndicator +import com.atridad.mealient.ui.components.previewBaseScreenState +import com.atridad.mealient.ui.preview.ColorSchemePreview @Destination @Composable diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLScreenEvent.kt b/app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLScreenEvent.kt similarity index 91% rename from app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLScreenEvent.kt rename to app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLScreenEvent.kt index 58d51e0..a5eb2fa 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLScreenEvent.kt +++ b/app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLScreenEvent.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.baseurl +package com.atridad.mealient.ui.baseurl import java.security.cert.X509Certificate diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLScreenState.kt b/app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLScreenState.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLScreenState.kt rename to app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLScreenState.kt index 39ec300..b4a1037 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLScreenState.kt +++ b/app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLScreenState.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.baseurl +package com.atridad.mealient.ui.baseurl internal data class BaseURLScreenState( val isConfigured: Boolean = false, diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLViewModel.kt b/app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLViewModel.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLViewModel.kt rename to app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLViewModel.kt index 4437dad..8e44290 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/baseurl/BaseURLViewModel.kt +++ b/app/src/main/java/com/atridad/mealient/ui/baseurl/BaseURLViewModel.kt @@ -1,19 +1,19 @@ -package gq.kirmanak.mealient.ui.baseurl +package com.atridad.mealient.ui.baseurl import android.app.Application import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.data.baseurl.ServerInfoRepo -import gq.kirmanak.mealient.data.baseurl.impl.BaseUrlLogRedactor -import gq.kirmanak.mealient.data.recipes.RecipeRepo -import gq.kirmanak.mealient.datasource.CertificateCombinedException -import gq.kirmanak.mealient.datasource.NetworkError -import gq.kirmanak.mealient.datasource.TrustedCertificatesStore -import gq.kirmanak.mealient.datasource.findCauseAsInstanceOf -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.R +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.data.baseurl.ServerInfoRepo +import com.atridad.mealient.data.baseurl.impl.BaseUrlLogRedactor +import com.atridad.mealient.data.recipes.RecipeRepo +import com.atridad.mealient.datasource.CertificateCombinedException +import com.atridad.mealient.datasource.NetworkError +import com.atridad.mealient.datasource.TrustedCertificatesStore +import com.atridad.mealient.datasource.findCauseAsInstanceOf +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/baseurl/InvalidCertificateDialog.kt b/app/src/main/java/com/atridad/mealient/ui/baseurl/InvalidCertificateDialog.kt similarity index 90% rename from app/src/main/java/gq/kirmanak/mealient/ui/baseurl/InvalidCertificateDialog.kt rename to app/src/main/java/com/atridad/mealient/ui/baseurl/InvalidCertificateDialog.kt index c3d732c..0f5e27b 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/baseurl/InvalidCertificateDialog.kt +++ b/app/src/main/java/com/atridad/mealient/ui/baseurl/InvalidCertificateDialog.kt @@ -1,13 +1,13 @@ -package gq.kirmanak.mealient.ui.baseurl +package com.atridad.mealient.ui.baseurl import androidx.compose.material3.AlertDialog import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.R +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.preview.ColorSchemePreview @Composable internal fun InvalidCertificateDialog( diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerScreen.kt b/app/src/main/java/com/atridad/mealient/ui/disclaimer/DisclaimerScreen.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerScreen.kt rename to app/src/main/java/com/atridad/mealient/ui/disclaimer/DisclaimerScreen.kt index cd4dbf8..067cae0 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerScreen.kt +++ b/app/src/main/java/com/atridad/mealient/ui/disclaimer/DisclaimerScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.disclaimer +package com.atridad.mealient.ui.disclaimer import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -20,11 +20,11 @@ import androidx.compose.ui.semantics.testTag import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController import com.ramcosta.composedestinations.annotation.Destination -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.components.BaseScreen -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.R +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.components.BaseScreen +import com.atridad.mealient.ui.preview.ColorSchemePreview @Destination @Composable diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerScreenState.kt b/app/src/main/java/com/atridad/mealient/ui/disclaimer/DisclaimerScreenState.kt similarity index 70% rename from app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerScreenState.kt rename to app/src/main/java/com/atridad/mealient/ui/disclaimer/DisclaimerScreenState.kt index fdd5086..28220f6 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerScreenState.kt +++ b/app/src/main/java/com/atridad/mealient/ui/disclaimer/DisclaimerScreenState.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.disclaimer +package com.atridad.mealient.ui.disclaimer internal data class DisclaimerScreenState( val isCountDownOver: Boolean, diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt b/app/src/main/java/com/atridad/mealient/ui/disclaimer/DisclaimerViewModel.kt similarity index 95% rename from app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt rename to app/src/main/java/com/atridad/mealient/ui/disclaimer/DisclaimerViewModel.kt index c6b4ddc..56988cc 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt +++ b/app/src/main/java/com/atridad/mealient/ui/disclaimer/DisclaimerViewModel.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient.ui.disclaimer +package com.atridad.mealient.ui.disclaimer import androidx.annotation.VisibleForTesting import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorage -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.data.disclaimer.DisclaimerStorage +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/HeaderSection.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/info/HeaderSection.kt similarity index 95% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/HeaderSection.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/info/HeaderSection.kt index b97ff94..775901c 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/HeaderSection.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/info/HeaderSection.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.info +package com.atridad.mealient.ui.recipes.info import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -17,8 +17,8 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import coil.compose.AsyncImage -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.Dimens +import com.atridad.mealient.R +import com.atridad.mealient.ui.Dimens @Composable internal fun HeaderSection( diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/IngredientsSection.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/info/IngredientsSection.kt similarity index 95% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/IngredientsSection.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/info/IngredientsSection.kt index bdeb517..0e5a4da 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/IngredientsSection.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/info/IngredientsSection.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.info +package com.atridad.mealient.ui.recipes.info import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -19,9 +19,9 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.ui.Dimens +import com.atridad.mealient.R +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.ui.Dimens @Composable internal fun IngredientsSection( diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/InstructionsSection.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/info/InstructionsSection.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/InstructionsSection.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/info/InstructionsSection.kt index d3d1b2b..2c584ea 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/InstructionsSection.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/info/InstructionsSection.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.info +package com.atridad.mealient.ui.recipes.info import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,10 +13,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity -import gq.kirmanak.mealient.ui.Dimens +import com.atridad.mealient.R +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.database.recipe.entity.RecipeInstructionEntity +import com.atridad.mealient.ui.Dimens @Composable internal fun InstructionsSection( diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/KeepScreenOn.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/info/KeepScreenOn.kt similarity index 84% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/KeepScreenOn.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/info/KeepScreenOn.kt index e260e30..eb75e88 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/KeepScreenOn.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/info/KeepScreenOn.kt @@ -1,10 +1,10 @@ -package gq.kirmanak.mealient.ui.recipes.info +package com.atridad.mealient.ui.recipes.info import android.view.WindowManager import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.ui.platform.LocalContext -import gq.kirmanak.mealient.extensions.findActivity +import com.atridad.mealient.extensions.findActivity @Composable fun KeepScreenOn() { diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/PreviewData.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/info/PreviewData.kt similarity index 86% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/PreviewData.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/info/PreviewData.kt index 6e27259..c3687ad 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/PreviewData.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/info/PreviewData.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.ui.recipes.info +package com.atridad.mealient.ui.recipes.info -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.database.recipe.entity.RecipeInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity import kotlinx.datetime.LocalDate internal val INGREDIENT_TWO = RecipeIngredientEntity( diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoUiState.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/info/RecipeInfoUiState.kt similarity index 68% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoUiState.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/info/RecipeInfoUiState.kt index 3fe0f9b..23091ba 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoUiState.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/info/RecipeInfoUiState.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.ui.recipes.info +package com.atridad.mealient.ui.recipes.info -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.database.recipe.entity.RecipeInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity data class RecipeInfoUiState( val showIngredients: Boolean = false, diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/info/RecipeInfoViewModel.kt similarity index 84% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/info/RecipeInfoViewModel.kt index 8ad1df5..7a16adc 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModel.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/info/RecipeInfoViewModel.kt @@ -1,16 +1,16 @@ -package gq.kirmanak.mealient.ui.recipes.info +package com.atridad.mealient.ui.recipes.info import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealient.data.recipes.RecipeRepo -import gq.kirmanak.mealient.data.recipes.impl.RecipeImageUrlProvider -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.ui.navArgs +import com.atridad.mealient.data.recipes.RecipeRepo +import com.atridad.mealient.data.recipes.impl.RecipeImageUrlProvider +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.database.recipe.entity.RecipeInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.ui.navArgs import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.flow diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeScreen.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/info/RecipeScreen.kt similarity index 90% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeScreen.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/info/RecipeScreen.kt index 2a63990..9fe4525 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/info/RecipeScreen.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/info/RecipeScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.info +package com.atridad.mealient.ui.recipes.info import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -11,10 +11,10 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.hilt.navigation.compose.hiltViewModel import com.ramcosta.composedestinations.annotation.Destination -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.components.BaseScreen -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.components.BaseScreen +import com.atridad.mealient.ui.preview.ColorSchemePreview data class RecipeScreenArgs( val recipeId: String, diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/ConfirmDeleteDialog.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/list/ConfirmDeleteDialog.kt similarity index 95% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/ConfirmDeleteDialog.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/list/ConfirmDeleteDialog.kt index 73bf5dd..9bf09f8 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/ConfirmDeleteDialog.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/list/ConfirmDeleteDialog.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.list +package com.atridad.mealient.ui.recipes.list import androidx.compose.material3.AlertDialog import androidx.compose.material3.Text @@ -6,7 +6,7 @@ import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource -import gq.kirmanak.mealient.R +import com.atridad.mealient.R @Composable internal fun ConfirmDeleteDialog( diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipeItem.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipeItem.kt similarity index 94% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipeItem.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipeItem.kt index 4323527..c7e6351 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipeItem.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipeItem.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.list +package com.atridad.mealient.ui.recipes.list import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -25,11 +25,11 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import coil.compose.AsyncImage -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview -import gq.kirmanak.mealient.ui.recipes.info.SUMMARY_ENTITY +import com.atridad.mealient.R +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.ui.recipes.info.SUMMARY_ENTITY import kotlin.random.Random @Composable diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipeListItemState.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipeListItemState.kt similarity index 56% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipeListItemState.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipeListItemState.kt index 704572e..f7277a8 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipeListItemState.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipeListItemState.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.ui.recipes.list +package com.atridad.mealient.ui.recipes.list -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity data class RecipeListItemState( val imageUrl: String?, diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipeListSnackbar.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipeListSnackbar.kt similarity index 86% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipeListSnackbar.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipeListSnackbar.kt index e0ae477..d7ea746 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipeListSnackbar.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipeListSnackbar.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.list +package com.atridad.mealient.ui.recipes.list internal sealed interface RecipeListSnackbar { diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipesList.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipesList.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipesList.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipesList.kt index c300f9a..df86b85 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipesList.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipesList.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.list +package com.atridad.mealient.ui.recipes.list import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -33,16 +33,16 @@ import androidx.paging.compose.itemContentType import androidx.paging.compose.itemKey import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.navigate -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.components.BaseScreenState -import gq.kirmanak.mealient.ui.components.BaseScreenWithNavigation -import gq.kirmanak.mealient.ui.components.CenteredProgressIndicator -import gq.kirmanak.mealient.ui.components.LazyPagingColumnPullRefresh -import gq.kirmanak.mealient.ui.components.OpenDrawerIconButton -import gq.kirmanak.mealient.ui.destinations.RecipeScreenDestination -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.R +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.components.BaseScreenState +import com.atridad.mealient.ui.components.BaseScreenWithNavigation +import com.atridad.mealient.ui.components.CenteredProgressIndicator +import com.atridad.mealient.ui.components.LazyPagingColumnPullRefresh +import com.atridad.mealient.ui.components.OpenDrawerIconButton +import com.atridad.mealient.ui.destinations.RecipeScreenDestination +import com.atridad.mealient.ui.preview.ColorSchemePreview @Destination diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipesListError.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipesListError.kt similarity index 85% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipesListError.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipesListError.kt index d8f237c..72fc4f0 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipesListError.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipesListError.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.list +package com.atridad.mealient.ui.recipes.list import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding @@ -9,12 +9,12 @@ import androidx.paging.LoadState import androidx.paging.PagingData import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.collectAsLazyPagingItems -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.datasource.NetworkError -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.components.EmptyListError -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.R +import com.atridad.mealient.datasource.NetworkError +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.components.EmptyListError +import com.atridad.mealient.ui.preview.ColorSchemePreview import kotlinx.coroutines.flow.emptyFlow @Composable diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipesListViewModel.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipesListViewModel.kt similarity index 94% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipesListViewModel.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipesListViewModel.kt index ba2d3e4..40a7b00 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/RecipesListViewModel.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/list/RecipesListViewModel.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.list +package com.atridad.mealient.ui.recipes.list import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -6,12 +6,12 @@ import androidx.paging.PagingData import androidx.paging.cachedIn import androidx.paging.map import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealient.architecture.valueUpdatesOnly -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.data.recipes.RecipeRepo -import gq.kirmanak.mealient.data.recipes.impl.RecipeImageUrlProvider -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.architecture.valueUpdatesOnly +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.data.recipes.RecipeRepo +import com.atridad.mealient.data.recipes.impl.RecipeImageUrlProvider +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/SearchTextField.kt b/app/src/main/java/com/atridad/mealient/ui/recipes/list/SearchTextField.kt similarity index 92% rename from app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/SearchTextField.kt rename to app/src/main/java/com/atridad/mealient/ui/recipes/list/SearchTextField.kt index 116cad4..c84ee51 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/list/SearchTextField.kt +++ b/app/src/main/java/com/atridad/mealient/ui/recipes/list/SearchTextField.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.recipes.list +package com.atridad.mealient.ui.recipes.list import androidx.annotation.StringRes import androidx.compose.foundation.text.KeyboardActions @@ -16,9 +16,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag import androidx.compose.ui.text.input.ImeAction -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.R +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.preview.ColorSchemePreview @Composable internal fun SearchTextField( diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/share/ShareRecipeActivity.kt b/app/src/main/java/com/atridad/mealient/ui/share/ShareRecipeActivity.kt similarity index 85% rename from app/src/main/java/gq/kirmanak/mealient/ui/share/ShareRecipeActivity.kt rename to app/src/main/java/com/atridad/mealient/ui/share/ShareRecipeActivity.kt index 346df2c..3148e8c 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/share/ShareRecipeActivity.kt +++ b/app/src/main/java/com/atridad/mealient/ui/share/ShareRecipeActivity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.share +package com.atridad.mealient.ui.share import android.content.Intent import android.os.Bundle @@ -7,12 +7,12 @@ import androidx.activity.compose.setContent import androidx.activity.viewModels import androidx.core.view.WindowInsetsControllerCompat import dagger.hilt.android.AndroidEntryPoint -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.extensions.isDarkThemeOn -import gq.kirmanak.mealient.extensions.showLongToast -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.OperationUiState +import com.atridad.mealient.R +import com.atridad.mealient.extensions.isDarkThemeOn +import com.atridad.mealient.extensions.showLongToast +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.OperationUiState import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/share/ShareRecipeScreen.kt b/app/src/main/java/com/atridad/mealient/ui/share/ShareRecipeScreen.kt similarity index 90% rename from app/src/main/java/gq/kirmanak/mealient/ui/share/ShareRecipeScreen.kt rename to app/src/main/java/com/atridad/mealient/ui/share/ShareRecipeScreen.kt index 9a3c4c5..b291c58 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/share/ShareRecipeScreen.kt +++ b/app/src/main/java/com/atridad/mealient/ui/share/ShareRecipeScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.share +package com.atridad.mealient.ui.share import androidx.annotation.DrawableRes import androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi @@ -17,10 +17,10 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.stringResource -import gq.kirmanak.mealient.R -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.components.BaseScreen -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.R +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.components.BaseScreen +import com.atridad.mealient.ui.preview.ColorSchemePreview import kotlinx.coroutines.delay @Composable diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/share/ShareRecipeViewModel.kt b/app/src/main/java/com/atridad/mealient/ui/share/ShareRecipeViewModel.kt similarity index 82% rename from app/src/main/java/gq/kirmanak/mealient/ui/share/ShareRecipeViewModel.kt rename to app/src/main/java/com/atridad/mealient/ui/share/ShareRecipeViewModel.kt index 8172e88..218bfd6 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/share/ShareRecipeViewModel.kt +++ b/app/src/main/java/com/atridad/mealient/ui/share/ShareRecipeViewModel.kt @@ -1,14 +1,14 @@ -package gq.kirmanak.mealient.ui.share +package com.atridad.mealient.ui.share import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealient.data.share.ShareRecipeRepo -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.ui.OperationUiState +import com.atridad.mealient.data.share.ShareRecipeRepo +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.ui.OperationUiState import kotlinx.coroutines.launch import javax.inject.Inject diff --git a/app/src/main/java/gq/kirmanak/mealient/data/add/AddRecipeDataSource.kt b/app/src/main/java/gq/kirmanak/mealient/data/add/AddRecipeDataSource.kt deleted file mode 100644 index 405335d..0000000 --- a/app/src/main/java/gq/kirmanak/mealient/data/add/AddRecipeDataSource.kt +++ /dev/null @@ -1,8 +0,0 @@ -package gq.kirmanak.mealient.data.add - -import gq.kirmanak.mealient.datasource.models.AddRecipeInfo - -interface AddRecipeDataSource { - - suspend fun addRecipe(recipe: AddRecipeInfo): String -} \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSource.kt b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSource.kt deleted file mode 100644 index 4b38692..0000000 --- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSource.kt +++ /dev/null @@ -1,8 +0,0 @@ -package gq.kirmanak.mealient.data.baseurl - -import gq.kirmanak.mealient.datasource.models.VersionResponse - -interface VersionDataSource { - - suspend fun requestVersion(baseURL: String): VersionResponse -} \ No newline at end of file diff --git a/app/src/test/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoTest.kt b/app/src/test/java/com/atridad/mealient/data/add/impl/AddRecipeRepoTest.kt similarity index 80% rename from app/src/test/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoTest.kt rename to app/src/test/java/com/atridad/mealient/data/add/impl/AddRecipeRepoTest.kt index 267cb1c..a7c5a66 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/add/impl/AddRecipeRepoTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/add/impl/AddRecipeRepoTest.kt @@ -1,14 +1,14 @@ -package gq.kirmanak.mealient.data.add.impl +package com.atridad.mealient.data.add.impl import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.add.AddRecipeDataSource -import gq.kirmanak.mealient.data.add.AddRecipeRepo -import gq.kirmanak.mealient.datasource_test.PORRIDGE_ADD_RECIPE_INFO -import gq.kirmanak.mealient.datastore.recipe.AddRecipeStorage -import gq.kirmanak.mealient.datastore_test.PORRIDGE_RECIPE_DRAFT -import gq.kirmanak.mealient.model_mapper.ModelMapper -import gq.kirmanak.mealient.model_mapper.ModelMapperImpl -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.data.add.AddRecipeDataSource +import com.atridad.mealient.data.add.AddRecipeRepo +import com.atridad.mealient.datasource_test.PORRIDGE_ADD_RECIPE_INFO +import com.atridad.mealient.datastore.recipe.AddRecipeStorage +import com.atridad.mealient.datastore_test.PORRIDGE_RECIPE_DRAFT +import com.atridad.mealient.model_mapper.ModelMapper +import com.atridad.mealient.model_mapper.ModelMapperImpl +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImplTest.kt b/app/src/test/java/com/atridad/mealient/data/auth/impl/AuthRepoImplTest.kt similarity index 80% rename from app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImplTest.kt rename to app/src/test/java/com/atridad/mealient/data/auth/impl/AuthRepoImplTest.kt index 7edaa42..7afa557 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImplTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/auth/impl/AuthRepoImplTest.kt @@ -1,15 +1,15 @@ -package gq.kirmanak.mealient.data.auth.impl +package com.atridad.mealient.data.auth.impl import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.auth.AuthDataSource -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.data.auth.AuthStorage -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.test.AuthImplTestData.TEST_API_TOKEN -import gq.kirmanak.mealient.test.AuthImplTestData.TEST_PASSWORD -import gq.kirmanak.mealient.test.AuthImplTestData.TEST_TOKEN -import gq.kirmanak.mealient.test.AuthImplTestData.TEST_USERNAME -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.data.auth.AuthDataSource +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.data.auth.AuthStorage +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.test.AuthImplTestData.TEST_API_TOKEN +import com.atridad.mealient.test.AuthImplTestData.TEST_PASSWORD +import com.atridad.mealient.test.AuthImplTestData.TEST_TOKEN +import com.atridad.mealient.test.AuthImplTestData.TEST_USERNAME +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.confirmVerified diff --git a/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImplTest.kt b/app/src/test/java/com/atridad/mealient/data/auth/impl/AuthStorageImplTest.kt similarity index 81% rename from app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImplTest.kt rename to app/src/test/java/com/atridad/mealient/data/auth/impl/AuthStorageImplTest.kt index 009a305..f74102a 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImplTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/auth/impl/AuthStorageImplTest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.auth.impl +package com.atridad.mealient.data.auth.impl import android.content.Context import android.content.SharedPreferences @@ -6,11 +6,11 @@ import androidx.core.content.edit import com.google.common.truth.Truth.assertThat import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.data.auth.AuthStorage -import gq.kirmanak.mealient.data.auth.impl.AuthStorageImpl.Companion.AUTH_TOKEN_KEY -import gq.kirmanak.mealient.datasource.TokenChangeListener -import gq.kirmanak.mealient.test.AuthImplTestData.TEST_TOKEN -import gq.kirmanak.mealient.test.HiltRobolectricTest +import com.atridad.mealient.data.auth.AuthStorage +import com.atridad.mealient.data.auth.impl.AuthStorageImpl.Companion.AUTH_TOKEN_KEY +import com.atridad.mealient.datasource.TokenChangeListener +import com.atridad.mealient.test.AuthImplTestData.TEST_TOKEN +import com.atridad.mealient.test.HiltRobolectricTest import io.mockk.MockKAnnotations import io.mockk.impl.annotations.MockK import kotlinx.coroutines.flow.first diff --git a/app/src/test/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepoTest.kt b/app/src/test/java/com/atridad/mealient/data/baseurl/ServerInfoRepoTest.kt similarity index 89% rename from app/src/test/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepoTest.kt rename to app/src/test/java/com/atridad/mealient/data/baseurl/ServerInfoRepoTest.kt index 5f872dc..a9f9a3a 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/baseurl/ServerInfoRepoTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/baseurl/ServerInfoRepoTest.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.data.baseurl +package com.atridad.mealient.data.baseurl import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.test.AuthImplTestData.TEST_BASE_URL -import gq.kirmanak.mealient.test.AuthImplTestData.VERSION_RESPONSE -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.test.AuthImplTestData.TEST_BASE_URL +import com.atridad.mealient.test.AuthImplTestData.VERSION_RESPONSE +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.impl.annotations.MockK diff --git a/app/src/test/java/gq/kirmanak/mealient/data/baseurl/ServerInfoStorageTest.kt b/app/src/test/java/com/atridad/mealient/data/baseurl/ServerInfoStorageTest.kt similarity index 84% rename from app/src/test/java/gq/kirmanak/mealient/data/baseurl/ServerInfoStorageTest.kt rename to app/src/test/java/com/atridad/mealient/data/baseurl/ServerInfoStorageTest.kt index c903a08..06f23a6 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/baseurl/ServerInfoStorageTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/baseurl/ServerInfoStorageTest.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient.data.baseurl +package com.atridad.mealient.data.baseurl import androidx.datastore.preferences.core.stringPreferencesKey import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.baseurl.impl.ServerInfoStorageImpl -import gq.kirmanak.mealient.data.storage.PreferencesStorage -import gq.kirmanak.mealient.test.AuthImplTestData.TEST_BASE_URL -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.data.baseurl.impl.ServerInfoStorageImpl +import com.atridad.mealient.data.storage.PreferencesStorage +import com.atridad.mealient.test.AuthImplTestData.TEST_BASE_URL +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/app/src/test/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImplTest.kt b/app/src/test/java/com/atridad/mealient/data/disclaimer/DisclaimerStorageImplTest.kt similarity index 87% rename from app/src/test/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImplTest.kt rename to app/src/test/java/com/atridad/mealient/data/disclaimer/DisclaimerStorageImplTest.kt index 188a58b..801ea72 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImplTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/disclaimer/DisclaimerStorageImplTest.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.data.disclaimer +package com.atridad.mealient.data.disclaimer import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.test.HiltRobolectricTest +import com.atridad.mealient.test.HiltRobolectricTest import kotlinx.coroutines.test.runTest import org.junit.Test import javax.inject.Inject diff --git a/app/src/test/java/gq/kirmanak/mealient/data/migration/From24AuthMigrationExecutorTest.kt b/app/src/test/java/com/atridad/mealient/data/migration/From24AuthMigrationExecutorTest.kt similarity index 94% rename from app/src/test/java/gq/kirmanak/mealient/data/migration/From24AuthMigrationExecutorTest.kt rename to app/src/test/java/com/atridad/mealient/data/migration/From24AuthMigrationExecutorTest.kt index 3e045c5..57d7e82 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/migration/From24AuthMigrationExecutorTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/migration/From24AuthMigrationExecutorTest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.migration +package com.atridad.mealient.data.migration import android.content.Context import android.content.SharedPreferences @@ -6,8 +6,8 @@ import androidx.core.content.edit import com.google.common.truth.Truth.assertThat import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.test.HiltRobolectricTest +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.test.HiltRobolectricTest import io.mockk.MockKAnnotations import io.mockk.coEvery import io.mockk.coVerify diff --git a/app/src/test/java/gq/kirmanak/mealient/data/migration/MigrationDetectorImplTest.kt b/app/src/test/java/com/atridad/mealient/data/migration/MigrationDetectorImplTest.kt similarity index 93% rename from app/src/test/java/gq/kirmanak/mealient/data/migration/MigrationDetectorImplTest.kt rename to app/src/test/java/com/atridad/mealient/data/migration/MigrationDetectorImplTest.kt index 7b8e769..f86fe2d 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/migration/MigrationDetectorImplTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/migration/MigrationDetectorImplTest.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.data.migration +package com.atridad.mealient.data.migration import androidx.datastore.preferences.core.intPreferencesKey -import gq.kirmanak.mealient.architecture.configuration.BuildConfiguration -import gq.kirmanak.mealient.data.storage.PreferencesStorage -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.architecture.configuration.BuildConfiguration +import com.atridad.mealient.data.storage.PreferencesStorage +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/app/src/test/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapperTest.kt b/app/src/test/java/com/atridad/mealient/data/network/MealieDataSourceWrapperTest.kt similarity index 81% rename from app/src/test/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapperTest.kt rename to app/src/test/java/com/atridad/mealient/data/network/MealieDataSourceWrapperTest.kt index c159bef..d2e1764 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/network/MealieDataSourceWrapperTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/network/MealieDataSourceWrapperTest.kt @@ -1,20 +1,20 @@ -package gq.kirmanak.mealient.data.network +package com.atridad.mealient.data.network import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.datasource.MealieDataSource -import gq.kirmanak.mealient.datasource_test.PORRIDGE_ADD_RECIPE_INFO -import gq.kirmanak.mealient.datasource_test.PORRIDGE_CREATE_RECIPE_REQUEST -import gq.kirmanak.mealient.datasource_test.PORRIDGE_RECIPE_RESPONSE -import gq.kirmanak.mealient.datasource_test.PORRIDGE_RECIPE_SUMMARY_RESPONSE -import gq.kirmanak.mealient.datasource_test.PORRIDGE_UPDATE_RECIPE_REQUEST -import gq.kirmanak.mealient.datasource_test.RECIPE_SUMMARY_PORRIDGE -import gq.kirmanak.mealient.model_mapper.ModelMapper -import gq.kirmanak.mealient.model_mapper.ModelMapperImpl -import gq.kirmanak.mealient.test.AuthImplTestData.FAVORITE_RECIPES_LIST -import gq.kirmanak.mealient.test.AuthImplTestData.TEST_TOKEN -import gq.kirmanak.mealient.test.AuthImplTestData.USER_INFO -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.datasource.MealieDataSource +import com.atridad.mealient.datasource_test.PORRIDGE_ADD_RECIPE_INFO +import com.atridad.mealient.datasource_test.PORRIDGE_CREATE_RECIPE_REQUEST +import com.atridad.mealient.datasource_test.PORRIDGE_RECIPE_RESPONSE +import com.atridad.mealient.datasource_test.PORRIDGE_RECIPE_SUMMARY_RESPONSE +import com.atridad.mealient.datasource_test.PORRIDGE_UPDATE_RECIPE_REQUEST +import com.atridad.mealient.datasource_test.RECIPE_SUMMARY_PORRIDGE +import com.atridad.mealient.model_mapper.ModelMapper +import com.atridad.mealient.model_mapper.ModelMapperImpl +import com.atridad.mealient.test.AuthImplTestData.FAVORITE_RECIPES_LIST +import com.atridad.mealient.test.AuthImplTestData.TEST_TOKEN +import com.atridad.mealient.test.AuthImplTestData.USER_INFO +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.coVerifySequence diff --git a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProviderImplTest.kt b/app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipeImageUrlProviderImplTest.kt similarity index 93% rename from app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProviderImplTest.kt rename to app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipeImageUrlProviderImplTest.kt index e460441..fcf4b4a 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeImageUrlProviderImplTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipeImageUrlProviderImplTest.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.data.recipes.impl +package com.atridad.mealient.data.recipes.impl import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.data.baseurl.ServerInfoStorage -import gq.kirmanak.mealient.test.HiltRobolectricTest +import com.atridad.mealient.data.baseurl.ServerInfoStorage +import com.atridad.mealient.test.HiltRobolectricTest import kotlinx.coroutines.runBlocking import kotlinx.coroutines.test.runTest import org.junit.Before diff --git a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactoryImplTest.kt b/app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipePagingSourceFactoryImplTest.kt similarity index 81% rename from app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactoryImplTest.kt rename to app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipePagingSourceFactoryImplTest.kt index 7ad5aaf..361919c 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipePagingSourceFactoryImplTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipePagingSourceFactoryImplTest.kt @@ -1,14 +1,14 @@ -package gq.kirmanak.mealient.data.recipes.impl +package com.atridad.mealient.data.recipes.impl import androidx.paging.PagingSource import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.database.CAKE_RECIPE_SUMMARY_ENTITY -import gq.kirmanak.mealient.database.PORRIDGE_RECIPE_SUMMARY_ENTITY -import gq.kirmanak.mealient.database.TEST_RECIPE_SUMMARY_ENTITIES -import gq.kirmanak.mealient.database.recipe.RecipeStorage -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.test.HiltRobolectricTest +import com.atridad.mealient.database.CAKE_RECIPE_SUMMARY_ENTITY +import com.atridad.mealient.database.PORRIDGE_RECIPE_SUMMARY_ENTITY +import com.atridad.mealient.database.TEST_RECIPE_SUMMARY_ENTITIES +import com.atridad.mealient.database.recipe.RecipeStorage +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.test.HiltRobolectricTest import kotlinx.coroutines.test.runTest import org.junit.Test import javax.inject.Inject diff --git a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoTest.kt b/app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipeRepoTest.kt similarity index 81% rename from app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoTest.kt rename to app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipeRepoTest.kt index bb49eb0..69481be 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipeRepoTest.kt @@ -1,24 +1,24 @@ -package gq.kirmanak.mealient.data.recipes.impl +package com.atridad.mealient.data.recipes.impl import androidx.paging.LoadType import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.recipes.RecipeRepo -import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource -import gq.kirmanak.mealient.database.BAKE_CAKE_RECIPE_INSTRUCTION_ENTITY -import gq.kirmanak.mealient.database.CAKE_BREAD_RECIPE_INGREDIENT_ENTITY -import gq.kirmanak.mealient.database.CAKE_RECIPE_ENTITY -import gq.kirmanak.mealient.database.CAKE_RECIPE_SUMMARY_ENTITY -import gq.kirmanak.mealient.database.CAKE_SUGAR_RECIPE_INGREDIENT_ENTITY -import gq.kirmanak.mealient.database.FULL_CAKE_INFO_ENTITY -import gq.kirmanak.mealient.database.MIX_BREAD_RECIPE_INGREDIENT_INSTRUCTION_ENTITY -import gq.kirmanak.mealient.database.MIX_CAKE_RECIPE_INSTRUCTION_ENTITY -import gq.kirmanak.mealient.database.MIX_SUGAR_RECIPE_INGREDIENT_INSTRUCTION_ENTITY -import gq.kirmanak.mealient.database.recipe.RecipeStorage -import gq.kirmanak.mealient.datasource.NetworkError.Unauthorized -import gq.kirmanak.mealient.datasource_test.CAKE_RECIPE_RESPONSE -import gq.kirmanak.mealient.model_mapper.ModelMapper -import gq.kirmanak.mealient.model_mapper.ModelMapperImpl -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.data.recipes.RecipeRepo +import com.atridad.mealient.data.recipes.network.RecipeDataSource +import com.atridad.mealient.database.BAKE_CAKE_RECIPE_INSTRUCTION_ENTITY +import com.atridad.mealient.database.CAKE_BREAD_RECIPE_INGREDIENT_ENTITY +import com.atridad.mealient.database.CAKE_RECIPE_ENTITY +import com.atridad.mealient.database.CAKE_RECIPE_SUMMARY_ENTITY +import com.atridad.mealient.database.CAKE_SUGAR_RECIPE_INGREDIENT_ENTITY +import com.atridad.mealient.database.FULL_CAKE_INFO_ENTITY +import com.atridad.mealient.database.MIX_BREAD_RECIPE_INGREDIENT_INSTRUCTION_ENTITY +import com.atridad.mealient.database.MIX_CAKE_RECIPE_INSTRUCTION_ENTITY +import com.atridad.mealient.database.MIX_SUGAR_RECIPE_INGREDIENT_INSTRUCTION_ENTITY +import com.atridad.mealient.database.recipe.RecipeStorage +import com.atridad.mealient.datasource.NetworkError.Unauthorized +import com.atridad.mealient.datasource_test.CAKE_RECIPE_RESPONSE +import com.atridad.mealient.model_mapper.ModelMapper +import com.atridad.mealient.model_mapper.ModelMapperImpl +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.coVerifyOrder diff --git a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt b/app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt similarity index 90% rename from app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt rename to app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt index 3392ead..c28ecb5 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt @@ -1,17 +1,17 @@ -package gq.kirmanak.mealient.data.recipes.impl +package com.atridad.mealient.data.recipes.impl import androidx.paging.* import androidx.paging.LoadType.* import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.recipes.network.RecipeDataSource -import gq.kirmanak.mealient.database.TEST_RECIPE_SUMMARY_ENTITIES -import gq.kirmanak.mealient.database.recipe.RecipeStorage -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.datasource.NetworkError.Unauthorized -import gq.kirmanak.mealient.datasource_test.TEST_RECIPE_SUMMARIES -import gq.kirmanak.mealient.model_mapper.ModelMapper -import gq.kirmanak.mealient.model_mapper.ModelMapperImpl -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.data.recipes.network.RecipeDataSource +import com.atridad.mealient.database.TEST_RECIPE_SUMMARY_ENTITIES +import com.atridad.mealient.database.recipe.RecipeStorage +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.datasource.NetworkError.Unauthorized +import com.atridad.mealient.datasource_test.TEST_RECIPE_SUMMARIES +import com.atridad.mealient.model_mapper.ModelMapper +import com.atridad.mealient.model_mapper.ModelMapperImpl +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.impl.annotations.MockK diff --git a/app/src/test/java/gq/kirmanak/mealient/data/share/ShareRecipeRepoImplTest.kt b/app/src/test/java/com/atridad/mealient/data/share/ShareRecipeRepoImplTest.kt similarity index 94% rename from app/src/test/java/gq/kirmanak/mealient/data/share/ShareRecipeRepoImplTest.kt rename to app/src/test/java/com/atridad/mealient/data/share/ShareRecipeRepoImplTest.kt index 1bd7f02..7e1ca3e 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/share/ShareRecipeRepoImplTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/share/ShareRecipeRepoImplTest.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.data.share +package com.atridad.mealient.data.share -import gq.kirmanak.mealient.datasource.models.ParseRecipeURLRequest -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.datasource.models.ParseRecipeURLRequest +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.impl.annotations.MockK diff --git a/app/src/test/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImplTest.kt b/app/src/test/java/com/atridad/mealient/data/storage/PreferencesStorageImplTest.kt similarity index 93% rename from app/src/test/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImplTest.kt rename to app/src/test/java/com/atridad/mealient/data/storage/PreferencesStorageImplTest.kt index efb7f50..88c39b7 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImplTest.kt +++ b/app/src/test/java/com/atridad/mealient/data/storage/PreferencesStorageImplTest.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.data.storage +package com.atridad.mealient.data.storage import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.test.HiltRobolectricTest +import com.atridad.mealient.test.HiltRobolectricTest import kotlinx.coroutines.flow.first import kotlinx.coroutines.test.runTest import org.junit.Test diff --git a/app/src/test/java/gq/kirmanak/mealient/test/AuthImplTestData.kt b/app/src/test/java/com/atridad/mealient/test/AuthImplTestData.kt similarity index 73% rename from app/src/test/java/gq/kirmanak/mealient/test/AuthImplTestData.kt rename to app/src/test/java/com/atridad/mealient/test/AuthImplTestData.kt index 31c88f1..3fdafbe 100644 --- a/app/src/test/java/gq/kirmanak/mealient/test/AuthImplTestData.kt +++ b/app/src/test/java/com/atridad/mealient/test/AuthImplTestData.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.test +package com.atridad.mealient.test -import gq.kirmanak.mealient.datasource.models.GetUserInfoResponse -import gq.kirmanak.mealient.datasource.models.VersionResponse +import com.atridad.mealient.datasource.models.GetUserInfoResponse +import com.atridad.mealient.datasource.models.VersionResponse object AuthImplTestData { const val TEST_USERNAME = "TEST_USERNAME" diff --git a/app/src/test/java/gq/kirmanak/mealient/ui/add/AddRecipeViewModelTest.kt b/app/src/test/java/com/atridad/mealient/ui/add/AddRecipeViewModelTest.kt similarity index 92% rename from app/src/test/java/gq/kirmanak/mealient/ui/add/AddRecipeViewModelTest.kt rename to app/src/test/java/com/atridad/mealient/ui/add/AddRecipeViewModelTest.kt index 0c2adf6..3193ca6 100644 --- a/app/src/test/java/gq/kirmanak/mealient/ui/add/AddRecipeViewModelTest.kt +++ b/app/src/test/java/com/atridad/mealient/ui/add/AddRecipeViewModelTest.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient.ui.add +package com.atridad.mealient.ui.add import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.add.AddRecipeRepo -import gq.kirmanak.mealient.datasource.models.AddRecipeInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeSettingsInfo -import gq.kirmanak.mealient.datasource_test.PORRIDGE_ADD_RECIPE_INFO -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.data.add.AddRecipeRepo +import com.atridad.mealient.datasource.models.AddRecipeInfo +import com.atridad.mealient.datasource.models.AddRecipeSettingsInfo +import com.atridad.mealient.datasource_test.PORRIDGE_ADD_RECIPE_INFO +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.impl.annotations.MockK diff --git a/app/src/test/java/gq/kirmanak/mealient/ui/baseurl/BaseURLViewModelTest.kt b/app/src/test/java/com/atridad/mealient/ui/baseurl/BaseURLViewModelTest.kt similarity index 91% rename from app/src/test/java/gq/kirmanak/mealient/ui/baseurl/BaseURLViewModelTest.kt rename to app/src/test/java/com/atridad/mealient/ui/baseurl/BaseURLViewModelTest.kt index 5c8eca7..6fc8ccf 100644 --- a/app/src/test/java/gq/kirmanak/mealient/ui/baseurl/BaseURLViewModelTest.kt +++ b/app/src/test/java/com/atridad/mealient/ui/baseurl/BaseURLViewModelTest.kt @@ -1,16 +1,16 @@ -package gq.kirmanak.mealient.ui.baseurl +package com.atridad.mealient.ui.baseurl import android.app.Application import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.data.baseurl.ServerInfoRepo -import gq.kirmanak.mealient.data.baseurl.impl.BaseUrlLogRedactor -import gq.kirmanak.mealient.data.recipes.RecipeRepo -import gq.kirmanak.mealient.datasource.NetworkError -import gq.kirmanak.mealient.datasource.TrustedCertificatesStore -import gq.kirmanak.mealient.test.AuthImplTestData.TEST_BASE_URL -import gq.kirmanak.mealient.test.AuthImplTestData.VERSION_RESPONSE -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.data.baseurl.ServerInfoRepo +import com.atridad.mealient.data.baseurl.impl.BaseUrlLogRedactor +import com.atridad.mealient.data.recipes.RecipeRepo +import com.atridad.mealient.datasource.NetworkError +import com.atridad.mealient.datasource.TrustedCertificatesStore +import com.atridad.mealient.test.AuthImplTestData.TEST_BASE_URL +import com.atridad.mealient.test.AuthImplTestData.VERSION_RESPONSE +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.coVerify import io.mockk.coVerifyOrder diff --git a/app/src/test/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModelTest.kt b/app/src/test/java/com/atridad/mealient/ui/disclaimer/DisclaimerViewModelTest.kt similarity index 88% rename from app/src/test/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModelTest.kt rename to app/src/test/java/com/atridad/mealient/ui/disclaimer/DisclaimerViewModelTest.kt index 354a638..ce09ed4 100644 --- a/app/src/test/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModelTest.kt +++ b/app/src/test/java/com/atridad/mealient/ui/disclaimer/DisclaimerViewModelTest.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.ui.disclaimer +package com.atridad.mealient.ui.disclaimer import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorage -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.data.disclaimer.DisclaimerStorage +import com.atridad.mealient.test.BaseUnitTest import io.mockk.impl.annotations.MockK import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.take diff --git a/app/src/test/java/gq/kirmanak/mealient/ui/recipes/RecipesListViewModelTest.kt b/app/src/test/java/com/atridad/mealient/ui/recipes/RecipesListViewModelTest.kt similarity index 87% rename from app/src/test/java/gq/kirmanak/mealient/ui/recipes/RecipesListViewModelTest.kt rename to app/src/test/java/com/atridad/mealient/ui/recipes/RecipesListViewModelTest.kt index 368c71c..2d1e4a9 100644 --- a/app/src/test/java/gq/kirmanak/mealient/ui/recipes/RecipesListViewModelTest.kt +++ b/app/src/test/java/com/atridad/mealient/ui/recipes/RecipesListViewModelTest.kt @@ -1,15 +1,15 @@ -package gq.kirmanak.mealient.ui.recipes +package com.atridad.mealient.ui.recipes import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.data.recipes.RecipeRepo -import gq.kirmanak.mealient.data.recipes.impl.RecipeImageUrlProvider -import gq.kirmanak.mealient.database.CAKE_RECIPE_SUMMARY_ENTITY -import gq.kirmanak.mealient.test.BaseUnitTest -import gq.kirmanak.mealient.ui.recipes.list.RecipeListEvent -import gq.kirmanak.mealient.ui.recipes.list.RecipeListItemState -import gq.kirmanak.mealient.ui.recipes.list.RecipeListSnackbar -import gq.kirmanak.mealient.ui.recipes.list.RecipesListViewModel +import com.atridad.mealient.data.auth.AuthRepo +import com.atridad.mealient.data.recipes.RecipeRepo +import com.atridad.mealient.data.recipes.impl.RecipeImageUrlProvider +import com.atridad.mealient.database.CAKE_RECIPE_SUMMARY_ENTITY +import com.atridad.mealient.test.BaseUnitTest +import com.atridad.mealient.ui.recipes.list.RecipeListEvent +import com.atridad.mealient.ui.recipes.list.RecipeListItemState +import com.atridad.mealient.ui.recipes.list.RecipeListSnackbar +import com.atridad.mealient.ui.recipes.list.RecipesListViewModel import io.mockk.coEvery import io.mockk.coVerify import io.mockk.every diff --git a/app/src/test/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModelTest.kt b/app/src/test/java/com/atridad/mealient/ui/recipes/info/RecipeInfoViewModelTest.kt similarity index 81% rename from app/src/test/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModelTest.kt rename to app/src/test/java/com/atridad/mealient/ui/recipes/info/RecipeInfoViewModelTest.kt index 6d0d659..c1bcb00 100644 --- a/app/src/test/java/gq/kirmanak/mealient/ui/recipes/info/RecipeInfoViewModelTest.kt +++ b/app/src/test/java/com/atridad/mealient/ui/recipes/info/RecipeInfoViewModelTest.kt @@ -1,15 +1,15 @@ -package gq.kirmanak.mealient.ui.recipes.info +package com.atridad.mealient.ui.recipes.info import androidx.lifecycle.SavedStateHandle import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.recipes.RecipeRepo -import gq.kirmanak.mealient.data.recipes.impl.RecipeImageUrlProvider -import gq.kirmanak.mealient.database.BAKE_CAKE_RECIPE_INSTRUCTION_ENTITY -import gq.kirmanak.mealient.database.CAKE_BREAD_RECIPE_INGREDIENT_ENTITY -import gq.kirmanak.mealient.database.CAKE_SUGAR_RECIPE_INGREDIENT_ENTITY -import gq.kirmanak.mealient.database.FULL_CAKE_INFO_ENTITY -import gq.kirmanak.mealient.database.MIX_CAKE_RECIPE_INSTRUCTION_ENTITY -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.data.recipes.RecipeRepo +import com.atridad.mealient.data.recipes.impl.RecipeImageUrlProvider +import com.atridad.mealient.database.BAKE_CAKE_RECIPE_INSTRUCTION_ENTITY +import com.atridad.mealient.database.CAKE_BREAD_RECIPE_INGREDIENT_ENTITY +import com.atridad.mealient.database.CAKE_SUGAR_RECIPE_INGREDIENT_ENTITY +import com.atridad.mealient.database.FULL_CAKE_INFO_ENTITY +import com.atridad.mealient.database.MIX_CAKE_RECIPE_INSTRUCTION_ENTITY +import com.atridad.mealient.test.BaseUnitTest import io.mockk.coEvery import io.mockk.impl.annotations.MockK import kotlinx.coroutines.flow.first diff --git a/app/src/test/java/gq/kirmanak/mealient/ui/share/ShareRecipeViewModelTest.kt b/app/src/test/java/com/atridad/mealient/ui/share/ShareRecipeViewModelTest.kt similarity index 91% rename from app/src/test/java/gq/kirmanak/mealient/ui/share/ShareRecipeViewModelTest.kt rename to app/src/test/java/com/atridad/mealient/ui/share/ShareRecipeViewModelTest.kt index bced6fd..6c515c8 100644 --- a/app/src/test/java/gq/kirmanak/mealient/ui/share/ShareRecipeViewModelTest.kt +++ b/app/src/test/java/com/atridad/mealient/ui/share/ShareRecipeViewModelTest.kt @@ -1,10 +1,10 @@ -package gq.kirmanak.mealient.ui.share +package com.atridad.mealient.ui.share import androidx.lifecycle.asFlow import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.data.share.ShareRecipeRepo -import gq.kirmanak.mealient.test.BaseUnitTest -import gq.kirmanak.mealient.ui.OperationUiState +import com.atridad.mealient.data.share.ShareRecipeRepo +import com.atridad.mealient.test.BaseUnitTest +import com.atridad.mealient.ui.OperationUiState import io.mockk.coEvery import io.mockk.coVerify import io.mockk.impl.annotations.MockK diff --git a/architecture/build.gradle.kts b/architecture/build.gradle.kts index 064f096..2bbbb4b 100644 --- a/architecture/build.gradle.kts +++ b/architecture/build.gradle.kts @@ -1,11 +1,11 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") id("dagger.hilt.android.plugin") alias(libs.plugins.ksp) } android { - namespace = "gq.kirmanak.mealient.architecture" + namespace = "com.atridad.mealient.architecture" } dependencies { @@ -17,4 +17,4 @@ dependencies { testImplementation(libs.androidx.coreTesting) testImplementation(libs.google.truth) testImplementation(project(":testing")) -} \ No newline at end of file +} diff --git a/architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/FlowExtensions.kt b/architecture/src/main/kotlin/com/atridad/mealient/architecture/FlowExtensions.kt similarity index 93% rename from architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/FlowExtensions.kt rename to architecture/src/main/kotlin/com/atridad/mealient/architecture/FlowExtensions.kt index 497b717..94aceaa 100644 --- a/architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/FlowExtensions.kt +++ b/architecture/src/main/kotlin/com/atridad/mealient/architecture/FlowExtensions.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.architecture +package com.atridad.mealient.architecture import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.FlowCollector diff --git a/architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/AppDispatchers.kt b/architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/AppDispatchers.kt similarity index 79% rename from architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/AppDispatchers.kt rename to architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/AppDispatchers.kt index 81cb800..1e3e969 100644 --- a/architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/AppDispatchers.kt +++ b/architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/AppDispatchers.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.architecture.configuration +package com.atridad.mealient.architecture.configuration import kotlinx.coroutines.CoroutineDispatcher diff --git a/architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/AppDispatchersImpl.kt b/architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/AppDispatchersImpl.kt similarity index 89% rename from architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/AppDispatchersImpl.kt rename to architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/AppDispatchersImpl.kt index 1f6d142..9389cc2 100644 --- a/architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/AppDispatchersImpl.kt +++ b/architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/AppDispatchersImpl.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.architecture.configuration +package com.atridad.mealient.architecture.configuration import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/ArchitectureModule.kt b/architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/ArchitectureModule.kt similarity index 84% rename from architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/ArchitectureModule.kt rename to architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/ArchitectureModule.kt index 55d1167..5ce07be 100644 --- a/architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/ArchitectureModule.kt +++ b/architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/ArchitectureModule.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.architecture.configuration +package com.atridad.mealient.architecture.configuration import dagger.Binds import dagger.Module diff --git a/architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/BuildConfiguration.kt b/architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/BuildConfiguration.kt similarity index 61% rename from architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/BuildConfiguration.kt rename to architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/BuildConfiguration.kt index a34ab9e..48ccde2 100644 --- a/architecture/src/main/kotlin/gq/kirmanak/mealient/architecture/configuration/BuildConfiguration.kt +++ b/architecture/src/main/kotlin/com/atridad/mealient/architecture/configuration/BuildConfiguration.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.architecture.configuration +package com.atridad.mealient.architecture.configuration interface BuildConfiguration { diff --git a/architecture/src/test/kotlin/gq/kirmanak/mealient/architecture/FlowExtensionsKtTest.kt b/architecture/src/test/kotlin/com/atridad/mealient/architecture/FlowExtensionsKtTest.kt similarity index 93% rename from architecture/src/test/kotlin/gq/kirmanak/mealient/architecture/FlowExtensionsKtTest.kt rename to architecture/src/test/kotlin/com/atridad/mealient/architecture/FlowExtensionsKtTest.kt index 60af332..dd9ca18 100644 --- a/architecture/src/test/kotlin/gq/kirmanak/mealient/architecture/FlowExtensionsKtTest.kt +++ b/architecture/src/test/kotlin/com/atridad/mealient/architecture/FlowExtensionsKtTest.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.architecture +package com.atridad.mealient.architecture import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.test.BaseUnitTest import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.toList import kotlinx.coroutines.test.runTest diff --git a/build-logic/convention/build.gradle.kts b/build-logic/convention/build.gradle.kts index 65dd8bc..f0f58b4 100644 --- a/build-logic/convention/build.gradle.kts +++ b/build-logic/convention/build.gradle.kts @@ -2,7 +2,7 @@ plugins { `kotlin-dsl` } -group = "gq.kirmanak.mealient.buildlogic" +group = "com.atridad.mealient.buildlogic" dependencies { implementation(libs.jetbrains.kotlinPlugin) @@ -12,19 +12,19 @@ dependencies { gradlePlugin { plugins { register("androidApplication") { - id = "gq.kirmanak.mealient.application" + id = "com.atridad.mealient.application" implementationClass = "AndroidApplicationConventionPlugin" } register("androidLibrary") { - id = "gq.kirmanak.mealient.library" + id = "com.atridad.mealient.library" implementationClass = "AndroidLibraryConventionPlugin" } register("compose") { - id = "gq.kirmanak.mealient.compose" + id = "com.atridad.mealient.compose" implementationClass = "AndroidLibraryComposeConventionPlugin" } register("appCompose") { - id = "gq.kirmanak.mealient.compose.app" + id = "com.atridad.mealient.compose.app" implementationClass = "AndroidApplicationComposeConventionPlugin" } } diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt index c81944b..68453fc 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt @@ -1,5 +1,5 @@ import com.android.build.gradle.internal.dsl.BaseAppModuleExtension -import gq.kirmanak.mealient.configureAndroidCompose +import com.atridad.mealient.configureAndroidCompose import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure diff --git a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt index 67ec28e..8608963 100644 --- a/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt @@ -1,6 +1,6 @@ import com.android.build.gradle.internal.dsl.BaseAppModuleExtension -import gq.kirmanak.mealient.Versions -import gq.kirmanak.mealient.configureKotlinAndroid +import com.atridad.mealient.Versions +import com.atridad.mealient.configureKotlinAndroid import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt index ecedca7..f19976f 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt @@ -1,5 +1,5 @@ import com.android.build.gradle.LibraryExtension -import gq.kirmanak.mealient.configureAndroidCompose +import com.atridad.mealient.configureAndroidCompose import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt index 6a82976..804ea32 100644 --- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt +++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt @@ -1,6 +1,6 @@ import com.android.build.gradle.LibraryExtension -import gq.kirmanak.mealient.Versions -import gq.kirmanak.mealient.configureKotlinAndroid +import com.atridad.mealient.Versions +import com.atridad.mealient.configureKotlinAndroid import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.configure diff --git a/build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/AndroidCompose.kt b/build-logic/convention/src/main/kotlin/com/atridad/mealient/AndroidCompose.kt similarity index 98% rename from build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/AndroidCompose.kt rename to build-logic/convention/src/main/kotlin/com/atridad/mealient/AndroidCompose.kt index 761b155..0ea8fc9 100644 --- a/build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/AndroidCompose.kt +++ b/build-logic/convention/src/main/kotlin/com/atridad/mealient/AndroidCompose.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient +package com.atridad.mealient import com.android.build.api.dsl.CommonExtension import com.android.build.gradle.LibraryExtension diff --git a/build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/Extensions.kt b/build-logic/convention/src/main/kotlin/com/atridad/mealient/Extensions.kt similarity index 97% rename from build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/Extensions.kt rename to build-logic/convention/src/main/kotlin/com/atridad/mealient/Extensions.kt index 6381013..316f1f8 100644 --- a/build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/Extensions.kt +++ b/build-logic/convention/src/main/kotlin/com/atridad/mealient/Extensions.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient +package com.atridad.mealient import org.gradle.api.Action import org.gradle.api.NamedDomainObjectContainer diff --git a/build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/KotlinAndroid.kt b/build-logic/convention/src/main/kotlin/com/atridad/mealient/KotlinAndroid.kt similarity index 98% rename from build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/KotlinAndroid.kt rename to build-logic/convention/src/main/kotlin/com/atridad/mealient/KotlinAndroid.kt index 65c09b3..50d7fbd 100644 --- a/build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/KotlinAndroid.kt +++ b/build-logic/convention/src/main/kotlin/com/atridad/mealient/KotlinAndroid.kt @@ -1,6 +1,6 @@ @file:Suppress("UnstableApiUsage") -package gq.kirmanak.mealient +package com.atridad.mealient import com.android.build.api.dsl.CommonExtension import org.gradle.api.Project diff --git a/build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/Versions.kt b/build-logic/convention/src/main/kotlin/com/atridad/mealient/Versions.kt similarity index 93% rename from build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/Versions.kt rename to build-logic/convention/src/main/kotlin/com/atridad/mealient/Versions.kt index 697ab06..e1d98b2 100644 --- a/build-logic/convention/src/main/kotlin/gq/kirmanak/mealient/Versions.kt +++ b/build-logic/convention/src/main/kotlin/com/atridad/mealient/Versions.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient +package com.atridad.mealient import org.gradle.api.Project import org.gradle.api.artifacts.VersionCatalog diff --git a/database/build.gradle.kts b/database/build.gradle.kts index 6d774dd..a2a3c9e 100644 --- a/database/build.gradle.kts +++ b/database/build.gradle.kts @@ -1,11 +1,11 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") id("dagger.hilt.android.plugin") alias(libs.plugins.ksp) } android { - namespace = "gq.kirmanak.mealient.database" + namespace = "com.atridad.mealient.database" } dependencies { @@ -35,4 +35,4 @@ dependencies { testImplementation(libs.google.truth) testImplementation(libs.io.mockk) -} \ No newline at end of file +} diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/AppDb.kt b/database/src/main/kotlin/com/atridad/mealient/database/AppDb.kt similarity index 56% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/AppDb.kt rename to database/src/main/kotlin/com/atridad/mealient/database/AppDb.kt index 16adf16..1d3eea2 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/AppDb.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/AppDb.kt @@ -1,14 +1,14 @@ -package gq.kirmanak.mealient.database +package com.atridad.mealient.database import androidx.room.Database import androidx.room.RoomDatabase import androidx.room.TypeConverters -import gq.kirmanak.mealient.database.recipe.RecipeDao -import gq.kirmanak.mealient.database.recipe.entity.RecipeEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.database.recipe.RecipeDao +import com.atridad.mealient.database.recipe.entity.RecipeEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity @Database( version = 13, diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/DatabaseModule.kt b/database/src/main/kotlin/com/atridad/mealient/database/DatabaseModule.kt similarity index 79% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/DatabaseModule.kt rename to database/src/main/kotlin/com/atridad/mealient/database/DatabaseModule.kt index 45b82c4..7408e58 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/DatabaseModule.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/DatabaseModule.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.database +package com.atridad.mealient.database import android.content.Context import androidx.room.Room @@ -8,9 +8,9 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealient.database.recipe.RecipeDao -import gq.kirmanak.mealient.database.recipe.RecipeStorage -import gq.kirmanak.mealient.database.recipe.RecipeStorageImpl +import com.atridad.mealient.database.recipe.RecipeDao +import com.atridad.mealient.database.recipe.RecipeStorage +import com.atridad.mealient.database.recipe.RecipeStorageImpl import javax.inject.Singleton @Module diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/RoomTypeConverters.kt b/database/src/main/kotlin/com/atridad/mealient/database/RoomTypeConverters.kt similarity index 94% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/RoomTypeConverters.kt rename to database/src/main/kotlin/com/atridad/mealient/database/RoomTypeConverters.kt index 2f5a29e..71dfaf7 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/RoomTypeConverters.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/RoomTypeConverters.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.database +package com.atridad.mealient.database import androidx.room.TypeConverter import kotlinx.datetime.* diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/RecipeDao.kt b/database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeDao.kt similarity index 96% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/RecipeDao.kt rename to database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeDao.kt index 4123025..8071411 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/RecipeDao.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeDao.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.database.recipe +package com.atridad.mealient.database.recipe import androidx.paging.PagingSource import androidx.room.* -import gq.kirmanak.mealient.database.recipe.entity.* +import com.atridad.mealient.database.recipe.entity.* @Dao internal interface RecipeDao { diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/RecipeStorage.kt b/database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeStorage.kt similarity index 66% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/RecipeStorage.kt rename to database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeStorage.kt index e24ce99..d897a1d 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/RecipeStorage.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeStorage.kt @@ -1,12 +1,12 @@ -package gq.kirmanak.mealient.database.recipe +package com.atridad.mealient.database.recipe import androidx.paging.PagingSource -import gq.kirmanak.mealient.database.recipe.entity.RecipeEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions +import com.atridad.mealient.database.recipe.entity.RecipeEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions interface RecipeStorage { suspend fun saveRecipes(recipes: List) diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/RecipeStorageImpl.kt b/database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeStorageImpl.kt similarity index 85% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/RecipeStorageImpl.kt rename to database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeStorageImpl.kt index 56a635d..76aefd9 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/RecipeStorageImpl.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/recipe/RecipeStorageImpl.kt @@ -1,15 +1,15 @@ -package gq.kirmanak.mealient.database.recipe +package com.atridad.mealient.database.recipe import androidx.paging.PagingSource import androidx.room.withTransaction -import gq.kirmanak.mealient.database.AppDb -import gq.kirmanak.mealient.database.recipe.entity.RecipeEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.database.AppDb +import com.atridad.mealient.database.recipe.entity.RecipeEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions +import com.atridad.mealient.logging.Logger import javax.inject.Inject internal class RecipeStorageImpl @Inject constructor( diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeEntity.kt b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeEntity.kt similarity index 88% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeEntity.kt rename to database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeEntity.kt index 1b93e20..d0f516e 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeEntity.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.database.recipe.entity +package com.atridad.mealient.database.recipe.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeIngredientEntity.kt b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeIngredientEntity.kt similarity index 95% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeIngredientEntity.kt rename to database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeIngredientEntity.kt index a2519b4..6c71d17 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeIngredientEntity.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeIngredientEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.database.recipe.entity +package com.atridad.mealient.database.recipe.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeIngredientToInstructionEntity.kt b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeIngredientToInstructionEntity.kt similarity index 95% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeIngredientToInstructionEntity.kt rename to database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeIngredientToInstructionEntity.kt index 728cba3..67367c5 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeIngredientToInstructionEntity.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeIngredientToInstructionEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.database.recipe.entity +package com.atridad.mealient.database.recipe.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeInstructionEntity.kt b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeInstructionEntity.kt similarity index 93% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeInstructionEntity.kt rename to database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeInstructionEntity.kt index 1698d7d..40e04aa 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeInstructionEntity.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeInstructionEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.database.recipe.entity +package com.atridad.mealient.database.recipe.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeSummaryEntity.kt b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeSummaryEntity.kt similarity index 93% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeSummaryEntity.kt rename to database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeSummaryEntity.kt index b77c15f..1993d5d 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeSummaryEntity.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeSummaryEntity.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.database.recipe.entity +package com.atridad.mealient.database.recipe.entity import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeWithSummaryAndIngredientsAndInstructions.kt b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeWithSummaryAndIngredientsAndInstructions.kt similarity index 93% rename from database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeWithSummaryAndIngredientsAndInstructions.kt rename to database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeWithSummaryAndIngredientsAndInstructions.kt index a3d2982..4652eac 100644 --- a/database/src/main/kotlin/gq/kirmanak/mealient/database/recipe/entity/RecipeWithSummaryAndIngredientsAndInstructions.kt +++ b/database/src/main/kotlin/com/atridad/mealient/database/recipe/entity/RecipeWithSummaryAndIngredientsAndInstructions.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.database.recipe.entity +package com.atridad.mealient.database.recipe.entity import androidx.room.Embedded import androidx.room.Relation diff --git a/database/src/test/kotlin/gq/kirmanak/mealient/database/RecipeStorageImplTest.kt b/database/src/test/kotlin/com/atridad/mealient/database/RecipeStorageImplTest.kt similarity index 96% rename from database/src/test/kotlin/gq/kirmanak/mealient/database/RecipeStorageImplTest.kt rename to database/src/test/kotlin/com/atridad/mealient/database/RecipeStorageImplTest.kt index 82dc8f3..f0cd4e5 100644 --- a/database/src/test/kotlin/gq/kirmanak/mealient/database/RecipeStorageImplTest.kt +++ b/database/src/test/kotlin/com/atridad/mealient/database/RecipeStorageImplTest.kt @@ -1,10 +1,10 @@ -package gq.kirmanak.mealient.database +package com.atridad.mealient.database import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.database.recipe.RecipeDao -import gq.kirmanak.mealient.database.recipe.RecipeStorageImpl -import gq.kirmanak.mealient.test.HiltRobolectricTest +import com.atridad.mealient.database.recipe.RecipeDao +import com.atridad.mealient.database.recipe.RecipeStorageImpl +import com.atridad.mealient.test.HiltRobolectricTest import kotlinx.coroutines.test.runTest import org.junit.Test import javax.inject.Inject diff --git a/database/src/test/kotlin/gq/kirmanak/mealient/database/RoomTypeConvertersTest.kt b/database/src/test/kotlin/com/atridad/mealient/database/RoomTypeConvertersTest.kt similarity index 97% rename from database/src/test/kotlin/gq/kirmanak/mealient/database/RoomTypeConvertersTest.kt rename to database/src/test/kotlin/com/atridad/mealient/database/RoomTypeConvertersTest.kt index 4e621b0..d2ab989 100644 --- a/database/src/test/kotlin/gq/kirmanak/mealient/database/RoomTypeConvertersTest.kt +++ b/database/src/test/kotlin/com/atridad/mealient/database/RoomTypeConvertersTest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.database +package com.atridad.mealient.database import com.google.common.truth.Truth.assertThat import kotlinx.datetime.LocalDate diff --git a/database_test/build.gradle.kts b/database_test/build.gradle.kts index 57937af..3c6b4a8 100644 --- a/database_test/build.gradle.kts +++ b/database_test/build.gradle.kts @@ -1,11 +1,11 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") } android { - namespace = "gq.kirmanak.mealient.database_test" + namespace = "com.atridad.mealient.database_test" } dependencies { implementation(project(":database")) -} \ No newline at end of file +} diff --git a/database_test/src/main/kotlin/gq/kirmanak/mealient/database/TestData.kt b/database_test/src/main/kotlin/com/atridad/mealient/database/TestData.kt similarity index 90% rename from database_test/src/main/kotlin/gq/kirmanak/mealient/database/TestData.kt rename to database_test/src/main/kotlin/com/atridad/mealient/database/TestData.kt index a76af1e..3b23d87 100644 --- a/database_test/src/main/kotlin/gq/kirmanak/mealient/database/TestData.kt +++ b/database_test/src/main/kotlin/com/atridad/mealient/database/TestData.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient.database +package com.atridad.mealient.database -import gq.kirmanak.mealient.database.recipe.entity.RecipeEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions +import com.atridad.mealient.database.recipe.entity.RecipeEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientToInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.database.recipe.entity.RecipeWithSummaryAndIngredientsAndInstructions import kotlinx.datetime.LocalDate val CAKE_RECIPE_SUMMARY_ENTITY = RecipeSummaryEntity( diff --git a/datasource/build.gradle.kts b/datasource/build.gradle.kts index 524a8e7..8e2fd05 100644 --- a/datasource/build.gradle.kts +++ b/datasource/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") id("dagger.hilt.android.plugin") id("org.jetbrains.kotlin.plugin.serialization") alias(libs.plugins.ksp) @@ -10,7 +10,7 @@ android { buildConfigField("Boolean", "LOG_NETWORK", "true") consumerProguardFiles("consumer-proguard-rules.pro") } - namespace = "gq.kirmanak.mealient.datasource" + namespace = "com.atridad.mealient.datasource" buildFeatures { buildConfig = true } diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/AuthenticationProvider.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/AuthenticationProvider.kt similarity index 72% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/AuthenticationProvider.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/AuthenticationProvider.kt index 8216bbe..88a1d21 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/AuthenticationProvider.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/AuthenticationProvider.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource interface AuthenticationProvider { diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/CertificateCombinedException.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/CertificateCombinedException.kt similarity index 96% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/CertificateCombinedException.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/CertificateCombinedException.kt index baf740b..6ae9621 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/CertificateCombinedException.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/CertificateCombinedException.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource import java.security.cert.CertPathValidatorException import java.security.cert.CertificateException diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/DataSourceExtensions.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/DataSourceExtensions.kt similarity index 94% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/DataSourceExtensions.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/DataSourceExtensions.kt index fe664e7..dd7bb14 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/DataSourceExtensions.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/DataSourceExtensions.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource import kotlinx.coroutines.CancellationException diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/DataSourceModule.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/DataSourceModule.kt similarity index 81% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/DataSourceModule.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/DataSourceModule.kt index 1cc0945..21d8abb 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/DataSourceModule.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/DataSourceModule.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource import dagger.Binds import dagger.Module @@ -6,12 +6,12 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import dagger.multibindings.IntoSet -import gq.kirmanak.mealient.datasource.impl.MealieDataSourceImpl -import gq.kirmanak.mealient.datasource.impl.MealieServiceKtor -import gq.kirmanak.mealient.datasource.impl.NetworkRequestWrapperImpl -import gq.kirmanak.mealient.datasource.impl.OkHttpBuilderImpl -import gq.kirmanak.mealient.datasource.impl.TrustedCertificatesStoreImpl -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.datasource.impl.MealieDataSourceImpl +import com.atridad.mealient.datasource.impl.MealieServiceKtor +import com.atridad.mealient.datasource.impl.NetworkRequestWrapperImpl +import com.atridad.mealient.datasource.impl.OkHttpBuilderImpl +import com.atridad.mealient.datasource.impl.TrustedCertificatesStoreImpl +import com.atridad.mealient.logging.Logger import kotlinx.serialization.json.Json import okhttp3.Interceptor import okhttp3.OkHttpClient diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/MealieDataSource.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/MealieDataSource.kt similarity index 63% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/MealieDataSource.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/MealieDataSource.kt index 6ac793e..4982bdc 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/MealieDataSource.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/MealieDataSource.kt @@ -1,21 +1,21 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource -import gq.kirmanak.mealient.datasource.models.CreateApiTokenRequest -import gq.kirmanak.mealient.datasource.models.CreateApiTokenResponse -import gq.kirmanak.mealient.datasource.models.CreateRecipeRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListItemRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListRequest -import gq.kirmanak.mealient.datasource.models.GetFoodsResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListsResponse -import gq.kirmanak.mealient.datasource.models.GetUnitsResponse -import gq.kirmanak.mealient.datasource.models.GetUserInfoResponse -import gq.kirmanak.mealient.datasource.models.ParseRecipeURLRequest -import gq.kirmanak.mealient.datasource.models.UpdateRecipeRequest -import gq.kirmanak.mealient.datasource.models.VersionResponse +import com.atridad.mealient.datasource.models.CreateApiTokenRequest +import com.atridad.mealient.datasource.models.CreateApiTokenResponse +import com.atridad.mealient.datasource.models.CreateRecipeRequest +import com.atridad.mealient.datasource.models.CreateShoppingListItemRequest +import com.atridad.mealient.datasource.models.CreateShoppingListRequest +import com.atridad.mealient.datasource.models.GetFoodsResponse +import com.atridad.mealient.datasource.models.GetRecipeResponse +import com.atridad.mealient.datasource.models.GetRecipeSummaryResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.models.GetShoppingListResponse +import com.atridad.mealient.datasource.models.GetShoppingListsResponse +import com.atridad.mealient.datasource.models.GetUnitsResponse +import com.atridad.mealient.datasource.models.GetUserInfoResponse +import com.atridad.mealient.datasource.models.ParseRecipeURLRequest +import com.atridad.mealient.datasource.models.UpdateRecipeRequest +import com.atridad.mealient.datasource.models.VersionResponse interface MealieDataSource { diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/MealieService.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/MealieService.kt similarity index 63% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/MealieService.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/MealieService.kt index 0717ec8..bf36ec8 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/MealieService.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/MealieService.kt @@ -1,21 +1,21 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource -import gq.kirmanak.mealient.datasource.models.CreateApiTokenRequest -import gq.kirmanak.mealient.datasource.models.CreateApiTokenResponse -import gq.kirmanak.mealient.datasource.models.CreateRecipeRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListItemRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListRequest -import gq.kirmanak.mealient.datasource.models.GetFoodsResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeResponse -import gq.kirmanak.mealient.datasource.models.GetRecipesResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListsResponse -import gq.kirmanak.mealient.datasource.models.GetTokenResponse -import gq.kirmanak.mealient.datasource.models.GetUnitsResponse -import gq.kirmanak.mealient.datasource.models.GetUserInfoResponse -import gq.kirmanak.mealient.datasource.models.ParseRecipeURLRequest -import gq.kirmanak.mealient.datasource.models.UpdateRecipeRequest -import gq.kirmanak.mealient.datasource.models.VersionResponse +import com.atridad.mealient.datasource.models.CreateApiTokenRequest +import com.atridad.mealient.datasource.models.CreateApiTokenResponse +import com.atridad.mealient.datasource.models.CreateRecipeRequest +import com.atridad.mealient.datasource.models.CreateShoppingListItemRequest +import com.atridad.mealient.datasource.models.CreateShoppingListRequest +import com.atridad.mealient.datasource.models.GetFoodsResponse +import com.atridad.mealient.datasource.models.GetRecipeResponse +import com.atridad.mealient.datasource.models.GetRecipesResponse +import com.atridad.mealient.datasource.models.GetShoppingListResponse +import com.atridad.mealient.datasource.models.GetShoppingListsResponse +import com.atridad.mealient.datasource.models.GetTokenResponse +import com.atridad.mealient.datasource.models.GetUnitsResponse +import com.atridad.mealient.datasource.models.GetUserInfoResponse +import com.atridad.mealient.datasource.models.ParseRecipeURLRequest +import com.atridad.mealient.datasource.models.UpdateRecipeRequest +import com.atridad.mealient.datasource.models.VersionResponse import kotlinx.serialization.json.JsonElement internal interface MealieService { diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/NetworkError.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/NetworkError.kt similarity index 89% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/NetworkError.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/NetworkError.kt index 024c234..829f035 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/NetworkError.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/NetworkError.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource sealed class NetworkError(cause: Throwable) : RuntimeException(cause.message, cause) { class Unauthorized(cause: Throwable) : NetworkError(cause) diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/NetworkRequestWrapper.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/NetworkRequestWrapper.kt similarity index 90% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/NetworkRequestWrapper.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/NetworkRequestWrapper.kt index aaf9323..6a03ee6 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/NetworkRequestWrapper.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/NetworkRequestWrapper.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource interface NetworkRequestWrapper { diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ServerUrlProvider.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ServerUrlProvider.kt similarity index 62% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ServerUrlProvider.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/ServerUrlProvider.kt index bf18129..c33fd00 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ServerUrlProvider.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ServerUrlProvider.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource interface ServerUrlProvider { diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/TokenChangeListener.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/TokenChangeListener.kt similarity index 61% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/TokenChangeListener.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/TokenChangeListener.kt index e28ca34..82882ec 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/TokenChangeListener.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/TokenChangeListener.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource fun interface TokenChangeListener { diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/TrustedCertificatesStore.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/TrustedCertificatesStore.kt similarity index 82% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/TrustedCertificatesStore.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/TrustedCertificatesStore.kt index b96befc..a989e12 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/TrustedCertificatesStore.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/TrustedCertificatesStore.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource import java.security.cert.Certificate diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/AdvancedX509TrustManager.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/AdvancedX509TrustManager.kt similarity index 90% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/AdvancedX509TrustManager.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/AdvancedX509TrustManager.kt index 5a99778..82523e3 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/AdvancedX509TrustManager.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/AdvancedX509TrustManager.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.datasource.impl +package com.atridad.mealient.datasource.impl import android.annotation.SuppressLint -import gq.kirmanak.mealient.datasource.CertificateCombinedException -import gq.kirmanak.mealient.datasource.TrustedCertificatesStore -import gq.kirmanak.mealient.datasource.findCauseAsInstanceOf +import com.atridad.mealient.datasource.CertificateCombinedException +import com.atridad.mealient.datasource.TrustedCertificatesStore +import com.atridad.mealient.datasource.findCauseAsInstanceOf import java.security.KeyStore import java.security.cert.* import javax.inject.Inject diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/CacheBuilderImpl.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/CacheBuilderImpl.kt similarity index 93% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/CacheBuilderImpl.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/CacheBuilderImpl.kt index fbf79be..66eec77 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/CacheBuilderImpl.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/CacheBuilderImpl.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.datasource.impl +package com.atridad.mealient.datasource.impl import android.content.Context import android.os.StatFs import dagger.hilt.android.qualifiers.ApplicationContext -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.logging.Logger import okhttp3.Cache import java.io.File import javax.inject.Inject diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/MealieDataSourceImpl.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/MealieDataSourceImpl.kt similarity index 87% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/MealieDataSourceImpl.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/MealieDataSourceImpl.kt index 8f6149f..17f36aa 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/MealieDataSourceImpl.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/MealieDataSourceImpl.kt @@ -1,26 +1,26 @@ -package gq.kirmanak.mealient.datasource.impl +package com.atridad.mealient.datasource.impl -import gq.kirmanak.mealient.datasource.MealieDataSource -import gq.kirmanak.mealient.datasource.MealieService -import gq.kirmanak.mealient.datasource.NetworkError -import gq.kirmanak.mealient.datasource.NetworkRequestWrapper -import gq.kirmanak.mealient.datasource.models.CreateApiTokenRequest -import gq.kirmanak.mealient.datasource.models.CreateApiTokenResponse -import gq.kirmanak.mealient.datasource.models.CreateRecipeRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListItemRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListRequest -import gq.kirmanak.mealient.datasource.models.ErrorDetail -import gq.kirmanak.mealient.datasource.models.GetFoodsResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListsResponse -import gq.kirmanak.mealient.datasource.models.GetUnitsResponse -import gq.kirmanak.mealient.datasource.models.GetUserInfoResponse -import gq.kirmanak.mealient.datasource.models.ParseRecipeURLRequest -import gq.kirmanak.mealient.datasource.models.UpdateRecipeRequest -import gq.kirmanak.mealient.datasource.models.VersionResponse +import com.atridad.mealient.datasource.MealieDataSource +import com.atridad.mealient.datasource.MealieService +import com.atridad.mealient.datasource.NetworkError +import com.atridad.mealient.datasource.NetworkRequestWrapper +import com.atridad.mealient.datasource.models.CreateApiTokenRequest +import com.atridad.mealient.datasource.models.CreateApiTokenResponse +import com.atridad.mealient.datasource.models.CreateRecipeRequest +import com.atridad.mealient.datasource.models.CreateShoppingListItemRequest +import com.atridad.mealient.datasource.models.CreateShoppingListRequest +import com.atridad.mealient.datasource.models.ErrorDetail +import com.atridad.mealient.datasource.models.GetFoodsResponse +import com.atridad.mealient.datasource.models.GetRecipeResponse +import com.atridad.mealient.datasource.models.GetRecipeSummaryResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.models.GetShoppingListResponse +import com.atridad.mealient.datasource.models.GetShoppingListsResponse +import com.atridad.mealient.datasource.models.GetUnitsResponse +import com.atridad.mealient.datasource.models.GetUserInfoResponse +import com.atridad.mealient.datasource.models.ParseRecipeURLRequest +import com.atridad.mealient.datasource.models.UpdateRecipeRequest +import com.atridad.mealient.datasource.models.VersionResponse import io.ktor.client.call.NoTransformationFoundException import io.ktor.client.call.body import io.ktor.client.plugins.ResponseException diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/MealieServiceKtor.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/MealieServiceKtor.kt similarity index 86% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/MealieServiceKtor.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/MealieServiceKtor.kt index cfda761..3313604 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/MealieServiceKtor.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/MealieServiceKtor.kt @@ -1,23 +1,23 @@ -package gq.kirmanak.mealient.datasource.impl +package com.atridad.mealient.datasource.impl -import gq.kirmanak.mealient.datasource.MealieService -import gq.kirmanak.mealient.datasource.ServerUrlProvider -import gq.kirmanak.mealient.datasource.models.CreateApiTokenRequest -import gq.kirmanak.mealient.datasource.models.CreateApiTokenResponse -import gq.kirmanak.mealient.datasource.models.CreateRecipeRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListItemRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListRequest -import gq.kirmanak.mealient.datasource.models.GetFoodsResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeResponse -import gq.kirmanak.mealient.datasource.models.GetRecipesResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListsResponse -import gq.kirmanak.mealient.datasource.models.GetTokenResponse -import gq.kirmanak.mealient.datasource.models.GetUnitsResponse -import gq.kirmanak.mealient.datasource.models.GetUserInfoResponse -import gq.kirmanak.mealient.datasource.models.ParseRecipeURLRequest -import gq.kirmanak.mealient.datasource.models.UpdateRecipeRequest -import gq.kirmanak.mealient.datasource.models.VersionResponse +import com.atridad.mealient.datasource.MealieService +import com.atridad.mealient.datasource.ServerUrlProvider +import com.atridad.mealient.datasource.models.CreateApiTokenRequest +import com.atridad.mealient.datasource.models.CreateApiTokenResponse +import com.atridad.mealient.datasource.models.CreateRecipeRequest +import com.atridad.mealient.datasource.models.CreateShoppingListItemRequest +import com.atridad.mealient.datasource.models.CreateShoppingListRequest +import com.atridad.mealient.datasource.models.GetFoodsResponse +import com.atridad.mealient.datasource.models.GetRecipeResponse +import com.atridad.mealient.datasource.models.GetRecipesResponse +import com.atridad.mealient.datasource.models.GetShoppingListResponse +import com.atridad.mealient.datasource.models.GetShoppingListsResponse +import com.atridad.mealient.datasource.models.GetTokenResponse +import com.atridad.mealient.datasource.models.GetUnitsResponse +import com.atridad.mealient.datasource.models.GetUserInfoResponse +import com.atridad.mealient.datasource.models.ParseRecipeURLRequest +import com.atridad.mealient.datasource.models.UpdateRecipeRequest +import com.atridad.mealient.datasource.models.VersionResponse import io.ktor.client.HttpClient import io.ktor.client.call.body import io.ktor.client.request.HttpRequestBuilder diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/NetworkRequestWrapperImpl.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/NetworkRequestWrapperImpl.kt similarity index 86% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/NetworkRequestWrapperImpl.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/NetworkRequestWrapperImpl.kt index 77d9c4e..c049c5f 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/NetworkRequestWrapperImpl.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/NetworkRequestWrapperImpl.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.datasource.impl +package com.atridad.mealient.datasource.impl -import gq.kirmanak.mealient.datasource.NetworkError -import gq.kirmanak.mealient.datasource.NetworkRequestWrapper -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.datasource.NetworkError +import com.atridad.mealient.datasource.NetworkRequestWrapper +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.logging.Logger import io.ktor.client.plugins.ResponseException import javax.inject.Inject diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/OkHttpBuilderImpl.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/OkHttpBuilderImpl.kt similarity index 91% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/OkHttpBuilderImpl.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/OkHttpBuilderImpl.kt index 3cb0047..7debea1 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/OkHttpBuilderImpl.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/OkHttpBuilderImpl.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.datasource.impl +package com.atridad.mealient.datasource.impl -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.logging.Logger import okhttp3.Interceptor import okhttp3.OkHttpClient import javax.inject.Inject diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/SslSocketFactoryFactory.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/SslSocketFactoryFactory.kt similarity index 93% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/SslSocketFactoryFactory.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/SslSocketFactoryFactory.kt index 65e856d..dc089ce 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/SslSocketFactoryFactory.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/SslSocketFactoryFactory.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.datasource.impl +package com.atridad.mealient.datasource.impl -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.logging.Logger import javax.inject.Inject import javax.net.ssl.SSLContext import javax.net.ssl.SSLSocketFactory diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/TrustedCertificatesStoreImpl.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/TrustedCertificatesStoreImpl.kt similarity index 93% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/TrustedCertificatesStoreImpl.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/TrustedCertificatesStoreImpl.kt index 49181e1..fb7cd95 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/TrustedCertificatesStoreImpl.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/impl/TrustedCertificatesStoreImpl.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.datasource.impl +package com.atridad.mealient.datasource.impl import android.content.Context import dagger.hilt.android.qualifiers.ApplicationContext -import gq.kirmanak.mealient.datasource.TrustedCertificatesStore -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.datasource.TrustedCertificatesStore +import com.atridad.mealient.logging.Logger import java.io.File import java.io.FileInputStream import java.security.KeyStore diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/AuthKtorConfiguration.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/AuthKtorConfiguration.kt similarity index 92% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/AuthKtorConfiguration.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/AuthKtorConfiguration.kt index 20da0ee..603f0d8 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/AuthKtorConfiguration.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/AuthKtorConfiguration.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.datasource.ktor +package com.atridad.mealient.datasource.ktor import androidx.annotation.VisibleForTesting -import gq.kirmanak.mealient.datasource.AuthenticationProvider -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.datasource.AuthenticationProvider +import com.atridad.mealient.logging.Logger import io.ktor.client.HttpClientConfig import io.ktor.client.engine.HttpClientEngineConfig import io.ktor.client.plugins.auth.Auth diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/ContentNegotiationConfiguration.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/ContentNegotiationConfiguration.kt similarity index 92% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/ContentNegotiationConfiguration.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/ContentNegotiationConfiguration.kt index a061325..6fa11b5 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/ContentNegotiationConfiguration.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/ContentNegotiationConfiguration.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.ktor +package com.atridad.mealient.datasource.ktor import io.ktor.client.HttpClientConfig import io.ktor.client.engine.HttpClientEngineConfig diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/EncodingKtorConfiguration.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/EncodingKtorConfiguration.kt similarity index 91% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/EncodingKtorConfiguration.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/EncodingKtorConfiguration.kt index ac4ae11..1c7c9fa 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/EncodingKtorConfiguration.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/EncodingKtorConfiguration.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.ktor +package com.atridad.mealient.datasource.ktor import io.ktor.client.HttpClientConfig import io.ktor.client.engine.HttpClientEngineConfig diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorClientBuilder.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorClientBuilder.kt similarity index 71% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorClientBuilder.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorClientBuilder.kt index a502a33..09eaa25 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorClientBuilder.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorClientBuilder.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.ktor +package com.atridad.mealient.datasource.ktor import io.ktor.client.HttpClient diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorClientBuilderImpl.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorClientBuilderImpl.kt similarity index 89% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorClientBuilderImpl.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorClientBuilderImpl.kt index 41738ce..6b8f591 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorClientBuilderImpl.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorClientBuilderImpl.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.datasource.ktor +package com.atridad.mealient.datasource.ktor -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.logging.Logger import io.ktor.client.HttpClient import io.ktor.client.engine.okhttp.OkHttp import okhttp3.OkHttpClient diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorConfiguration.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorConfiguration.kt similarity index 82% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorConfiguration.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorConfiguration.kt index 2b39788..9dc427f 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorConfiguration.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorConfiguration.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.ktor +package com.atridad.mealient.datasource.ktor import io.ktor.client.HttpClientConfig import io.ktor.client.engine.HttpClientEngineConfig diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorModule.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorModule.kt similarity index 90% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorModule.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorModule.kt index b9dd54a..73df8a3 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/KtorModule.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/KtorModule.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.ktor +package com.atridad.mealient.datasource.ktor import dagger.Binds import dagger.Module @@ -6,7 +6,7 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent import dagger.multibindings.IntoSet -import gq.kirmanak.mealient.datasource.TokenChangeListener +import com.atridad.mealient.datasource.TokenChangeListener import io.ktor.client.HttpClient import javax.inject.Singleton diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/TokenChangeListenerKtor.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/TokenChangeListenerKtor.kt similarity index 82% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/TokenChangeListenerKtor.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/TokenChangeListenerKtor.kt index 424cc81..c5000f3 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/ktor/TokenChangeListenerKtor.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/ktor/TokenChangeListenerKtor.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.datasource.ktor +package com.atridad.mealient.datasource.ktor -import gq.kirmanak.mealient.datasource.TokenChangeListener -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.datasource.TokenChangeListener +import com.atridad.mealient.logging.Logger import io.ktor.client.HttpClient import io.ktor.client.plugins.auth.Auth import io.ktor.client.plugins.auth.providers.BearerAuthProvider diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/AddRecipeInfo.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/AddRecipeInfo.kt similarity index 91% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/AddRecipeInfo.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/AddRecipeInfo.kt index 4c84a54..29895f3 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/AddRecipeInfo.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/AddRecipeInfo.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models data class AddRecipeInfo( val name: String, diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateApiTokenRequest.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateApiTokenRequest.kt similarity index 78% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateApiTokenRequest.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateApiTokenRequest.kt index 60b5a01..530d14a 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateApiTokenRequest.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateApiTokenRequest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateApiTokenResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateApiTokenResponse.kt similarity index 79% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateApiTokenResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateApiTokenResponse.kt index 0b184a0..7e61df1 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateApiTokenResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateApiTokenResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateRecipeRequest.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateRecipeRequest.kt similarity index 78% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateRecipeRequest.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateRecipeRequest.kt index a15733a..0dba806 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateRecipeRequest.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateRecipeRequest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateShoppingListItemRequest.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateShoppingListItemRequest.kt similarity index 91% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateShoppingListItemRequest.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateShoppingListItemRequest.kt index e76f57a..ccf6379 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateShoppingListItemRequest.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateShoppingListItemRequest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateShoppingListRequest.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateShoppingListRequest.kt similarity index 79% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateShoppingListRequest.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateShoppingListRequest.kt index f114b98..15aa593 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/CreateShoppingListRequest.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/CreateShoppingListRequest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/ErrorDetail.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/ErrorDetail.kt similarity index 79% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/ErrorDetail.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/ErrorDetail.kt index 407af76..b9687b5 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/ErrorDetail.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/ErrorDetail.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetFoodsResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetFoodsResponse.kt similarity index 88% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetFoodsResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetFoodsResponse.kt index 438a1f4..ad89388 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetFoodsResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetFoodsResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetItemLabelResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetItemLabelResponse.kt similarity index 86% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetItemLabelResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetItemLabelResponse.kt index 10b0831..877d7fe 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetItemLabelResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetItemLabelResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetRecipeResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetRecipeResponse.kt similarity index 97% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetRecipeResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetRecipeResponse.kt index 3007789..f6cf009 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetRecipeResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetRecipeResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetRecipeSummaryResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetRecipeSummaryResponse.kt similarity index 89% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetRecipeSummaryResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetRecipeSummaryResponse.kt index 4fa07f7..7391c75 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetRecipeSummaryResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetRecipeSummaryResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.datetime.LocalDate import kotlinx.serialization.SerialName diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetRecipesResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetRecipesResponse.kt similarity index 80% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetRecipesResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetRecipesResponse.kt index bf32d87..0b7ac1c 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetRecipesResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetRecipesResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetShoppingListResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetShoppingListResponse.kt similarity index 97% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetShoppingListResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetShoppingListResponse.kt index 57e0793..7d5744e 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetShoppingListResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetShoppingListResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetShoppingListsResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetShoppingListsResponse.kt similarity index 89% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetShoppingListsResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetShoppingListsResponse.kt index 2a69b69..43a90f8 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetShoppingListsResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetShoppingListsResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetShoppingListsSummaryResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetShoppingListsSummaryResponse.kt similarity index 82% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetShoppingListsSummaryResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetShoppingListsSummaryResponse.kt index 408dfe3..67271d0 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetShoppingListsSummaryResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetShoppingListsSummaryResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetTokenResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetTokenResponse.kt similarity index 79% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetTokenResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetTokenResponse.kt index 0ecd9b4..232fb2c 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetTokenResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetTokenResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetUnitsResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetUnitsResponse.kt similarity index 88% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetUnitsResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetUnitsResponse.kt index 88624b7..9a2b868 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetUnitsResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetUnitsResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetUserInfoResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetUserInfoResponse.kt similarity index 84% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetUserInfoResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetUserInfoResponse.kt index e3aefee..dd0c845 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/GetUserInfoResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/GetUserInfoResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/ParseRecipeURLRequest.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/ParseRecipeURLRequest.kt similarity index 83% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/ParseRecipeURLRequest.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/ParseRecipeURLRequest.kt index 853ab08..c57a385 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/ParseRecipeURLRequest.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/ParseRecipeURLRequest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/UpdateRecipeRequest.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/UpdateRecipeRequest.kt similarity index 97% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/UpdateRecipeRequest.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/UpdateRecipeRequest.kt index 03ee124..77f1938 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/UpdateRecipeRequest.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/UpdateRecipeRequest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/VersionResponse.kt b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/VersionResponse.kt similarity index 78% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/VersionResponse.kt rename to datasource/src/main/kotlin/com/atridad/mealient/datasource/models/VersionResponse.kt index 22cd45d..ad7cf26 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/models/VersionResponse.kt +++ b/datasource/src/main/kotlin/com/atridad/mealient/datasource/models/VersionResponse.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource.models +package com.atridad.mealient.datasource.models import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/AuthKtorConfigurationTest.kt b/datasource/src/test/kotlin/com/atridad/mealient/datasource/AuthKtorConfigurationTest.kt similarity index 96% rename from datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/AuthKtorConfigurationTest.kt rename to datasource/src/test/kotlin/com/atridad/mealient/datasource/AuthKtorConfigurationTest.kt index d68cda1..722c062 100644 --- a/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/AuthKtorConfigurationTest.kt +++ b/datasource/src/test/kotlin/com/atridad/mealient/datasource/AuthKtorConfigurationTest.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.datasource.ktor.AuthKtorConfiguration -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.datasource.ktor.AuthKtorConfiguration +import com.atridad.mealient.test.BaseUnitTest import io.ktor.client.plugins.auth.providers.BearerTokens import io.ktor.client.plugins.auth.providers.RefreshTokensParams import io.ktor.client.statement.HttpResponse diff --git a/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/FakeProvider.kt b/datasource/src/test/kotlin/com/atridad/mealient/datasource/FakeProvider.kt similarity index 76% rename from datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/FakeProvider.kt rename to datasource/src/test/kotlin/com/atridad/mealient/datasource/FakeProvider.kt index 6a7ee5c..07322f5 100644 --- a/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/FakeProvider.kt +++ b/datasource/src/test/kotlin/com/atridad/mealient/datasource/FakeProvider.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package com.atridad.mealient.datasource import javax.inject.Provider diff --git a/datasource_test/build.gradle.kts b/datasource_test/build.gradle.kts index 6623270..a1b74d4 100644 --- a/datasource_test/build.gradle.kts +++ b/datasource_test/build.gradle.kts @@ -1,9 +1,9 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") } android { - namespace = "gq.kirmanak.mealient.datasource_test" + namespace = "com.atridad.mealient.datasource_test" } dependencies { diff --git a/datasource_test/src/main/kotlin/gq/kirmanak/mealient/datasource_test/TestData.kt b/datasource_test/src/main/kotlin/com/atridad/mealient/datasource_test/TestData.kt similarity index 83% rename from datasource_test/src/main/kotlin/gq/kirmanak/mealient/datasource_test/TestData.kt rename to datasource_test/src/main/kotlin/com/atridad/mealient/datasource_test/TestData.kt index 84b5a98..6100fa9 100644 --- a/datasource_test/src/main/kotlin/gq/kirmanak/mealient/datasource_test/TestData.kt +++ b/datasource_test/src/main/kotlin/com/atridad/mealient/datasource_test/TestData.kt @@ -1,20 +1,20 @@ -package gq.kirmanak.mealient.datasource_test +package com.atridad.mealient.datasource_test -import gq.kirmanak.mealient.datasource.models.AddRecipeInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeIngredient -import gq.kirmanak.mealient.datasource.models.AddRecipeIngredientInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeInstruction -import gq.kirmanak.mealient.datasource.models.AddRecipeInstructionInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeSettings -import gq.kirmanak.mealient.datasource.models.AddRecipeSettingsInfo -import gq.kirmanak.mealient.datasource.models.CreateRecipeRequest -import gq.kirmanak.mealient.datasource.models.GetRecipeIngredientResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeInstructionIngredientReference -import gq.kirmanak.mealient.datasource.models.GetRecipeInstructionResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeSettingsResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse -import gq.kirmanak.mealient.datasource.models.UpdateRecipeRequest +import com.atridad.mealient.datasource.models.AddRecipeInfo +import com.atridad.mealient.datasource.models.AddRecipeIngredient +import com.atridad.mealient.datasource.models.AddRecipeIngredientInfo +import com.atridad.mealient.datasource.models.AddRecipeInstruction +import com.atridad.mealient.datasource.models.AddRecipeInstructionInfo +import com.atridad.mealient.datasource.models.AddRecipeSettings +import com.atridad.mealient.datasource.models.AddRecipeSettingsInfo +import com.atridad.mealient.datasource.models.CreateRecipeRequest +import com.atridad.mealient.datasource.models.GetRecipeIngredientResponse +import com.atridad.mealient.datasource.models.GetRecipeInstructionIngredientReference +import com.atridad.mealient.datasource.models.GetRecipeInstructionResponse +import com.atridad.mealient.datasource.models.GetRecipeResponse +import com.atridad.mealient.datasource.models.GetRecipeSettingsResponse +import com.atridad.mealient.datasource.models.GetRecipeSummaryResponse +import com.atridad.mealient.datasource.models.UpdateRecipeRequest import kotlinx.datetime.LocalDate val RECIPE_SUMMARY_CAKE = GetRecipeSummaryResponse( diff --git a/datastore/build.gradle.kts b/datastore/build.gradle.kts index 8e0e9ec..4b5861c 100644 --- a/datastore/build.gradle.kts +++ b/datastore/build.gradle.kts @@ -1,12 +1,12 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") id("dagger.hilt.android.plugin") alias(libs.plugins.protobuf) alias(libs.plugins.ksp) } android { - namespace = "gq.kirmanak.mealient.datastore" + namespace = "com.atridad.mealient.datastore" } dependencies { diff --git a/datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/DataStoreModule.kt b/datastore/src/main/kotlin/com/atridad/mealient/datastore/DataStoreModule.kt similarity index 90% rename from datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/DataStoreModule.kt rename to datastore/src/main/kotlin/com/atridad/mealient/datastore/DataStoreModule.kt index 2d0ba3c..8ed0f0e 100644 --- a/datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/DataStoreModule.kt +++ b/datastore/src/main/kotlin/com/atridad/mealient/datastore/DataStoreModule.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datastore +package com.atridad.mealient.datastore import android.content.Context import android.content.SharedPreferences @@ -12,8 +12,8 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealient.datastore.recipe.AddRecipeInput -import gq.kirmanak.mealient.datastore.recipe.AddRecipeInputSerializer +import com.atridad.mealient.datastore.recipe.AddRecipeInput +import com.atridad.mealient.datastore.recipe.AddRecipeInputSerializer import javax.inject.Named import javax.inject.Singleton diff --git a/datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeDraft.kt b/datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeDraft.kt similarity index 85% rename from datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeDraft.kt rename to datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeDraft.kt index 57a6063..c0c3c3d 100644 --- a/datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeDraft.kt +++ b/datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeDraft.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datastore.recipe +package com.atridad.mealient.datastore.recipe data class AddRecipeDraft( val recipeName: String, diff --git a/datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeInputSerializer.kt b/datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeInputSerializer.kt similarity index 93% rename from datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeInputSerializer.kt rename to datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeInputSerializer.kt index 1b2e60a..5cd8be3 100644 --- a/datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeInputSerializer.kt +++ b/datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeInputSerializer.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datastore.recipe +package com.atridad.mealient.datastore.recipe import androidx.datastore.core.CorruptionException import androidx.datastore.core.Serializer diff --git a/datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeStorage.kt b/datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeStorage.kt similarity index 80% rename from datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeStorage.kt rename to datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeStorage.kt index 5d10385..27a13fb 100644 --- a/datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeStorage.kt +++ b/datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeStorage.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datastore.recipe +package com.atridad.mealient.datastore.recipe import kotlinx.coroutines.flow.Flow diff --git a/datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeStorageImpl.kt b/datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeStorageImpl.kt similarity index 94% rename from datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeStorageImpl.kt rename to datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeStorageImpl.kt index 4d26d3b..9e47f4a 100644 --- a/datastore/src/main/kotlin/gq/kirmanak/mealient/datastore/recipe/AddRecipeStorageImpl.kt +++ b/datastore/src/main/kotlin/com/atridad/mealient/datastore/recipe/AddRecipeStorageImpl.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.datastore.recipe +package com.atridad.mealient.datastore.recipe import androidx.datastore.core.DataStore -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import javax.inject.Inject diff --git a/datastore_test/build.gradle.kts b/datastore_test/build.gradle.kts index eb97c9c..7092793 100644 --- a/datastore_test/build.gradle.kts +++ b/datastore_test/build.gradle.kts @@ -1,9 +1,9 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") } android { - namespace = "gq.kirmanak.mealient.datastore_test" + namespace = "com.atridad.mealient.datastore_test" } dependencies { diff --git a/datastore_test/src/main/kotlin/gq/kirmanak/mealient/datastore_test/TestData.kt b/datastore_test/src/main/kotlin/com/atridad/mealient/datastore_test/TestData.kt similarity index 78% rename from datastore_test/src/main/kotlin/gq/kirmanak/mealient/datastore_test/TestData.kt rename to datastore_test/src/main/kotlin/com/atridad/mealient/datastore_test/TestData.kt index b0ffe52..9827840 100644 --- a/datastore_test/src/main/kotlin/gq/kirmanak/mealient/datastore_test/TestData.kt +++ b/datastore_test/src/main/kotlin/com/atridad/mealient/datastore_test/TestData.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.datastore_test +package com.atridad.mealient.datastore_test -import gq.kirmanak.mealient.datastore.recipe.AddRecipeDraft +import com.atridad.mealient.datastore.recipe.AddRecipeDraft val PORRIDGE_RECIPE_DRAFT = AddRecipeDraft( recipeName = "Porridge", diff --git a/features/shopping_lists/build.gradle.kts b/features/shopping_lists/build.gradle.kts index 9ef51f0..ff6c735 100644 --- a/features/shopping_lists/build.gradle.kts +++ b/features/shopping_lists/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } android { - namespace = "gq.kirmanak.mealient.shopping_list" + namespace = "com.atridad.mealient.shopping_lists" } ksp { diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ShoppingListsModule.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ShoppingListsModule.kt similarity index 59% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ShoppingListsModule.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ShoppingListsModule.kt index a593726..958ef70 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ShoppingListsModule.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ShoppingListsModule.kt @@ -1,13 +1,13 @@ -package gq.kirmanak.mealient.shopping_lists +package com.atridad.mealient.shopping_lists import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealient.shopping_lists.network.ShoppingListsDataSource -import gq.kirmanak.mealient.shopping_lists.network.ShoppingListsDataSourceImpl -import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsRepo -import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsRepoImpl +import com.atridad.mealient.shopping_lists.network.ShoppingListsDataSource +import com.atridad.mealient.shopping_lists.network.ShoppingListsDataSourceImpl +import com.atridad.mealient.shopping_lists.repo.ShoppingListsRepo +import com.atridad.mealient.shopping_lists.repo.ShoppingListsRepoImpl @Module @InstallIn(SingletonComponent::class) diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/network/ShoppingListsDataSource.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/network/ShoppingListsDataSource.kt similarity index 59% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/network/ShoppingListsDataSource.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/network/ShoppingListsDataSource.kt index 87540c6..e6145e2 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/network/ShoppingListsDataSource.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/network/ShoppingListsDataSource.kt @@ -1,12 +1,12 @@ -package gq.kirmanak.mealient.shopping_lists.network +package com.atridad.mealient.shopping_lists.network -import gq.kirmanak.mealient.datasource.models.CreateShoppingListItemRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListRequest -import gq.kirmanak.mealient.datasource.models.GetFoodResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListsSummaryResponse -import gq.kirmanak.mealient.datasource.models.GetUnitResponse +import com.atridad.mealient.datasource.models.CreateShoppingListItemRequest +import com.atridad.mealient.datasource.models.CreateShoppingListRequest +import com.atridad.mealient.datasource.models.GetFoodResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.models.GetShoppingListResponse +import com.atridad.mealient.datasource.models.GetShoppingListsSummaryResponse +import com.atridad.mealient.datasource.models.GetUnitResponse interface ShoppingListsDataSource { diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/network/ShoppingListsDataSourceImpl.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/network/ShoppingListsDataSourceImpl.kt similarity index 72% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/network/ShoppingListsDataSourceImpl.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/network/ShoppingListsDataSourceImpl.kt index 5c914ef..1991d09 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/network/ShoppingListsDataSourceImpl.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/network/ShoppingListsDataSourceImpl.kt @@ -1,13 +1,13 @@ -package gq.kirmanak.mealient.shopping_lists.network +package com.atridad.mealient.shopping_lists.network -import gq.kirmanak.mealient.datasource.MealieDataSource -import gq.kirmanak.mealient.datasource.models.CreateShoppingListItemRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListRequest -import gq.kirmanak.mealient.datasource.models.GetFoodResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListsSummaryResponse -import gq.kirmanak.mealient.datasource.models.GetUnitResponse +import com.atridad.mealient.datasource.MealieDataSource +import com.atridad.mealient.datasource.models.CreateShoppingListItemRequest +import com.atridad.mealient.datasource.models.CreateShoppingListRequest +import com.atridad.mealient.datasource.models.GetFoodResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.models.GetShoppingListResponse +import com.atridad.mealient.datasource.models.GetShoppingListsSummaryResponse +import com.atridad.mealient.datasource.models.GetUnitResponse import javax.inject.Inject class ShoppingListsDataSourceImpl @Inject constructor( diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/repo/ShoppingListsAuthRepo.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/repo/ShoppingListsAuthRepo.kt similarity index 69% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/repo/ShoppingListsAuthRepo.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/repo/ShoppingListsAuthRepo.kt index 45600b4..0e9846f 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/repo/ShoppingListsAuthRepo.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/repo/ShoppingListsAuthRepo.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.shopping_lists.repo +package com.atridad.mealient.shopping_lists.repo import kotlinx.coroutines.flow.Flow diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/repo/ShoppingListsRepo.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/repo/ShoppingListsRepo.kt similarity index 59% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/repo/ShoppingListsRepo.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/repo/ShoppingListsRepo.kt index ae4f260..9a35b2c 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/repo/ShoppingListsRepo.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/repo/ShoppingListsRepo.kt @@ -1,12 +1,12 @@ -package gq.kirmanak.mealient.shopping_lists.repo +package com.atridad.mealient.shopping_lists.repo -import gq.kirmanak.mealient.datasource.models.CreateShoppingListItemRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListRequest -import gq.kirmanak.mealient.datasource.models.GetFoodResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListsSummaryResponse -import gq.kirmanak.mealient.datasource.models.GetUnitResponse +import com.atridad.mealient.datasource.models.CreateShoppingListItemRequest +import com.atridad.mealient.datasource.models.CreateShoppingListRequest +import com.atridad.mealient.datasource.models.GetFoodResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.models.GetShoppingListResponse +import com.atridad.mealient.datasource.models.GetShoppingListsSummaryResponse +import com.atridad.mealient.datasource.models.GetUnitResponse interface ShoppingListsRepo { diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/repo/ShoppingListsRepoImpl.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/repo/ShoppingListsRepoImpl.kt similarity index 78% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/repo/ShoppingListsRepoImpl.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/repo/ShoppingListsRepoImpl.kt index 9565bf2..6619f75 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/repo/ShoppingListsRepoImpl.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/repo/ShoppingListsRepoImpl.kt @@ -1,14 +1,14 @@ -package gq.kirmanak.mealient.shopping_lists.repo +package com.atridad.mealient.shopping_lists.repo -import gq.kirmanak.mealient.datasource.models.CreateShoppingListItemRequest -import gq.kirmanak.mealient.datasource.models.CreateShoppingListRequest -import gq.kirmanak.mealient.datasource.models.GetFoodResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListsSummaryResponse -import gq.kirmanak.mealient.datasource.models.GetUnitResponse -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.shopping_lists.network.ShoppingListsDataSource +import com.atridad.mealient.datasource.models.CreateShoppingListItemRequest +import com.atridad.mealient.datasource.models.CreateShoppingListRequest +import com.atridad.mealient.datasource.models.GetFoodResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.models.GetShoppingListResponse +import com.atridad.mealient.datasource.models.GetShoppingListsSummaryResponse +import com.atridad.mealient.datasource.models.GetUnitResponse +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.shopping_lists.network.ShoppingListsDataSource import javax.inject.Inject class ShoppingListsRepoImpl @Inject constructor( diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/composables/EditableItemBox.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/composables/EditableItemBox.kt similarity index 97% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/composables/EditableItemBox.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/composables/EditableItemBox.kt index 9c7072a..a0730d5 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/composables/EditableItemBox.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/composables/EditableItemBox.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.shopping_lists.ui.composables +package com.atridad.mealient.shopping_lists.ui.composables import androidx.compose.animation.animateColorAsState import androidx.compose.foundation.background @@ -23,7 +23,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector -import gq.kirmanak.mealient.ui.Dimens +import com.atridad.mealient.ui.Dimens @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/composables/GetErrorMessage.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/composables/GetErrorMessage.kt similarity index 74% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/composables/GetErrorMessage.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/composables/GetErrorMessage.kt index 03ab1c5..1832fed 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/composables/GetErrorMessage.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/composables/GetErrorMessage.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.shopping_lists.ui.composables +package com.atridad.mealient.shopping_lists.ui.composables import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import gq.kirmanak.mealient.datasource.NetworkError -import gq.kirmanak.mealient.shopping_list.R +import com.atridad.mealient.datasource.NetworkError +import com.atridad.mealient.shopping_list.R @Composable fun getErrorMessage(error: Throwable): String = when (error) { diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/composables/MealientTextField.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/composables/MealientTextField.kt similarity index 97% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/composables/MealientTextField.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/composables/MealientTextField.kt index 84c9802..195837b 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/composables/MealientTextField.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/composables/MealientTextField.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.shopping_lists.ui.composables +package com.atridad.mealient.shopping_lists.ui.composables import androidx.compose.foundation.text.KeyboardActions import androidx.compose.foundation.text.KeyboardOptions diff --git a/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListData.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListData.kt new file mode 100644 index 0000000..c55882e --- /dev/null +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListData.kt @@ -0,0 +1,11 @@ +package com.atridad.mealient.shopping_lists.ui.details + +import com.atridad.mealient.datasource.models.GetFoodResponse +import com.atridad.mealient.datasource.models.GetShoppingListResponse +import com.atridad.mealient.datasource.models.GetUnitResponse + +data class ShoppingListData( + val foods: List, + val units: List, + val shoppingList: GetShoppingListResponse, +) diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListEditingState.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListEditingState.kt similarity index 71% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListEditingState.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListEditingState.kt index 3f2a775..31519ae 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListEditingState.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListEditingState.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.shopping_lists.ui.details +package com.atridad.mealient.shopping_lists.ui.details -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse data class ShoppingListEditingState( val deletedItemIds: Set = emptySet(), diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListScreen.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListScreen.kt similarity index 96% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListScreen.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListScreen.kt index 473acd8..240e7d2 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListScreen.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.shopping_lists.ui.details +package com.atridad.mealient.shopping_lists.ui.details import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -50,23 +50,23 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.text.withStyle import androidx.hilt.navigation.compose.hiltViewModel import com.ramcosta.composedestinations.annotation.Destination -import gq.kirmanak.mealient.datasource.models.GetFoodResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemRecipeReferenceResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse -import gq.kirmanak.mealient.datasource.models.GetUnitResponse -import gq.kirmanak.mealient.shopping_list.R -import gq.kirmanak.mealient.shopping_lists.ui.composables.EditableItemBox -import gq.kirmanak.mealient.shopping_lists.ui.composables.getErrorMessage -import gq.kirmanak.mealient.shopping_lists.util.ItemLabelGroup -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.components.BaseScreen -import gq.kirmanak.mealient.ui.components.LazyColumnWithLoadingState -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview -import gq.kirmanak.mealient.ui.util.LoadingState -import gq.kirmanak.mealient.ui.util.data -import gq.kirmanak.mealient.ui.util.error -import gq.kirmanak.mealient.ui.util.map +import com.atridad.mealient.datasource.models.GetFoodResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemRecipeReferenceResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.models.GetUnitResponse +import com.atridad.mealient.shopping_list.R +import com.atridad.mealient.shopping_lists.ui.composables.EditableItemBox +import com.atridad.mealient.shopping_lists.ui.composables.getErrorMessage +import com.atridad.mealient.shopping_lists.util.ItemLabelGroup +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.components.BaseScreen +import com.atridad.mealient.ui.components.LazyColumnWithLoadingState +import com.atridad.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.ui.util.LoadingState +import com.atridad.mealient.ui.util.data +import com.atridad.mealient.ui.util.error +import com.atridad.mealient.ui.util.map import java.text.DecimalFormat data class ShoppingListNavArgs( diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListScreenState.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListScreenState.kt similarity index 83% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListScreenState.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListScreenState.kt index 95ce452..a6c709f 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListScreenState.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListScreenState.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.shopping_lists.ui.details +package com.atridad.mealient.shopping_lists.ui.details -import gq.kirmanak.mealient.datasource.models.GetFoodResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse -import gq.kirmanak.mealient.datasource.models.GetUnitResponse -import gq.kirmanak.mealient.shopping_lists.util.ItemLabelGroup +import com.atridad.mealient.datasource.models.GetFoodResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.models.GetUnitResponse +import com.atridad.mealient.shopping_lists.util.ItemLabelGroup import java.util.UUID internal data class ShoppingListScreenState( diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListViewModel.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListViewModel.kt similarity index 92% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListViewModel.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListViewModel.kt index 6f4f339..7ea1c3e 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListViewModel.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListViewModel.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.shopping_lists.ui.details +package com.atridad.mealient.shopping_lists.ui.details import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -7,20 +7,20 @@ import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealient.architecture.valueUpdatesOnly -import gq.kirmanak.mealient.datasource.models.CreateShoppingListItemRequest -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsAuthRepo -import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsRepo -import gq.kirmanak.mealient.shopping_lists.ui.destinations.ShoppingListScreenDestination -import gq.kirmanak.mealient.shopping_lists.util.groupItemsByLabel -import gq.kirmanak.mealient.ui.util.LoadingHelperFactory -import gq.kirmanak.mealient.ui.util.LoadingState -import gq.kirmanak.mealient.ui.util.LoadingStateNoData -import gq.kirmanak.mealient.ui.util.data -import gq.kirmanak.mealient.ui.util.map +import com.atridad.mealient.architecture.valueUpdatesOnly +import com.atridad.mealient.datasource.models.CreateShoppingListItemRequest +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.shopping_lists.repo.ShoppingListsAuthRepo +import com.atridad.mealient.shopping_lists.repo.ShoppingListsRepo +import com.atridad.mealient.shopping_lists.ui.destinations.ShoppingListScreenDestination +import com.atridad.mealient.shopping_lists.util.groupItemsByLabel +import com.atridad.mealient.ui.util.LoadingHelperFactory +import com.atridad.mealient.ui.util.LoadingState +import com.atridad.mealient.ui.util.LoadingStateNoData +import com.atridad.mealient.ui.util.data +import com.atridad.mealient.ui.util.map import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.MutableStateFlow diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/DeleteListConfirmDialog.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/DeleteListConfirmDialog.kt similarity index 93% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/DeleteListConfirmDialog.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/DeleteListConfirmDialog.kt index 1ede374..a61a438 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/DeleteListConfirmDialog.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/DeleteListConfirmDialog.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.shopping_lists.ui.list +package com.atridad.mealient.shopping_lists.ui.list import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Cancel @@ -10,8 +10,8 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import gq.kirmanak.mealient.shopping_list.R -import gq.kirmanak.mealient.ui.AppTheme +import com.atridad.mealient.shopping_list.R +import com.atridad.mealient.ui.AppTheme @Composable internal fun DeleteListConfirmDialog( diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/ShoppingListNameDialog.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/ShoppingListNameDialog.kt similarity index 95% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/ShoppingListNameDialog.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/ShoppingListNameDialog.kt index 81a5cb4..3523cbe 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/ShoppingListNameDialog.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/ShoppingListNameDialog.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.shopping_lists.ui.list +package com.atridad.mealient.shopping_lists.ui.list import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -33,11 +33,11 @@ import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.text.input.KeyboardCapitalization -import gq.kirmanak.mealient.shopping_list.R -import gq.kirmanak.mealient.shopping_lists.ui.composables.MealientTextField -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.shopping_list.R +import com.atridad.mealient.shopping_lists.ui.composables.MealientTextField +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.preview.ColorSchemePreview @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/ShoppingListsScreen.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/ShoppingListsScreen.kt similarity index 91% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/ShoppingListsScreen.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/ShoppingListsScreen.kt index 4b3dde8..9555029 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/ShoppingListsScreen.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/ShoppingListsScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.shopping_lists.ui.list +package com.atridad.mealient.shopping_lists.ui.list import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement @@ -24,17 +24,17 @@ import androidx.hilt.navigation.compose.hiltViewModel import androidx.navigation.NavController import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.navigation.navigate -import gq.kirmanak.mealient.shopping_list.R -import gq.kirmanak.mealient.shopping_lists.ui.composables.EditableItemBox -import gq.kirmanak.mealient.shopping_lists.ui.composables.getErrorMessage -import gq.kirmanak.mealient.shopping_lists.ui.destinations.ShoppingListScreenDestination -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.components.BaseScreenState -import gq.kirmanak.mealient.ui.components.BaseScreenWithNavigation -import gq.kirmanak.mealient.ui.components.LazyColumnWithLoadingState -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview -import gq.kirmanak.mealient.ui.util.error +import com.atridad.mealient.shopping_list.R +import com.atridad.mealient.shopping_lists.ui.composables.EditableItemBox +import com.atridad.mealient.shopping_lists.ui.composables.getErrorMessage +import com.atridad.mealient.shopping_lists.ui.destinations.ShoppingListScreenDestination +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.components.BaseScreenState +import com.atridad.mealient.ui.components.BaseScreenWithNavigation +import com.atridad.mealient.ui.components.LazyColumnWithLoadingState +import com.atridad.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.ui.util.error @Destination @Composable diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/ShoppingListsViewModel.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/ShoppingListsViewModel.kt similarity index 92% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/ShoppingListsViewModel.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/ShoppingListsViewModel.kt index 0f6cdf8..f326df9 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/list/ShoppingListsViewModel.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/ui/list/ShoppingListsViewModel.kt @@ -1,20 +1,20 @@ -package gq.kirmanak.mealient.shopping_lists.ui.list +package com.atridad.mealient.shopping_lists.ui.list import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel -import gq.kirmanak.mealient.architecture.valueUpdatesOnly -import gq.kirmanak.mealient.datasource.models.CreateShoppingListRequest -import gq.kirmanak.mealient.datasource.models.GetShoppingListsSummaryResponse -import gq.kirmanak.mealient.datasource.runCatchingExceptCancel -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsAuthRepo -import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsRepo -import gq.kirmanak.mealient.ui.util.LoadingHelper -import gq.kirmanak.mealient.ui.util.LoadingHelperFactory -import gq.kirmanak.mealient.ui.util.LoadingState -import gq.kirmanak.mealient.ui.util.LoadingStateNoData -import gq.kirmanak.mealient.ui.util.map +import com.atridad.mealient.architecture.valueUpdatesOnly +import com.atridad.mealient.datasource.models.CreateShoppingListRequest +import com.atridad.mealient.datasource.models.GetShoppingListsSummaryResponse +import com.atridad.mealient.datasource.runCatchingExceptCancel +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.shopping_lists.repo.ShoppingListsAuthRepo +import com.atridad.mealient.shopping_lists.repo.ShoppingListsRepo +import com.atridad.mealient.ui.util.LoadingHelper +import com.atridad.mealient.ui.util.LoadingHelperFactory +import com.atridad.mealient.ui.util.LoadingState +import com.atridad.mealient.ui.util.LoadingStateNoData +import com.atridad.mealient.ui.util.map import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/util/ShopingListLabelHelper.kt b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/util/ShopingListLabelHelper.kt similarity index 93% rename from features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/util/ShopingListLabelHelper.kt rename to features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/util/ShopingListLabelHelper.kt index 6d52912..30fa742 100644 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/util/ShopingListLabelHelper.kt +++ b/features/shopping_lists/src/main/kotlin/com/atridad/mealient/shopping_lists/util/ShopingListLabelHelper.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.shopping_lists.util +package com.atridad.mealient.shopping_lists.util -import gq.kirmanak.mealient.datasource.models.GetItemLabelResponse -import gq.kirmanak.mealient.shopping_lists.ui.details.ShoppingListItemState -import gq.kirmanak.mealient.shopping_lists.ui.details.checked +import com.atridad.mealient.datasource.models.GetItemLabelResponse +import com.atridad.mealient.shopping_lists.ui.details.ShoppingListItemState +import com.atridad.mealient.shopping_lists.ui.details.checked sealed class ItemLabelGroup { data object DefaultLabel : ItemLabelGroup() diff --git a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListData.kt b/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListData.kt deleted file mode 100644 index dbe3052..0000000 --- a/features/shopping_lists/src/main/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListData.kt +++ /dev/null @@ -1,11 +0,0 @@ -package gq.kirmanak.mealient.shopping_lists.ui.details - -import gq.kirmanak.mealient.datasource.models.GetFoodResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListResponse -import gq.kirmanak.mealient.datasource.models.GetUnitResponse - -data class ShoppingListData( - val foods: List, - val units: List, - val shoppingList: GetShoppingListResponse, -) diff --git a/features/shopping_lists/src/test/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListViewModelTest.kt b/features/shopping_lists/src/test/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListViewModelTest.kt similarity index 88% rename from features/shopping_lists/src/test/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListViewModelTest.kt rename to features/shopping_lists/src/test/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListViewModelTest.kt index cf29923..9beffc6 100644 --- a/features/shopping_lists/src/test/kotlin/gq/kirmanak/mealient/shopping_lists/ui/details/ShoppingListViewModelTest.kt +++ b/features/shopping_lists/src/test/kotlin/com/atridad/mealient/shopping_lists/ui/details/ShoppingListViewModelTest.kt @@ -1,21 +1,21 @@ -package gq.kirmanak.mealient.shopping_lists.ui.details +package com.atridad.mealient.shopping_lists.ui.details import androidx.lifecycle.SavedStateHandle -import gq.kirmanak.mealient.datasource.models.GetItemLabelResponse -import gq.kirmanak.mealient.datasource.models.GetFoodResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemRecipeReferenceResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListItemResponse -import gq.kirmanak.mealient.datasource.models.GetShoppingListResponse -import gq.kirmanak.mealient.datasource.models.GetUnitResponse -import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsAuthRepo -import gq.kirmanak.mealient.shopping_lists.repo.ShoppingListsRepo -import gq.kirmanak.mealient.shopping_lists.util.ItemLabelGroup -import gq.kirmanak.mealient.test.BaseUnitTest -import gq.kirmanak.mealient.ui.util.LoadingHelper -import gq.kirmanak.mealient.ui.util.LoadingHelperFactory -import gq.kirmanak.mealient.ui.util.LoadingState -import gq.kirmanak.mealient.ui.util.LoadingStateNoData -import gq.kirmanak.mealient.ui.util.LoadingStateWithData +import com.atridad.mealient.datasource.models.GetItemLabelResponse +import com.atridad.mealient.datasource.models.GetFoodResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemRecipeReferenceResponse +import com.atridad.mealient.datasource.models.GetShoppingListItemResponse +import com.atridad.mealient.datasource.models.GetShoppingListResponse +import com.atridad.mealient.datasource.models.GetUnitResponse +import com.atridad.mealient.shopping_lists.repo.ShoppingListsAuthRepo +import com.atridad.mealient.shopping_lists.repo.ShoppingListsRepo +import com.atridad.mealient.shopping_lists.util.ItemLabelGroup +import com.atridad.mealient.test.BaseUnitTest +import com.atridad.mealient.ui.util.LoadingHelper +import com.atridad.mealient.ui.util.LoadingHelperFactory +import com.atridad.mealient.ui.util.LoadingState +import com.atridad.mealient.ui.util.LoadingStateNoData +import com.atridad.mealient.ui.util.LoadingStateWithData import io.mockk.CapturingSlot import io.mockk.coEvery import io.mockk.coVerify diff --git a/logging/build.gradle.kts b/logging/build.gradle.kts index 245f0ca..05803e6 100644 --- a/logging/build.gradle.kts +++ b/logging/build.gradle.kts @@ -1,11 +1,11 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") id("dagger.hilt.android.plugin") alias(libs.plugins.ksp) } android { - namespace = "gq.kirmanak.mealient.logging" + namespace = "com.atridad.mealient.logging" } dependencies { @@ -13,4 +13,4 @@ dependencies { implementation(libs.google.dagger.hiltAndroid) ksp(libs.google.dagger.hiltCompiler) -} \ No newline at end of file +} diff --git a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/Appender.kt b/logging/src/main/kotlin/com/atridad/mealient/logging/Appender.kt similarity index 84% rename from logging/src/main/kotlin/gq/kirmanak/mealient/logging/Appender.kt rename to logging/src/main/kotlin/com/atridad/mealient/logging/Appender.kt index ea590bd..766d59b 100644 --- a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/Appender.kt +++ b/logging/src/main/kotlin/com/atridad/mealient/logging/Appender.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.logging +package com.atridad.mealient.logging interface Appender { diff --git a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/AppenderModule.kt b/logging/src/main/kotlin/com/atridad/mealient/logging/AppenderModule.kt similarity index 91% rename from logging/src/main/kotlin/gq/kirmanak/mealient/logging/AppenderModule.kt rename to logging/src/main/kotlin/com/atridad/mealient/logging/AppenderModule.kt index 11df41b..aee3807 100644 --- a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/AppenderModule.kt +++ b/logging/src/main/kotlin/com/atridad/mealient/logging/AppenderModule.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.logging +package com.atridad.mealient.logging import dagger.Binds import dagger.Module diff --git a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/FileAppender.kt b/logging/src/main/kotlin/com/atridad/mealient/logging/FileAppender.kt similarity index 97% rename from logging/src/main/kotlin/gq/kirmanak/mealient/logging/FileAppender.kt rename to logging/src/main/kotlin/com/atridad/mealient/logging/FileAppender.kt index ab3b9fe..7c99594 100644 --- a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/FileAppender.kt +++ b/logging/src/main/kotlin/com/atridad/mealient/logging/FileAppender.kt @@ -1,10 +1,10 @@ -package gq.kirmanak.mealient.logging +package com.atridad.mealient.logging import android.app.Activity import android.app.Application import android.app.Application.ActivityLifecycleCallbacks import android.os.Bundle -import gq.kirmanak.mealient.architecture.configuration.AppDispatchers +import com.atridad.mealient.architecture.configuration.AppDispatchers import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.SupervisorJob import kotlinx.coroutines.cancel diff --git a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/LogLevel.kt b/logging/src/main/kotlin/com/atridad/mealient/logging/LogLevel.kt similarity index 62% rename from logging/src/main/kotlin/gq/kirmanak/mealient/logging/LogLevel.kt rename to logging/src/main/kotlin/com/atridad/mealient/logging/LogLevel.kt index 824c69e..eb2382f 100644 --- a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/LogLevel.kt +++ b/logging/src/main/kotlin/com/atridad/mealient/logging/LogLevel.kt @@ -1,3 +1,3 @@ -package gq.kirmanak.mealient.logging +package com.atridad.mealient.logging enum class LogLevel { VERBOSE, DEBUG, INFO, WARNING, ERROR } \ No newline at end of file diff --git a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/LogRedactor.kt b/logging/src/main/kotlin/com/atridad/mealient/logging/LogRedactor.kt similarity index 64% rename from logging/src/main/kotlin/gq/kirmanak/mealient/logging/LogRedactor.kt rename to logging/src/main/kotlin/com/atridad/mealient/logging/LogRedactor.kt index 19aafb5..57ff954 100644 --- a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/LogRedactor.kt +++ b/logging/src/main/kotlin/com/atridad/mealient/logging/LogRedactor.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.logging +package com.atridad.mealient.logging interface LogRedactor { diff --git a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/LogcatAppender.kt b/logging/src/main/kotlin/com/atridad/mealient/logging/LogcatAppender.kt similarity index 93% rename from logging/src/main/kotlin/gq/kirmanak/mealient/logging/LogcatAppender.kt rename to logging/src/main/kotlin/com/atridad/mealient/logging/LogcatAppender.kt index f4aff9f..16aca57 100644 --- a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/LogcatAppender.kt +++ b/logging/src/main/kotlin/com/atridad/mealient/logging/LogcatAppender.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.logging +package com.atridad.mealient.logging import android.util.Log -import gq.kirmanak.mealient.architecture.configuration.BuildConfiguration +import com.atridad.mealient.architecture.configuration.BuildConfiguration import javax.inject.Inject internal class LogcatAppender @Inject constructor( diff --git a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/Logger.kt b/logging/src/main/kotlin/com/atridad/mealient/logging/Logger.kt similarity index 95% rename from logging/src/main/kotlin/gq/kirmanak/mealient/logging/Logger.kt rename to logging/src/main/kotlin/com/atridad/mealient/logging/Logger.kt index 53f1636..30d6e85 100644 --- a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/Logger.kt +++ b/logging/src/main/kotlin/com/atridad/mealient/logging/Logger.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.logging +package com.atridad.mealient.logging import android.content.Context import java.io.File diff --git a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/LoggerImpl.kt b/logging/src/main/kotlin/com/atridad/mealient/logging/LoggerImpl.kt similarity index 98% rename from logging/src/main/kotlin/gq/kirmanak/mealient/logging/LoggerImpl.kt rename to logging/src/main/kotlin/com/atridad/mealient/logging/LoggerImpl.kt index 40a194b..8ca9d9b 100644 --- a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/LoggerImpl.kt +++ b/logging/src/main/kotlin/com/atridad/mealient/logging/LoggerImpl.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.logging +package com.atridad.mealient.logging import android.util.Log import java.util.regex.Pattern diff --git a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/LoggerModule.kt b/logging/src/main/kotlin/com/atridad/mealient/logging/LoggerModule.kt similarity index 87% rename from logging/src/main/kotlin/gq/kirmanak/mealient/logging/LoggerModule.kt rename to logging/src/main/kotlin/com/atridad/mealient/logging/LoggerModule.kt index d02312e..8995fa6 100644 --- a/logging/src/main/kotlin/gq/kirmanak/mealient/logging/LoggerModule.kt +++ b/logging/src/main/kotlin/com/atridad/mealient/logging/LoggerModule.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.logging +package com.atridad.mealient.logging import dagger.Binds import dagger.Module diff --git a/model_mapper/build.gradle.kts b/model_mapper/build.gradle.kts index af028e3..095062c 100644 --- a/model_mapper/build.gradle.kts +++ b/model_mapper/build.gradle.kts @@ -1,11 +1,11 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") id("dagger.hilt.android.plugin") alias(libs.plugins.ksp) } android { - namespace = "gq.kirmanak.mealient.model_mapper" + namespace = "com.atridad.mealient.model_mapper" } dependencies { diff --git a/model_mapper/src/main/kotlin/com/atridad/mealient/model_mapper/ModelMapper.kt b/model_mapper/src/main/kotlin/com/atridad/mealient/model_mapper/ModelMapper.kt new file mode 100644 index 0000000..c8d97b0 --- /dev/null +++ b/model_mapper/src/main/kotlin/com/atridad/mealient/model_mapper/ModelMapper.kt @@ -0,0 +1,52 @@ +package com.atridad.mealient.model_mapper + +import com.atridad.mealient.database.recipe.entity.RecipeEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.database.recipe.entity.RecipeInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.datasource.models.AddRecipeInfo +import com.atridad.mealient.datasource.models.AddRecipeIngredient +import com.atridad.mealient.datasource.models.AddRecipeIngredientInfo +import com.atridad.mealient.datasource.models.AddRecipeInstruction +import com.atridad.mealient.datasource.models.AddRecipeInstructionInfo +import com.atridad.mealient.datasource.models.AddRecipeSettings +import com.atridad.mealient.datasource.models.AddRecipeSettingsInfo +import com.atridad.mealient.datasource.models.CreateRecipeRequest +import com.atridad.mealient.datasource.models.GetRecipeIngredientResponse +import com.atridad.mealient.datasource.models.GetRecipeInstructionResponse +import com.atridad.mealient.datasource.models.GetRecipeResponse +import com.atridad.mealient.datasource.models.GetRecipeSummaryResponse +import com.atridad.mealient.datasource.models.UpdateRecipeRequest +import com.atridad.mealient.datastore.recipe.AddRecipeDraft + +interface ModelMapper { + + fun toRecipeEntity(getRecipeResponse: GetRecipeResponse): RecipeEntity + + fun toRecipeIngredientEntity( + ingredientResponse: GetRecipeIngredientResponse, recipeId: String + ): RecipeIngredientEntity + + fun toRecipeInstructionEntity( + instructionResponse: GetRecipeInstructionResponse, recipeId: String + ): RecipeInstructionEntity + + fun toRecipeSummaryEntity( + recipeSummaryInfo: GetRecipeSummaryResponse, isFavorite: Boolean + ): RecipeSummaryEntity + + fun toAddRecipeInfo(addRecipeDraft: AddRecipeDraft): AddRecipeInfo + + fun toDraft(addRecipeInfo: AddRecipeInfo): AddRecipeDraft + + fun toCreateRequest(addRecipeInfo: AddRecipeInfo): CreateRecipeRequest + + fun toUpdateRequest(addRecipeInfo: AddRecipeInfo): UpdateRecipeRequest + + fun toSettings(addRecipeSettingsInfo: AddRecipeSettingsInfo): AddRecipeSettings + + fun toIngredient(addRecipeIngredientInfo: AddRecipeIngredientInfo): AddRecipeIngredient + + fun toInstruction(addRecipeInstructionInfo: AddRecipeInstructionInfo): AddRecipeInstruction + +} \ No newline at end of file diff --git a/model_mapper/src/main/kotlin/gq/kirmanak/mealient/model_mapper/ModelMapperImpl.kt b/model_mapper/src/main/kotlin/com/atridad/mealient/model_mapper/ModelMapperImpl.kt similarity index 78% rename from model_mapper/src/main/kotlin/gq/kirmanak/mealient/model_mapper/ModelMapperImpl.kt rename to model_mapper/src/main/kotlin/com/atridad/mealient/model_mapper/ModelMapperImpl.kt index 8d8a32c..930dba7 100644 --- a/model_mapper/src/main/kotlin/gq/kirmanak/mealient/model_mapper/ModelMapperImpl.kt +++ b/model_mapper/src/main/kotlin/com/atridad/mealient/model_mapper/ModelMapperImpl.kt @@ -1,23 +1,23 @@ -package gq.kirmanak.mealient.model_mapper +package com.atridad.mealient.model_mapper -import gq.kirmanak.mealient.database.recipe.entity.RecipeEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.datasource.models.AddRecipeInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeIngredient -import gq.kirmanak.mealient.datasource.models.AddRecipeIngredientInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeInstruction -import gq.kirmanak.mealient.datasource.models.AddRecipeInstructionInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeSettings -import gq.kirmanak.mealient.datasource.models.AddRecipeSettingsInfo -import gq.kirmanak.mealient.datasource.models.CreateRecipeRequest -import gq.kirmanak.mealient.datasource.models.GetRecipeIngredientResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeInstructionResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse -import gq.kirmanak.mealient.datasource.models.UpdateRecipeRequest -import gq.kirmanak.mealient.datastore.recipe.AddRecipeDraft +import com.atridad.mealient.database.recipe.entity.RecipeEntity +import com.atridad.mealient.database.recipe.entity.RecipeIngredientEntity +import com.atridad.mealient.database.recipe.entity.RecipeInstructionEntity +import com.atridad.mealient.database.recipe.entity.RecipeSummaryEntity +import com.atridad.mealient.datasource.models.AddRecipeInfo +import com.atridad.mealient.datasource.models.AddRecipeIngredient +import com.atridad.mealient.datasource.models.AddRecipeIngredientInfo +import com.atridad.mealient.datasource.models.AddRecipeInstruction +import com.atridad.mealient.datasource.models.AddRecipeInstructionInfo +import com.atridad.mealient.datasource.models.AddRecipeSettings +import com.atridad.mealient.datasource.models.AddRecipeSettingsInfo +import com.atridad.mealient.datasource.models.CreateRecipeRequest +import com.atridad.mealient.datasource.models.GetRecipeIngredientResponse +import com.atridad.mealient.datasource.models.GetRecipeInstructionResponse +import com.atridad.mealient.datasource.models.GetRecipeResponse +import com.atridad.mealient.datasource.models.GetRecipeSummaryResponse +import com.atridad.mealient.datasource.models.UpdateRecipeRequest +import com.atridad.mealient.datastore.recipe.AddRecipeDraft import java.util.UUID import javax.inject.Inject diff --git a/model_mapper/src/main/kotlin/gq/kirmanak/mealient/model_mapper/ModelMapperModule.kt b/model_mapper/src/main/kotlin/com/atridad/mealient/model_mapper/ModelMapperModule.kt similarity index 86% rename from model_mapper/src/main/kotlin/gq/kirmanak/mealient/model_mapper/ModelMapperModule.kt rename to model_mapper/src/main/kotlin/com/atridad/mealient/model_mapper/ModelMapperModule.kt index 0523a70..db6de73 100644 --- a/model_mapper/src/main/kotlin/gq/kirmanak/mealient/model_mapper/ModelMapperModule.kt +++ b/model_mapper/src/main/kotlin/com/atridad/mealient/model_mapper/ModelMapperModule.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.model_mapper +package com.atridad.mealient.model_mapper import dagger.Binds import dagger.Module diff --git a/model_mapper/src/main/kotlin/gq/kirmanak/mealient/model_mapper/ModelMapper.kt b/model_mapper/src/main/kotlin/gq/kirmanak/mealient/model_mapper/ModelMapper.kt deleted file mode 100644 index 2e575b2..0000000 --- a/model_mapper/src/main/kotlin/gq/kirmanak/mealient/model_mapper/ModelMapper.kt +++ /dev/null @@ -1,52 +0,0 @@ -package gq.kirmanak.mealient.model_mapper - -import gq.kirmanak.mealient.database.recipe.entity.RecipeEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeIngredientEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeInstructionEntity -import gq.kirmanak.mealient.database.recipe.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.datasource.models.AddRecipeInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeIngredient -import gq.kirmanak.mealient.datasource.models.AddRecipeIngredientInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeInstruction -import gq.kirmanak.mealient.datasource.models.AddRecipeInstructionInfo -import gq.kirmanak.mealient.datasource.models.AddRecipeSettings -import gq.kirmanak.mealient.datasource.models.AddRecipeSettingsInfo -import gq.kirmanak.mealient.datasource.models.CreateRecipeRequest -import gq.kirmanak.mealient.datasource.models.GetRecipeIngredientResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeInstructionResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeResponse -import gq.kirmanak.mealient.datasource.models.GetRecipeSummaryResponse -import gq.kirmanak.mealient.datasource.models.UpdateRecipeRequest -import gq.kirmanak.mealient.datastore.recipe.AddRecipeDraft - -interface ModelMapper { - - fun toRecipeEntity(getRecipeResponse: GetRecipeResponse): RecipeEntity - - fun toRecipeIngredientEntity( - ingredientResponse: GetRecipeIngredientResponse, recipeId: String - ): RecipeIngredientEntity - - fun toRecipeInstructionEntity( - instructionResponse: GetRecipeInstructionResponse, recipeId: String - ): RecipeInstructionEntity - - fun toRecipeSummaryEntity( - recipeSummaryInfo: GetRecipeSummaryResponse, isFavorite: Boolean - ): RecipeSummaryEntity - - fun toAddRecipeInfo(addRecipeDraft: AddRecipeDraft): AddRecipeInfo - - fun toDraft(addRecipeInfo: AddRecipeInfo): AddRecipeDraft - - fun toCreateRequest(addRecipeInfo: AddRecipeInfo): CreateRecipeRequest - - fun toUpdateRequest(addRecipeInfo: AddRecipeInfo): UpdateRecipeRequest - - fun toSettings(addRecipeSettingsInfo: AddRecipeSettingsInfo): AddRecipeSettings - - fun toIngredient(addRecipeIngredientInfo: AddRecipeIngredientInfo): AddRecipeIngredient - - fun toInstruction(addRecipeInstructionInfo: AddRecipeInstructionInfo): AddRecipeInstruction - -} \ No newline at end of file diff --git a/model_mapper/src/test/kotlin/gq/kirmanak/mealient/model_mapper/ModelMappingsTest.kt b/model_mapper/src/test/kotlin/com/atridad/mealient/model_mapper/ModelMappingsTest.kt similarity index 72% rename from model_mapper/src/test/kotlin/gq/kirmanak/mealient/model_mapper/ModelMappingsTest.kt rename to model_mapper/src/test/kotlin/com/atridad/mealient/model_mapper/ModelMappingsTest.kt index 25ff6e3..3ef60ce 100644 --- a/model_mapper/src/test/kotlin/gq/kirmanak/mealient/model_mapper/ModelMappingsTest.kt +++ b/model_mapper/src/test/kotlin/com/atridad/mealient/model_mapper/ModelMappingsTest.kt @@ -1,17 +1,17 @@ -package gq.kirmanak.mealient.model_mapper +package com.atridad.mealient.model_mapper import com.google.common.truth.Truth.assertThat -import gq.kirmanak.mealient.database.CAKE_RECIPE_ENTITY -import gq.kirmanak.mealient.database.CAKE_SUGAR_RECIPE_INGREDIENT_ENTITY -import gq.kirmanak.mealient.database.MIX_CAKE_RECIPE_INSTRUCTION_ENTITY -import gq.kirmanak.mealient.datasource_test.CAKE_RECIPE_RESPONSE -import gq.kirmanak.mealient.datasource_test.MIX_RECIPE_INSTRUCTION_RESPONSE -import gq.kirmanak.mealient.datasource_test.PORRIDGE_ADD_RECIPE_INFO -import gq.kirmanak.mealient.datasource_test.PORRIDGE_CREATE_RECIPE_REQUEST -import gq.kirmanak.mealient.datasource_test.PORRIDGE_UPDATE_RECIPE_REQUEST -import gq.kirmanak.mealient.datasource_test.SUGAR_RECIPE_INGREDIENT_RESPONSE -import gq.kirmanak.mealient.datastore_test.PORRIDGE_RECIPE_DRAFT -import gq.kirmanak.mealient.test.BaseUnitTest +import com.atridad.mealient.database.CAKE_RECIPE_ENTITY +import com.atridad.mealient.database.CAKE_SUGAR_RECIPE_INGREDIENT_ENTITY +import com.atridad.mealient.database.MIX_CAKE_RECIPE_INSTRUCTION_ENTITY +import com.atridad.mealient.datasource_test.CAKE_RECIPE_RESPONSE +import com.atridad.mealient.datasource_test.MIX_RECIPE_INSTRUCTION_RESPONSE +import com.atridad.mealient.datasource_test.PORRIDGE_ADD_RECIPE_INFO +import com.atridad.mealient.datasource_test.PORRIDGE_CREATE_RECIPE_REQUEST +import com.atridad.mealient.datasource_test.PORRIDGE_UPDATE_RECIPE_REQUEST +import com.atridad.mealient.datasource_test.SUGAR_RECIPE_INGREDIENT_RESPONSE +import com.atridad.mealient.datastore_test.PORRIDGE_RECIPE_DRAFT +import com.atridad.mealient.test.BaseUnitTest import org.junit.Before import org.junit.Test diff --git a/template_module/build.gradle.kts b/template_module/build.gradle.kts index b36c99b..73b8eed 100644 --- a/template_module/build.gradle.kts +++ b/template_module/build.gradle.kts @@ -1,9 +1,9 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") } android { - namespace = "gq.kirmanak.mealient.MODULE_NAME" + namespace = "com.atridad.mealient.MODULE_NAME" } dependencies { diff --git a/testing/build.gradle.kts b/testing/build.gradle.kts index ab6b911..6410bfc 100644 --- a/testing/build.gradle.kts +++ b/testing/build.gradle.kts @@ -1,11 +1,11 @@ plugins { - id("gq.kirmanak.mealient.library") + id("com.atridad.mealient.library") alias(libs.plugins.ksp) id("dagger.hilt.android.plugin") } android { - namespace = "gq.kirmanak.mealient.test" + namespace = "com.atridad.mealient.test" lint { abortOnError = false quiet = true @@ -34,4 +34,3 @@ dependencies { implementation(libs.robolectric) } - diff --git a/testing/src/main/kotlin/gq/kirmanak/mealient/test/BaseUnitTest.kt b/testing/src/main/kotlin/com/atridad/mealient/test/BaseUnitTest.kt similarity index 90% rename from testing/src/main/kotlin/gq/kirmanak/mealient/test/BaseUnitTest.kt rename to testing/src/main/kotlin/com/atridad/mealient/test/BaseUnitTest.kt index da5291f..2faef4c 100644 --- a/testing/src/main/kotlin/gq/kirmanak/mealient/test/BaseUnitTest.kt +++ b/testing/src/main/kotlin/com/atridad/mealient/test/BaseUnitTest.kt @@ -1,8 +1,8 @@ -package gq.kirmanak.mealient.test +package com.atridad.mealient.test import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import gq.kirmanak.mealient.architecture.configuration.AppDispatchers -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.architecture.configuration.AppDispatchers +import com.atridad.mealient.logging.Logger import io.mockk.MockKAnnotations import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.Dispatchers diff --git a/testing/src/main/kotlin/gq/kirmanak/mealient/test/FakeLogger.kt b/testing/src/main/kotlin/com/atridad/mealient/test/FakeLogger.kt similarity index 88% rename from testing/src/main/kotlin/gq/kirmanak/mealient/test/FakeLogger.kt rename to testing/src/main/kotlin/com/atridad/mealient/test/FakeLogger.kt index 76e3a06..ff8f335 100644 --- a/testing/src/main/kotlin/gq/kirmanak/mealient/test/FakeLogger.kt +++ b/testing/src/main/kotlin/com/atridad/mealient/test/FakeLogger.kt @@ -1,7 +1,7 @@ -package gq.kirmanak.mealient.test +package com.atridad.mealient.test -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.logging.MessageSupplier +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.logging.MessageSupplier import javax.inject.Inject class FakeLogger @Inject constructor() : Logger { diff --git a/testing/src/main/kotlin/gq/kirmanak/mealient/test/FakeLoggerModule.kt b/testing/src/main/kotlin/com/atridad/mealient/test/FakeLoggerModule.kt similarity index 72% rename from testing/src/main/kotlin/gq/kirmanak/mealient/test/FakeLoggerModule.kt rename to testing/src/main/kotlin/com/atridad/mealient/test/FakeLoggerModule.kt index d168427..d789cff 100644 --- a/testing/src/main/kotlin/gq/kirmanak/mealient/test/FakeLoggerModule.kt +++ b/testing/src/main/kotlin/com/atridad/mealient/test/FakeLoggerModule.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient.test +package com.atridad.mealient.test import dagger.Binds import dagger.Module import dagger.hilt.components.SingletonComponent import dagger.hilt.testing.TestInstallIn -import gq.kirmanak.mealient.logging.Logger -import gq.kirmanak.mealient.logging.LoggerModule +import com.atridad.mealient.logging.Logger +import com.atridad.mealient.logging.LoggerModule @Module @TestInstallIn( diff --git a/testing/src/main/kotlin/gq/kirmanak/mealient/test/HiltRobolectricTest.kt b/testing/src/main/kotlin/com/atridad/mealient/test/HiltRobolectricTest.kt similarity index 89% rename from testing/src/main/kotlin/gq/kirmanak/mealient/test/HiltRobolectricTest.kt rename to testing/src/main/kotlin/com/atridad/mealient/test/HiltRobolectricTest.kt index 4c6ebd4..78e0f28 100644 --- a/testing/src/main/kotlin/gq/kirmanak/mealient/test/HiltRobolectricTest.kt +++ b/testing/src/main/kotlin/com/atridad/mealient/test/HiltRobolectricTest.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.test +package com.atridad.mealient.test import androidx.test.ext.junit.runners.AndroidJUnit4 import dagger.hilt.android.testing.HiltAndroidRule import dagger.hilt.android.testing.HiltTestApplication -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.logging.Logger import org.junit.Before import org.junit.Rule import org.junit.runner.RunWith diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts index 4156dc9..ce6836b 100644 --- a/ui/build.gradle.kts +++ b/ui/build.gradle.kts @@ -1,12 +1,12 @@ plugins { - id("gq.kirmanak.mealient.library") - alias(libs.plugins.ksp) - id("gq.kirmanak.mealient.compose") + id("com.atridad.mealient.library") + id("com.atridad.mealient.compose") id("dagger.hilt.android.plugin") + alias(libs.plugins.ksp) } android { - namespace = "gq.kirmanak.mealient.ui" + namespace = "com.atridad.mealient.ui" } dependencies { @@ -27,4 +27,4 @@ dependencies { testImplementation(libs.google.truth) testImplementation(libs.io.mockk) -} \ No newline at end of file +} diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/OperationUiState.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/OperationUiState.kt similarity index 97% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/OperationUiState.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/OperationUiState.kt index 31aaf38..ce180a5 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/OperationUiState.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/OperationUiState.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui +package com.atridad.mealient.ui import android.widget.Button import android.widget.ProgressBar diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/Theme.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/Theme.kt similarity index 97% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/Theme.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/Theme.kt index f3fdbed..06f23ac 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/Theme.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/Theme.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui +package com.atridad.mealient.ui import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/UiModule.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/UiModule.kt similarity index 66% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/UiModule.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/UiModule.kt index 5843f7f..6c22282 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/UiModule.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/UiModule.kt @@ -1,11 +1,11 @@ -package gq.kirmanak.mealient.ui +package com.atridad.mealient.ui import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import gq.kirmanak.mealient.ui.util.LoadingHelperFactory -import gq.kirmanak.mealient.ui.util.LoadingHelperFactoryImpl +import com.atridad.mealient.ui.util.LoadingHelperFactory +import com.atridad.mealient.ui.util.LoadingHelperFactoryImpl @Module @InstallIn(SingletonComponent::class) diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/BaseScreen.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/components/BaseScreen.kt similarity index 98% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/BaseScreen.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/components/BaseScreen.kt index 90c282f..a4bc5c6 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/BaseScreen.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/components/BaseScreen.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.components +package com.atridad.mealient.ui.components import androidx.compose.foundation.layout.ExperimentalLayoutApi import androidx.compose.foundation.layout.consumeWindowInsets @@ -25,7 +25,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag -import gq.kirmanak.mealient.ui.R +import com.atridad.mealient.ui.R import kotlinx.coroutines.launch @OptIn(ExperimentalLayoutApi::class) diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/CenteredProgressIndicator.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/components/CenteredProgressIndicator.kt similarity index 81% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/CenteredProgressIndicator.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/components/CenteredProgressIndicator.kt index 1b41018..dee6000 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/CenteredProgressIndicator.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/components/CenteredProgressIndicator.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.components +package com.atridad.mealient.ui.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -6,8 +6,8 @@ import androidx.compose.material3.CircularProgressIndicator import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.preview.ColorSchemePreview @Composable fun CenteredProgressIndicator( diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/DrawerContent.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/components/DrawerContent.kt similarity index 94% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/DrawerContent.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/components/DrawerContent.kt index 392aa8f..98c1e14 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/DrawerContent.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/components/DrawerContent.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.components +package com.atridad.mealient.ui.components import androidx.compose.foundation.layout.padding import androidx.compose.material3.DrawerState @@ -10,8 +10,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.R +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.R interface DrawerItem { diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/EmptyListError.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/components/EmptyListError.kt similarity index 89% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/EmptyListError.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/components/EmptyListError.kt index 664f976..dd97e86 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/EmptyListError.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/components/EmptyListError.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.components +package com.atridad.mealient.ui.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -10,9 +10,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.semantics.semantics import androidx.compose.ui.semantics.testTag -import gq.kirmanak.mealient.ui.AppTheme -import gq.kirmanak.mealient.ui.Dimens -import gq.kirmanak.mealient.ui.preview.ColorSchemePreview +import com.atridad.mealient.ui.AppTheme +import com.atridad.mealient.ui.Dimens +import com.atridad.mealient.ui.preview.ColorSchemePreview @Composable fun EmptyListError( diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/ErrorSnackbar.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/components/ErrorSnackbar.kt similarity index 94% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/ErrorSnackbar.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/components/ErrorSnackbar.kt index 2997512..adaa75f 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/ErrorSnackbar.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/components/ErrorSnackbar.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.components +package com.atridad.mealient.ui.components import androidx.compose.material3.SnackbarHostState import androidx.compose.runtime.Composable diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/LazyColumnPullRefresh.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/components/LazyColumnPullRefresh.kt similarity index 97% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/LazyColumnPullRefresh.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/components/LazyColumnPullRefresh.kt index eeedabc..fa82200 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/LazyColumnPullRefresh.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/components/LazyColumnPullRefresh.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.components +package com.atridad.mealient.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/LazyColumnWithLoadingState.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/components/LazyColumnWithLoadingState.kt similarity index 92% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/LazyColumnWithLoadingState.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/components/LazyColumnWithLoadingState.kt index 54583fc..988c196 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/LazyColumnWithLoadingState.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/components/LazyColumnWithLoadingState.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.components +package com.atridad.mealient.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues @@ -17,11 +17,11 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import gq.kirmanak.mealient.ui.util.LoadingState -import gq.kirmanak.mealient.ui.util.LoadingStateNoData -import gq.kirmanak.mealient.ui.util.data -import gq.kirmanak.mealient.ui.util.isLoading -import gq.kirmanak.mealient.ui.util.isRefreshing +import com.atridad.mealient.ui.util.LoadingState +import com.atridad.mealient.ui.util.LoadingStateNoData +import com.atridad.mealient.ui.util.data +import com.atridad.mealient.ui.util.isLoading +import com.atridad.mealient.ui.util.isRefreshing @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/LazyPagingColumnPullRefresh.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/components/LazyPagingColumnPullRefresh.kt similarity index 96% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/LazyPagingColumnPullRefresh.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/components/LazyPagingColumnPullRefresh.kt index 336bc67..9b74510 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/LazyPagingColumnPullRefresh.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/components/LazyPagingColumnPullRefresh.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.components +package com.atridad.mealient.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.PaddingValues diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/TopProgressIndicator.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/components/TopProgressIndicator.kt similarity index 95% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/TopProgressIndicator.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/components/TopProgressIndicator.kt index 6905f00..d74ed07 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/components/TopProgressIndicator.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/components/TopProgressIndicator.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.components +package com.atridad.mealient.ui.components import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/preview/ColorSchemePreview.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/preview/ColorSchemePreview.kt similarity index 96% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/preview/ColorSchemePreview.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/preview/ColorSchemePreview.kt index a3cf4a5..bd76ac3 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/preview/ColorSchemePreview.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/preview/ColorSchemePreview.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.preview +package com.atridad.mealient.ui.preview import android.content.res.Configuration.UI_MODE_NIGHT_MASK import android.content.res.Configuration.UI_MODE_NIGHT_YES diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelper.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelper.kt similarity index 81% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelper.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelper.kt index 2d8152e..54a7466 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelper.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelper.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.util +package com.atridad.mealient.ui.util import kotlinx.coroutines.flow.StateFlow diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelperFactory.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelperFactory.kt similarity index 84% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelperFactory.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelperFactory.kt index 22bff11..6046b6d 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelperFactory.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelperFactory.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.util +package com.atridad.mealient.ui.util import kotlinx.coroutines.CoroutineScope diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelperFactoryImpl.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelperFactoryImpl.kt similarity index 86% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelperFactoryImpl.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelperFactoryImpl.kt index f4b6835..d916cfd 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelperFactoryImpl.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelperFactoryImpl.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.ui.util +package com.atridad.mealient.ui.util -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.CoroutineScope import javax.inject.Inject diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelperImpl.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelperImpl.kt similarity index 94% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelperImpl.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelperImpl.kt index 4a396ae..60e2c02 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingHelperImpl.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingHelperImpl.kt @@ -1,6 +1,6 @@ -package gq.kirmanak.mealient.ui.util +package com.atridad.mealient.ui.util -import gq.kirmanak.mealient.logging.Logger +import com.atridad.mealient.logging.Logger import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update diff --git a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingState.kt b/ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingState.kt similarity index 97% rename from ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingState.kt rename to ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingState.kt index eee0204..a390833 100644 --- a/ui/src/main/kotlin/gq/kirmanak/mealient/ui/util/LoadingState.kt +++ b/ui/src/main/kotlin/com/atridad/mealient/ui/util/LoadingState.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.ui.util +package com.atridad.mealient.ui.util sealed class LoadingState