Skip to content

Commit e8d1030

Browse files
authored
Merge pull request #201 from YAPP-Github/fix/#200-map_zoom_level
[fix] #200 브랜드 마커 선택 시 줌 레벨 강제 초기화 버그 수정
2 parents ad94b81 + c6294ed commit e8d1030

4 files changed

Lines changed: 5 additions & 2 deletions

File tree

build-logic/src/main/java/com/neki/android/buildlogic/const/BuildConst.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.gradle.api.JavaVersion
55
object BuildConst {
66
const val APPLICATION_ID = "com.neki.android"
77

8-
const val VERSION_CODE = 16
8+
const val VERSION_CODE = 17
99
const val VERSION_NAME = "1.2.0"
1010

1111
const val MIN_SDK = 29

feature/map/impl/src/main/java/com/neki/android/feature/map/impl/MapContract.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.compose.ui.graphics.ImageBitmap
44
import com.neki.android.core.model.Brand
55
import com.neki.android.core.model.PhotoBooth
66
import com.neki.android.feature.map.impl.const.DirectionApp
7+
import com.neki.android.feature.map.impl.const.MapConst
78
import kotlinx.collections.immutable.ImmutableList
89
import kotlinx.collections.immutable.ImmutableMap
910
import kotlinx.collections.immutable.persistentListOf
@@ -63,6 +64,7 @@ sealed interface MapEffect {
6364
data class MoveCameraToPosition(
6465
val locLatLng: LocLatLng,
6566
val isRequiredLoadPhotoBooths: Boolean = false,
67+
val zoomLevel: Double = MapConst.DEFAULT_ZOOM_LEVEL,
6668
) : MapEffect
6769
data class ZoomToClusterBounds(
6870
val southWest: LocLatLng,

feature/map/impl/src/main/java/com/neki/android/feature/map/impl/MapScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ fun MapRoute(
141141
cameraPositionState.animate(
142142
update = CameraUpdate.scrollAndZoomTo(
143143
LatLng(sideEffect.locLatLng.latitude, sideEffect.locLatLng.longitude),
144-
MapConst.DEFAULT_ZOOM_LEVEL,
144+
sideEffect.zoomLevel,
145145
),
146146
animation = CameraAnimation.Easing,
147147
durationMs = MapConst.DEFAULT_CAMERA_ANIMATION_DURATIONS_MS,

feature/map/impl/src/main/java/com/neki/android/feature/map/impl/const/MapConst.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ internal object MapConst {
77

88
// 기본 줌 레벨
99
internal const val DEFAULT_ZOOM_LEVEL = 14.0
10+
internal const val MARKER_SELECTED_ZOOM_LEVEL = 18.0
1011
internal const val MIN_ZOOM_LEVEL = 12.0
1112
internal const val MAX_ZOOM_LEVEL = 20.0
1213

0 commit comments

Comments
 (0)