[MERGE] MVP 개발 상태 main에 merge #89
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
- view에서 바로 사용해야 하는 것으로 추측됨
- app/proguard-rules.pro 내용 합치기 - setting.gradle에서 include 내용 동기화
…boarding [MERGE] KKUMI-40, KKUMI-46 #36 : 홈 > 로그인, 온보딩 진행 중
- EncryptedSharedPreferences에 저장하는 작업 필요
…hToken 저장 시도 중
…references로 localDataStore에 저장
[FEAT/UI] KKUMI-105 #81: 신고, 탈퇴 + UI 일부 수정
…tFactory를 keep
- profileImage nullable 처리
- profileImage nullable 처리
…e' into KKUMI-107/feature/#87/update_home # Conflicts: # app/build.gradle # core/common-ui/proguard-rules.pro # core/common-ui/src/main/java/com/swmarastro/mykkumi/common_ui/post/PostImagesAdapter.kt # core/data/proguard-rules.pro # feature/around/proguard-rules.pro # feature/auth/proguard-rules.pro # feature/home/proguard-rules.pro # feature/home/src/main/java/com/swmarastro/mykkumi/feature/home/HomeViewModel.kt # feature/mypage/proguard-rules.pro # feature/post/proguard-rules.pro # feature/shopping/proguard-rules.pro
[FEAT] KKUMI-107 #87 - 오류 해결 + 홈 swipe 새로고침
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.
MERGE | develop 브랜치 -> main 브랜치