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] 온보딩 / 가이드, 스토리, 닉네임 기능 구현 #114

Merged
merged 46 commits into from
Aug 16, 2023

Commits on Aug 5, 2023

  1. Configuration menu
    Copy the full SHA
    e7a1c08 View commit details
    Browse the repository at this point in the history
  2. [chore] #95 패키지 이동

    leeeha committed Aug 5, 2023
    Configuration menu
    Copy the full SHA
    f22833a View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. Merge branch 'develop' of https://github.com/team-winey/Winey-AOS int…

    …o feature/ui-onboarding-guide
    leeeha committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    791aea6 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Merge branch 'develop' of https://github.com/team-winey/Winey-AOS int…

    …o feature/ui-onboarding-guide
    
    � Conflicts:
    �	app/src/main/AndroidManifest.xml
    leeeha committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    77ec1ad View commit details
    Browse the repository at this point in the history
  2. Merge branch 'feature/feat-nickname-duplicate-check' of https://githu…

    …b.com/team-winey/Winey-AOS into feature/ui-onboarding-guide
    
    � Conflicts:
    �	app/src/main/AndroidManifest.xml
    leeeha committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    92836ec View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6e45853 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Configuration menu
    Copy the full SHA
    e44e01f View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2023

  1. Configuration menu
    Copy the full SHA
    632effb View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    aa6b51c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0665d9d View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2023

  1. Configuration menu
    Copy the full SHA
    8ef64cc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f6767d5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    af0a35e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1d2ffae View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6fc71fd View commit details
    Browse the repository at this point in the history
  6. Merge branch 'feature/feat-default-nickname-patch' of https://github.…

    …com/team-winey/Winey-AOS into feature/ui-onboarding-guide
    
    � Conflicts:
    �	app/src/main/java/com/android/go/sopt/winey/presentation/splash/SplashActivity.kt
    leeeha committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    6697ca0 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Configuration menu
    Copy the full SHA
    44e0ebe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    bc2a229 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0736348 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    586b022 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b508ae7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7ad08db View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    29c3959 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4e5daa3 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    83d47cd View commit details
    Browse the repository at this point in the history
  10. Merge remote-tracking branch 'origin/feature/ui-onboarding-guide' int…

    …o feature/ui-onboarding-guide
    
    # Conflicts:
    #	app/src/main/res/layout/fragment_level_guide.xml
    leeeha committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    1455030 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    851ef7b View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    420acaa View commit details
    Browse the repository at this point in the history
  13. Merge branch 'feature/ui-onboarding-story' into feature/ui-onboarding…

    …-guide
    
    # Conflicts:
    #	app/src/main/java/com/android/go/sopt/winey/presentation/splash/SplashActivity.kt
    #	app/src/main/res/layout/activity_guide.xml
    leeeha committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    b40a3d9 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    bf467bf View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    1afd822 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Configuration menu
    Copy the full SHA
    a4be0f5 View commit details
    Browse the repository at this point in the history
  2. [fix] #95 뒤로가기 제대로 작동하지 않는 문제 해결

    - popBackStack 명시적으로 호출하기
    leeeha committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    fed2a6c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c6ba339 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b73ef8a View commit details
    Browse the repository at this point in the history
  5. Merge branch 'develop' of https://github.com/team-winey/Winey-AOS int…

    …o feature/ui-onboarding-guide
    
    � Conflicts:
    �	app/src/main/java/com/android/go/sopt/winey/data/repository/AuthRepositoryImpl.kt
    �	app/src/main/java/com/android/go/sopt/winey/data/service/AuthService.kt
    �	app/src/main/java/com/android/go/sopt/winey/data/source/AuthDataSource.kt
    �	app/src/main/java/com/android/go/sopt/winey/domain/repository/AuthRepository.kt
    �	app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/upload/amount/AmountViewModel.kt
    leeeha committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    7a5fac3 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'develop' of https://github.com/team-winey/Winey-AOS int…

    …o feature/ui-onboarding-guide
    
    � Conflicts:
    �	app/src/main/java/com/android/go/sopt/winey/presentation/splash/SplashActivity.kt
    leeeha committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    b2f9352 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    4e2a852 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    bba0a7a View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. Configuration menu
    Copy the full SHA
    edfc045 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4eb032b View commit details
    Browse the repository at this point in the history
  3. Merge branch 'feature/ui-onboarding-guide' of https://github.com/team…

    …-winey/Winey-AOS into feature/ui-onboarding-guide
    
    � Conflicts:
    �	app/src/main/res/layout/fragment_first_story.xml
    �	app/src/main/res/layout/fragment_second_story.xml
    �	app/src/main/res/layout/fragment_third_story.xml
    leeeha committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    5c85942 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6693502 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    716fb6d View commit details
    Browse the repository at this point in the history
  6. Merge remote-tracking branch 'origin/feature/ui-onboarding-guide' int…

    …o feature/ui-onboarding-guide
    
    # Conflicts:
    #	app/src/main/java/com/android/go/sopt/winey/presentation/splash/SplashActivity.kt
    leeeha committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    dacc435 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f25175b View commit details
    Browse the repository at this point in the history