Skip to content

Commit f949a1f

Browse files
likppi10likppi10
authored
Merge pull request #40 from Nexters/release/v1.0.2
release/v1.0.2
2 parents 14abeb9 + 1742817 commit f949a1f

File tree

20 files changed

+422
-195
lines changed

20 files changed

+422
-195
lines changed

‎app/build.gradle.kts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
plugins {
23
alias(libs.plugins.android.application)
34
alias(libs.plugins.kotlin.android)
@@ -13,7 +14,7 @@ android {
1314
applicationId = "com.ggaebiz.ggaebiz"
1415
minSdk = 24
1516
targetSdk = 35
16-
versionCode = 1000200
17+
versionCode = 1000201
1718
versionName = "1.0.2"
1819

1920
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

‎app/src/main/java/com/ggaebiz/ggaebiz/presentation/designsystem/component/header/LogoAppBar.kt‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,43 @@
11
package com.ggaebiz.ggaebiz.presentation.designsystem.component.header
22

33
import androidx.compose.foundation.Image
4-
import androidx.compose.foundation.background
5-
import androidx.compose.foundation.clickable
64
import androidx.compose.foundation.layout.Box
75
import androidx.compose.foundation.layout.fillMaxWidth
86
import androidx.compose.foundation.layout.height
97
import androidx.compose.foundation.layout.padding
10-
import androidx.compose.foundation.layout.size
11-
import androidx.compose.foundation.shape.CircleShape
8+
import androidx.compose.foundation.layout.wrapContentSize
129
import androidx.compose.runtime.Composable
1310
import androidx.compose.ui.Alignment
1411
import androidx.compose.ui.Modifier
15-
import androidx.compose.ui.draw.clip
1612
import androidx.compose.ui.res.painterResource
1713
import androidx.compose.ui.res.stringResource
1814
import androidx.compose.ui.tooling.preview.Preview
1915
import androidx.compose.ui.unit.dp
2016
import com.ggaebiz.ggaebiz.R
21-
import com.ggaebiz.ggaebiz.presentation.designsystem.theme.GaeBizTheme
2217

2318
@Composable
2419
fun GaeBizLogoAppBar(
2520
modifier: Modifier = Modifier,
2621
logoDrawable: Int = R.drawable.ggaebiz_kor,
27-
clickRightIcon: () -> Unit,
2822
) {
2923
Box(
30-
modifier = modifier
31-
.fillMaxWidth()
32-
.padding(horizontal = 20.dp)
24+
modifier = modifier.wrapContentSize(align = Alignment.Center)
3325
) {
3426
Image(
3527
modifier = modifier
28+
.fillMaxWidth()
3629
.height(64.dp)
3730
.padding(vertical = 22.dp),
3831
painter = painterResource(id = logoDrawable),
3932
contentDescription = stringResource(R.string.logo_img_description),
4033
)
41-
42-
Image(
43-
modifier = Modifier
44-
.size(48.dp)
45-
.clip(
46-
CircleShape
47-
)
48-
.clickable {
49-
clickRightIcon()
50-
}
51-
.background(GaeBizTheme.colors.gray50)
52-
.padding(vertical = 12.dp, horizontal = 16.dp)
53-
.align(Alignment.CenterEnd),
54-
painter = painterResource(id = R.drawable.icon_setting),
55-
contentDescription = "Clickable Image"
56-
)
5734
}
5835
}
5936

6037
@Preview("Logo App Bar")
6138
@Composable
6239
private fun GaeBizLogoAppBarPreview() {
6340
GaeBizLogoAppBar(
64-
logoDrawable = R.drawable.ggaebiz_kor,
65-
clickRightIcon = {}
41+
logoDrawable = R.drawable.ggaebiz_kor
6642
)
6743
}

‎app/src/main/java/com/ggaebiz/ggaebiz/presentation/designsystem/component/header/LogoRightIconAppBar.kt‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
package com.ggaebiz.ggaebiz.presentation.designsystem.component.header
2+
3+
import androidx.compose.foundation.Image
4+
import androidx.compose.foundation.background
5+
import androidx.compose.foundation.clickable
6+
import androidx.compose.foundation.layout.Box
7+
import androidx.compose.foundation.layout.fillMaxWidth
8+
import androidx.compose.foundation.layout.height
9+
import androidx.compose.foundation.layout.padding
10+
import androidx.compose.foundation.layout.size
11+
import androidx.compose.foundation.shape.CircleShape
12+
import androidx.compose.runtime.Composable
13+
import androidx.compose.ui.Alignment
14+
import androidx.compose.ui.Modifier
15+
import androidx.compose.ui.draw.clip
16+
import androidx.compose.ui.res.painterResource
17+
import androidx.compose.ui.res.stringResource
18+
import androidx.compose.ui.tooling.preview.Preview
19+
import androidx.compose.ui.unit.dp
20+
import com.ggaebiz.ggaebiz.R
21+
import com.ggaebiz.ggaebiz.presentation.designsystem.theme.GaeBizTheme
22+
23+
@Composable
24+
fun GaeBizLogoRightIconAppBar(
25+
modifier: Modifier = Modifier,
26+
logoDrawable: Int = R.drawable.ggaebiz_kor,
27+
clickRightIcon: () -> Unit,
28+
) {
29+
Box(
30+
modifier = modifier
31+
.fillMaxWidth()
32+
.padding(horizontal = 20.dp)
33+
) {
34+
Image(
35+
modifier = modifier
36+
.height(64.dp)
37+
.padding(vertical = 22.dp),
38+
painter = painterResource(id = logoDrawable),
39+
contentDescription = stringResource(R.string.logo_img_description),
40+
)
41+
Image(
42+
modifier = Modifier
43+
.size(48.dp)
44+
.clip(
45+
CircleShape
46+
)
47+
.clickable {
48+
clickRightIcon()
49+
}
50+
.background(GaeBizTheme.colors.gray50)
51+
.padding(14.dp)
52+
.align(Alignment.CenterEnd),
53+
painter = painterResource(id = R.drawable.icon_setting),
54+
contentDescription = "Clickable Image"
55+
)
56+
57+
}
58+
}
59+
60+
@Preview("Logo App Bar")
61+
@Composable
62+
private fun GaeBizLogoAppBarPreview() {
63+
GaeBizLogoRightIconAppBar(
64+
logoDrawable = R.drawable.ggaebiz_kor,
65+
clickRightIcon = {}
66+
)
67+
}

‎app/src/main/java/com/ggaebiz/ggaebiz/presentation/designsystem/component/icon/GaeBizIcon.kt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ object GaeBizIcon {
1010
val icBack: ImageVector
1111
@Composable
1212
get() = ImageVector.vectorResource(R.drawable.ic_back)
13+
1314
val icRightArrow: ImageVector
1415
@Composable
1516
get() = ImageVector.vectorResource(R.drawable.ic_right_arrow)
@@ -21,4 +22,8 @@ object GaeBizIcon {
2122
val icColon : ImageVector
2223
@Composable
2324
get() = ImageVector.vectorResource(R.drawable.icon_colon)
25+
26+
val icOrangeSpeaker : ImageVector
27+
@Composable
28+
get() = ImageVector.vectorResource(R.drawable.ic_orange_speaker)
2429
}

‎app/src/main/java/com/ggaebiz/ggaebiz/presentation/designsystem/component/toast/Toast.kt‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
package com.ggaebiz.ggaebiz.presentation.designsystem.component.toast
2+
3+
import androidx.compose.foundation.background
4+
import androidx.compose.foundation.layout.Box
5+
import androidx.compose.foundation.layout.Row
6+
import androidx.compose.foundation.layout.Spacer
7+
import androidx.compose.foundation.layout.fillMaxWidth
8+
import androidx.compose.foundation.layout.padding
9+
import androidx.compose.foundation.layout.width
10+
import androidx.compose.foundation.layout.wrapContentSize
11+
import androidx.compose.foundation.shape.RoundedCornerShape
12+
import androidx.compose.material3.Icon
13+
import androidx.compose.material3.Text
14+
import androidx.compose.runtime.Composable
15+
import androidx.compose.ui.Alignment
16+
import androidx.compose.ui.Modifier
17+
import androidx.compose.ui.graphics.Color
18+
import androidx.compose.ui.tooling.preview.Preview
19+
import androidx.compose.ui.unit.dp
20+
import com.ggaebiz.ggaebiz.presentation.designsystem.component.icon.GaeBizIcon
21+
import com.ggaebiz.ggaebiz.presentation.designsystem.theme.GaeBizTheme
22+
23+
@Composable
24+
fun GaebizToast(
25+
modifier:Modifier = Modifier,
26+
ment: String,
27+
) {
28+
Box(
29+
modifier = modifier
30+
.fillMaxWidth()
31+
.padding(horizontal = 23.5.dp),
32+
) {
33+
Row(
34+
modifier = Modifier
35+
.fillMaxWidth()
36+
.background(GaeBizTheme.colors.black44, shape = RoundedCornerShape(15.dp))
37+
.padding(horizontal = 14.dp, vertical = 16.dp),
38+
verticalAlignment = Alignment.CenterVertically
39+
) {
40+
Icon(
41+
modifier = Modifier.wrapContentSize(),
42+
imageVector = GaeBizIcon.icOrangeSpeaker,
43+
tint = Color.Unspecified,
44+
contentDescription = null,
45+
)
46+
Spacer(modifier = Modifier.width(10.dp))
47+
48+
Text(
49+
text = ment,
50+
color = Color.White,
51+
style = GaeBizTheme.typography.body2Medium
52+
)
53+
}
54+
}
55+
}
56+
57+
@Preview("Toast")
58+
@Composable
59+
private fun GaeBizToastPreview() {
60+
GaebizToast(ment = "{키키}가 말 하고 있어요. 볼륨을 켜주세요.")
61+
}

‎app/src/main/java/com/ggaebiz/ggaebiz/presentation/designsystem/theme/Type.kt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ data class GaeBizTypography(
2323
val label1: TextStyle,
2424
val label2: TextStyle,
2525
val label3: TextStyle,
26+
val label4 : TextStyle,
2627
val timer1: TextStyle,
2728
val timer2: TextStyle,
2829
val timer3: TextStyle,
@@ -42,6 +43,7 @@ val LocalGaeBizTypography = staticCompositionLocalOf {
4243
label1 = TextStyle.Default,
4344
label2 = TextStyle.Default,
4445
label3 = TextStyle.Default,
46+
label4 = TextStyle.Default,
4547
timer1 = TextStyle.Default,
4648
timer2 = TextStyle.Default,
4749
timer3 = TextStyle.Default,
@@ -125,6 +127,11 @@ val Typography = GaeBizTypography(
125127
fontWeight = FontWeight.SemiBold,
126128
fontSize = 12.sp
127129
),
130+
label4 = TextStyle(
131+
fontFamily = PretendardFont,
132+
fontWeight = FontWeight.Medium,
133+
fontSize = 11.sp
134+
),
128135
timer1 = TextStyle(
129136
fontFamily = ZuumeFont,
130137
fontWeight = FontWeight.Bold,

‎app/src/main/java/com/ggaebiz/ggaebiz/presentation/designsystem/ui/Ment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fun GaeBizMent(
4747
) {
4848
Text(
4949
text = text,
50-
maxLines = 1,
50+
maxLines = 2,
5151
color = textColor,
5252
style = textStyle,
5353
)

‎app/src/main/java/com/ggaebiz/ggaebiz/presentation/designsystem/ui/SlideButton.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import androidx.compose.ui.input.pointer.pointerInput
4040
import androidx.compose.ui.layout.onSizeChanged
4141
import androidx.compose.ui.platform.LocalDensity
4242
import androidx.compose.ui.res.stringResource
43+
import androidx.compose.ui.text.style.TextAlign
4344
import androidx.compose.ui.tooling.preview.Preview
4445
import androidx.compose.ui.unit.IntOffset
4546
import androidx.compose.ui.unit.dp
@@ -104,10 +105,13 @@ fun GaeBizSlideButton(
104105
Text(
105106
text = text,
106107
modifier = Modifier
108+
.fillMaxWidth()
109+
.padding(start = iconSize / 2)
107110
.align(Alignment.Center)
108111
.alpha(1f - (offsetX / maxDragDistance)),
109112
color = GaeBizTheme.colors.gray500,
110113
style = GaeBizTheme.typography.bodySemiBold,
114+
textAlign = TextAlign.Center
111115
)
112116

113117
Box(

0 commit comments

Comments
 (0)