chore: FixedSizeText 사용된 부분 nonScaleSp 속성 제거, modifier 파라미터 순서 변경

custom composable 정의한 파라미터 순서에 맞게 사용되는 곳에 파라미터 순서를 변경

app/src/main/kotlin/com/nexters/bandalart/android/ui/BandalartApp.kt

@@ -52,11 +52,11 @@ fun BandalartApp(
             Box(Modifier.fillMaxSize()) {
               FixedSizeText(
                 text = it.visuals.message,
-                fontWeight = FontWeight.W600,
                 color = Gray700,
                 fontSize = 12.sp,
-                letterSpacing = -(0.24).sp,
+                fontWeight = FontWeight.W600,
                 modifier = Modifier.align(Alignment.Center),
+                letterSpacing = -(0.24).sp,
               )
             }
           }

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/AppTitle.kt

@@ -41,10 +41,10 @@ fun AppKoreanTitle(
 ) {
   FixedSizeText(
     text = stringResource(R.string.bandalart),
-    modifier = modifier,
     color = Gray900,
     fontSize = 28.sp,
     fontWeight = FontWeight.W400,
+    modifier = modifier,
     fontFamily = neurimboGothicRegular,
     lineHeight = 20.sp,
     letterSpacing = (-0.56).sp,
@@ -56,11 +56,11 @@ fun AppEnglishTitle(
   modifier: Modifier = Modifier,
 ) {
   FixedSizeText(
-    modifier = modifier,
     text = stringResource(R.string.bandalart),
     color = Gray900,
     fontSize = 18.sp,
     fontWeight = FontWeight.W400,
+    modifier = modifier,
     fontFamily = koronaOneRegular,
     lineHeight = 20.sp,
     letterSpacing = (-0.36).sp,

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/BandalartButton.kt

@@ -36,11 +36,11 @@ fun BandalartButton(
   ) {
     FixedSizeText(
       text = text,
-      fontFamily = pretendard,
+      color = White,
+      fontSize = 16.sp,
       fontWeight = FontWeight.W700,
       modifier = Modifier.padding(horizontal = 32.dp),
-      fontSize = 16.sp,
-      color = White,
+      fontFamily = pretendard,
       letterSpacing = (-0.32).sp,
     )
   }

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/BandalartDeleteAlertDialog.kt

@@ -61,23 +61,23 @@ fun BandalartDeleteAlertDialog(
         )
         Spacer(modifier = Modifier.height(18.dp))
         FixedSizeText(
-          modifier = Modifier.align(Alignment.CenterHorizontally),
           text = title,
           color = Gray900,
           fontSize = 20.sp,
           fontWeight = FontWeight.W700,
+          modifier = Modifier.align(Alignment.CenterHorizontally),
           textAlign = TextAlign.Center,
           lineHeight = 30.sp,
           letterSpacing = (-0.4).sp,
         )
         if (message != null) {
           Spacer(modifier = Modifier.height(8.dp))
           FixedSizeText(
-            modifier = Modifier.align(Alignment.CenterHorizontally),
             text = message,
             color = Gray400,
             fontSize = 14.sp,
             fontWeight = FontWeight.W500,
+            modifier = Modifier.align(Alignment.CenterHorizontally),
             textAlign = TextAlign.Center,
             letterSpacing = (-0.28).sp,
           )
@@ -125,9 +125,9 @@ fun BandalartDeleteAlertDialog(
           ) {
             FixedSizeText(
               text = context.getString(R.string.delete_bandalart_delete),
+              color = White,
               fontSize = 16.sp,
               fontWeight = FontWeight.W600,
-              color = White,
             )
           }
         }

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/BandalartDropDownMenu.kt

@@ -64,16 +64,16 @@ fun BandalartDropDownMenu(
 //                .height(14.dp)
 //                .align(CenterVertically),
 //            )
-//            Text(
+//            FixedSizeText(
+//              text = "이미지 내보내기",
+//              color = Gray800,
+//              fontSize = 14.sp,
+//              fontWeight = FontWeight.W500,
 //              modifier = Modifier
 //                .fillMaxHeight()
 //                .padding(start = 13.dp)
 //                .align(CenterVertically),
-//              text = "이미지 내보내기",
-//              color = Gray800,
-//              fontSize = 14.sp.nonScaleSp,
 //              fontFamily = pretendard,
-//              fontWeight = FontWeight.W500,
 //            )
 //          }
 //        },
@@ -97,15 +97,15 @@ fun BandalartDropDownMenu(
               colorFilter = ColorFilter.tint(Error),
             )
             FixedSizeText(
+              text = context.getString(R.string.dropdown_delete),
+              color = Error,
+              fontSize = 14.sp,
+              fontWeight = FontWeight.W500,
               modifier = Modifier
                 .fillMaxHeight()
                 .padding(start = 13.dp)
                 .align(CenterVertically),
-              text = context.getString(R.string.dropdown_delete),
-              color = Error,
-              fontSize = 14.sp,
               fontFamily = pretendard,
-              fontWeight = FontWeight.W500,
             )
           }
         },

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/CellText.kt

@@ -32,10 +32,10 @@ fun CellText(
   textAlpha: Float = 1f,
 ) {
   Text(
+    text = cellText,
     modifier = modifier
       .padding(horizontal = 4.dp, vertical = 6.dp)
       .alpha(textAlpha),
-    text = cellText,
     color = cellTextColor,
     fontFamily = pretendard,
     fontWeight = fontWeight,

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/FixedSizeText.kt

@@ -1,9 +1,11 @@
 package com.nexters.bandalart.android.core.ui.component
 
+import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -25,6 +27,7 @@ fun FixedSizeText(
   letterSpacing: TextUnit = TextUnit.Unspecified,
   textAlign: TextAlign? = null,
   lineHeight: TextUnit = TextUnit.Unspecified,
+  style: TextStyle = LocalTextStyle.current
 ) {
   Text(
     text = text,
@@ -36,6 +39,7 @@ fun FixedSizeText(
     letterSpacing = letterSpacing.nonScaleSp,
     textAlign = textAlign,
     lineHeight = lineHeight.nonScaleSp,
+    style = style,
   )
 }
 

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/NetworkErrorAlertDialog.kt

@@ -56,21 +56,21 @@ fun NetworkErrorAlertDialog(
         Spacer(modifier = Modifier.height(8.dp))
         FixedSizeText(
           text = title,
-          modifier = Modifier.align(Alignment.CenterHorizontally),
           color = Gray900,
           fontSize = 20.sp,
           fontWeight = FontWeight.W700,
+          modifier = Modifier.align(Alignment.CenterHorizontally),
           textAlign = TextAlign.Center,
           lineHeight = 30.sp,
           letterSpacing = (-0.4).sp,
         )
         Spacer(modifier = Modifier.height(8.dp))
         FixedSizeText(
           text = message,
-          modifier = Modifier.align(Alignment.CenterHorizontally),
           color = Gray400,
           fontSize = 14.sp,
           fontWeight = FontWeight.W500,
+          modifier = Modifier.align(Alignment.CenterHorizontally),
           textAlign = TextAlign.Center,
           letterSpacing = (-0.28).sp,
         )

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/bottomsheet/BottomSheetButton.kt

@@ -23,8 +23,8 @@ fun BottomSheetDeleteButton(
 ) {
   FilledIconButton(
     onClick = onClick,
-    colors = IconButtonColors(Gray200, Gray900, Gray200, Gray900),
     modifier = modifier.height(56.dp),
+    colors = IconButtonColors(Gray200, Gray900, Gray200, Gray900),
   ) {
     BottomSheetButtonText(
       text = stringResource(R.string.bottomsheet_delete),
@@ -41,8 +41,8 @@ fun BottomSheetCompleteButton(
 ) {
   FilledIconButton(
     onClick = onClick,
-    colors = IconButtonColors(Gray900, White, Gray200, Gray400),
     modifier = modifier.height(56.dp),
+    colors = IconButtonColors(Gray900, White, Gray200, Gray400),
     enabled = !isBlankCell,
   ) {
     BottomSheetButtonText(

core/ui/src/main/kotlin/com/nexters/bandalart/android/core/ui/component/bottomsheet/BottomSheetText.kt

@@ -31,11 +31,11 @@ fun BottomSheetTitleText(
     else if (isMainCell) stringResource(id = R.string.bottomsheet_header_maincell_edit_title)
     else if (isSubCell) stringResource(id = R.string.bottomsheet_header_subcell_edit_title)
     else stringResource(id = R.string.bottomsheet_header_taskcell_edit_title),
-    modifier = modifier.fillMaxWidth(),
-    textAlign = TextAlign.Center,
     color = Gray900,
     fontSize = 16.sp,
     fontWeight = FontWeight.W700,
+    modifier = modifier.fillMaxWidth(),
+    textAlign = TextAlign.Center,
     letterSpacing = (-0.32).sp,
     lineHeight = 22.4.sp,
   )
@@ -48,11 +48,11 @@ fun BottomSheetSubTitleText(
 ) {
   FixedSizeText(
     text = text,
-    textAlign = TextAlign.Start,
     color = Gray600,
     fontSize = 12.sp,
     fontWeight = FontWeight.W700,
     modifier = modifier,
+    textAlign = TextAlign.Start,
     letterSpacing = (-0.24).sp,
     lineHeight = 22.4.sp,
   )
@@ -65,11 +65,11 @@ fun BottomSheetContentPlaceholder(
 ) {
   FixedSizeText(
     text = text,
-    textAlign = TextAlign.Start,
     color = Gray400,
     fontSize = 16.sp,
     fontWeight = FontWeight.W400,
     modifier = modifier,
+    textAlign = TextAlign.Start,
     letterSpacing = (-0.32).sp,
     lineHeight = 22.4.sp,
   )

feature/complete/src/main/kotlin/com/nexters/bandalart/android/feature/complete/ui/CompleteBandalart.kt

@@ -101,8 +101,8 @@ fun CompleteBandalart(
         FixedSizeText(
           text = title,
           color = Black,
-          fontWeight = FontWeight.W700,
           fontSize = 16.sp,
+          fontWeight = FontWeight.W700,
           letterSpacing = (-0.32).sp,
         )
         Spacer(modifier = Modifier.height(16.dp))

feature/home/src/main/kotlin/com/nexters/bandalart/android/feature/home/BandalartBottomSheet.kt

@@ -87,7 +87,6 @@ import com.nexters.bandalart.android.core.ui.component.bottomsheet.BottomSheetTo
 import com.nexters.bandalart.android.core.ui.extension.clearFocusOnKeyboardDismiss
 import com.nexters.bandalart.android.core.ui.extension.noRippleClickable
 import com.nexters.bandalart.android.core.ui.getNavigationBarPadding
-import com.nexters.bandalart.android.core.ui.nonScaleSp
 import com.nexters.bandalart.android.core.util.extension.getCurrentLocale
 import com.nexters.bandalart.android.core.util.extension.toLocalDateTime
 import com.nexters.bandalart.android.core.util.extension.toStringLocalDateTime
@@ -318,7 +317,7 @@ fun BandalartBottomSheetContent(
                     } else {
                       EmojiText(
                         emojiText = uiState.cellData.profileEmoji,
-                        fontSize = 22.sp.nonScaleSp,
+                        fontSize = 22.sp,
                       )
                     }
                   }

feature/home/src/main/kotlin/com/nexters/bandalart/android/feature/home/ui/HomeHeader.kt

@@ -109,12 +109,12 @@ fun HomeHeader(
           text = bandalartDetailData.title
             ?: stringResource(com.nexters.bandalart.android.core.ui.R.string.home_empty_title),
           color = if (bandalartDetailData.title.isNullOrEmpty()) Gray300 else Gray900,
-          fontWeight = FontWeight.W700,
           fontSize = 20.sp,
-          letterSpacing = (-0.4).sp,
+          fontWeight = FontWeight.W700,
           modifier = Modifier
             .align(Alignment.Center)
             .clickable { openCellBottomSheet(true) },
+          letterSpacing = (-0.4).sp,
         )
         Image(
           imageVector = ImageVector.vectorResource(
@@ -146,8 +146,8 @@ fun HomeHeader(
           bandalartDetailData.completionRatio,
         ),
         color = Gray600,
-        fontWeight = FontWeight.W500,
         fontSize = 12.sp,
+        fontWeight = FontWeight.W500,
         letterSpacing = (-0.24).sp,
       )
       if (!bandalartDetailData.dueDate.isNullOrEmpty()) {
@@ -161,10 +161,10 @@ fun HomeHeader(
         FixedSizeText(
           text = bandalartDetailData.dueDate.toFormatDate(),
           color = Gray600,
-          fontWeight = FontWeight.W500,
           fontSize = 12.sp,
-          letterSpacing = (-0.24).sp,
+          fontWeight = FontWeight.W500,
           modifier = Modifier.padding(start = 6.dp),
+          letterSpacing = (-0.24).sp,
         )
       }
       Spacer(modifier = Modifier.weight(1f))
@@ -187,10 +187,10 @@ fun HomeHeader(
             FixedSizeText(
               text = stringResource(com.nexters.bandalart.android.core.ui.R.string.home_complete),
               color = Gray900,
-              fontWeight = FontWeight.W600,
               fontSize = 10.sp,
-              letterSpacing = (-0.2).sp,
+              fontWeight = FontWeight.W600,
               modifier = Modifier.padding(start = 2.dp),
+              letterSpacing = (-0.2).sp,
             )
           }
         }

feature/home/src/main/kotlin/com/nexters/bandalart/android/feature/home/ui/HomeShareButton.kt

@@ -23,7 +23,6 @@ import com.nexters.bandalart.android.core.designsystem.theme.Gray900
 import com.nexters.bandalart.android.core.ui.ComponentPreview
 import com.nexters.bandalart.android.core.ui.component.FixedSizeText
 import com.nexters.bandalart.android.core.ui.extension.clickableSingle
-import com.nexters.bandalart.android.core.ui.nonScaleSp
 import com.nexters.bandalart.android.feature.home.model.BandalartDetailUiModel
 import com.nexters.bandalart.android.feature.home.model.dummyBandalartDetailData
 
@@ -53,10 +52,10 @@ fun HomeShareButton(
       )
       FixedSizeText(
         text = stringResource(com.nexters.bandalart.android.core.ui.R.string.home_share),
-        modifier = Modifier.padding(start = 4.dp),
         color = Gray900,
-        fontSize = 12.sp.nonScaleSp,
+        fontSize = 12.sp,
         fontWeight = FontWeight.W700,
+        modifier = Modifier.padding(start = 4.dp),
       )
     }
   }

feature/home/src/main/kotlin/com/nexters/bandalart/android/feature/home/ui/HomeTopBar.kt

@@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.Icon
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -30,7 +29,6 @@ import com.nexters.bandalart.android.core.ui.ComponentPreview
 import com.nexters.bandalart.android.core.ui.R
 import com.nexters.bandalart.android.core.ui.component.AppTitle
 import com.nexters.bandalart.android.core.ui.component.FixedSizeText
-import com.nexters.bandalart.android.core.ui.nonScaleSp
 
 @Composable
 internal fun HomeTopBar(
@@ -65,12 +63,12 @@ internal fun HomeTopBar(
               ),
               contentDescription = stringResource(R.string.hamburger_descrption),
             )
-            Text(
+            FixedSizeText(
               text = stringResource(R.string.home_list),
-              fontFamily = pretendard,
-              fontWeight = FontWeight.W700,
               color = Gray600,
-              fontSize = 16.sp.nonScaleSp,
+              fontSize = 16.sp,
+              fontWeight = FontWeight.W700,
+              fontFamily = pretendard,
             )
           } else {
             Icon(
@@ -82,8 +80,8 @@ internal fun HomeTopBar(
             FixedSizeText(
               text = stringResource(R.string.home_add),
               color = Gray600,
-              fontWeight = FontWeight.W700,
               fontSize = 16.sp,
+              fontWeight = FontWeight.W700,
             )
           }
         }