[add] MarkerVo image 필드 추가

29sungdong · Feb 25, 2024 · a242bc5 · a242bc5
1 parent d03acab
commit a242bc5
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 17 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/.idea/modules/app/SungdongWalk.app.iml b/.idea/modules/app/SungdongWalk.app.iml
diff --git a/app/src/main/java/com/example/sungdongwalk/api/Dto.kt b/app/src/main/java/com/example/sungdongwalk/api/Dto.kt
@@ -80,6 +80,7 @@ class Dto {
     data class MarkerVo(
         val id: Int,
         val name: String,
+        val image: String,
         val openingTime: String,
         val closingTime: String,
         val hasEvent: Boolean,

diff --git a/app/src/main/java/com/example/sungdongwalk/components/ButtonBoarder.kt b/app/src/main/java/com/example/sungdongwalk/components/ButtonBoarder.kt
@@ -65,7 +65,7 @@ fun ButtonBoarder(
                 modifier = Modifier.padding(horizontal = 5.dp)
             )
             Text(
-                text = "${totalTime/60}시간 ${totalTime%60}분",
+                text = "${totalTime/3600}시간 ${totalTime/60%60}분",
                 color = if(selectedId == id) SDblue else Gray500,
                 style = Typography.headlineLarge,
                 modifier = Modifier.padding(5.dp)

diff --git a/app/src/main/java/com/example/sungdongwalk/components/DimArrive.kt b/app/src/main/java/com/example/sungdongwalk/components/DimArrive.kt
@@ -112,7 +112,7 @@ fun DimArrive(
                     style = Typography.labelLarge,
                     textAlign = TextAlign.Center,
                     modifier = Modifier
-                        .padding(15.dp)
+                        .padding(10.dp)
                 )
             }
         }

diff --git a/app/src/main/java/com/example/sungdongwalk/components/NavigatorTopSearch.kt b/app/src/main/java/com/example/sungdongwalk/components/NavigatorTopSearch.kt
@@ -108,7 +108,7 @@ fun NavigatorTopSearch(setIsLoading: (Boolean)-> Unit){
                                 RetrofitManager.instance.getPaths(
                                     placeId = results[idx].id,
                                     placeName = results[idx].name,
-                                    placeImg = "",//results[idx].image,
+                                    placeImg = results[idx].image,
                                     xCoordinate = LocationViewModel.instance.location.value.longitude.toString(),
                                     yCoordinate = LocationViewModel.instance.location.value.latitude.toString(),
                                 )

diff --git a/app/src/main/java/com/example/sungdongwalk/components/map/MapView.kt b/app/src/main/java/com/example/sungdongwalk/components/map/MapView.kt
@@ -65,7 +65,7 @@ fun MapView(setIsLoading: (Boolean)-> Unit){
                 RetrofitManager.instance.getPaths(
                     placeId = place.id,
                     placeName = place.name,
-                    placeImg = "",//place.image,
+                    placeImg = place.image,
                     xCoordinate = LocationViewModel.instance.location.value.longitude.toString(),
                     yCoordinate = LocationViewModel.instance.location.value.latitude.toString(),
                 )

diff --git a/app/src/main/java/com/example/sungdongwalk/components/navigator_bottom/BottomNavGroup.kt b/app/src/main/java/com/example/sungdongwalk/components/navigator_bottom/BottomNavGroup.kt
@@ -93,7 +93,7 @@ fun BottomNav(navController: NavController){
                 MapScreen(setIsLoading)
             }
             composable(route = BottomNavScreens.EventScreen.name){
-                EventScreen(navController)
+                EventScreen()
             }
         }
         if(isLoading)

diff --git a/app/src/main/java/com/example/sungdongwalk/screens/EventScreen.kt b/app/src/main/java/com/example/sungdongwalk/screens/EventScreen.kt
@@ -1,19 +1,31 @@
 package com.example.sungdongwalk.screens
 
-import androidx.compose.foundation.layout.Box
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.Text
+import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavController
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.example.sungdongwalk.components.NavigatorTop
+import com.example.sungdongwalk.components.NavigatorTopType
+import com.example.sungdongwalk.components.calendar.Calendar
+import com.example.sungdongwalk.ui.theme.SDwhite
 
+@RequiresApi(Build.VERSION_CODES.O)
+@Preview(showBackground = true)
 @Composable
-fun EventScreen(navController: NavController) {
-    Box(modifier = Modifier
-        .fillMaxSize()
-    ){
-        Text(
-            text = "EventScreen"
-        )
+fun EventScreen() {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(SDwhite)
+            .padding(10.dp)
+    ) {
+        NavigatorTop(NavigatorTopType.EVENT)
+        Calendar()
     }
 }