Merge pull request #75 from everymeals/feature/font_fix

[feature/font_fix]: fix font style
everymeals · Oct 21, 2023 · ac045a6 · ac045a6
2 parents 5fe0c6c + 6622815
commit ac045a6
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 113 deletions.
diff --git a/...ntation/src/main/java/com/everymeal/presentation/components/EveryMealBottomSheetDialog.kt b/...ntation/src/main/java/com/everymeal/presentation/components/EveryMealBottomSheetDialog.kt
@@ -33,7 +33,7 @@ import androidx.compose.ui.unit.sp
 import com.everymeal.presentation.R
 import com.everymeal.presentation.ui.detail.ReportCategoryType
 import com.everymeal.presentation.ui.home.HomeCategoryList
-import com.everymeal.presentation.ui.theme.EveryMealTypography
+import com.everymeal.presentation.ui.theme.EveryMealTypo
 import com.everymeal.presentation.ui.theme.Gray200
 import com.everymeal.presentation.ui.theme.Gray400
 import com.everymeal.presentation.ui.theme.Gray600
@@ -146,7 +146,7 @@ fun SortCategoryItem(
             text = category,
             fontSize = 17.sp,
             color = Gray900,
-            style = EveryMealTypography.displayMedium,
+            style = EveryMealTypo.displayMedium,
         )
         if(title == category) {
             Image(
@@ -326,7 +326,7 @@ fun EveryMealDetailReportBottomSheetDialog(
                 modifier = Modifier.padding(bottom = 18.dp),
                 text = stringResource(R.string.select_what_report),
                 fontSize = 22.sp,
-                style = EveryMealTypography.titleMedium,
+                style = EveryMealTypo.titleMedium,
                 color = Gray900
             )
             ReportCategoryItem(
@@ -379,7 +379,7 @@ fun ReportCategoryItem(
             fontSize = 16.sp,
             color = Gray800,
             fontWeight = FontWeight.Normal,
-            style = EveryMealTypography.bodySmall
+            style = EveryMealTypo.bodySmall
         )
         Image(
             modifier = Modifier.size(24.dp),

diff --git a/presentation/src/main/java/com/everymeal/presentation/components/EveryMealDialog.kt b/presentation/src/main/java/com/everymeal/presentation/components/EveryMealDialog.kt
@@ -12,7 +12,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
-import com.everymeal.presentation.ui.theme.EveryMealTypography
+import com.everymeal.presentation.ui.theme.EveryMealTypo
 import com.everymeal.presentation.ui.theme.Grey7
 import com.everymeal.presentation.ui.theme.MONO_BLACK
 
@@ -41,13 +41,13 @@ fun EveryMealDialog(
                 ) {
                     Text(
                         text = title,
-                        style = EveryMealTypography.titleLarge,
+                        style = EveryMealTypo.titleLarge,
                         color = MONO_BLACK
                     )
                     Spacer(modifier = Modifier.height(4.dp))
                     Text(
                         text = message,
-                        style = EveryMealTypography.bodyMedium,
+                        style = EveryMealTypo.bodyMedium,
                         color = Grey7
                     )
                     Spacer(modifier = Modifier.height(24.dp))

diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/home/HomeScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/home/HomeScreen.kt
@@ -44,8 +44,7 @@ import com.everymeal.presentation.components.EveryMealLineButton
 import com.everymeal.presentation.components.EveryMealMainBottomSheetDialog
 import com.everymeal.presentation.components.EveryMealRestaurantItem
 import com.everymeal.presentation.components.EveryMealReviewItem
-import com.everymeal.presentation.ui.detail.RestaurantCategoryType
-import com.everymeal.presentation.ui.theme.EveryMealTypography
+import com.everymeal.presentation.ui.theme.EveryMealTypo
 import com.everymeal.presentation.ui.theme.EveryMeal_AndroidTheme
 import com.everymeal.presentation.ui.theme.Gray100
 import com.everymeal.presentation.ui.theme.Gray300
@@ -297,12 +296,12 @@ fun HomeMainTopLayout(
             Text(
                 text = stringResource(id = R.string.home_top_category_title, "슈니"),
                 fontSize = 15.sp,
-                style = EveryMealTypography.displaySmall,
+                style = EveryMealTypo.displaySmall,
                 color = Gray800
             )
             Text(
                 text = stringResource(R.string.home_top_category_sub_title),
-                style = EveryMealTypography.labelSmall,
+                style = EveryMealTypo.labelSmall,
                 fontSize = 14.sp,
                 color = Gray500
             )
@@ -432,4 +431,4 @@ fun HomeScreenPreview() {
             onDetailRestaurantClick = {},
         )
     }
-}
+}
diff --git a/presentation/src/main/java/com/everymeal/presentation/ui/onboarding/OnboardingScreen.kt b/presentation/src/main/java/com/everymeal/presentation/ui/onboarding/OnboardingScreen.kt
@@ -33,7 +33,7 @@ import com.airbnb.lottie.compose.LottieCompositionSpec
 import com.airbnb.lottie.compose.rememberLottieComposition
 import com.everymeal.presentation.R
 import com.everymeal.presentation.components.EveryMealMainButton
-import com.everymeal.presentation.ui.theme.EveryMealTypography
+import com.everymeal.presentation.ui.theme.EveryMealTypo
 import com.everymeal.presentation.ui.theme.Gray300
 import com.everymeal.presentation.ui.theme.Main100
 
@@ -94,7 +94,7 @@ fun OnboardingScreen(
                         Spacer(modifier = Modifier.size(20.dp))
                         Text(
                             text = onBoardingList[it].text,
-                            style = EveryMealTypography.titleLarge,
+                            style = EveryMealTypo.titleLarge,
                             fontSize = 22.sp,
                             textAlign = TextAlign.Center,
                             lineHeight = 30.sp
@@ -131,4 +131,4 @@ fun OnboardingScreen(
 @Composable
 fun OnboardingScreenPreview() {
     OnboardingScreen(onNavigateToUnivSelect = {})
-}
+}
diff --git a/...entation/src/main/java/com/everymeal/presentation/ui/restaurant/DetailRestaurantScreen.kt b/...entation/src/main/java/com/everymeal/presentation/ui/restaurant/DetailRestaurantScreen.kt
@@ -20,7 +20,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Button
 import androidx.compose.material3.Divider
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.Scaffold
@@ -52,7 +51,7 @@ import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.everymeal.presentation.R
 import com.everymeal.presentation.ui.save.SaveTopBar
-import com.everymeal.presentation.ui.theme.EveryMealTypography
+import com.everymeal.presentation.ui.theme.EveryMealTypo
 import com.everymeal.presentation.ui.theme.Gray100
 import com.everymeal.presentation.ui.theme.Gray300
 import com.everymeal.presentation.ui.theme.Gray400
@@ -146,7 +145,7 @@ fun DetailRestaurantScreen(
                         modifier = Modifier.padding(start = 2.dp),
                         text = stringResource(R.string.restaurant_only_picture),
                         color = Gray900,
-                        style = EveryMealTypography.bodySmall
+                        style = EveryMealTypo.bodySmall
                     )
                 }
                 Row(
@@ -165,7 +164,7 @@ fun DetailRestaurantScreen(
                         modifier = Modifier.padding(start = 2.dp),
                         text = stringResource(R.string.restaurant_review),
                         color = Gray900,
-                        style = EveryMealTypography.bodySmall
+                        style = EveryMealTypo.bodySmall
                     )
                 }
             }
@@ -196,7 +195,7 @@ fun DetailRestaurantImage(
                 .background(Color.Black.copy(alpha = 0.6f))
                 .padding(horizontal = 8.dp, vertical = 2.dp),
             text = "1/6",
-            style = EveryMealTypography.bodySmall,
+            style = EveryMealTypo.bodySmall,
             fontSize = 14.sp,
             color = Color.White,
         )
@@ -222,14 +221,14 @@ fun DetailRestaurantMainInfo(
             text = "술집",
             color = Gray600,
             fontSize = 12.sp,
-            style = EveryMealTypography.labelSmall,
+            style = EveryMealTypo.labelSmall,
         )
         Text(
             modifier = Modifier.padding(top = 6.dp),
             text = "스타벅스 서울대 입구점",
             color = Color.Black,
             fontSize = 22.sp,
-            style = EveryMealTypography.titleMedium,
+            style = EveryMealTypo.titleMedium,
         )
         Spacer(modifier = Modifier.padding(5.dp))
         Row(
@@ -285,7 +284,7 @@ fun DetailRestaurantMainInfo(
                     text = "89",
                     color = Gray500,
                     fontSize = 15.sp,
-                    style = EveryMealTypography.displaySmall
+                    style = EveryMealTypo.displaySmall
                 )
             }
             Spacer(modifier = Modifier.width(8.dp))
@@ -307,7 +306,7 @@ fun DetailRestaurantMainInfo(
                     text = stringResource(R.string.restaurant_share),
                     color = Gray600,
                     fontSize = 15.sp,
-                    style = EveryMealTypography.displaySmall
+                    style = EveryMealTypo.displaySmall
                 )
             }
         }
@@ -350,7 +349,7 @@ fun DetailRestaurantTabLayout(
             Tab(
                 text = { Text(
                     text = title,
-                    style = EveryMealTypography.labelSmall,
+                    style = EveryMealTypo.labelSmall,
                 ) },
                 selected = viewState.selectedTabIndex == index,
                 onClick = {
@@ -394,7 +393,7 @@ fun DetailRestaurantTabInfo(
                 text = "서울특별시 관악구 관악로 1",
                 color = Gray800,
                 fontSize = 14.sp,
-                style = EveryMealTypography.bodySmall
+                style = EveryMealTypo.bodySmall
             )
         }
         Spacer(modifier = Modifier.padding(6.dp))
@@ -410,7 +409,7 @@ fun DetailRestaurantTabInfo(
                 text = "1533-2233",
                 color = Gray800,
                 fontSize = 14.sp,
-                style = EveryMealTypography.bodySmall
+                style = EveryMealTypo.bodySmall
             )
         }
         Spacer(modifier = Modifier.padding(6.dp))
@@ -426,7 +425,7 @@ fun DetailRestaurantTabInfo(
                 text = "카카오맵 이동하기",
                 color = Gray800,
                 fontSize = 14.sp,
-                style = EveryMealTypography.bodySmall
+                style = EveryMealTypo.bodySmall
             )
         }
         Spacer(modifier = Modifier.padding(18.dp))