Skip to content

Commit 1e3a2b1

Browse files
JJUYAAAJJUYAAA
committed
[refactor]: color 수정(#26)
1 parent 3e893d6 commit 1e3a2b1

9 files changed

Lines changed: 66 additions & 71 deletions

File tree

‎app/src/main/java/com/texthip/thip/ui/myPage/DeleteAccountCompleteScreen.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
1010
import androidx.compose.foundation.layout.height
1111
import androidx.compose.foundation.layout.padding
1212
import androidx.compose.foundation.layout.size
13-
import androidx.compose.foundation.layout.width
1413
import androidx.compose.material3.Scaffold
1514
import androidx.compose.material3.Text
1615
import androidx.compose.runtime.Composable
@@ -23,15 +22,14 @@ import androidx.compose.ui.tooling.preview.Preview
2322
import androidx.compose.ui.unit.dp
2423
import com.texthip.thip.R
2524
import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
26-
import com.texthip.thip.ui.theme.Black
25+
import com.texthip.thip.ui.theme.ThipTheme.colors
2726
import com.texthip.thip.ui.theme.ThipTheme.typography
28-
import com.texthip.thip.ui.theme.White
2927

3028

3129
@Composable
3230
fun DeleteAccountCompleteScreen() {
3331
Scaffold(
34-
containerColor = Black,
32+
containerColor = colors.Black,
3533
topBar = {
3634
DefaultTopAppBar(
3735
isRightIconVisible = false,
@@ -50,7 +48,7 @@ fun DeleteAccountCompleteScreen() {
5048
Text(
5149
text = stringResource(R.string.delete_account_complete),
5250
style = typography.title_b700_s20_h24,
53-
color = White,
51+
color = colors.White,
5452
textAlign = TextAlign.Center,
5553
modifier = Modifier
5654
.fillMaxWidth()
@@ -59,7 +57,7 @@ fun DeleteAccountCompleteScreen() {
5957
Text(
6058
text = stringResource(R.string.see_you_again),
6159
style = typography.menu_m500_s16_h24,
62-
color = White,
60+
color = colors.White,
6361
textAlign = TextAlign.Center,
6462
modifier = Modifier
6563
.fillMaxWidth()

‎app/src/main/java/com/texthip/thip/ui/myPage/DeleteAccountScreen.kt‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@ package com.texthip.thip.ui.myPage.screen
22

33
import androidx.compose.foundation.background
44
import androidx.compose.foundation.clickable
5-
import androidx.compose.foundation.layout.*
5+
import androidx.compose.foundation.layout.Arrangement
6+
import androidx.compose.foundation.layout.Box
7+
import androidx.compose.foundation.layout.Column
8+
import androidx.compose.foundation.layout.Row
9+
import androidx.compose.foundation.layout.Spacer
10+
import androidx.compose.foundation.layout.fillMaxSize
11+
import androidx.compose.foundation.layout.fillMaxWidth
12+
import androidx.compose.foundation.layout.height
13+
import androidx.compose.foundation.layout.padding
614
import androidx.compose.foundation.shape.RoundedCornerShape
715
import androidx.compose.material3.Icon
816
import androidx.compose.material3.Scaffold
@@ -26,18 +34,19 @@ import com.texthip.thip.R
2634
import com.texthip.thip.ui.common.buttons.CheckboxButton
2735
import com.texthip.thip.ui.common.modal.DialogPopup
2836
import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar
29-
import com.texthip.thip.ui.theme.*
37+
import com.texthip.thip.ui.theme.DarkGrey02
38+
import com.texthip.thip.ui.theme.Red
3039
import com.texthip.thip.ui.theme.ThipTheme.colors
3140
import com.texthip.thip.ui.theme.ThipTheme.typography
3241

3342
@Composable
3443
fun DeleteAccountScreen() {
3544
var isChecked by rememberSaveable { mutableStateOf(false) }
36-
val backgroundColor = if (isChecked) Purple else Grey02
45+
val backgroundColor = if (isChecked) colors.Purple else colors.Grey02
3746
var isDialogVisible by rememberSaveable { mutableStateOf(false) }
3847

3948
Scaffold(
40-
containerColor = Black,
49+
containerColor = colors.Black,
4150
topBar = {
4251
DefaultTopAppBar(
4352
title = stringResource(R.string.delete_account),
@@ -89,7 +98,7 @@ fun DeleteAccountScreen() {
8998
Text(
9099
text = stringResource(R.string.leave_thip_notice_title),
91100
style = typography.menu_m500_s16_h24,
92-
color = White
101+
color = colors.White
93102
)
94103
Spacer(modifier = Modifier.height(40.dp))
95104
Text(
@@ -108,13 +117,13 @@ fun DeleteAccountScreen() {
108117
Text(
109118
text = stringResource(R.string.leave_thip_notice_4),
110119
style = typography.copy_r400_s14,
111-
color = White
120+
color = colors.White
112121
)
113122
Spacer(modifier = Modifier.height(20.dp))
114123
Text(
115124
text = stringResource(R.string.leave_thip_notice_5),
116125
style = typography.copy_r400_s14,
117-
color = White
126+
color = colors.White
118127
)
119128
}
120129
}
@@ -123,7 +132,7 @@ fun DeleteAccountScreen() {
123132
Text(
124133
text = stringResource(R.string.leave_thip_agree),
125134
style = typography.copy_r400_s14,
126-
color = White,
135+
color = colors.White,
127136
modifier = Modifier.weight(1f)
128137
)
129138
CheckboxButton(

‎app/src/main/java/com/texthip/thip/ui/myPage/EditProfileScreen.kt‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@ package com.texthip.thip.ui.myPage.screen
22

33

44
import androidx.compose.foundation.layout.Arrangement
5-
import androidx.compose.foundation.layout.Box
65
import androidx.compose.foundation.layout.Column
76
import androidx.compose.foundation.layout.FlowRow
87
import androidx.compose.foundation.layout.Spacer
9-
import androidx.compose.foundation.layout.fillMaxSize
108
import androidx.compose.foundation.layout.fillMaxWidth
119
import androidx.compose.foundation.layout.height
1210
import androidx.compose.foundation.layout.padding
13-
import androidx.compose.foundation.layout.size
1411
import androidx.compose.material3.Scaffold
1512
import androidx.compose.material3.Text
1613
import androidx.compose.runtime.Composable
@@ -28,14 +25,8 @@ import com.texthip.thip.ui.common.forms.BaseInputTextField
2825
import com.texthip.thip.ui.common.topappbar.InputTopAppBar
2926
import com.texthip.thip.ui.myPage.component.RoleCard
3027
import com.texthip.thip.ui.myPage.mock.RoleItem
31-
import com.texthip.thip.ui.theme.Black
32-
import com.texthip.thip.ui.theme.Lavendar
33-
import com.texthip.thip.ui.theme.NeonGreen
34-
import com.texthip.thip.ui.theme.Orange
35-
import com.texthip.thip.ui.theme.Pink
36-
import com.texthip.thip.ui.theme.Skyblue
28+
import com.texthip.thip.ui.theme.ThipTheme.colors
3729
import com.texthip.thip.ui.theme.ThipTheme.typography
38-
import com.texthip.thip.ui.theme.White
3930

4031
@Composable
4132
fun EditProfileScreen() {
@@ -45,35 +36,35 @@ fun EditProfileScreen() {
4536
stringResource(R.string.literature),
4637
stringResource(R.string.literary_person),
4738
R.drawable.character_literature,
48-
NeonGreen
39+
colors.NeonGreen
4940
),
5041
RoleItem(
5142
stringResource(R.string.science_it),
5243
stringResource(R.string.scientist),
5344
R.drawable.character_science,
54-
Lavendar
45+
colors.Lavendar
5546
),
5647
RoleItem(
5748
stringResource(R.string.social_science),
5849
stringResource(R.string.sociologist),
5950
R.drawable.character_sociology,
60-
Orange
51+
colors.Orange
6152
),
6253
RoleItem(
6354
stringResource(R.string.art),
6455
stringResource(R.string.artist),
6556
R.drawable.character_art,
66-
Pink
57+
colors.Pink
6758
),
6859
RoleItem(
6960
stringResource(R.string.humanities),
7061
stringResource(R.string.philosopher),
7162
R.drawable.character_humanities,
72-
Skyblue
63+
colors.Skyblue
7364
)
7465
)
7566
Scaffold(
76-
containerColor = Black,
67+
containerColor = colors.Black,
7768
topBar = {
7869
InputTopAppBar(
7970
title = stringResource(R.string.edit_profile),
@@ -94,7 +85,7 @@ fun EditProfileScreen() {
9485
Text(
9586
text = stringResource(R.string.change_nickname),
9687
style = typography.smalltitle_sb600_s18_h24,
97-
color = White,
88+
color = colors.White,
9889
modifier = Modifier
9990
.fillMaxWidth()
10091
.padding(bottom = 12.dp)
@@ -107,23 +98,23 @@ fun EditProfileScreen() {
10798
Text(
10899
text = stringResource(R.string.edit_role),
109100
style = typography.smalltitle_sb600_s18_h24,
110-
color = White,
101+
color = colors.White,
111102
modifier = Modifier
112103
.fillMaxWidth()
113104
.padding(bottom = 8.dp)
114105
)
115106
Text(
116107
text = stringResource(R.string.role_description),
117108
style = typography.copy_r400_s14,
118-
color = White,
109+
color = colors.White,
119110
modifier = Modifier
120111
.fillMaxWidth()
121112
.padding(bottom = 12.dp)
122113
)
123114
Text(
124115
text = stringResource(R.string.choice_one),
125116
style = typography.info_r400_s12,
126-
color = NeonGreen,
117+
color = colors.NeonGreen,
127118
modifier = Modifier
128119
.fillMaxWidth()
129120
.padding(bottom = 12.dp)
@@ -140,7 +131,7 @@ fun EditProfileScreen() {
140131
genre = RoleItem.genre,
141132
role = RoleItem.role,
142133
imageResId = RoleItem.imageResId,
143-
genreColor = White,
134+
genreColor = colors.White,
144135
roleColor = RoleItem.roleColor,
145136
selected = selectedIndex == index,
146137
onClick = { selectedIndex = index }

‎app/src/main/java/com/texthip/thip/ui/myPage/MyPageScreen.kt‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ import com.texthip.thip.ui.common.header.AuthorHeader
2626
import com.texthip.thip.ui.common.modal.DialogPopup
2727
import com.texthip.thip.ui.common.topappbar.LeftNameTopAppBar
2828
import com.texthip.thip.ui.theme.Black
29-
import com.texthip.thip.ui.theme.DarkGrey02
30-
import com.texthip.thip.ui.theme.Red
29+
import com.texthip.thip.ui.theme.ThipTheme.colors
3130
import com.texthip.thip.ui.theme.ThipTheme.typography
32-
import com.texthip.thip.ui.theme.White
3331

3432
@Composable
3533
fun MyPageScreen(
@@ -70,16 +68,16 @@ fun MyPageScreen(
7068
Text(
7169
text = stringResource(R.string.my_activity),
7270
style = typography.smalltitle_sb600_s18_h24,
73-
color = White,
71+
color = colors.White,
7472
modifier = Modifier
7573
.fillMaxWidth()
7674
.padding(bottom = 12.dp)
7775
)
7876
MenuItemButton(
7977
text = stringResource(R.string.saved),
8078
icon = painterResource(R.drawable.ic_save),
81-
contentColor = White,
82-
backgroundColor = DarkGrey02,
79+
contentColor = colors.White,
80+
backgroundColor = colors.DarkGrey02,
8381
hasRightIcon = true,
8482
modifier = Modifier.fillMaxWidth(),
8583
onClick = {}
@@ -88,8 +86,8 @@ fun MyPageScreen(
8886
MenuItemButton(
8987
text = stringResource(R.string.reactions),
9088
icon = painterResource(R.drawable.ic_heart),
91-
contentColor = White,
92-
backgroundColor = DarkGrey02,
89+
contentColor = colors.White,
90+
backgroundColor = colors.DarkGrey02,
9391
hasRightIcon = true,
9492
modifier = Modifier.fillMaxWidth(),
9593
onClick = {}
@@ -104,16 +102,16 @@ fun MyPageScreen(
104102
Text(
105103
text = stringResource(R.string.menu),
106104
style = typography.smalltitle_sb600_s18_h24,
107-
color = White,
105+
color = colors.White,
108106
modifier = Modifier
109107
.fillMaxWidth()
110108
.padding(bottom = 12.dp)
111109
)
112110
MenuItemButton(
113111
text = stringResource(R.string.notification_settings),
114112
icon = painterResource(R.drawable.ic_notice),
115-
contentColor = White,
116-
backgroundColor = DarkGrey02,
113+
contentColor = colors.White,
114+
backgroundColor = colors.DarkGrey02,
117115
hasRightIcon = true,
118116
modifier = Modifier.fillMaxWidth(),
119117
onClick = {}
@@ -122,8 +120,8 @@ fun MyPageScreen(
122120
MenuItemButton(
123121
text = stringResource(R.string.guide),
124122
icon = painterResource(R.drawable.ic_guide),
125-
contentColor = White,
126-
backgroundColor = DarkGrey02,
123+
contentColor = colors.White,
124+
backgroundColor = colors.DarkGrey02,
127125
hasRightIcon = true,
128126
modifier = Modifier.fillMaxWidth(),
129127
onClick = {}
@@ -132,8 +130,8 @@ fun MyPageScreen(
132130
MenuItemButton(
133131
text = stringResource(R.string.customer_service),
134132
icon = painterResource(R.drawable.ic_center),
135-
contentColor = White,
136-
backgroundColor = DarkGrey02,
133+
contentColor = colors.White,
134+
backgroundColor = colors.DarkGrey02,
137135
hasRightIcon = true,
138136
modifier = Modifier.fillMaxWidth(),
139137
onClick = {}
@@ -142,8 +140,8 @@ fun MyPageScreen(
142140
MenuItemButton(
143141
text = stringResource(R.string.delete_account),
144142
icon = painterResource(R.drawable.ic_bye),
145-
contentColor = White,
146-
backgroundColor = DarkGrey02,
143+
contentColor = colors.White,
144+
backgroundColor = colors.DarkGrey02,
147145
hasRightIcon = true,
148146
modifier = Modifier.fillMaxWidth(),
149147
onClick = {}
@@ -152,8 +150,8 @@ fun MyPageScreen(
152150
MenuItemButton(
153151
text = stringResource(R.string.log_out),
154152
icon = painterResource(R.drawable.ic_logout),
155-
contentColor = Red,
156-
backgroundColor = DarkGrey02,
153+
contentColor = colors.Red,
154+
backgroundColor = colors.DarkGrey02,
157155
hasRightIcon = false,
158156
modifier = Modifier.fillMaxWidth(),
159157
onClick = {

‎app/src/main/java/com/texthip/thip/ui/myPage/NotificationScreen.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ import com.texthip.thip.R
2424
import com.texthip.thip.ui.common.buttons.ToggleSwitchButton
2525
import com.texthip.thip.ui.common.modal.Toast
2626
import com.texthip.thip.ui.common.topappbar.InputTopAppBar
27-
import com.texthip.thip.ui.theme.Black
27+
import com.texthip.thip.ui.theme.ThipTheme.colors
2828
import com.texthip.thip.ui.theme.ThipTheme.typography
29-
import com.texthip.thip.ui.theme.White
3029
import kotlinx.coroutines.delay
3130

3231
@Composable
@@ -57,11 +56,10 @@ fun NotificationScreen() {
5756
date = "2025년 6월 29일 22시 30분",
5857
modifier = Modifier.fillMaxWidth()
5958
)
60-
// Spacer(modifier = Modifier.height(37.dp))
6159
}
6260
}
6361
Scaffold(
64-
containerColor = Black,
62+
containerColor = colors.Black,
6563
topBar = {
6664
InputTopAppBar(
6765
title = stringResource(R.string.notification_settings),
@@ -81,7 +79,7 @@ fun NotificationScreen() {
8179
Text(
8280
text = stringResource(R.string.push_notification),
8381
style = typography.smalltitle_sb600_s18_h24,
84-
color = White,
82+
color = colors.White,
8583
modifier = Modifier
8684
.fillMaxWidth()
8785
.padding(bottom = 12.dp)
@@ -90,7 +88,7 @@ fun NotificationScreen() {
9088
Text(
9189
text = stringResource(R.string.notification_description),
9290
style = typography.menu_r400_s14_h24,
93-
color = White,
91+
color = colors.White,
9492
modifier = Modifier
9593
.fillMaxWidth()
9694
.padding(bottom = 8.dp)

‎app/src/main/java/com/texthip/thip/ui/myPage/ReactionsScreen.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import androidx.compose.ui.res.stringResource
2020
import androidx.compose.ui.tooling.preview.Preview
2121
import androidx.compose.ui.unit.dp
2222
import com.texthip.thip.R
23-
import com.texthip.thip.ui.common.buttons.HeaderButton
2423
import com.texthip.thip.ui.common.buttons.OptionChipButton
2524
import com.texthip.thip.ui.common.cards.NotificationCard
2625
import com.texthip.thip.ui.common.topappbar.DefaultTopAppBar

0 commit comments

Comments
 (0)