Skip to content

Commit c5fd480

Browse files
committed
[refactor]: Toast 컴포넌트명 수정 -> ToastWithDate 및 preview 수정(#26)
1 parent da83f88 commit c5fd480

3 files changed

Lines changed: 32 additions & 28 deletions

File tree

app/src/main/java/com/texthip/thip/ui/common/modal/Toast.kt renamed to app/src/main/java/com/texthip/thip/ui/common/modal/ToastWithDate.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.texthip.thip.ui.common.modal
22

3+
import android.widget.Toast
34
import androidx.compose.foundation.background
45
import androidx.compose.foundation.border
56
import androidx.compose.foundation.layout.Arrangement
@@ -21,7 +22,7 @@ import com.texthip.thip.ui.theme.ThipTheme.colors
2122
import com.texthip.thip.ui.theme.ThipTheme.typography
2223

2324
@Composable
24-
fun Toast(
25+
fun ToastWithDate(
2526
modifier: Modifier = Modifier,
2627
message: String,
2728
date: String
@@ -35,7 +36,7 @@ fun Toast(
3536
color = colors.Grey02,
3637
shape = RoundedCornerShape(12.dp)
3738
)
38-
.padding(horizontal = 15.dp, vertical = 15.dp)
39+
.padding(15.dp)
3940
) {
4041
Row(
4142
modifier = Modifier.fillMaxWidth(),
@@ -59,7 +60,7 @@ fun Toast(
5960
@Preview(showBackground = true)
6061
@Composable
6162
fun ToastPrev() {
62-
Toast(
63+
ToastWithDate(
6364
message = stringResource(R.string.push_off),
6465
date = "2025년 6월 29일 22시 30분",
6566
modifier = Modifier.fillMaxWidth()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import androidx.compose.ui.unit.dp
2222
import androidx.compose.ui.zIndex
2323
import com.texthip.thip.R
2424
import com.texthip.thip.ui.common.buttons.ToggleSwitchButton
25-
import com.texthip.thip.ui.common.modal.Toast
25+
import com.texthip.thip.ui.common.modal.ToastWithDate
2626
import com.texthip.thip.ui.common.topappbar.InputTopAppBar
2727
import com.texthip.thip.ui.theme.ThipTheme.colors
2828
import com.texthip.thip.ui.theme.ThipTheme.typography
@@ -49,7 +49,7 @@ fun NotificationScreen() {
4949
.padding(horizontal = 15.dp, vertical = 15.dp),
5050
contentAlignment = Alignment.TopCenter
5151
) {
52-
Toast(
52+
ToastWithDate(
5353
message = stringResource(
5454
if (message == "push_on") R.string.push_on else R.string.push_off
5555
),

app/src/main/java/com/texthip/thip/ui/myPage/component/RoleCard.kt

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import com.texthip.thip.R
3333
import com.texthip.thip.ui.theme.DarkGrey
3434
import com.texthip.thip.ui.theme.NeonGreen
3535
import com.texthip.thip.ui.theme.Pink
36+
import com.texthip.thip.ui.theme.ThipTheme
3637
import com.texthip.thip.ui.theme.ThipTheme.colors
3738
import com.texthip.thip.ui.theme.ThipTheme.typography
3839
import com.texthip.thip.ui.theme.White
@@ -102,34 +103,36 @@ fun RoleCard(
102103
}
103104
}
104105

105-
@Preview(showBackground = true, backgroundColor = 0xFF121212)
106+
@Preview
106107
@Composable
107108
fun RoleCardPreview() {
108109
var selected1 by rememberSaveable { mutableStateOf(true) }
109110
var selected2 by rememberSaveable { mutableStateOf(false) }
110111

111-
Row(
112-
modifier = Modifier.padding(20.dp),
113-
horizontalArrangement = Arrangement.spacedBy(12.dp)
114-
) {
115-
RoleCard(
116-
genre = "문학",
117-
role = "문학가",
118-
imageResId = R.drawable.character_literature,
119-
genreColor = White,
120-
roleColor = NeonGreen,
121-
selected = selected1,
122-
onClick = { selected1 = !selected1 }
123-
)
112+
ThipTheme {
113+
Row(
114+
modifier = Modifier.padding(20.dp),
115+
horizontalArrangement = Arrangement.spacedBy(12.dp)
116+
) {
117+
RoleCard(
118+
genre = "문학",
119+
role = "문학가",
120+
imageResId = R.drawable.character_literature,
121+
genreColor = White,
122+
roleColor = NeonGreen,
123+
selected = selected1,
124+
onClick = { selected1 = !selected1 }
125+
)
124126

125-
RoleCard(
126-
genre = "예술",
127-
role = "예술가",
128-
imageResId = R.drawable.character_art,
129-
genreColor = White,
130-
roleColor = Pink,
131-
selected = selected2,
132-
onClick = { selected2 = !selected2 }
133-
)
127+
RoleCard(
128+
genre = "예술",
129+
role = "예술가",
130+
imageResId = R.drawable.character_art,
131+
genreColor = White,
132+
roleColor = Pink,
133+
selected = selected2,
134+
onClick = { selected2 = !selected2 }
135+
)
136+
}
134137
}
135138
}

0 commit comments

Comments
 (0)