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] 마이페이지 / 2주 절약, 낭비 기능 구현 #261

Merged
merged 41 commits into from
Mar 2, 2024
Merged

[feat] 마이페이지 / 2주 절약, 낭비 기능 구현 #261

merged 41 commits into from
Mar 2, 2024

Commits on Feb 23, 2024

  1. [mod] #253 getUser API 응답 변경사항 반영

    @sxunea
    sxunea committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    fe59de5 View commit details
    Browse the repository at this point in the history

  2. [add] #253 문자열 리소스 추가

    @sxunea
    sxunea committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    72f748a View commit details
    Browse the repository at this point in the history

  3. [feat] #253 마이페이지 목표 관련 텍스트 레벨 별 바인딩

    @sxunea
    sxunea committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    8bb7631 View commit details
    Browse the repository at this point in the history

  4. [mod] #253 UserV2에 목표금액 , 목표 횟수 도달 여부 Boolean 값 추가

    @sxunea
    sxunea committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    4dc014e View commit details
    Browse the repository at this point in the history

  5. [feat] #253 한국 화폐 단위 유틸 함수

    @sxunea
    sxunea committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    5486f27 View commit details
    Browse the repository at this point in the history

  6. [feat] #253 레벨업 관련 남은 목표 레벨별 바인딩

    @sxunea
    sxunea committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    8979959 View commit details
    Browse the repository at this point in the history

  7. [feat] #253 2주 절약 / 소비 시 알바 시간 기능 구현

    @sxunea
    sxunea committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    b97945f View commit details
    Browse the repository at this point in the history

  8. [feat] #253 절약 프로그레스바

    @sxunea
    sxunea committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    b48eaab View commit details
    Browse the repository at this point in the history

  9. [add] #253 막대 그래프용 shape 리소스 추가

    @sxunea
    sxunea committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    66422a6 View commit details
    Browse the repository at this point in the history

  10. [feat] #253 2주 절약, 낭비 막대그래프 애니메이션 구현

    @sxunea
    sxunea committed Feb 23, 2024
    Configuration menu
    Copy the full SHA
    5ae592c View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2024

  1. [feat] #253 애니메이션 끝났을때만 금액 보여주도록 구현

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    d6a2ab9 View commit details
    Browse the repository at this point in the history

  2. [feat] #253 애니메이션 간의 2초 시간 간격 설정

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    3a7f4e6 View commit details
    Browse the repository at this point in the history

  3. [feat] #253 부모 뷰의 너비를 가져와 계산해 애니메이션이 차지할 너비를 지정해 그래프의 길이 설정

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    cf765c6 View commit details
    Browse the repository at this point in the history

  4. [fix] #253 레벨업 조건 식 수정

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    a29a906 View commit details
    Browse the repository at this point in the history

  5. [feat] #253 일년 후 절약 금액

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    cdc2608 View commit details
    Browse the repository at this point in the history

  6. [mod] #253 금액 유틸 변경

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    5e43924 View commit details
    Browse the repository at this point in the history

  7. [refactor] #253 함수화

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    727da2c View commit details
    Browse the repository at this point in the history

  8. [ui] #253 2주간 낭비 금액 디자인 구현

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    f39209d View commit details
    Browse the repository at this point in the history

  9. [feat] #253 같은방법으로 2주간 낭비 애니메이션 구현

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    550eaa7 View commit details
    Browse the repository at this point in the history

  10. [chore] #253 로직 위치 이동해서 가독성 개선

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    2a3e8bd View commit details
    Browse the repository at this point in the history

  11. [mod] #253 string 리소스 활용

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    ec6bc1a View commit details
    Browse the repository at this point in the history

  12. [refactor] #253 함수화

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    bd039fa View commit details
    Browse the repository at this point in the history

  13. [feat] #253 황제 레벨 관련 문구 변경된 것 대응

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    5465107 View commit details
    Browse the repository at this point in the history

  14. [ui] #253 프로그레스바 radius 적용

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    fbfb6c1 View commit details
    Browse the repository at this point in the history

  15. [mod] #253 반올림 없이 나눗셈해서 계산하도록 통일

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    c169d15 View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'origin/develop' into feature/mypage-2we… 

    …eks-animation

# Conflicts:
#	app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
#	app/src/main/java/org/go/sopt/winey/util/binding/BindingAdapter.kt
    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    2da0fc8 View commit details
    Browse the repository at this point in the history

  17. [fix] #253 accumulatedAmount인 경우 분모가 0이되어 ArithmeticException 오류 해결

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    6790b4e View commit details
    Browse the repository at this point in the history

  18. [feat] #253 절약금액, 일년후 금액 글씨 색상 다르도록 SpannableString 적용

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    3102f32 View commit details
    Browse the repository at this point in the history

  19. [feat] #253 절약, 낭비에 따라 +, - 표현

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    b648ebb View commit details
    Browse the repository at this point in the history

  20. [feat] #253 마이피드에서 피드 삭제후 마이페이지로 돌아올 때 바로 데이터 반영될 수 있도록 UiState 초기화

    @sxunea
    sxunea committed Mar 1, 2024
    Configuration menu
    Copy the full SHA
    e689b98 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2024

  1. [chore] #253 ktlint 포맷 적용

    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    2162ee5 View commit details
    Browse the repository at this point in the history

  2. [fix] #253 타입 오입력 변경

    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    4d67251 View commit details
    Browse the repository at this point in the history

  3. [fix] #253 타입 오입력 변경

    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    e95ed84 View commit details
    Browse the repository at this point in the history

  4. [fix] #253 치킨, 운동화 금액 변경

    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    c327ff2 View commit details
    Browse the repository at this point in the history

  5. [mod] #253 프로그레스 바 백분율 식 변경

    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    02f3aec View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/develop' into feature/mypage-2we… 

    …eks-animation

# Conflicts:
#	app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt
#	app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt
#	app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt
#	app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    1b2df17 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/develop' into feature/mypage-2we… 

    …eks-animation

# Conflicts:
#	app/src/main/java/org/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt
    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    ef5dce9 View commit details
    Browse the repository at this point in the history

  8. [chore] #253 충돌 해결

    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    f482235 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/develop' into feature/mypage-2we… 

    …eks-animation
    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    04c7016 View commit details
    Browse the repository at this point in the history

  10. [mod] #253 마이페이지의 getUser에서만 state 초기화 하도록 변경 + 주석 추가

    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    cf7f70d View commit details
    Browse the repository at this point in the history

  11. [mod] #253 한달후,세달후,일년후 간의 시간 딜레이 없도록 변경

    @sxunea
    sxunea committed Mar 2, 2024
    Configuration menu
    Copy the full SHA
    ba5cffb View commit details
    Browse the repository at this point in the history