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

[refactor] 이름 및 패키지 정리, Type-Safe Navigation 적용 #168

Merged
merged 48 commits into from
Feb 11, 2025
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
939f82d
[chore] 패키지 분리, 유스케이스 수정
miller198 Jan 5, 2025
c69904b
[refactor] FavoriteAction 파일 분리
miller198 Jan 5, 2025
7a3aac3
[refactor] Search feature 분리
Jan 5, 2025
fe45315
[style] 파라미터 순서 변경
Jan 5, 2025
d0a3186
[style] 오타 수정
Jan 5, 2025
d09877a
[refactor] 유스케이스 이름 수정 및 통합
Jan 5, 2025
362e1df
[refactor] Navigation 정리 중
Jan 5, 2025
cc5a67f
[refactor] Navigation 정리 중
Jan 7, 2025
b120ff7
[refactor] Route 정리
Jan 7, 2025
ad70c73
[feature] MainNavigator 클래스
Jan 7, 2025
0853192
[feature] 지도화면 Bottom Navigation Tab
miller198 Jan 18, 2025
c3ec27d
[refactor] 파일 정리, Navigation 정리
miller198 Jan 19, 2025
f90f54a
[refactor] UseCase에서 collect
miller198 Jan 20, 2025
26a8565
[refactor] @Serialization 어노테이션
miller198 Jan 21, 2025
166a40d
Merge branch 'develop' into feature/module
miller198 Jan 21, 2025
d377149
[refactor] merge중 빠진것 수정
miller198 Jan 21, 2025
6a076ee
[refactor] 빠진 루트 추가
miller198 Jan 23, 2025
0b901f1
[refactor] 실행 문제 해결
miller198 Jan 24, 2025
ad911da
[refactor] MapBottomBar 이름변경
miller198 Jan 24, 2025
b4e220f
[refactor] encode
miller198 Jan 25, 2025
dbfea34
[fix] illegalArgumentsException 해결
miller198 Jan 25, 2025
13d40b9
[style] log 제거
miller198 Jan 25, 2025
35ad243
[refactor] saveStateHandle 사용, 필요없는 코드 삭제
miller198 Jan 25, 2025
fcd0dd8
[refactor] 필요없는 코드 삭제
miller198 Jan 25, 2025
81a683e
[refactor] Song 순수 코틀린 클래스
miller198 Jan 27, 2025
fe9ca54
[refactor] usecase 추상화
miller198 Jan 30, 2025
b744e93
[refactor] PickList 공통 뷰모델 생성
miller198 Jan 30, 2025
3fec5d4
[chore] 파일 삭제 및 이동
miller198 Jan 30, 2025
f600271
[refactor] 누락 편집 기능 재반영
miller198 Jan 30, 2025
71e4d76
[refactor] 유저정보 화면, route 이름 수정
miller198 Jan 30, 2025
d1964da
[refactor] 유저정보 화면, route 이름 수정
miller198 Jan 30, 2025
55a6d62
[refactor] 패키지 정정, 함수명 변경
miller198 Jan 30, 2025
7f6e6f5
[style] 필요없는 import 삭제
miller198 Jan 30, 2025
f52bd53
[chore] 필요없는 파일 삭제
miller198 Jan 30, 2025
649d16b
[refactor] 함수 정리, 패키지 정리
miller198 Jan 30, 2025
f44a331
[refactor] 변수 타입 변경
miller198 Jan 30, 2025
97b4349
[style] 필요없는 코드 삭제
miller198 Jan 30, 2025
15c54f1
[refactor] 컴포즈함수 이름 변경
miller198 Jan 30, 2025
5c9c66d
[fix] detail 화면 뒤로가기 수정
miller198 Jan 30, 2025
c189da2
[refactor] 변수 명 변경, 파라미터 명시
miller198 Jan 30, 2025
33dea53
[refactor] 내비게이션 수정
miller198 Jan 30, 2025
21a0c1f
[refactor] detail 뒤로가기 수정
miller198 Jan 30, 2025
6d4296f
[refactor] abstract class -> interface 변경
miller198 Feb 1, 2025
240149e
Merge branch 'develop' into feature/module
miller198 Feb 8, 2025
ea1c995
[refactor] merge 후 수정
miller198 Feb 9, 2025
6ba4090
[refactor] 유저정보, 로그아웃 다이얼로그
miller198 Feb 9, 2025
b5ae9b8
[refactor] 로그인 다이얼로그 수정
miller198 Feb 11, 2025
022d1d4
[refactor] 유저정보 화면 로그인 버튼 삭제
miller198 Feb 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[refactor] MapBottomBar 이름변경
-> MapBottomNavBar
miller198 committed Jan 24, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit ad911da03dd8bada58083ab4ce78eca6cb6e16b8
4 changes: 2 additions & 2 deletions app/src/main/java/com/squirtles/musicroad/map/MapScreen.kt
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ import com.squirtles.musicroad.main.MainActivity
import com.squirtles.musicroad.map.components.ClusterBottomSheet
import com.squirtles.musicroad.map.components.InfoWindow
import com.squirtles.musicroad.map.components.LoadingDialog
import com.squirtles.musicroad.map.components.MapBottomBar
import com.squirtles.musicroad.map.components.MapBottomNavBar
import com.squirtles.musicroad.map.components.PickNotificationBanner
import com.squirtles.musicroad.media.PlayerServiceViewModel

@@ -123,7 +123,7 @@ fun MapScreen(

VerticalSpacer(16)

MapBottomBar(
MapBottomNavBar(
modifier = Modifier.padding(bottom = 16.dp),
lastLocation = lastLocation,
onFavoriteClick = {
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ import com.squirtles.musicroad.ui.theme.MusicRoadTheme
import com.squirtles.musicroad.ui.theme.Primary

@Composable
internal fun MapBottomBar(
internal fun MapBottomNavBar(
modifier: Modifier = Modifier,
lastLocation: Location?,
onFavoriteClick: () -> Unit,
@@ -117,7 +117,7 @@ private fun MapBottomNavigationItem(
@Composable
fun BottomNavigationLightPreview() {
MusicRoadTheme {
MapBottomBar(
MapBottomNavBar(
onFavoriteClick = {},
lastLocation = null,
onCenterClick = {},
@@ -130,7 +130,7 @@ fun BottomNavigationLightPreview() {
@Composable
fun BottomNavigationDarkPreview() {
MusicRoadTheme {
MapBottomBar(
MapBottomNavBar(
onFavoriteClick = {},
lastLocation = null,
onCenterClick = {},