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/#374] Event / 점심시간 이벤트 구현 #378

Merged
merged 22 commits into from
Feb 8, 2024
Merged

[FEAT/#374] Event / 점심시간 이벤트 구현 #378

merged 22 commits into from
Feb 8, 2024

Commits on Feb 5, 2024

  1. [UI/#374] 점심시간 이벤트 xml 구현

    b1urrrr committed Feb 5, 2024
    Configuration menu
    Copy the full SHA
    0643e78 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. [MERGE] : develop -> #374

    b1urrrr committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    6c0fd24 View commit details
    Browse the repository at this point in the history

  2. [UI/#374] strings.xml 충돌 해결 및 보상 동적으로 동작하도록 xml 수정

    b1urrrr committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    c4c520f View commit details
    Browse the repository at this point in the history

  3. [UI/#374] Reward Dialog 파일 생성 및 xml 구현

    b1urrrr committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    73fd3d8 View commit details
    Browse the repository at this point in the history

  4. [FEAT/#374] 이벤트 조회 서버통신 기본 설정

    b1urrrr committed Feb 6, 2024
    Configuration menu
    Copy the full SHA
    5bbf9c6 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. [FEAT/#374] 이벤트 조회 기본 동작 구현

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    931ba9d View commit details
    Browse the repository at this point in the history

  2. [FEAT/#374] RewardAdapter 구현

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    37e8e56 View commit details
    Browse the repository at this point in the history

  3. [FEAT/#374] 이벤트 상태 조회 서버통신 기본 설정

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    cba4318 View commit details
    Browse the repository at this point in the history

  4. [FEAT/#374] 이벤트 상태 조회 동작 구현

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    ca55a37 View commit details
    Browse the repository at this point in the history

  5. [FEAT/#374] 이벤트 조회 로직 Main 뷰로 이동

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    cf8189c View commit details
    Browse the repository at this point in the history

  6. [CHORE/#374] idempotencyKey intent에 extra로 전달

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    df1dac7 View commit details
    Browse the repository at this point in the history

  7. [CHORE/#374] 이벤트 참여 서버통신 기본 설정

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    e07f736 View commit details
    Browse the repository at this point in the history

  8. [FEAT/#374] 이벤트 참여 서버통신 연결

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    eb0e6ea View commit details
    Browse the repository at this point in the history

  9. [FIX/#374] 이벤트 보상 다이얼로그 로직 보완

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    ee56bd6 View commit details
    Browse the repository at this point in the history

  10. [FIX/#374] adapter 설정 후 observe 순서 배치

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    4050ca2 View commit details
    Browse the repository at this point in the history

  11. [MERGE] : develop -> #374

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    0bdb1e1 View commit details
    Browse the repository at this point in the history

  12. [CHORE/#374] 완료된 TODO 제거

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    0c71547 View commit details
    Browse the repository at this point in the history

  13. [CHORE/#374] 투표 딜레이 시간 조정 및 flow job cancel 시점 변경

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    ebc737e View commit details
    Browse the repository at this point in the history

  14. Merge branch 'develop' of https://github.com/team-yello/YELLO-Android … 

    …into feat/#374-lunch-event-view
    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    f6efcf5 View commit details
    Browse the repository at this point in the history

  15. [FIX/#374] 이벤트 상태 조회 onFailure 분기 제거

    b1urrrr committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    d9eef2b View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. [UI/#374] 로티 이미지 변경 시 깜빡이지 않도록 보완

    b1urrrr committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    6cff21a View commit details
    Browse the repository at this point in the history

  2. [CHORE/#374] 함수 호출 순서 정렬

    b1urrrr committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    49247a1 View commit details
    Browse the repository at this point in the history