Merge pull request #7 from GwonDongHyeon21/main

ControlWard
GDG-on-Campus-KHU · Dec 6, 2024 · ec76f87 · ec76f87
2 parents c031023 + cec8d27
commit ec76f87
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 423 deletions.
diff --git a/ControlWard/.idea/compiler.xml b/ControlWard/.idea/compiler.xml
diff --git a/ControlWard/.idea/deploymentTargetSelector.xml b/ControlWard/.idea/deploymentTargetSelector.xml
diff --git a/ControlWard/.idea/gradle.xml b/ControlWard/.idea/gradle.xml
diff --git a/ControlWard/.idea/misc.xml b/ControlWard/.idea/misc.xml
diff --git a/ControlWard/.idea/other.xml b/ControlWard/.idea/other.xml
diff --git a/ControlWard/.idea/runConfigurations.xml b/ControlWard/.idea/runConfigurations.xml
diff --git a/ControlWard/app/src/main/java/com/example/controlward/MainActivity.kt b/ControlWard/app/src/main/java/com/example/controlward/MainActivity.kt
@@ -35,8 +35,8 @@ object Value {
     )
     val disasterCategory = listOf(
         "인명피해" to BitmapDescriptorFactory.HUE_CYAN,
-        "가뭄" to BitmapDescriptorFactory.HUE_BLUE,
-        "지진" to BitmapDescriptorFactory.HUE_VIOLET,
+        "가뭄" to BitmapDescriptorFactory.HUE_ORANGE,
+        "지진" to BitmapDescriptorFactory.HUE_BLUE,
         "화재" to BitmapDescriptorFactory.HUE_RED,
         "수해" to BitmapDescriptorFactory.HUE_MAGENTA,
     )

diff --git a/ControlWard/app/src/main/java/com/example/controlward/ui/GoogleLogin.kt b/ControlWard/app/src/main/java/com/example/controlward/ui/GoogleLogin.kt
diff --git a/ControlWard/app/src/main/java/com/example/controlward/ui/Main.kt b/ControlWard/app/src/main/java/com/example/controlward/ui/Main.kt
@@ -38,6 +38,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import androidx.core.content.ContextCompat
+import androidx.navigation.NavController
+import androidx.navigation.compose.rememberNavController
 import com.example.controlward.R
 import com.example.controlward.Value
 import com.example.controlward.Value.disasterCategory
@@ -52,10 +54,12 @@ import com.google.maps.android.compose.MapUiSettings
 import com.google.maps.android.compose.Marker
 import com.google.maps.android.compose.MarkerState
 import com.google.maps.android.compose.rememberCameraPositionState
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
 
 @SuppressLint("AutoboxingStateValueProperty")
 @Composable
-fun MainScreen() {
+fun MainScreen(navController: NavController) {
     val context = LocalContext.current
     val cameraPositionState = rememberCameraPositionState {
         position = CameraPosition.fromLatLngZoom(Value.location, 15f)
@@ -109,7 +113,13 @@ fun MainScreen() {
                     title = disaster.image,
                     snippet = disaster.text,
                     icon = customMarker(context, hue, alpha),
-                    onInfoWindowClick = { },
+                    onInfoWindowClick = {
+                        val encodedImage = URLEncoder.encode(
+                            disaster.image,
+                            StandardCharsets.UTF_8.toString()
+                        )
+                        navController.navigate("DisasterDetailScreen/${encodedImage}/${disaster.text}")
+                    },
                 )
             }
         }
@@ -217,5 +227,5 @@ fun customMarker(context: Context, hue: Float, alphaValue: Float): BitmapDescrip
 @Preview(showBackground = true)
 @Composable
 fun PreviewMainLayout() {
-    MainScreen()
+    MainScreen(rememberNavController())
 }
diff --git a/ControlWard/app/src/main/java/com/example/controlward/ui/Tab.kt b/ControlWard/app/src/main/java/com/example/controlward/ui/Tab.kt
@@ -40,7 +40,7 @@ fun TabScreen(navController: NavController) {
         }
     ) {
         when (pagerState.value) {
-            0 -> MainScreen()
+            0 -> MainScreen(navController)
             1 -> DisasterListScreen(navController)
             2 -> UserInfoScreen()
         }