[refactor]:TopBar 수정(#37)

JJUYAAA · JJUYAAA · commit a4c8ca2fb420 · 2025-07-05T14:27:47.000+09:00
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageEditScreen.kt b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageEditScreen.kt
@@ -1,14 +1,15 @@
 package com.texthip.thip.ui.mypage.screen
 
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.FlowRow
 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.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -63,20 +64,19 @@ fun EditProfileScreen() {
             colors.Skyblue
         )
     )
-    Scaffold(
-        containerColor = colors.Black,
-        topBar = {
-            InputTopAppBar(
-                title = stringResource(R.string.edit_profile),
-                isRightButtonEnabled = true,
-                onLeftClick = {},
-                onRightClick = {}
-            )
-        }
-    ) { innerPadding ->
+    Column(
+        Modifier
+            .background(colors.Black)
+            .fillMaxSize()
+    ) {
+        InputTopAppBar(
+            title = stringResource(R.string.edit_profile),
+            isRightButtonEnabled = true,
+            onLeftClick = {},
+            onRightClick = {}
+        )
         Column(
             modifier = Modifier
-                .padding(innerPadding)
                 .padding(horizontal = 20.dp)
                 .fillMaxWidth(),
             horizontalAlignment = Alignment.CenterHorizontally
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageLeavethipCompleteScreen.kt b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageLeavethipCompleteScreen.kt
@@ -1,6 +1,7 @@
 package com.texthip.thip.ui.mypage.screen
 
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -10,7 +11,6 @@ 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.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -28,19 +28,18 @@ import com.texthip.thip.ui.theme.ThipTheme.typography
 
 @Composable
 fun DeleteAccountCompleteScreen() {
-    Scaffold(
-        containerColor = colors.Black,
-        topBar = {
-            DefaultTopAppBar(
-                isRightIconVisible = false,
-                isTitleVisible = false,
-                onLeftClick = {},
-            )
-        }
-    ) { innerPadding ->
+    Column(
+        Modifier
+            .background(colors.Black)
+            .fillMaxSize()
+    ) {
+        DefaultTopAppBar(
+            isRightIconVisible = false,
+            isTitleVisible = false,
+            onLeftClick = {},
+        )
         Column(
             modifier = Modifier
-                .padding(innerPadding)
                 .fillMaxSize(),
             horizontalAlignment = Alignment.CenterHorizontally,
             verticalArrangement = Arrangement.Center
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageLeavethipScreen.kt b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageLeavethipScreen.kt
@@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Icon
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -45,47 +44,20 @@ fun DeleteAccountScreen() {
     val backgroundColor = if (isChecked) colors.Purple else colors.Grey02
     var isDialogVisible by rememberSaveable { mutableStateOf(false) }
 
-    Scaffold(
-        containerColor = colors.Black,
-        topBar = {
-            DefaultTopAppBar(
-                title = stringResource(R.string.delete_account),
-                onLeftClick = {},
-            )
-        },
-        bottomBar = {
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(56.dp)
-                    .background(backgroundColor)
-                    .clickable(
-                        enabled = isChecked,
-                        onClick = {
-                            isDialogVisible = true
-                        }),
-                horizontalArrangement = Arrangement.Center,
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Icon(
-                    painter = painterResource(R.drawable.ic_bye),
-                    contentDescription = null,
-                    tint = colors.White
-                )
-                Text(
-                    text = stringResource(R.string.leave_thip),
-                    color = colors.White,
-                    style = typography.smalltitle_sb600_s18_h24,
-                    modifier = Modifier.padding(horizontal = 8.dp)
-                )
-            }
-        }
-    ) { innerPadding ->
+    Column(
+        Modifier
+            .background(colors.Black)
+            .fillMaxSize()
+    ) {
+        DefaultTopAppBar(
+            title = stringResource(R.string.delete_account),
+            onLeftClick = {},
+        )
+        Spacer(modifier = Modifier.height(40.dp))
         Column(
             modifier = Modifier
-                .padding(20.dp)
-                .padding(innerPadding)
-                .fillMaxSize()
+                .weight(1f)
+                .padding(horizontal = 20.dp),
         ) {
             Box(
                 modifier = Modifier
@@ -144,6 +116,32 @@ fun DeleteAccountScreen() {
                 )
             }
         }
+        Spacer(modifier = Modifier.height(55.dp))
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .height(50.dp)
+                .background(backgroundColor)
+                .clickable(
+                    enabled = isChecked,
+                    onClick = {
+                        isDialogVisible = true
+                    }),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                painter = painterResource(R.drawable.ic_bye),
+                contentDescription = null,
+                tint = colors.White
+            )
+            Text(
+                text = stringResource(R.string.leave_thip),
+                color = colors.White,
+                style = typography.smalltitle_sb600_s18_h24,
+                modifier = Modifier.padding(horizontal = 8.dp)
+            )
+        }
         if (isDialogVisible) {
             Dialog(onDismissRequest = { isDialogVisible = false }) {
                 Box(
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageNotificationEditScreen.kt b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageNotificationEditScreen.kt
@@ -1,12 +1,14 @@
 package com.texthip.thip.ui.mypage.screen
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 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.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -58,20 +60,20 @@ fun NotificationScreen() {
                 )
             }
         }
-        Scaffold(
-            containerColor = colors.Black,
-            topBar = {
-                InputTopAppBar(
-                    title = stringResource(R.string.notification_settings),
-                    isRightButtonEnabled = true,
-                    onLeftClick = {},
-                    onRightClick = {}
-                )
-            }
-        ) { innerPadding ->
+        Column(
+            Modifier
+                .background(colors.Black)
+                .fillMaxSize()
+        ) {
+            InputTopAppBar(
+                title = stringResource(R.string.notification_settings),
+                isRightButtonEnabled = true,
+                onLeftClick = {},
+                onRightClick = {}
+            )
+            Spacer(modifier = Modifier.height(40.dp))
             Column(
                 modifier = Modifier
-                    .padding(innerPadding)
                     .padding(horizontal = 20.dp)
                     .fillMaxSize(),
                 horizontalAlignment = Alignment.CenterHorizontally
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageReactionScreen.kt b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageReactionScreen.kt
@@ -1,5 +1,6 @@
 package com.texthip.thip.ui.mypage.screen
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -25,6 +26,7 @@ import com.texthip.thip.ui.common.cards.CardAlarm
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
 import com.texthip.thip.ui.mypage.mock.ReactionItem
 import com.texthip.thip.ui.theme.Black
+import com.texthip.thip.ui.theme.ThipTheme.colors
 
 @Composable
 fun ReactionsScreen() {
@@ -54,21 +56,19 @@ fun ReactionsScreen() {
         }
     }
 
-    Scaffold(
-        containerColor = Black,
-        topBar = {
-            DefaultTopAppBar(
-                title = stringResource(R.string.reactions),
-                onLeftClick = {},
-            )
-        }
-    ) { innerPadding ->
+    Column(
+        Modifier
+            .background(colors.Black)
+            .fillMaxSize()
+    ) {
+        DefaultTopAppBar(
+            title = stringResource(R.string.reactions),
+            onLeftClick = {},
+        )
         Column(
             modifier = Modifier
-                .padding(innerPadding)
                 .fillMaxSize()
         ) {
-            //TODO card 컴포넌트 수정 후 적용 & 필터링 기능
             Row(modifier = Modifier.padding(start = 20.dp, top = 20.dp, bottom = 20.dp)) {
                 OptionChipButton(
                     text = stringResource(R.string.likes),
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageSaveScreen.kt b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageSaveScreen.kt
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Tab
 import androidx.compose.material3.TabRow
 import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
@@ -31,7 +30,6 @@ import com.texthip.thip.R
 import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
 import com.texthip.thip.ui.mypage.component.BookContent
 import com.texthip.thip.ui.mypage.component.FeedContent
-import com.texthip.thip.ui.theme.Black
 import com.texthip.thip.ui.theme.ThipTheme.colors
 import com.texthip.thip.ui.theme.ThipTheme.typography
 import com.texthip.thip.ui.theme.White
@@ -41,18 +39,17 @@ fun SavedScreen() {
     val tabs = listOf(stringResource(R.string.feed), stringResource(R.string.book))
     var selectedTabIndex by rememberSaveable { mutableStateOf(0) }
 
-    Scaffold(
-        containerColor = Black,
-        topBar = {
-            DefaultTopAppBar(
-                title = stringResource(R.string.saved),
-                onLeftClick = {},
-            )
-        }
-    ) { innerPadding ->
+    Column(
+        Modifier
+            .background(colors.Black)
+            .fillMaxSize()
+    ) {
+        DefaultTopAppBar(
+            title = stringResource(R.string.saved),
+            onLeftClick = {},
+        )
         Column(
             modifier = Modifier
-                .padding(innerPadding)
                 .fillMaxSize()
         ) {
             Box(modifier = Modifier.width(160.dp).padding(start = 20.dp)) {
diff --git a/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageScreen.kt b/app/src/main/java/com/texthip/thip/ui/mypage/screen/MypageScreen.kt
@@ -1,5 +1,6 @@
 package com.texthip.thip.ui.mypage.screen
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -36,19 +37,18 @@ fun MyPageScreen(
     badgeText: String
 ) {
     var showLogoutDialog by remember { mutableStateOf(false) }
-    Scaffold(
-        containerColor = Black,
-        topBar = {
-            LeftNameTopAppBar(
-                title = stringResource(R.string.my_page),
-                leftIcon = painterResource(R.drawable.ic_search),
-                rightIcon = painterResource(R.drawable.ic_plus)
-            )
-        }
-    ) { innerPadding ->
+    Column(
+        Modifier
+            .background(colors.Black)
+            .fillMaxSize()
+    ) {
+        LeftNameTopAppBar(
+            title = stringResource(R.string.my_page),
+            leftIcon = painterResource(R.drawable.ic_search),
+            rightIcon = painterResource(R.drawable.ic_plus)
+        )
         Column(
             modifier = Modifier
-                .padding(innerPadding)
                 .fillMaxSize()
         ) {
             Spacer(modifier = Modifier.height(40.dp))
