[mod] #125 solve error

core/designsystem/src/main/java/com/record/designsystem/component/badge/RecordyLocationBadge.kt

@@ -53,7 +53,7 @@ fun RecordyLocationBadge(
                 text = location,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
-                style = RecordyTheme.typography.caption1,
+                style = RecordyTheme.typography.caption1R,
                 color = RecordyTheme.colors.white,
                 textAlign = TextAlign.Center,
             )

core/designsystem/src/main/java/com/record/designsystem/component/button/RecordyButton.kt

@@ -17,8 +17,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.record.designsystem.theme.Black
-import com.record.designsystem.theme.Main
 import com.record.designsystem.theme.RecordyTheme
+import com.record.designsystem.theme.ViskitYellow500
 import timber.log.Timber
 
 @Composable
@@ -30,7 +30,7 @@ fun RecordyButton(
     enabled: Boolean = true,
     clickable: Boolean = true,
     onClick: () -> Unit = {},
-    backgroundColor: Color = Main,
+    backgroundColor: Color = ViskitYellow500,
     textColor: Color = RecordyTheme.colors.gray09,
     borderWidth: Dp = 0.dp,
     borderColor: Color = Color.Transparent,
@@ -44,7 +44,7 @@ fun RecordyButton(
         onClick = onClick,
         backgroundColor = if (enabled) backgroundColor else RecordyTheme.colors.gray08,
         rippleColor = rippleColor,
-        textColor = if (enabled) textColor else RecordyTheme.colors.gray04,
+        textColor = if (enabled) textColor else RecordyTheme.colors.gray06,
         clickable = clickable,
         padding = PaddingValues(15.dp),
         textStyle = textStyle,

core/designsystem/src/main/java/com/record/designsystem/component/button/RecordyChipButton.kt

@@ -22,8 +22,8 @@ import com.record.designsystem.theme.Gray01
 import com.record.designsystem.theme.Gray03
 import com.record.designsystem.theme.Gray08
 import com.record.designsystem.theme.Gray09
-import com.record.designsystem.theme.Main
 import com.record.designsystem.theme.RecordyTheme
+import com.record.designsystem.theme.ViskitYellow500
 import com.record.ui.extension.customClickable
 import timber.log.Timber
 
@@ -42,13 +42,13 @@ fun RecordyChipButton(
     onClick: () -> Unit = {},
 ) {
     val (borderLineColor, contentColor, backGroundColor) = if (isActive) {
-        if (isCheckSmall) Triple(Gray01, Gray09, Gray01) else Triple(Main, Main, Gray08)
+        if (isCheckSmall) Triple(Gray01, Gray09, Gray01) else Triple(ViskitYellow500, ViskitYellow500, Gray08)
     } else {
         Triple(Color.Transparent, Gray03, if (isCheckSmall) Gray09 else Gray08)
     }
 
     val textStyle = when {
-        isCheckSmall -> RecordyTheme.typography.caption1
+        isCheckSmall -> RecordyTheme.typography.caption1R
         isActive -> RecordyTheme.typography.button2
         else -> RecordyTheme.typography.body2M
     }

core/designsystem/src/main/java/com/record/designsystem/component/button/RecordyMiddleButton.kt

@@ -17,8 +17,8 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.record.designsystem.theme.Black
-import com.record.designsystem.theme.Main
 import com.record.designsystem.theme.RecordyTheme
+import com.record.designsystem.theme.ViskitYellow500
 import timber.log.Timber
 
 @Composable
@@ -30,7 +30,7 @@ fun RecordyMiddleButton(
     enabled: Boolean = true,
     clickable: Boolean = true,
     onClick: () -> Unit = {},
-    backgroundColor: Color = Main,
+    backgroundColor: Color = ViskitYellow500,
     textColor: Color = RecordyTheme.colors.gray09,
     borderWidth: Dp = 0.dp,
     borderColor: Color = Color.Transparent,
@@ -44,7 +44,7 @@ fun RecordyMiddleButton(
         onClick = onClick,
         backgroundColor = if (enabled) backgroundColor else RecordyTheme.colors.gray08,
         rippleColor = rippleColor,
-        textColor = if (enabled) textColor else RecordyTheme.colors.gray04,
+        textColor = if (enabled) textColor else RecordyTheme.colors.gray06,
         clickable = clickable,
         padding = PaddingValues(vertical = 12.dp, horizontal = 38.dp),
         textStyle = textStyle,

core/designsystem/src/main/java/com/record/designsystem/component/dialog/RecordyDialog.kt

@@ -64,7 +64,7 @@ fun RecordyDialog(
                 Text(
                     modifier = Modifier.padding(top = 6.dp, bottom = 20.dp),
                     text = subTitle,
-                    style = RecordyTheme.typography.caption1,
+                    style = RecordyTheme.typography.caption1R,
                     color = RecordyTheme.colors.gray01,
                     textAlign = TextAlign.Center,
                 )

core/designsystem/src/main/java/com/record/designsystem/component/progressbar/RecordyProgressBar.kt

@@ -60,13 +60,13 @@ fun RecordyProgressBar(
                 .fillMaxWidth()
                 .height(4.dp)
                 .align(Alignment.Center)
-                .background(RecordyTheme.colors.sub01),
+                .background(RecordyTheme.colors.gray01),
         )
         Box(
             modifier = Modifier
                 .fillMaxWidth(size)
                 .height(6.dp)
-                .background(RecordyTheme.colors.main)
+                .background(RecordyTheme.colors.viskitYellow500)
                 .animateContentSize(),
         )
     }

core/designsystem/src/main/java/com/record/designsystem/component/snackbar/RecordySnackBar.kt

@@ -70,7 +70,7 @@ fun RecordySnackBarContent(
                 bottom = 16.dp,
             )
             .background(
-                color = RecordyTheme.colors.sub01,
+                color = RecordyTheme.colors.background,
                 shape = RoundedCornerShape(8.dp),
             ),
         verticalAlignment = Alignment.CenterVertically,
@@ -82,7 +82,7 @@ fun RecordySnackBarContent(
                         .padding(start = 16.dp, top = 10.dp, bottom = 10.dp, end = 4.dp),
                     painter = painterResource(id = R.drawable.ic_exclamation_24),
                     contentDescription = "warning",
-                    tint = RecordyTheme.colors.alert,
+                    tint = RecordyTheme.colors.alert01,
                 )
             }
 
@@ -92,7 +92,7 @@ fun RecordySnackBarContent(
                         .padding(start = 16.dp, top = 10.dp, bottom = 10.dp, end = 4.dp),
                     painter = painterResource(id = R.drawable.ic_check_small_24),
                     contentDescription = "check",
-                    tint = RecordyTheme.colors.main,
+                    tint = RecordyTheme.colors.viskitYellow500,
                 )
             }
         }

core/designsystem/src/main/java/com/record/designsystem/component/textfield/RecordyBasicTextField.kt

@@ -32,14 +32,15 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import com.record.designsystem.theme.Alert
+import com.record.designsystem.theme.Alert01
 import com.record.designsystem.theme.Black
 import com.record.designsystem.theme.Gray01
 import com.record.designsystem.theme.Gray03
-import com.record.designsystem.theme.Gray04
+import com.record.designsystem.theme.Gray06
 import com.record.designsystem.theme.Gray08
-import com.record.designsystem.theme.Main
 import com.record.designsystem.theme.RecordyTheme
+import com.record.designsystem.theme.ViskitYellow500
+
 /**
  * design system small text field / Large text field 2가지 타입 구현 가능
  * */
@@ -65,14 +66,14 @@ fun RecordyBasicTextField(
     val isFocused by interactionSource.collectIsFocusedAsState()
 
     val borderLineColor = when {
-        isError -> Alert
-        isFocused -> Main
+        isError -> Alert01
+        isFocused -> ViskitYellow500
         value.isEmpty() -> Color.Transparent
         else -> Color.Transparent
     }
 
     val labelTextColor = when {
-        isError -> Alert
+        isError -> Alert01
         else -> Gray03
     }
 
@@ -87,7 +88,7 @@ fun RecordyBasicTextField(
         maxLines = if (minLines > maxLines) minLines else maxLines,
         minLines = minLines,
         interactionSource = interactionSource,
-        cursorBrush = SolidColor(Main),
+        cursorBrush = SolidColor(ViskitYellow500),
         keyboardOptions = keyboardOptions,
         keyboardActions = keyboardActions,
         visualTransformation = visualTransformation,
@@ -113,7 +114,7 @@ fun RecordyBasicTextField(
                     if (value.isEmpty()) {
                         Text(
                             text = placeholder,
-                            color = Gray04,
+                            color = Gray06,
                             style = RecordyTheme.typography.body2M,
                             maxLines = 1,
                             overflow = TextOverflow.Clip,
@@ -130,14 +131,14 @@ fun RecordyBasicTextField(
                         text = labelText,
                         modifier = Modifier.align(Alignment.CenterStart),
                         color = labelTextColor,
-                        style = RecordyTheme.typography.caption2,
+                        style = RecordyTheme.typography.caption2R,
                         maxLines = 1,
                     )
                     Text(
                         text = "${value.length} / $maxLength",
                         modifier = Modifier.align(Alignment.CenterEnd),
-                        color = Gray04,
-                        style = RecordyTheme.typography.caption2,
+                        color = Gray06,
+                        style = RecordyTheme.typography.caption2R,
                         maxLines = 1,
                     )
                 }

core/designsystem/src/main/java/com/record/designsystem/component/textfield/RecordyValidateTextfield.kt

@@ -71,9 +71,9 @@ fun RecordyValidateTextfield(
                     width = 1.dp,
                     color = if (isFocused) {
                         if (errorState == ValidateResult.OverlapError || errorState == ValidateResult.ValidationError) {
-                            RecordyTheme.colors.alert
+                            RecordyTheme.colors.alert01
                         } else {
-                            RecordyTheme.colors.main
+                            RecordyTheme.colors.viskitYellow500
                         }
                     } else {
                         Color.Transparent
@@ -106,7 +106,7 @@ fun RecordyValidateTextfield(
                     if (value.isEmpty() && !isFocused) {
                         Text(
                             text = placeholder,
-                            style = RecordyTheme.typography.body2M.copy(color = RecordyTheme.colors.gray04),
+                            style = RecordyTheme.typography.body2M.copy(color = RecordyTheme.colors.gray06),
                         )
                     }
                     innerTextField()
@@ -128,16 +128,16 @@ fun RecordyValidateTextfield(
                     ValidateResult.Inputting -> inputtingMessage
                 },
                 color = when (errorState) {
-                    ValidateResult.OverlapError, ValidateResult.ValidationError -> RecordyTheme.colors.alert
+                    ValidateResult.OverlapError, ValidateResult.ValidationError -> RecordyTheme.colors.alert01
                     ValidateResult.Success -> RecordyTheme.colors.gray03
                     ValidateResult.Inputting -> RecordyTheme.colors.gray03
                 },
-                style = RecordyTheme.typography.caption2,
+                style = RecordyTheme.typography.caption2R,
             )
             Text(
                 text = "${value.length} / $maxLength",
-                style = RecordyTheme.typography.caption2,
-                color = RecordyTheme.colors.gray04,
+                style = RecordyTheme.typography.caption2R,
+                color = RecordyTheme.colors.gray06,
             )
         }
     }

core/designsystem/src/main/java/com/record/designsystem/theme/Theme.kt

@@ -14,15 +14,15 @@ import androidx.compose.ui.graphics.Color
 
 @Stable
 class RecordyColors(
-    ViskitYellow500: Color,
-    ViskitYellow400: Color,
-    ViskitYellow300: Color,
-    ViskitYellow200: Color,
-    ViskitYellow100: Color,
-    ViskitYellow80: Color,
-    ViskitYellow60: Color,
-    ViskitYellow40: Color,
-    ViskitYellow20: Color,
+    viskitYellow500: Color,
+    viskitYellow400: Color,
+    viskitYellow300: Color,
+    viskitYellow200: Color,
+    viskitYellow100: Color,
+    viskitYellow80: Color,
+    viskitYellow60: Color,
+    viskitYellow40: Color,
+    viskitYellow20: Color,
     alert01: Color,
     alert02: Color,
     kakaoyellow: Color,
@@ -45,23 +45,23 @@ class RecordyColors(
     black50: Color,
     black70: Color,
 ) {
-    var ViskitYellow500 by mutableStateOf(ViskitYellow500)
+    var viskitYellow500 by mutableStateOf(ViskitYellow500)
         private set
-    var ViskitYellow400 by mutableStateOf(ViskitYellow400)
+    var viskitYellow400 by mutableStateOf(ViskitYellow400)
         private set
-    var ViskitYellow300 by mutableStateOf(ViskitYellow300)
+    var viskitYellow300 by mutableStateOf(ViskitYellow300)
         private set
-    var ViskitYellow200 by mutableStateOf(ViskitYellow200)
+    var viskitYellow200 by mutableStateOf(ViskitYellow200)
         private set
-    var ViskitYellow100 by mutableStateOf(ViskitYellow100)
+    var viskitYellow100 by mutableStateOf(ViskitYellow100)
         private set
-    var ViskitYellow80 by mutableStateOf(ViskitYellow80)
+    var viskitYellow80 by mutableStateOf(ViskitYellow80)
         private set
-    var ViskitYellow60 by mutableStateOf(ViskitYellow60)
+    var viskitYellow60 by mutableStateOf(ViskitYellow60)
         private set
-    var ViskitYellow40 by mutableStateOf(ViskitYellow40)
+    var viskitYellow40 by mutableStateOf(ViskitYellow40)
         private set
-    var ViskitYellow20 by mutableStateOf(ViskitYellow20)
+    var viskitYellow20 by mutableStateOf(ViskitYellow20)
         private set
     var alert01 by mutableStateOf(alert01)
         private set
@@ -140,15 +140,15 @@ class RecordyColors(
     )
 
     fun update(other: RecordyColors) {
-        ViskitYellow500 = other.ViskitYellow500
-        ViskitYellow400 = other.ViskitYellow400
-        ViskitYellow300 = other.ViskitYellow300
-        ViskitYellow200 = other.ViskitYellow200
-        ViskitYellow100 = other.ViskitYellow100
-        ViskitYellow80 = other.ViskitYellow80
-        ViskitYellow60 = other.ViskitYellow60
-        ViskitYellow40 = other.ViskitYellow40
-        ViskitYellow20 = other.ViskitYellow20
+        viskitYellow500 = other.viskitYellow500
+        viskitYellow400 = other.viskitYellow400
+        viskitYellow300 = other.viskitYellow300
+        viskitYellow200 = other.viskitYellow200
+        viskitYellow100 = other.viskitYellow100
+        viskitYellow80 = other.viskitYellow80
+        viskitYellow60 = other.viskitYellow60
+        viskitYellow40 = other.viskitYellow40
+        viskitYellow20 = other.viskitYellow20
         alert01 = other.alert01
         alert02 = other.alert02
         kakaoyellow = other.kakaoyellow

core/designsystem/src/main/res/drawable/ic_tab_home.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M12.64,5.347C13.488,4.884 14.512,4.884 15.36,5.347L24.522,10.344C24.817,10.505 25,10.814 25,11.149C25,11.656 24.59,12.066 24.083,12.066L24.082,12.066C23.816,12.065 23.562,12.17 23.374,12.358C23.186,12.546 23.08,12.8 23.08,13.066V22.666C23.08,23.174 22.668,23.586 22.16,23.586H18V22V20V19C18,16.791 16.209,15 14,15C11.791,15 10,16.791 10,19V20V22V23.586H5.84C5.332,23.586 4.92,23.174 4.92,22.666V13.066C4.92,12.8 4.814,12.546 4.626,12.358C4.438,12.17 4.183,12.065 3.918,12.066L3.917,12.066H3.916C3.41,12.065 3,11.655 3,11.149C3,10.814 3.183,10.505 3.478,10.344L12.64,5.347ZM12,23.586H16V22V20V19C16,17.895 15.105,17 14,17C12.895,17 12,17.895 12,19V20V22V23.586ZM16.318,3.591C14.873,2.803 13.127,2.803 11.682,3.591L2.52,8.589C1.583,9.1 1,10.082 1,11.149C1,12.41 1.8,13.484 2.92,13.891V22.666C2.92,24.279 4.227,25.586 5.84,25.586H22.16C23.773,25.586 25.08,24.279 25.08,22.666V13.891C26.2,13.484 27,12.41 27,11.149C27,10.082 26.417,9.1 25.48,8.589L16.318,3.591Z"
+      android:fillColor="#4D4D4D"
+      android:fillType="evenOdd"/>
+</vector>

core/designsystem/src/main/res/drawable/ic_tab_mypage.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M18.726,14.196L17.942,13.575C17.747,13.821 17.68,14.145 17.759,14.449C17.839,14.753 18.057,15.002 18.347,15.121L18.726,14.196ZM8.872,14.222L9.258,15.145C9.548,15.024 9.764,14.774 9.841,14.47C9.919,14.165 9.849,13.842 9.653,13.597L8.872,14.222ZM3.343,19.097L4.227,19.566H4.227L3.343,19.097ZM3.601,22.166L4.395,21.558L4.395,21.558L3.601,22.166ZM24.427,22.327L25.207,22.953L25.207,22.953L24.427,22.327ZM24.679,19.487L23.795,19.954L24.679,19.487ZM19.082,10.293C19.082,11.534 18.656,12.673 17.942,13.575L19.511,14.816C20.494,13.573 21.082,12 21.082,10.293H19.082ZM13.789,5C16.712,5 19.082,7.37 19.082,10.293H21.082C21.082,6.265 17.817,3 13.789,3V5ZM8.496,10.293C8.496,7.37 10.865,5 13.789,5V3C9.761,3 6.496,6.265 6.496,10.293H8.496ZM9.653,13.597C8.928,12.692 8.496,11.544 8.496,10.293H6.496C6.496,12.015 7.093,13.599 8.092,14.847L9.653,13.597ZM8.487,13.3C6.254,14.233 3.918,15.881 2.46,18.628L4.227,19.566C5.413,17.33 7.33,15.95 9.258,15.145L8.487,13.3ZM2.46,18.628C1.678,20.102 1.958,21.666 2.807,22.774L4.395,21.558C3.971,21.004 3.849,20.278 4.227,19.566L2.46,18.628ZM2.807,22.774C3.622,23.838 4.944,24.492 6.368,24.492V22.492C5.547,22.492 4.82,22.113 4.395,21.558L2.807,22.774ZM6.368,24.492H21.863V22.492H6.368V24.492ZM21.863,24.492C23.154,24.492 24.409,23.947 25.207,22.953L23.648,21.701C23.267,22.174 22.612,22.492 21.863,22.492V24.492ZM25.207,22.953C26.058,21.894 26.297,20.41 25.563,19.02L23.795,19.954C24.136,20.601 24.026,21.229 23.648,21.701L25.207,22.953ZM25.563,19.02C24.414,16.844 22.271,14.567 19.105,13.27L18.347,15.121C21.043,16.225 22.846,18.157 23.795,19.954L25.563,19.02Z"
+      android:fillColor="#4D4D4D"/>
+</vector>

core/designsystem/src/main/res/drawable/ic_tab_search.xml

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M13,13m-5.5,5.5a7.778,7.778 0,1 1,11 -11a7.778,7.778 0,1 1,-11 11"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#EEDA24"/>
+  <path
+      android:pathData="M19.188,19.188L24,24"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#EEDA24"
+      android:strokeLineCap="round"/>
+</vector>

core/designsystem/src/main/res/drawable/ic_tab_upload.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:pathData="M13.286,14.714H9.714C9.32,14.714 9,14.394 9,14C9,13.606 9.32,13.286 9.714,13.286H13.286V9.714C13.286,9.32 13.606,9 14,9C14.394,9 14.714,9.32 14.714,9.714V13.286H18.286C18.68,13.286 19,13.606 19,14C19,14.394 18.68,14.714 18.286,14.714H14.714V18.286C14.714,18.68 14.394,19 14,19C13.606,19 13.286,18.68 13.286,18.286V14.714Z"
+      android:fillColor="#4D4D4D"/>
+  <path
+      android:pathData="M17.709,5.047C21.15,2.744 25.256,6.851 22.954,10.291C27.015,11.096 27.015,16.904 22.954,17.709C25.256,21.15 21.149,25.256 17.709,22.954C16.904,27.015 11.096,27.015 10.291,22.954C6.85,25.256 2.744,21.149 5.047,17.709C0.984,16.904 0.984,11.096 5.047,10.291C2.744,6.851 6.85,2.745 10.291,5.047C11.096,0.984 16.904,0.984 17.709,5.047Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="#00000000"
+      android:strokeColor="#4D4D4D"/>
+</vector>