Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 마이페이지 프로필 및 내 서재 api 연결 #262

Merged
merged 21 commits into from
Aug 29, 2024
Merged

feat: 마이페이지 프로필 및 내 서재 api 연결 #262

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7dd78eb
feat: 프로필 데이터 바인딩 적용
yeonjeen Aug 28, 2024
870c211
feat: 내 프로필 api 연결
yeonjeen Aug 28, 2024
d8ede11
feat: 내 프로필 response Dto
yeonjeen Aug 28, 2024
adef96b
feat: 내 프로필 api 연결 설정
yeonjeen Aug 28, 2024
debf96d
feat: 내 프로필 api 연결
yeonjeen Aug 28, 2024
0c5e1e6
feat: 데이터 바인딩 적용
yeonjeen Aug 29, 2024
1aab92e
refactor: 마이프로필 업데이트 함수명 변경
yeonjeen Aug 29, 2024
6c63044
feat: 내 서재 보관함 카운트 api 연결
yeonjeen Aug 29, 2024
9c0a1b5
refactor: 현판 이름 수정
yeonjeen Aug 29, 2024
77e83ea
refactor: 데이터 바인딩 네이밍 수정
yeonjeen Aug 29, 2024
a9d1bb6
refactor: 매력포인트 텍스트 결합 수정
yeonjeen Aug 29, 2024
9ab0aa9
feat: 장르/작품 선호 api 연결
yeonjeen Aug 29, 2024
3701df3
refactor: 불필요한 코드 삭제
yeonjeen Aug 29, 2024
a122906
feat: 데이터 바인딩 적용
yeonjeen Aug 29, 2024
60a8365
feat: 장르 및 작품 선호 업데이트
yeonjeen Aug 29, 2024
938c900
Merge remote-tracking branch 'origin/develop' into feat/240
yeonjeen Aug 29, 2024
e289b88
fix: 충돌해결
yeonjeen Aug 29, 2024
ded7b7d
Merge remote-tracking branch 'origin/develop' into feat/240
yeonjeen Aug 29, 2024
9b1a384
feat: 트레일링콤마 추가
yeonjeen Aug 29, 2024
3629ac7
refactor: 코드리뷰 반영
yeonjeen Aug 29, 2024
3ff5bb0
refactor: 코드리뷰 반영
yeonjeen Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/develop' into feat/240 
# Conflicts:
#	app/src/main/res/values/strings.xml
  • Loading branch information
@yeonjeen
yeonjeen committed Aug 29, 2024
commit ded7b7d9d3045672bdc141bf153f53dff5fdf98b
3 changes: 2 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,8 @@
<!-- 내 활동 디테일 뷰 -->
<string name="my_activity_detail_title">내 활동</string>

<!-- 다른유저 페이지 -->
<!-- 다른 유저 페이지 뷰 -->
<string name="other_user_page_library">서재</string>
<string name="other_user_page_activity">활동</string>

</resources>
You are viewing a condensed version of this merge commit. You can view the full changes here.