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.

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

[feat/api_friend] : 마이탭 마시멜로 api 연결 및 분기처리 #18

Closed
wants to merge 349 commits into from

Conversation

SsongSik
Copy link
Member

주요 작업 내용

작업 내용 정리

  • 마이탭에 있는 마시멜로 api 연결
  • api 연결에 따른 분기처리
  • itemDecoration 적용

변경점

  • 마시멜로에 해당하는 분기처리를 해주었습니다.
  • 참고해야할 점은 추 후에 위에 HeaderAdapter를 적용하여 전체화면이 스크롤 되게끔 변경해야 할 것 같습니다.
  • 현재는 밑에는 RV가 적용되어있어 마시멜로 부분만 스크롤이 가능합니다.

hanseul-Choi and others added 30 commits January 16, 2023 22:16
# Conflicts:
#	app/src/main/res/drawable/ic_arrow_right_24.xml
#	app/src/main/res/navigation/pome_navigation.xml
#	app/src/main/res/values/strings.xml
[feat] mipmap 잘못들어간 부분 삭제
@SsongSik SsongSik requested a review from hanseul-Choi May 15, 2023 13:32
@SsongSik SsongSik self-assigned this May 15, 2023
@SsongSik SsongSik closed this May 15, 2023
@SsongSik
Copy link
Member Author

master 브랜치로 PR 잘못올려서 다시 PR 올립니다.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants