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

[1.1.1/AN-FEAT] 포켓몬 상세에서 배틀 도우미로 가는 floating 버튼 추가(Revert 된 것 다시) #413

Merged
merged 44 commits into from
Oct 23, 2024

Conversation

sh1mj1
Copy link
Contributor

@sh1mj1 sh1mj1 commented Oct 23, 2024

sh1mj1 and others added 30 commits October 11, 2024 18:20
* 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 위치 조정
@github-actions github-actions bot added the AN_FEAT ✨ 안드 새로운 기능 label Oct 23, 2024
@sh1mj1 sh1mj1 changed the title An/feat/pokemon detail navigate battle button [1.1.1/AN-FEAT] 포켓몬 상세에서 배틀 도우미로 가는 floating 버튼 추가(Revert 된 것 다시) Oct 23, 2024
@sh1mj1 sh1mj1 added the AN_UI 🎨 안드 UI 작업 label Oct 23, 2024
@sh1mj1 sh1mj1 merged commit 1aba612 into an/develop Oct 23, 2024
2 of 3 checks passed
@sh1mj1 sh1mj1 deleted the an/feat/pokemon-detail-navigate-battle-button branch October 23, 2024 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AN_FEAT ✨ 안드 새로운 기능 AN_UI 🎨 안드 UI 작업
Projects
Development

Successfully merging this pull request may close these issues.

1 participant