feat: 마이페이지 프로필 및 내 서재 api 연결 #262
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/res/values/strings.xml
# Conflicts: # app/src/main/res/values/strings.xml
m6z1
approved these changes
Aug 29, 2024
app/src/main/java/com/teamwss/websoso/data/mapper/UserMapper.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/data/mapper/UserMapper.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/data/mapper/UserMapper.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/data/mapper/UserMapper.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/data/model/MyProfileEntity.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/ui/main/myPage/MyPageViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/ui/main/myPage/myLibrary/MyLibraryViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/ui/main/myPage/myLibrary/MyLibraryViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/ui/main/myPage/myLibrary/MyLibraryViewModel.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/ui/main/myPage/myLibrary/MyLibraryViewModel.kt
Show resolved
Hide resolved
librarywon
requested changes
Aug 29, 2024
app/src/main/java/com/teamwss/websoso/data/mapper/UserMapper.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/data/mapper/UserMapper.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/data/remote/api/UserApi.kt
Outdated
Show resolved
Hide resolved
app/src/main/java/com/teamwss/websoso/ui/main/myPage/myLibrary/MyLibraryViewModel.kt
Show resolved
Hide resolved
Comment on lines
+78
to
80
| private fun getUserId(): Long { | ||
| return 1L | ||
| } |
| @@ -282,15 +282,15 @@ | |||
| android:id="@+id/iv_my_library_dominant_genre_first_logo" | |||
| android:layout_width="30dp" | |||
| android:layout_height="37dp" | |||
| android:src="@drawable/ic_novel_detail_genre_test" | |||
| app:loadImageUrl="@{myLibraryViewModel.topGenres[0].genreImage}" | |||
There was a problem hiding this comment.
기존에는 테스트 이미지였는데 지금응ㄴ 서버에서 내려주는 이미지입니다!
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.
📌𝘐𝘴𝘴𝘶𝘦𝘴
📎𝘞𝘰𝘳𝘬 𝘋𝘦𝘴𝘤𝘳𝘪𝘱𝘵𝘪𝘰𝘯
📷𝘚𝘤𝘳𝘦𝘦𝘯𝘴𝘩𝘰𝘵
KakaoTalk_Video_2024-08-29-16-14-30.mp4
💬𝘛𝘰 𝘙𝘦𝘷𝘪𝘦𝘸𝘦𝘳𝘴