Merge pull request #230 from SWM-KAWAI-MANS/PAR-384

#PAR-384 : GoogleMap isMyLocationEnabled property Exception 처리
SWM-KAWAI-MANS · Oct 14, 2023 · 49119e6 · 49119e6
2 parents f0ac86c + 1850def
commit 49119e6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/...a/online/partyrun/partyrunapplication/feature/running_result/battle/BattleResultScreen.kt b/...a/online/partyrun/partyrunapplication/feature/running_result/battle/BattleResultScreen.kt
@@ -134,6 +134,7 @@ private fun BattleResultBody(
                     .heightIn(400.dp) // 지도의 높이는 400dp
             ) {
                 MapWidget(
+                    isFromMyPage = isFromMyPage,
                     targetDistanceFormatted = battleResult.targetDistanceFormatted,
                     records = selectedRunner?.records
                 )

diff --git a/...in/java/online/partyrun/partyrunapplication/feature/running_result/component/MapWidget.kt b/...in/java/online/partyrun/partyrunapplication/feature/running_result/component/MapWidget.kt
@@ -43,6 +43,7 @@ import online.partyrun.partyrunapplication.feature.running_result.R
 
 @Composable
 fun MapWidget(
+    isFromMyPage: Boolean = false,
     targetDistanceFormatted: String,
     records: List<RunnerRecordUiModel>?,
 ) {
@@ -61,7 +62,7 @@ fun MapWidget(
             .fillMaxWidth(),
         properties = MapProperties(
             isBuildingEnabled = true,
-            isMyLocationEnabled = true
+            isMyLocationEnabled = !isFromMyPage // 마이페이지로부터 조회하는 경우에는 현재 위치 보여줄 필요 없음
         ),
         uiSettings = MapUiSettings(
             zoomControlsEnabled = false,

diff --git a/...a/online/partyrun/partyrunapplication/feature/running_result/single/SingleResultScreen.kt b/...a/online/partyrun/partyrunapplication/feature/running_result/single/SingleResultScreen.kt
@@ -114,6 +114,7 @@ private fun SingleResultBody(
                     .heightIn(400.dp) // 지도의 높이는 400dp
             ) {
                 MapWidget(
+                    isFromMyPage = isFromMyPage,
                     targetDistanceFormatted = singleResult.targetDistanceFormatted,
                     records = singleResult.singleRunnerStatus.records
                 )