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/mz 181 ledger filter #85

Merged
merged 15 commits into from
Jan 23, 2024
Merged

Feature/mz 181 ledger filter #85

merged 15 commits into from
Jan 23, 2024

Commits on Jan 17, 2024

  1. feat: μž₯λΆ€ ν•„ν„° 이동 μ‹œ Argument와 ν•¨κ»˜ μ΄λ™ν•˜κ²Œ κ΅¬ν˜„

    @jinukeu
    jinukeu committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    b9e6b02 View commit details
    Browse the repository at this point in the history

  2. feat: μž₯λΆ€ ν•„ν„° μΉ΄ν…Œκ³ λ¦¬, λ‚ μ§œ 선택 λ™μž‘ κ΅¬ν˜„

    @jinukeu
    jinukeu committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    067141b View commit details
    Browse the repository at this point in the history

  3. feat: μž₯λΆ€ λ‚ μ§œ ν•„ν„° 적용

    @jinukeu
    jinukeu committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    894e787 View commit details
    Browse the repository at this point in the history

  4. rename: OnBottomReached이 λ™μž‘ν•˜λŠ” μ•„μ΄ν…œμ˜ μ΅œμ†Œ 개수 λ§€κ°œλ³€μˆ˜ 이름 λ³€κ²½

    @jinukeu
    jinukeu committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    c880dd2 View commit details
    Browse the repository at this point in the history

  5. fix: μž₯λΆ€ λ‚ μ§œ ν•„ν„°μ—μ„œ μ’…λ£Œ λ‚ μ§œ λ²”μœ„κ°€ μ˜¬λ°”λ₯΄μ§€ μ•ŠλŠ” ν˜„μƒ μˆ˜μ •

    @jinukeu
    jinukeu committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    36304d3 View commit details
    Browse the repository at this point in the history

  6. feat: λ°›μ•„μš” ν™”λ©΄μ—μ„œ ν•„ν„° 제거 κΈ°λŠ₯ κ΅¬ν˜„

    @jinukeu
    jinukeu committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    75ed3f2 View commit details
    Browse the repository at this point in the history

  7. fix: collectWithLifecycle ν™•μž₯ ν•¨μˆ˜μ˜ keyκ°€ μ˜¬λ°”λ₯΄κ²Œ μ„€μ •λ˜μ–΄μžˆμ§€ μ•Šλ˜ 문제 ν•΄κ²°

    @jinukeu
    jinukeu committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    bc0ad85 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2024

  1. feat: μž₯λΆ€ μ •λ ¬ κΈ°λŠ₯ κ΅¬ν˜„

    @jinukeu
    jinukeu committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    46c83e3 View commit details
    Browse the repository at this point in the history

  2. feat: μž₯λΆ€ μΉ΄ν…Œκ³ λ¦¬ μ •λ ¬ κΈ°λŠ₯ κ΅¬ν˜„

    @jinukeu
    jinukeu committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    b1a8733 View commit details
    Browse the repository at this point in the history

  3. fix: ν•„ν„° 쑰건 λ³€κ²½

    @jinukeu
    jinukeu committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    2be2372 View commit details
    Browse the repository at this point in the history

  4. chore: ktlint

    @jinukeu
    jinukeu committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    d88424a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into feature/MZ-181-ledger-filter 

    # Conflicts:
#	core/ui/src/main/res/values/strings.xml
#	feature/navigator/src/main/java/com/susu/feature/navigator/MainNavigator.kt
#	feature/navigator/src/main/java/com/susu/feature/navigator/MainScreen.kt
#	feature/received/src/main/java/com/susu/feature/received/navigation/ReceivedNavigation.kt
#	feature/received/src/main/java/com/susu/feature/received/received/ReceivedScreen.kt
#	feature/received/src/main/res/values/strings.xml
    @jinukeu
    jinukeu committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    a51c671 View commit details
    Browse the repository at this point in the history

  6. chore: resolve conflict

    @jinukeu
    jinukeu committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    a6f015f View commit details
    Browse the repository at this point in the history

  7. chore: resolve conflict

    @jinukeu
    jinukeu committed Jan 22, 2024
    Configuration menu
    Copy the full SHA
    ce1a658 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2024

  1. feat: LedgerFilterScreen μ˜ˆμ™Έ 핸듀링

    @jinukeu
    jinukeu committed Jan 23, 2024
    Configuration menu
    Copy the full SHA
    dc14044 View commit details
    Browse the repository at this point in the history