From 114ba03bc3da5d3d820bf52fa2d4948599e116a7 Mon Sep 17 00:00:00 2001 From: Cody Weaver Date: Fri, 22 Dec 2023 23:48:43 -0700 Subject: [PATCH] add google-services.json and refactor packages --- .gitignore | 2 +- app/google-services.json | 29 +++++++++++++++++++ .../{category => model}/Category.kt | 2 +- .../{ingredient => model}/Ingredient.kt | 2 +- .../pocketalchemy/{recipe => model}/Recipe.kt | 4 +-- .../recipelist/RecipeListCard.kt | 2 +- 6 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 app/google-services.json rename app/src/main/java/com/android/pocketalchemy/{category => model}/Category.kt (51%) rename app/src/main/java/com/android/pocketalchemy/{ingredient => model}/Ingredient.kt (68%) rename app/src/main/java/com/android/pocketalchemy/{recipe => model}/Recipe.kt (78%) diff --git a/.gitignore b/.gitignore index 04e203b..170a9ed 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,7 @@ render.experimental.xml *.keystore # Google Services (e.g. APIs or Firebase) -google-services.json +# google-services.json # Android Profiling *.hprof*.iml diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 0000000..ddc8848 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,29 @@ +{ + "project_info": { + "project_number": "678864922010", + "project_id": "pocketalchemy-c2355", + "storage_bucket": "pocketalchemy-c2355.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:678864922010:android:c92358ce9258368a144623", + "android_client_info": { + "package_name": "com.android.pocketalchemy" + } + }, + "oauth_client": [], + "api_key": [ + { + "current_key": "AIzaSyDmyM-QdLe52I8-hjH8ICCb7S9Y7sjgBC0" + } + ], + "services": { + "appinvite_service": { + "other_platform_oauth_client": [] + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/src/main/java/com/android/pocketalchemy/category/Category.kt b/app/src/main/java/com/android/pocketalchemy/model/Category.kt similarity index 51% rename from app/src/main/java/com/android/pocketalchemy/category/Category.kt rename to app/src/main/java/com/android/pocketalchemy/model/Category.kt index 1f86c41..e68c81b 100644 --- a/app/src/main/java/com/android/pocketalchemy/category/Category.kt +++ b/app/src/main/java/com/android/pocketalchemy/model/Category.kt @@ -1,4 +1,4 @@ -package com.android.pocketalchemy.category +package com.android.pocketalchemy.model data class Category( val title: String diff --git a/app/src/main/java/com/android/pocketalchemy/ingredient/Ingredient.kt b/app/src/main/java/com/android/pocketalchemy/model/Ingredient.kt similarity index 68% rename from app/src/main/java/com/android/pocketalchemy/ingredient/Ingredient.kt rename to app/src/main/java/com/android/pocketalchemy/model/Ingredient.kt index 5031e1e..80368d6 100644 --- a/app/src/main/java/com/android/pocketalchemy/ingredient/Ingredient.kt +++ b/app/src/main/java/com/android/pocketalchemy/model/Ingredient.kt @@ -1,4 +1,4 @@ -package com.android.pocketalchemy.ingredient +package com.android.pocketalchemy.model /* PLACEHOLDER */ data class Ingredient( diff --git a/app/src/main/java/com/android/pocketalchemy/recipe/Recipe.kt b/app/src/main/java/com/android/pocketalchemy/model/Recipe.kt similarity index 78% rename from app/src/main/java/com/android/pocketalchemy/recipe/Recipe.kt rename to app/src/main/java/com/android/pocketalchemy/model/Recipe.kt index 192ada5..f5ae042 100644 --- a/app/src/main/java/com/android/pocketalchemy/recipe/Recipe.kt +++ b/app/src/main/java/com/android/pocketalchemy/model/Recipe.kt @@ -1,10 +1,8 @@ -package com.android.pocketalchemy.recipe +package com.android.pocketalchemy.model import androidx.annotation.DrawableRes import androidx.annotation.StringRes import com.android.pocketalchemy.R -import com.android.pocketalchemy.category.Category -import com.android.pocketalchemy.ingredient.Ingredient import java.time.LocalDateTime data class Recipe( diff --git a/app/src/main/java/com/android/pocketalchemy/recipelist/RecipeListCard.kt b/app/src/main/java/com/android/pocketalchemy/recipelist/RecipeListCard.kt index 599585b..9d5ce95 100644 --- a/app/src/main/java/com/android/pocketalchemy/recipelist/RecipeListCard.kt +++ b/app/src/main/java/com/android/pocketalchemy/recipelist/RecipeListCard.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.android.pocketalchemy.R -import com.android.pocketalchemy.recipe.Recipe +import com.android.pocketalchemy.model.Recipe // Max number of lines of text for recipe descriptions. private const val MAX_DETAIL_LINES = 7