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

[FEATURE] 메인화면 Bottom Navigation을 이용한 Fragment 전환 구현 #29 #81

Merged
merged 18 commits into from
Jul 23, 2023
Merged

[FEATURE] 메인화면 Bottom Navigation을 이용한 Fragment 전환 구현 #29 #81

merged 18 commits into from
Jul 23, 2023

Commits on Jul 17, 2023

  1. Merge branch 'dev' into feature/#62-bottom-navigation

    @aurora32s
    aurora32s committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    073291e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev' into feature/#62-bottom-navigation

    @aurora32s
    aurora32s committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    d18563e View commit details
    Browse the repository at this point in the history

  3. [FEAT] #62 - BottomNavigation Layout 추가

    @PaytalabYeonjuJin
    PaytalabYeonjuJin committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    355df31 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. [FEAT] #62 - viewpager2 추가

    @aurora32s
    aurora32s committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    af4bc32 View commit details
    Browse the repository at this point in the history

  2. [FEAT] #62 - viewpager2 이슈 수정

    @aurora32s
    aurora32s committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    5dc3ce4 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. [FEAT] #62 - filter chip이 화면에 보이지 않는 이슈 수정

    @aurora32s
    aurora32s committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    f4ed376 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. [FEAT] #62 - MainAdapter 추가

    @PaytalabYeonjuJin
    PaytalabYeonjuJin committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    3e8aca2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/#62-bottom-navigation' of https://github.com/YA… 

    …PP-Github/22nd-Android-Team-1-Android into feature/#62-bottom-navigation

# Conflicts:
#	feature/main/src/main/java/com/peonlee/main/MainAdapter.kt
#	feature/main/src/main/java/com/peonlee/main/MainViewModel.kt
    @PaytalabYeonjuJin
    PaytalabYeonjuJin committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    92c0543 View commit details
    Browse the repository at this point in the history

  3. [FEAT] #62 - Bottom Navigation과 Fragment 연동

    @PaytalabYeonjuJin
    PaytalabYeonjuJin committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    5afddb3 View commit details
    Browse the repository at this point in the history

  4. [FIX] #62 - 탐색 화면에서 필터링 Chip이 화면에서 사라지는 이슈 수정

    @PaytalabYeonjuJin
    PaytalabYeonjuJin committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    1aaa2b8 View commit details
    Browse the repository at this point in the history

  5. [FIX] #62 - onboard 모듈 추가

    @PaytalabYeonjuJin
    PaytalabYeonjuJin committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    4b48013 View commit details
    Browse the repository at this point in the history

  6. [FEAT] #62 - 메인화면에 간편평가 화면 추가 완료

    @PaytalabYeonjuJin
    PaytalabYeonjuJin committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    e0fb7c5 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'dev' into feature/#62-bottom-navigation 

    # Conflicts:
#	feature/evaluate/src/main/java/com/peonlee/evaluate/OnboardActivity.kt
    @PaytalabYeonjuJin
    PaytalabYeonjuJin committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    3167145 View commit details
    Browse the repository at this point in the history

  8. [FEAT] #62 - 메인 화면 전환 기능 완료 및 간편 리뷰 기능 추가

    @PaytalabYeonjuJin
    PaytalabYeonjuJin committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    37884d4 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2023

  1. [FEAT] #62 - Product module 분리

    @aurora32s
    aurora32s committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    254074f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/feature/#62-bottom-navigation' i… 

    …nto feature/#62-bottom-navigation

# Conflicts:
#	feature/evaluate/src/main/java/com/peonlee/evaluate/EvaluateFragment.kt
#	feature/evaluate/src/main/res/layout/activity_onboading.xml
#	feature/evaluate/src/main/res/layout/fragment_evaluate.xml
#	feature/explore/src/main/java/com/peonlee/explore/ExploreActivity.kt
#	feature/explore/src/main/java/com/peonlee/product/ProductFragment.kt
#	feature/explore/src/main/java/com/peonlee/product/ProductViewModel.kt
#	feature/main/src/main/java/com/peonlee/main/MainActivity.kt
#	feature/main/src/main/java/com/peonlee/main/MainAdapter.kt
#	feature/main/src/main/res/layout/activity_main.xml
#	feature/onboading/src/main/res/layout/activity_onboading.xml
#	feature/onboard/src/main/res/layout/activity_onboading.xml
#	feature/user/src/main/java/com/peonlee/user/UserFragment.kt
#	settings.gradle.kts
    @aurora32s
    aurora32s committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    0f0206f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dev' into feature/#62-bottom-navigation 

    # Conflicts:
#	core/data/src/main/java/com/peonlee/data/evaluate/EvaluatePagingSource.kt
#	feature/evaluate/src/main/java/com/peonlee/evaluate/EvaluateFragment.kt
#	feature/evaluate/src/main/res/layout/fragment_evaluate.xml
#	feature/main/build.gradle.kts
#	feature/main/src/main/java/com/peonlee/main/MainActivity.kt
#	feature/main/src/main/java/com/peonlee/main/MainAdapter.kt
#	gradle/libs.versions.toml
#	settings.gradle.kts
    @aurora32s
    aurora32s committed Jul 22, 2023
    Configuration menu
    Copy the full SHA
    c8ba0fb View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2023

  1. [FEAT] #62 - 충돌 이슈 수장

    @aurora32s
    aurora32s committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    eefbf29 View commit details
    Browse the repository at this point in the history