Feature/review api #95
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # app/src/main/java/com/everymeal/everymeal_android/di/NetworkModule.kt # app/src/main/java/com/everymeal/everymeal_android/di/RepositoryModule.kt
|
일단 기능 최신화 및 인증 작업건과 합쳐야해서 먼저 디벨롭 머지 후 진행하겠습니다, |
# Conflicts: # data/src/main/java/com/everymeal/data/repository/restaurant/RestaurantRepositoryImpl.kt # domain/src/main/java/com/everymeal/domain/repository/restaurant/RestaurantRepository.kt # presentation/src/main/java/com/everymeal/presentation/ui/detail/DetailListScreen.kt # presentation/src/main/java/com/everymeal/presentation/ui/main/MainScreen.kt
kez-lab
force-pushed
the
feature/review_api
branch
from
dd09138 to
b2c1ce7
Compare
# Conflicts: # data/src/main/java/com/everymeal/data/model/restaruant/GetUnivRestaurantResponse.kt # data/src/main/java/com/everymeal/data/repository/restaurant/RestaurantRepositoryImpl.kt # domain/src/main/java/com/everymeal/domain/repository/restaurant/RestaurantRepository.kt # presentation/src/main/java/com/everymeal/presentation/components/EveryMealRestaurantItem.kt # presentation/src/main/java/com/everymeal/presentation/ui/bottom/BottomNavigation.kt # presentation/src/main/java/com/everymeal/presentation/ui/home/HomeContract.kt # presentation/src/main/java/com/everymeal/presentation/ui/home/HomeScreen.kt # presentation/src/main/java/com/everymeal/presentation/ui/home/HomeViewModel.kt # presentation/src/main/java/com/everymeal/presentation/ui/main/MainScreen.kt # presentation/src/main/java/com/everymeal/presentation/ui/restaurant/DetailRestaurantScreen.kt
SsongSik
approved these changes
Feb 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
주요 작업 내용
작업 내용 정리
변경점