Skip to content

Commit ef69c1d

Browse files
l5x5ll5x5l
committed
FEAT: 감정구슬 리디자인 화면 구현
1 parent 3ed3404 commit ef69c1d

5 files changed

Lines changed: 459 additions & 0 deletions

File tree

‎core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/typography/Type.kt‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@ class BitnagilTypography internal constructor(
101101
lineHeight = 30,
102102
letterSpacing = (-0.5f),
103103
),
104+
private val _cafe24SsurroundAir2: BitnagilTextStyle = BitnagilTextStyle(
105+
fontFamily = cafe24SsurroundAir,
106+
fontWeight = FontWeight.Light,
107+
fontSize = 16,
108+
lineHeight = 24,
109+
letterSpacing = (-0.5f),
110+
),
104111
) {
105112
private val _headline1Bold = _headline1.copy(fontWeight = FontWeight.Bold)
106113
private val _headline1Medium = _headline1.copy(fontWeight = FontWeight.Medium)
@@ -163,6 +170,7 @@ class BitnagilTypography internal constructor(
163170
val button1: TextStyle @Composable get() = _button1.toDpTextStyle
164171
val button2: TextStyle @Composable get() = _button2.toDpTextStyle
165172
val cafe24SsurroundAir: TextStyle @Composable get() = _cafe24SsurroundAir.toDpTextStyle
173+
val cafe24SsurroundAir2: TextStyle @Composable get() = _cafe24SsurroundAir2.toDpTextStyle
166174
}
167175

168176
internal val LocalBitnagilTypography = staticCompositionLocalOf { BitnagilTypography() }

‎core/designsystem/src/main/res/drawable/ic_double_left_arrow_24.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M19.325,18.979C19.035,18.69 19.295,18.43 19.005,18.139C18.715,17.85 18.695,17.869 18.405,17.58C18.115,17.289 18.065,17.34 17.775,17.049C17.485,16.76 17.285,16.959 16.985,16.67C16.685,16.379 16.575,16.49 16.285,16.199C15.995,15.91 15.995,15.91 15.705,15.62C15.415,15.33 15.545,15.189 15.255,14.899C14.965,14.609 14.985,14.59 14.695,14.3C14.405,14.009 14.455,13.95 14.165,13.66C13.875,13.37 13.765,13.479 13.475,13.179C13.185,12.88 13.475,12.59 13.185,12.3C12.895,12.009 12.505,12.33 12.505,11.91C12.505,11.49 12.515,11.45 12.805,11.16C13.095,10.87 13.275,11.05 13.565,10.759C13.855,10.469 14.025,10.639 14.315,10.349C14.605,10.059 14.525,9.98 14.815,9.69C15.105,9.4 15.015,9.31 15.315,9.02C15.615,8.73 15.775,8.9 16.065,8.61C16.355,8.32 16.135,8.1 16.425,7.81C16.715,7.52 16.635,7.44 16.925,7.15C17.215,6.86 17.135,6.78 17.435,6.49C17.735,6.2 18.025,6.49 18.325,6.2C18.625,5.91 18.465,5.76 18.765,5.46C19.065,5.16 19.205,5.31 19.495,5.02"
8+
android:strokeLineJoin="round"
9+
android:strokeWidth="2"
10+
android:fillColor="#00000000"
11+
android:strokeColor="#878A93"
12+
android:strokeLineCap="round"/>
13+
<path
14+
android:pathData="M11.325,18.979C11.035,18.69 11.295,18.43 11.005,18.139C10.715,17.85 10.695,17.869 10.405,17.58C10.115,17.289 10.065,17.34 9.775,17.049C9.485,16.76 9.285,16.959 8.985,16.67C8.685,16.379 8.575,16.49 8.285,16.199C7.995,15.91 7.995,15.91 7.705,15.62C7.415,15.33 7.545,15.189 7.255,14.899C6.965,14.609 6.985,14.59 6.695,14.3C6.405,14.009 6.455,13.95 6.165,13.66C5.875,13.37 5.765,13.479 5.475,13.179C5.185,12.88 5.475,12.59 5.185,12.3C4.895,12.009 4.505,12.33 4.505,11.91C4.505,11.49 4.515,11.45 4.805,11.16C5.095,10.87 5.275,11.05 5.565,10.759C5.855,10.469 6.025,10.639 6.315,10.349C6.605,10.059 6.525,9.98 6.815,9.69C7.105,9.4 7.015,9.31 7.315,9.02C7.615,8.73 7.775,8.9 8.065,8.61C8.355,8.32 8.135,8.1 8.425,7.81C8.715,7.52 8.635,7.44 8.925,7.15C9.215,6.86 9.135,6.78 9.435,6.49C9.735,6.2 10.025,6.49 10.325,6.2C10.625,5.91 10.465,5.76 10.765,5.46C11.065,5.16 11.205,5.31 11.495,5.02"
15+
android:strokeLineJoin="round"
16+
android:strokeWidth="2"
17+
android:fillColor="#00000000"
18+
android:strokeColor="#878A93"
19+
android:strokeLineCap="round"/>
20+
</vector>

‎core/designsystem/src/main/res/drawable/ic_double_right_arrow_24.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M4.675,5.02C4.965,5.31 4.705,5.57 4.995,5.86C5.285,6.15 5.305,6.13 5.595,6.42C5.885,6.71 5.935,6.66 6.225,6.95C6.515,7.24 6.715,7.04 7.015,7.33C7.315,7.62 7.425,7.51 7.715,7.8C8.005,8.09 8.005,8.09 8.295,8.38C8.585,8.67 8.455,8.81 8.745,9.1C9.035,9.39 9.015,9.41 9.305,9.7C9.595,9.99 9.545,10.05 9.835,10.34C10.125,10.63 10.235,10.521 10.525,10.821C10.815,11.12 10.525,11.41 10.815,11.7C11.105,11.991 11.495,11.67 11.495,12.09C11.495,12.51 11.485,12.55 11.195,12.84C10.905,13.13 10.725,12.95 10.435,13.241C10.145,13.531 9.975,13.361 9.685,13.651C9.395,13.941 9.475,14.021 9.185,14.311C8.895,14.601 8.985,14.691 8.685,14.981C8.385,15.271 8.225,15.101 7.935,15.391C7.645,15.681 7.865,15.901 7.575,16.191C7.285,16.48 7.365,16.56 7.075,16.851C6.785,17.14 6.865,17.221 6.565,17.51C6.265,17.801 5.975,17.51 5.675,17.801C5.375,18.09 5.535,18.24 5.235,18.541C4.935,18.84 4.795,18.691 4.505,18.98"
8+
android:strokeLineJoin="round"
9+
android:strokeWidth="2"
10+
android:fillColor="#00000000"
11+
android:strokeColor="#878A93"
12+
android:strokeLineCap="round"/>
13+
<path
14+
android:pathData="M12.675,5.02C12.965,5.31 12.705,5.57 12.995,5.86C13.285,6.15 13.305,6.13 13.595,6.42C13.885,6.71 13.935,6.66 14.225,6.95C14.515,7.24 14.715,7.04 15.015,7.33C15.315,7.62 15.425,7.51 15.715,7.8C16.005,8.09 16.005,8.09 16.295,8.38C16.585,8.67 16.455,8.81 16.745,9.1C17.035,9.39 17.015,9.41 17.305,9.7C17.595,9.99 17.545,10.05 17.835,10.34C18.125,10.63 18.235,10.521 18.525,10.821C18.815,11.12 18.525,11.41 18.815,11.7C19.105,11.991 19.495,11.67 19.495,12.09C19.495,12.51 19.485,12.55 19.195,12.84C18.905,13.13 18.725,12.95 18.435,13.241C18.145,13.531 17.975,13.361 17.685,13.651C17.395,13.941 17.475,14.021 17.185,14.311C16.895,14.601 16.985,14.691 16.685,14.981C16.385,15.271 16.225,15.101 15.935,15.391C15.645,15.681 15.865,15.901 15.575,16.191C15.285,16.48 15.365,16.56 15.075,16.851C14.785,17.14 14.865,17.221 14.565,17.51C14.265,17.801 13.975,17.51 13.675,17.801C13.375,18.09 13.535,18.24 13.235,18.541C12.935,18.84 12.795,18.691 12.505,18.98"
15+
android:strokeLineJoin="round"
16+
android:strokeWidth="2"
17+
android:fillColor="#00000000"
18+
android:strokeColor="#878A93"
19+
android:strokeLineCap="round"/>
20+
</vector>

‎presentation/src/main/java/com/threegap/bitnagil/presentation/common/dimension/dpToPx.kt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.threegap.bitnagil.presentation.common.dimension
2+
3+
import androidx.compose.runtime.Composable
4+
import androidx.compose.ui.platform.LocalDensity
5+
import androidx.compose.ui.unit.Dp
6+
7+
8+
@Composable
9+
fun Dp.dpToPx() = with(LocalDensity.current) { this@dpToPx.toPx() }

0 commit comments

Comments
 (0)