Use top bar

snuhcs-course · Dec 6, 2023 · 97988c0 · 97988c0
1 parent c367408
commit 97988c0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 78 deletions.
diff --git a/frontend/app/src/main/java/com/example/frontend/MeetupListUI.kt b/frontend/app/src/main/java/com/example/frontend/MeetupListUI.kt
@@ -5,25 +5,37 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import com.example.frontend.ui.theme.FrontendTheme
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Person
-import androidx.compose.material.icons.filled.Place
 import androidx.compose.material.icons.filled.DateRange
 import androidx.compose.material.icons.filled.Menu
+import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.filled.Place
 import androidx.compose.material.icons.outlined.KeyboardArrowLeft
-import androidx.compose.runtime.*
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.TextStyle
@@ -34,6 +46,8 @@ import androidx.compose.ui.unit.sp
 import com.example.frontend.data.defaultMeetups
 import com.example.frontend.model.MeetupModel
 import com.example.frontend.ui.component.LoadingIndicator
+import com.example.frontend.ui.component.MyTopAppBar
+import com.example.frontend.ui.theme.FrontendTheme
 import com.example.frontend.usecase.ListMeetUpUseCase
 
 
@@ -58,39 +72,8 @@ class MeetupListUI : ComponentActivity() {
                         .fillMaxWidth()
                         .background(color = Color(0xFFF3EDF7))
                 )
-                Row(
-                    modifier = Modifier
-                        .height(54.dp)
-                        .fillMaxWidth(),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Icon(
-                        imageVector = Icons.Outlined.KeyboardArrowLeft,
-                        contentDescription = null,
-                        modifier = Modifier
-                            .size(46.dp)
-                            .clickable {
-                                val nextIntent = Intent(context, MapActivity::class.java)
-                                context.startActivity(nextIntent)
-                                // finish current activity
-                                if (context is Activity) {
-                                    context.finish()
-                                }
-                            }
-                    )
-                    Spacer(modifier = Modifier.width(8.dp))
-
-                    Text(
-                        modifier = Modifier,
-                        text = "약속 목록",
-                        style = TextStyle(
-                            fontSize = 22.sp,
-                            lineHeight = 28.sp,
-                            fontWeight = FontWeight(400),
-                            color = Color(0xFF1D1B20)
-                        )
-                    )
-                }
+                MyTopAppBar(title = "약속 목록")
+
                 // A surface container using the 'background' color from the theme
                 Surface(
                     modifier = Modifier.padding(top = 54.dp),

diff --git a/frontend/app/src/main/java/com/example/frontend/MissionActivity.kt b/frontend/app/src/main/java/com/example/frontend/MissionActivity.kt
@@ -1,8 +1,6 @@
 package com.example.frontend
 
 
-import android.app.Activity
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
@@ -21,7 +19,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.CheckCircle
-import androidx.compose.material.icons.outlined.KeyboardArrowLeft
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
@@ -47,6 +44,7 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import com.example.frontend.data.defaultMissions
 import com.example.frontend.model.MissionModel
+import com.example.frontend.ui.component.MyTopAppBar
 import com.example.frontend.ui.theme.FrontendTheme
 import com.example.frontend.ui.theme.Purple40
 import com.example.frontend.usecase.ListMissionUseCase
@@ -85,38 +83,8 @@ fun ShowMissionUI(missions: List<MissionModel>, onSwitchToRegister: () -> Unit)
                 .fillMaxWidth()
                 .background(color = Color(0xFFF3EDF7))
         )
-        Row(
-            modifier = Modifier
-                .height(54.dp)
-                .fillMaxWidth(),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Icon(
-                imageVector = Icons.Outlined.KeyboardArrowLeft,
-                contentDescription = null,
-                modifier = Modifier
-                    .size(46.dp)
-                    .clickable {
-                        val nextIntent = Intent(context, MapActivity::class.java)
-                        context.startActivity(nextIntent)
-                        if (context is Activity) {
-                            context.finish()
-                        }
-                    }
-            )
-            Spacer(modifier = Modifier.width(8.dp))
+        MyTopAppBar(title = "달성 목록")
 
-            Text(
-                modifier = Modifier,
-                text = "달성 목록",
-                style = TextStyle(
-                    fontSize = 22.sp,
-                    lineHeight = 28.sp,
-                    fontWeight = FontWeight(400),
-                    color = Color(0xFF1D1B20)
-                )
-            )
-        }
         if (missions.isEmpty()) {
             Spacer(modifier = Modifier.height(16.dp))
             CircularProgressIndicator(
@@ -336,4 +304,4 @@ fun GridItems(
             Spacer(modifier = Modifier.height(16.dp))
         }
     }
-}
+}