@@ -70,6 +70,7 @@ import com.kakao.vectormap.LatLng
7070import com.kakao.vectormap.MapView
7171import com.kakao.vectormap.graphics.gl.GLSurfaceView
7272import com.paw.key.core.designsystem.component.LoadingScreen
73+ import com.paw.key.core.designsystem.component.PawkeyButton
7374import com.paw.key.core.designsystem.theme.PawKeyTheme
7475import com.paw.key.core.util.UiState
7576import com.paw.key.core.util.noRippleClickable
@@ -105,6 +106,7 @@ fun WalkCourseRoute(
105106 navigateNext : () -> Unit ,
106107 snackBarHostState : SnackbarHostState ,
107108 modifier : Modifier = Modifier ,
109+ isSharedWalk : Boolean = false,
108110 viewModel : WalkCourseViewModel = hiltViewModel(),
109111) {
110112 val state by viewModel.state.collectAsStateWithLifecycle()
@@ -298,7 +300,11 @@ fun WalkCourseRoute(
298300 context = context,
299301 onLabelClick = { _, _ -> },
300302 currentUserLocation = state.currentLocation,
301- poiPoints = state.poiPoints,
303+ poiPoints = if (isSharedWalk) {
304+ listOf ()
305+ } else {
306+ state.poiPoints
307+ },
302308 isTrackingEnabled = state.isTrackingEnabled,
303309 isPauseTracking = state.isRecording, // true = 잠시 중단, false = 시작
304310 isStopTracking = state.isLocationTracking, // true = 진짜 중단
@@ -427,7 +433,6 @@ fun WalkCourseScreen(
427433 .align(Alignment .Center )
428434 )
429435
430- // Todo : 공통컴포넌트용
431436 Column (
432437 modifier = modifier
433438 .fillMaxSize(),
@@ -453,25 +458,26 @@ fun WalkCourseScreen(
453458 horizontalAlignment = Alignment .CenterHorizontally ,
454459 verticalArrangement = Arrangement .Center
455460 ) {
461+ // Todo : 텍스트 스타일 24b로 변경 예쩡
456462 Text (
457463 text = " 산책이 중단되었어요!" ,
458- fontSize = 20 .sp,
459464 textAlign = TextAlign .Center ,
460- color = Color .White ,
465+ style = PawKeyTheme .typography.head22B,
466+ color = PawKeyTheme .colors.white1,
461467 modifier = Modifier .fillMaxWidth()
462468 )
463469
464470 Text (
465- text = " 산책을 정말 종료 ?" ,
471+ text = " 산책을 정말 종료하시겠어요 ?" ,
466472 fontSize = 12 .sp,
467473 textAlign = TextAlign .Center ,
468- color = Color .White ,
474+ style = PawKeyTheme .typography.body16M,
475+ color = PawKeyTheme .colors.white2,
469476 modifier = Modifier .fillMaxWidth()
470477 )
471478 }
472479 }
473480
474- // Todo : 나중에 버튼 들어갈자리
475481 Column (
476482 modifier = Modifier
477483 .fillMaxWidth()
@@ -499,7 +505,9 @@ fun WalkCourseScreen(
499505 }
500506
501507 if (isTracking) {
502- Button (
508+ PawkeyButton (
509+ text = " 산책 기록 종료" ,
510+ enabled = true ,
503511 onClick = {
504512 onPauseTracking()
505513
@@ -519,9 +527,7 @@ fun WalkCourseScreen(
519527 }
520528 }
521529 }
522- ) {
523- Text (text = " 산책 기록 종료" )
524- }
530+ )
525531 } else {
526532 Row (
527533 modifier = Modifier
@@ -541,7 +547,7 @@ fun WalkCourseScreen(
541547 }
542548 .border(
543549 width = 1 .dp,
544- color = Color ( 0xFF00C853 ) ,
550+ color = PawKeyTheme .colors.green500 ,
545551 shape = RoundedCornerShape (8 .dp)
546552 )
547553 .padding(horizontal = 24 .dp, vertical = 16 .dp)
@@ -554,15 +560,15 @@ fun WalkCourseScreen(
554560 modifier = Modifier
555561 .clip(RoundedCornerShape (8 .dp))
556562 .background(
557- Color ( 0xFF00C853 ) ,
558- RoundedCornerShape (8 .dp)
563+ color = PawKeyTheme .colors.green500 ,
564+ shape = RoundedCornerShape (8 .dp)
559565 )
560566 .noRippleClickable {
561567 navigateNext()
562568 onStopTracking()
563569 }
564570 .padding(horizontal = 24 .dp, vertical = 16 .dp),
565- color = Color . White
571+ color = PawKeyTheme .colors.white1
566572 )
567573 }
568574 }
@@ -615,7 +621,7 @@ private fun createBitmapFromGLSurface(x: Int, y: Int, w: Int, h: Int, gl: GL10):
615621 val fullBitmap = Bitmap .createBitmap(bitmapSource, w, h, Bitmap .Config .ARGB_8888 )
616622
617623 // 화면의 aspectRatio 계산 (Modifier.aspectRatio(340f / 150f) 와 동일하게)
618- val targetAspectRatio = 16f / 11f // 사용하고자 하는 화면의 aspectRatio를 여기에 설정합니다.
624+ val targetAspectRatio = 16f / 9f // 사용하고자 하는 화면의 aspectRatio를 여기에 설정합니다.
619625
620626 var cropWidth: Int
621627 var cropHeight: Int
0 commit comments