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

my page 모듈 및 네비게이션 세팅 #202

Merged
merged 7 commits into from
Nov 28, 2023
Merged

Conversation

2taezeat
Copy link
Collaborator

@2taezeat 2taezeat commented Nov 28, 2023

Issue

Overview

  • 재생 목록 UI #196 반영
    • fetch 후 -> mergin develop -> conflict 해결 -> commit -> push 하였습니다
      • 커밋 메시지는 Merge remote-tracking branch 'origin/develop' into android/feature/185 ... 입니다

Screenshot

my_page

…5 (playlist 모듈 생성과 conflict 해결 후 merge)

# Conflicts:
#	android/app/build.gradle.kts
#	android/app/src/main/res/menu/bottom_navigation_items.xml
#	android/app/src/main/res/navigation/catchytape_navigation.xml
#	android/settings.gradle.kts
@2taezeat 2taezeat added ✨ feat 기능 개발 🤖 android android labels Nov 28, 2023
@2taezeat 2taezeat self-assigned this Nov 28, 2023
@2taezeat 2taezeat added this to the 👋 my milestone Nov 28, 2023
@2taezeat 2taezeat linked an issue Nov 28, 2023 that may be closed by this pull request
Copy link

Test Results

4 tests   4 ✔️  1s ⏱️
1 suites  0 💤
1 files    0

Results for commit cc69d54.

Copy link
Member

@youlalala youlalala left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

고생하셨어요!

Comment on lines 27 to 29
buildFeatures {
buildConfig = true
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

buildConfig 당장 필요한거 아니면 없어도 될 것 같아용

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

반영하였습니다~

Copy link
Member

@HamBP HamBP left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 👍

android:label="mypage"
tools:layout="@layout/fragment_my_page">

<deepLink app:uri="android-app://com.ohdodok.catchytape/my_page_fragment" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

딥링크는 혹시 언제 필요한 걸까?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

당장 필요 없을 것 같네요, 삭제했습니다~

@2taezeat 2taezeat merged commit fa7ad5e into develop Nov 28, 2023
@2taezeat 2taezeat deleted the android/feature/185 branch November 28, 2023 06:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🤖 android android ✨ feat 기능 개발
Projects
None yet
Development

Successfully merging this pull request may close these issues.

마이 페이지 모듈, 네비게이션
3 participants