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

[1.1.1/AN-FEAT] 포켓몬 상세에서 배틀 도우미로 가는 floating 버튼 추가 #378

Merged
merged 43 commits into from
Oct 23, 2024
Merged

[1.1.1/AN-FEAT] 포켓몬 상세에서 배틀 도우미로 가는 floating 버튼 추가 #378

merged 43 commits into from
Oct 23, 2024

Commits on Oct 11, 2024

  1. feat(activity_pokemon_detail2): first coordinatorlayout

    @sh1mj1
    sh1mj1 committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    29d1c1a View commit details
    Browse the repository at this point in the history

  2. feat(activity_pokemon_detail2): title

    @sh1mj1
    sh1mj1 committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    5fc4e23 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2024

  1. chore: PokemonDetailActivity 안 쓰는 부분 일단 주석

    @sh1mj1
    sh1mj1 committed Oct 13, 2024
    Configuration menu
    Copy the full SHA
    3fdf234 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge branch 'an/develop' into an/feat/pokemon-detail-top-bar-animation

    @sh1mj1
    sh1mj1 committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    c819a79 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. feat(PokemonDetail2Activity): 샘플 코드 가져와보기

    @sh1mj1
    sh1mj1 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    982efc9 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. feat: activity_pokemon_detail2.xml 타입만 해결하면 되는데

    @sh1mj1
    sh1mj1 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4337513 View commit details
    Browse the repository at this point in the history

  2. feat: OuterEvolutionAdapter, OuterEvolutionViewHolder

    @sh1mj1
    sh1mj1 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    34941d6 View commit details
    Browse the repository at this point in the history

  3. feat: 진화 프래그먼트 outer evolutions 로 변경 

    issue: 화면이 안나옴..
    @sh1mj1
    sh1mj1 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    5438d68 View commit details
    Browse the repository at this point in the history

  4. fix: feat: 진화 프래그먼트 outer evolutions 로 , 화면 나옴

    @sh1mj1
    sh1mj1 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2a1fe81 View commit details
    Browse the repository at this point in the history

  5. fix: activity_pokemon_detail2 의 nestedScrollview 를 각 프래그먼트로 이동

    @sh1mj1
    sh1mj1 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    f1c76ec View commit details
    Browse the repository at this point in the history

  6. chore: ktlint, 사용하지 않는 파일 제거

    @sh1mj1
    sh1mj1 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a340ce3 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'an/develop' into an/feat/pokemon-detail-top-bar-animation

    @sh1mj1
    sh1mj1 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    2606ed8 View commit details
    Browse the repository at this point in the history

  8. chore: ktlint, 사용하지 않는 파일 제거

    @sh1mj1
    sh1mj1 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    67d0104 View commit details
    Browse the repository at this point in the history

  9. refactor(EvolutionsUiModel): ui 에서 사용하는 리스트로 변환

    @sh1mj1
    sh1mj1 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c0bfa6d View commit details
    Browse the repository at this point in the history

  10. refactor(EvolutionStageAdapter): 네이밍

    @sh1mj1
    sh1mj1 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ba2f865 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. fix: activity_pokemon_detail.xml 최상단일 때만 상단이 가려진다 

    fix: #369 (review)
    @sh1mj1
    sh1mj1 committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    f35628e View commit details
    Browse the repository at this point in the history

  2. chore: 로그 삭제

    @sh1mj1
    sh1mj1 committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    4c949b0 View commit details
    Browse the repository at this point in the history

  3. fix(activity_pokemon_detail): progress indicator 위치 조정

    @sh1mj1
    sh1mj1 committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    b179eec View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. feat: activity_pokemon_detail floating 버튼

    @sh1mj1
    sh1mj1 committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    cf1f9cf View commit details
    Browse the repository at this point in the history

  2. feat: floating 버튼에 쓰일 아이콘

    @sh1mj1
    sh1mj1 committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    5e523db View commit details
    Browse the repository at this point in the history

  3. feat: floating shape_red_20_fill_20_rect 텍스트 배경

    @sh1mj1
    sh1mj1 committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    e30de6f View commit details
    Browse the repository at this point in the history

  4. feat: 포켓몬 상세에서 배틀로 가는 팝업 아이템

    @sh1mj1
    sh1mj1 committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    f4feaa8 View commit details
    Browse the repository at this point in the history

  5. feat: PokemonDetailBattlePopupAdapter

    @sh1mj1
    sh1mj1 committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    7ac144c View commit details
    Browse the repository at this point in the history

  6. feat: PokemonDetailBattlePopupAdapter

    @sh1mj1
    sh1mj1 committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    763ddb8 View commit details
    Browse the repository at this point in the history

  7. feat: floating 버튼으로 배틀 이동

    @sh1mj1
    sh1mj1 committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    0afb52e View commit details
    Browse the repository at this point in the history

  8. chore: ktlint

    @sh1mj1
    sh1mj1 committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    7ba1348 View commit details
    Browse the repository at this point in the history

  9. feat: 배틀로 이동 시 로깅

    @sh1mj1
    sh1mj1 committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    b134112 View commit details
    Browse the repository at this point in the history

  10. feat: viewModel loading

    @sh1mj1
    sh1mj1 committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    88fb429 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2024

  1. [1.1.1/AN-UI, AN-REFACTOR] 포켓몬 상세 화면 스크롤 시 애니메이션 (#369) 

    * feat(activity_pokemon_detail2): first coordinatorlayout

* feat(activity_pokemon_detail2): title

* chore: PokemonDetailActivity 안 쓰는 부분 일단 주석

* feat(PokemonDetail2Activity): 샘플 코드 가져와보기

* feat: activity_pokemon_detail2.xml 타입만 해결하면 되는데

* feat: OuterEvolutionAdapter, OuterEvolutionViewHolder

* feat: 진화 프래그먼트 outer evolutions 로 변경

issue: 화면이 안나옴..

* fix: feat: 진화 프래그먼트 outer evolutions 로 , 화면 나옴

* fix: activity_pokemon_detail2 의 nestedScrollview 를 각 프래그먼트로 이동

* chore: ktlint, 사용하지 않는 파일 제거

* chore: ktlint, 사용하지 않는 파일 제거

* refactor(EvolutionsUiModel): ui 에서 사용하는 리스트로 변환

* refactor(EvolutionStageAdapter): 네이밍

* fix: activity_pokemon_detail.xml 최상단일 때만 상단이 가려진다

fix: #369 (review)

* chore: 로그 삭제

* fix(activity_pokemon_detail): progress indicator 위치 조정
    @sh1mj1
    sh1mj1 authored Oct 20, 2024
    Configuration menu
    Copy the full SHA
    31577e7 View commit details
    Browse the repository at this point in the history

  2. Merging an/feat/pokemon-detail-navigate-battle-button

    @sh1mj1
    sh1mj1 committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    3744231 View commit details
    Browse the repository at this point in the history

  3. feat: floating button 을 배틀 아이콘 실루엣으로 설정

    @sh1mj1
    sh1mj1 committed Oct 20, 2024
    Configuration menu
    Copy the full SHA
    6fada20 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. refactor: battle pop up extended floating action button 으로

    @sh1mj1
    sh1mj1 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    2393465 View commit details
    Browse the repository at this point in the history

  2. refactor: battle 플로팅 액션 버튼 정적으로 넣는다

    @sh1mj1
    sh1mj1 committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    d82385b View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. refactor: battle floating action bar 정적으로

    @sh1mj1
    sh1mj1 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    e03947d View commit details
    Browse the repository at this point in the history

  2. refactor: FloatingButtonHandler

    @sh1mj1
    sh1mj1 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    1410bdb View commit details
    Browse the repository at this point in the history

  3. refactor: 네비게이션, 기존 동적 플로팅 버튼 삭제

    @sh1mj1
    sh1mj1 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    15bef1b View commit details
    Browse the repository at this point in the history

  4. refactor(PokemonDetailViewModel): eventflow

    @sh1mj1
    sh1mj1 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    561375d View commit details
    Browse the repository at this point in the history

  5. fix(AnalyticsExtensions): analytic event

    @sh1mj1
    sh1mj1 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    a609181 View commit details
    Browse the repository at this point in the history

  6. chore; ktlintformat

    @sh1mj1
    sh1mj1 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    1d9fe1b View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. Merging an/feat/pokemon-detail-navigate-battle-button

    @sh1mj1
    sh1mj1 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    e61da4d View commit details
    Browse the repository at this point in the history

  2. refactor: FloatingButtonHandler 를 클래스가 아닌 함수로

    @sh1mj1
    sh1mj1 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    da73a56 View commit details
    Browse the repository at this point in the history

  3. feat: isExpanded save and restore

    @sh1mj1
    sh1mj1 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    e000bfb View commit details
    Browse the repository at this point in the history

  4. chore: ktlint

    @sh1mj1
    sh1mj1 committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    6252953 View commit details
    Browse the repository at this point in the history