From d99480095eb14d1184ca1c1c48cc8a51eceec772 Mon Sep 17 00:00:00 2001 From: Choi SeongHoon <108349655+SeongHoonC@users.noreply.github.com> Date: Sun, 2 Jun 2024 15:46:56 +0900 Subject: [PATCH] =?UTF-8?q?[Android]=20feat:=20=EB=A9=80=ED=8B=B0=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=ED=99=94=20=EB=B0=8F=20=EC=BB=B4=ED=8F=AC?= =?UTF-8?q?=EC=A6=88=20=EB=84=A4=EB=B9=84=EA=B2=8C=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20(#15)=20(#17)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: domain Module 정의 (cherry picked from commit a00af4114578b8a64f81abc2eda424311b4dfeab) * feat: multi module 정의 및 의존성 부여 (cherry picked from commit e5266f420d2480a864ccbb60ccc4ff5232263042) * feat: multi module 정의 및 의존성 부여 (cherry picked from commit 2106d9f076322551dee80ec2cd5d6339ee84bdc1) * feat: Main Activity 에서 Navigation 정의 (cherry picked from commit 94a90f6ac472058d2f2e284bce79c9b137f99b8b) * feat: HomeScreen 임시 구현 및 네비게이션 정의 (cherry picked from commit 030a0e20fd69e76cf775ce2e5b2e4fe8accbf116) * feat(navigation): 홈, 레시피 추천, 레시피 상세로 이동할 수 있다 (cherry picked from commit b61ffdf6c5b1fb20ebec4495fc874f653ff3b392) * chore: 앱 모듈 패키지 정리 (cherry picked from commit b38f3b69cde3133e23f6f9d765a27d2a5b454f1e) * feat: 레시피 추천 저장소 정의 (cherry picked from commit 2861a87e01f52e30daebf544c828dee2892f086b) * feat: 레시피 네비게이션 정의 (cherry picked from commit 1665b958d265125c8fbe29a5be6ecf77fc544666) --- Android/.idea/deploymentTargetSelector.xml | 3 + Android/.idea/gradle.xml | 10 ++ Android/app/build.gradle.kts | 3 + Android/app/src/main/AndroidManifest.xml | 11 -- .../banchango/repository/RecipeRepository.kt | 7 -- Android/app/src/main/res/values/strings.xml | 3 +- Android/build.gradle.kts | 3 + Android/core/data-api/.gitignore | 1 + Android/core/data-api/build.gradle.kts | 43 +++++++ Android/core/data-api/consumer-rules.pro | 0 Android/core/data-api/proguard-rules.pro | 21 ++++ .../data-api/src/main/AndroidManifest.xml | 2 + .../data/repository/api/RecipeRepository.kt | 7 ++ .../core/data/repository/api/.gitkeep | 0 Android/core/designsystem/.gitignore | 1 + Android/core/designsystem/build.gradle.kts | 55 +++++++++ Android/core/designsystem/consumer-rules.pro | 0 Android/core/designsystem/proguard-rules.pro | 21 ++++ .../com/sundaegukbap/banchango/core/.gitkeep | 0 .../designsystem/src/main/AndroidManifest.xml | 2 + .../designsystem/component}/NetworkImage.kt | 14 ++- .../core/designsystem}/theme/Color.kt | 2 +- .../core/designsystem}/theme/Theme.kt | 4 +- .../core/designsystem}/theme/Type.kt | 2 +- .../com/sundaegukbap/banchango/core/.gitkeep | 0 Android/core/domain/.gitignore | 1 + Android/core/domain/build.gradle.kts | 9 ++ .../banchango/core/domain/.gitkeep | 0 Android/core/model/.gitignore | 1 + Android/core/model/build.gradle.kts | 9 ++ .../com/sundaegukbap/banchango}/Recipe.kt | 2 +- Android/core/navigation/.gitignore | 1 + Android/core/navigation/build.gradle.kts | 45 ++++++++ Android/core/navigation/consumer-rules.pro | 0 Android/core/navigation/proguard-rules.pro | 21 ++++ .../navigation/src/main/AndroidManifest.xml | 2 + .../banchango/navigation/Route.kt | 16 +++ Android/feature/home/.gitignore | 1 + Android/feature/home/build.gradle.kts | 77 +++++++++++++ Android/feature/home/consumer-rules.pro | 0 Android/feature/home/proguard-rules.pro | 21 ++++ .../banchango/feature/home/.gitkeep | 0 .../feature/home/src/main/AndroidManifest.xml | 2 + .../banchango/feature/home/HomeScreen.kt | 8 ++ .../feature/home/navigation/HomeNavigator.kt | 19 +++ .../banchango/feature/home/.gitkeep | 0 Android/feature/main/.gitignore | 1 + Android/feature/main/build.gradle.kts | 83 ++++++++++++++ Android/feature/main/consumer-rules.pro | 0 Android/feature/main/proguard-rules.pro | 21 ++++ .../banchango/feature/main/.gitkeep | 0 .../feature/main/src/main/AndroidManifest.xml | 14 +++ .../banchango/feature/main}/MainActivity.kt | 17 +-- .../banchango/feature/main/MainBottomBar.kt | 108 ++++++++++++++++++ .../banchango/feature/main/MainNavigator.kt | 101 ++++++++++++++++ .../banchango/feature/main/MainScreen.kt | 48 ++++++++ .../main/src/main/res/drawable/ic_home.xml | 5 + .../main/res/drawable/ic_recipe_recommend.xml | 5 + .../banchango/feature/main/.gitkeep | 0 Android/feature/reciperecommend/.gitignore | 1 + .../feature/reciperecommend/build.gradle.kts | 77 +++++++++++++ .../reciperecommend/consumer-rules.pro | 0 .../reciperecommend/proguard-rules.pro | 21 ++++ .../sundaegukbap/banchango/feature/.gitkeep | 0 .../src/main/AndroidManifest.xml | 2 + .../feature}/reciperecommend/RecipeCard.kt | 13 +-- .../RecipeRecommendViewModel.kt | 4 +- .../reciperecommend/RecipesRecommendScreen.kt | 19 ++- .../navigation/RecipeRecommendNavigation.kt | 19 +++ .../sundaegukbap/banchango/feature/.gitkeep | 0 Android/gradle/libs.versions.toml | 18 ++- Android/settings.gradle.kts | 8 ++ 72 files changed, 981 insertions(+), 54 deletions(-) delete mode 100644 Android/app/src/main/java/com/sundaegukbap/banchango/repository/RecipeRepository.kt create mode 100644 Android/core/data-api/.gitignore create mode 100644 Android/core/data-api/build.gradle.kts create mode 100644 Android/core/data-api/consumer-rules.pro create mode 100644 Android/core/data-api/proguard-rules.pro create mode 100644 Android/core/data-api/src/main/AndroidManifest.xml create mode 100644 Android/core/data-api/src/main/java/com/sundaegukbap/banchango/core/data/repository/api/RecipeRepository.kt create mode 100644 Android/core/data-api/src/test/java/com/sundaegukbap/banchango/core/data/repository/api/.gitkeep create mode 100644 Android/core/designsystem/.gitignore create mode 100644 Android/core/designsystem/build.gradle.kts create mode 100644 Android/core/designsystem/consumer-rules.pro create mode 100644 Android/core/designsystem/proguard-rules.pro create mode 100644 Android/core/designsystem/src/androidTest/java/com/sundaegukbap/banchango/core/.gitkeep create mode 100644 Android/core/designsystem/src/main/AndroidManifest.xml rename Android/{app/src/main/java/com/sundaegukbap/banchango/core/designsystem => core/designsystem/src/main/java/com/sundaegukbap/banchango/core/designsystem/component}/NetworkImage.kt (67%) rename Android/{app/src/main/java/com/sundaegukbap/banchango/ui => core/designsystem/src/main/java/com/sundaegukbap/banchango/core/designsystem}/theme/Color.kt (80%) rename Android/{app/src/main/java/com/sundaegukbap/banchango/ui => core/designsystem/src/main/java/com/sundaegukbap/banchango/core/designsystem}/theme/Theme.kt (94%) rename Android/{app/src/main/java/com/sundaegukbap/banchango/ui => core/designsystem/src/main/java/com/sundaegukbap/banchango/core/designsystem}/theme/Type.kt (94%) create mode 100644 Android/core/designsystem/src/test/java/com/sundaegukbap/banchango/core/.gitkeep create mode 100644 Android/core/domain/.gitignore create mode 100644 Android/core/domain/build.gradle.kts create mode 100644 Android/core/domain/src/main/java/com/sundaegukbap/banchango/core/domain/.gitkeep create mode 100644 Android/core/model/.gitignore create mode 100644 Android/core/model/build.gradle.kts rename Android/{app/src/main/java/com/sundaegukbap/banchango/model => core/model/src/main/java/com/sundaegukbap/banchango}/Recipe.kt (86%) create mode 100644 Android/core/navigation/.gitignore create mode 100644 Android/core/navigation/build.gradle.kts create mode 100644 Android/core/navigation/consumer-rules.pro create mode 100644 Android/core/navigation/proguard-rules.pro create mode 100644 Android/core/navigation/src/main/AndroidManifest.xml create mode 100644 Android/core/navigation/src/main/java/com/sundaegukbap/banchango/navigation/Route.kt create mode 100644 Android/feature/home/.gitignore create mode 100644 Android/feature/home/build.gradle.kts create mode 100644 Android/feature/home/consumer-rules.pro create mode 100644 Android/feature/home/proguard-rules.pro create mode 100644 Android/feature/home/src/androidTest/java/com/sundaegukbap/banchango/feature/home/.gitkeep create mode 100644 Android/feature/home/src/main/AndroidManifest.xml create mode 100644 Android/feature/home/src/main/java/com/sundaegukbap/banchango/feature/home/HomeScreen.kt create mode 100644 Android/feature/home/src/main/java/com/sundaegukbap/banchango/feature/home/navigation/HomeNavigator.kt create mode 100644 Android/feature/home/src/test/java/com/sundaegukbap/banchango/feature/home/.gitkeep create mode 100644 Android/feature/main/.gitignore create mode 100644 Android/feature/main/build.gradle.kts create mode 100644 Android/feature/main/consumer-rules.pro create mode 100644 Android/feature/main/proguard-rules.pro create mode 100644 Android/feature/main/src/androidTest/java/com/sundaegukbap/banchango/feature/main/.gitkeep create mode 100644 Android/feature/main/src/main/AndroidManifest.xml rename Android/{app/src/main/java/com/sundaegukbap/banchango/presentation/reciperecommend => feature/main/src/main/java/com/sundaegukbap/banchango/feature/main}/MainActivity.kt (73%) create mode 100644 Android/feature/main/src/main/java/com/sundaegukbap/banchango/feature/main/MainBottomBar.kt create mode 100644 Android/feature/main/src/main/java/com/sundaegukbap/banchango/feature/main/MainNavigator.kt create mode 100644 Android/feature/main/src/main/java/com/sundaegukbap/banchango/feature/main/MainScreen.kt create mode 100644 Android/feature/main/src/main/res/drawable/ic_home.xml create mode 100644 Android/feature/main/src/main/res/drawable/ic_recipe_recommend.xml create mode 100644 Android/feature/main/src/test/java/com/sundaegukbap/banchango/feature/main/.gitkeep create mode 100644 Android/feature/reciperecommend/.gitignore create mode 100644 Android/feature/reciperecommend/build.gradle.kts create mode 100644 Android/feature/reciperecommend/consumer-rules.pro create mode 100644 Android/feature/reciperecommend/proguard-rules.pro create mode 100644 Android/feature/reciperecommend/src/androidTest/java/com/sundaegukbap/banchango/feature/.gitkeep create mode 100644 Android/feature/reciperecommend/src/main/AndroidManifest.xml rename Android/{app/src/main/java/com/sundaegukbap/banchango/presentation => feature/reciperecommend/src/main/java/com/sundaegukbap/banchango/feature}/reciperecommend/RecipeCard.kt (90%) rename Android/{app/src/main/java/com/sundaegukbap/banchango/presentation => feature/reciperecommend/src/main/java/com/sundaegukbap/banchango/feature}/reciperecommend/RecipeRecommendViewModel.kt (91%) rename Android/{app/src/main/java/com/sundaegukbap/banchango/presentation => feature/reciperecommend/src/main/java/com/sundaegukbap/banchango/feature}/reciperecommend/RecipesRecommendScreen.kt (78%) create mode 100644 Android/feature/reciperecommend/src/main/java/com/sundaegukbap/banchango/feature/reciperecommend/navigation/RecipeRecommendNavigation.kt create mode 100644 Android/feature/reciperecommend/src/test/java/com/sundaegukbap/banchango/feature/.gitkeep diff --git a/Android/.idea/deploymentTargetSelector.xml b/Android/.idea/deploymentTargetSelector.xml index b268ef3..fc8303f 100644 --- a/Android/.idea/deploymentTargetSelector.xml +++ b/Android/.idea/deploymentTargetSelector.xml @@ -5,6 +5,9 @@ + + \ No newline at end of file diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml index 0897082..606ee67 100644 --- a/Android/.idea/gradle.xml +++ b/Android/.idea/gradle.xml @@ -10,6 +10,16 @@