From 3b6c36259039d9bc04be4c6b15577ce2a25f3bb3 Mon Sep 17 00:00:00 2001 From: Choi SeongHoon <108349655+SeongHoonC@users.noreply.github.com> Date: Sun, 28 Jul 2024 23:49:21 +0900 Subject: [PATCH] =?UTF-8?q?[Android]=20feat:=20=EB=A0=88=EC=8B=9C=ED=94=BC?= =?UTF-8?q?=20=EC=83=81=EC=84=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84(#21)=20(#22)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(reciperecommend): 레시피 추천 화면 하단 로딩바 * refactor(data): RecipeRepository 코드 정리 * feat: 화면에 따라 상태 바를 다른 색으로 변경할 수 있다. * refactor: 사용하지 않는 코드 제거 * feat: 레시피 상세 화면 뼈대 작성 * feat(Stars): 별 개수에 따라 별이 그려지는 Composable 구현 * feat(RecipeDifficult): 레시피는 요리 난이도를 가진다 * feat(RecipeDifficult): 레시피 추천 난이도 화면을 그린다 * refactor: Recipe 상세 이동 버튼 분리 * feat: 레시피 상세 TopBar 생성 * feat: 좋아요 표시할 수 있는 레시피 객체 정의 * feat(RecipeRepository): RecipeRepository 에 좋아요를 요청할 수 있다 * feat(RecipeDetailCard): 레시피 상세 정보를 레시피 상세 전체 화면에서에서 분리한다 * feat(statusBarColor): systemBar 변경에서 statusBar 변경으로 바꾼다 * feat(RecipeDetailScreen): LikableRecipe 로 화면을 보여준다. * feat(RecipeDetailScreen): 상단까지 스크롤 하면 색깔이 변경되는 TopBar 를 구현한다 * feat(RecipeDetailScreen): Recipe 이미지에 그림자 그라데이션을 넣는다. * feat(RecipeDetailScreen): 보여주는 화면 크기를 네비게이션 바 전까지로 한다 * chore: gitIgnore 추가 --- Android/.gitignore | 1 + Android/.idea/deploymentTargetSelector.xml | 11 +- .../data/repository/api/RecipeRepository.kt | 9 +- .../api/model/RecipeRecommendResponseItem.kt | 1 - .../core/data/di/RepositoryModule.kt | 1 + .../core/data/mapper/RecipeMapper.kt | 10 +- .../repository/DefaultRecipeRepository.kt | 56 +++-- .../data/repository/FakeRecipeRepository.kt | 114 ++++----- .../core/designsystem/theme/Color.kt | 2 +- .../sundaegukbap/banchango/LikableRecipe.kt | 6 + .../java/com/sundaegukbap/banchango/Recipe.kt | 5 +- .../banchango/RecipeDifficulty.kt | 9 + .../banchango/feature/home/HomeScreen.kt | 6 +- .../feature/home/navigation/HomeNavigator.kt | 8 +- .../banchango/feature/main/MainActivity.kt | 18 +- .../banchango/feature/main/MainScreen.kt | 10 +- .../feature/recipe/detail/BtnMoveToRecipe.kt | 45 ++++ .../feature/recipe/detail/RecipeDetailCard.kt | 168 +++++++++++++ .../feature/recipe/detail/RecipeDetailInfo.kt | 126 ++++++++++ .../recipe/detail/RecipeDetailScreen.kt | 232 ++++++++++++++++++ .../recipe/detail/RecipeDetailUiState.kt | 15 ++ .../recipe/detail/RecipeDetailViewModel.kt | 47 ++++ .../feature/recipe/detail/RecipeTopbar.kt | 67 +++++ .../feature/recipe/difficulty/Stars.kt | 57 +++++ .../recipe/navigation/RecipeNavigation.kt | 16 +- .../feature/recipe/recommend/RecipeItem.kt | 19 +- .../recommend/RecipeRecommendViewModel.kt | 22 +- .../recommend/RecipesRecommendScreen.kt | 72 +++--- .../src/main/res/drawable/ic_star_filled.xml | 5 + .../src/main/res/drawable/ic_star_outline.xml | 12 + 30 files changed, 992 insertions(+), 178 deletions(-) create mode 100644 Android/core/model/src/main/java/com/sundaegukbap/banchango/LikableRecipe.kt create mode 100644 Android/core/model/src/main/java/com/sundaegukbap/banchango/RecipeDifficulty.kt create mode 100644 Android/feature/recipe/src/main/java/com/sundaegukbap/banchango/feature/recipe/detail/BtnMoveToRecipe.kt create mode 100644 Android/feature/recipe/src/main/java/com/sundaegukbap/banchango/feature/recipe/detail/RecipeDetailCard.kt create mode 100644 Android/feature/recipe/src/main/java/com/sundaegukbap/banchango/feature/recipe/detail/RecipeDetailInfo.kt create mode 100644 Android/feature/recipe/src/main/java/com/sundaegukbap/banchango/feature/recipe/detail/RecipeDetailScreen.kt create mode 100644 Android/feature/recipe/src/main/java/com/sundaegukbap/banchango/feature/recipe/detail/RecipeDetailUiState.kt create mode 100644 Android/feature/recipe/src/main/java/com/sundaegukbap/banchango/feature/recipe/detail/RecipeDetailViewModel.kt create mode 100644 Android/feature/recipe/src/main/java/com/sundaegukbap/banchango/feature/recipe/detail/RecipeTopbar.kt create mode 100644 Android/feature/recipe/src/main/java/com/sundaegukbap/banchango/feature/recipe/difficulty/Stars.kt create mode 100644 Android/feature/recipe/src/main/res/drawable/ic_star_filled.xml create mode 100644 Android/feature/recipe/src/main/res/drawable/ic_star_outline.xml diff --git a/Android/.gitignore b/Android/.gitignore index aa724b7..226d61c 100644 --- a/Android/.gitignore +++ b/Android/.gitignore @@ -7,6 +7,7 @@ /.idea/workspace.xml /.idea/navEditor.xml /.idea/assetWizardSettings.xml +/.idea/deploymentTargetSelector.xml .DS_Store /build /captures diff --git a/Android/.idea/deploymentTargetSelector.xml b/Android/.idea/deploymentTargetSelector.xml index c4abe25..da5007a 100644 --- a/Android/.idea/deploymentTargetSelector.xml +++ b/Android/.idea/deploymentTargetSelector.xml @@ -4,9 +4,14 @@ - -