From 7620a62623529e4ff5c015383d6095c425871312 Mon Sep 17 00:00:00 2001 From: Sangyoon Date: Tue, 28 Oct 2025 09:48:55 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX]=20=ED=8F=B0=ED=8A=B8=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EC=A6=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sampoom/android/core/ui/theme/Type.kt | 77 +++++++++++++++---- .../android/feature/user/ui/LoginScreen.kt | 3 +- .../android/feature/user/ui/SignUpScreen.kt | 6 +- 3 files changed, 68 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/com/sampoom/android/core/ui/theme/Type.kt b/app/src/main/java/com/sampoom/android/core/ui/theme/Type.kt index ed5af64..bc62309 100644 --- a/app/src/main/java/com/sampoom/android/core/ui/theme/Type.kt +++ b/app/src/main/java/com/sampoom/android/core/ui/theme/Type.kt @@ -4,6 +4,8 @@ import androidx.compose.material3.Typography import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import com.sampoom.android.R val GmarketSansFamily = FontFamily( @@ -15,19 +17,64 @@ val GmarketSansFamily = FontFamily( // Set of Material typography styles to start with private val baseTypography = Typography() val Typography = Typography( - displayLarge = baseTypography.displayLarge.copy(fontFamily = GmarketSansFamily), - displayMedium = baseTypography.displayMedium.copy(fontFamily = GmarketSansFamily), - displaySmall = baseTypography.displaySmall.copy(fontFamily = GmarketSansFamily), - headlineLarge = baseTypography.headlineLarge.copy(fontFamily = GmarketSansFamily), - headlineMedium = baseTypography.headlineMedium.copy(fontFamily = GmarketSansFamily), - headlineSmall = baseTypography.headlineSmall.copy(fontFamily = GmarketSansFamily), - titleLarge = baseTypography.titleLarge.copy(fontFamily = GmarketSansFamily), - titleMedium = baseTypography.titleMedium.copy(fontFamily = GmarketSansFamily), - titleSmall = baseTypography.titleSmall.copy(fontFamily = GmarketSansFamily), - bodyLarge = baseTypography.bodyLarge.copy(fontFamily = GmarketSansFamily), - bodyMedium = baseTypography.bodyMedium.copy(fontFamily = GmarketSansFamily), - bodySmall = baseTypography.bodySmall.copy(fontFamily = GmarketSansFamily), - labelLarge = baseTypography.labelLarge.copy(fontFamily = GmarketSansFamily), - labelMedium = baseTypography.labelMedium.copy(fontFamily = GmarketSansFamily), - labelSmall = baseTypography.labelSmall.copy(fontFamily = GmarketSansFamily) + displayLarge = baseTypography.displayLarge.copy( + fontFamily = GmarketSansFamily, + fontSize = 43.sp + ), + displayMedium = baseTypography.displayMedium.copy( + fontFamily = GmarketSansFamily, + fontSize = 34.sp + ), + displaySmall = baseTypography.displaySmall.copy( + fontFamily = GmarketSansFamily, + fontSize = 27.sp + ), + headlineLarge = baseTypography.headlineLarge.copy( + fontFamily = GmarketSansFamily, + fontSize = 24.sp + ), + headlineMedium = baseTypography.headlineMedium.copy( + fontFamily = GmarketSansFamily, + fontSize = 21.sp + ), + headlineSmall = baseTypography.headlineSmall.copy( + fontFamily = GmarketSansFamily, + fontSize = 18.sp + ), + titleLarge = baseTypography.titleLarge.copy( + fontFamily = GmarketSansFamily, + fontSize = 16.sp + ), + titleMedium = baseTypography.titleMedium.copy( + fontFamily = GmarketSansFamily, + fontSize = 12.sp + ), + titleSmall = baseTypography.titleSmall.copy( + fontFamily = GmarketSansFamily, + fontSize = 11.sp + ), + bodyLarge = baseTypography.bodyLarge.copy( + fontFamily = GmarketSansFamily, + fontSize = 12.sp + ), + bodyMedium = baseTypography.bodyMedium.copy( + fontFamily = GmarketSansFamily, + fontSize = 12.sp + ), + bodySmall = baseTypography.bodySmall.copy( + fontFamily = GmarketSansFamily, + fontSize = 10.sp + ), + labelLarge = baseTypography.labelLarge.copy( + fontFamily = GmarketSansFamily, + fontSize = 11.sp + ), + labelMedium = baseTypography.labelMedium.copy( + fontFamily = GmarketSansFamily, + fontSize = 10.sp + ), + labelSmall = baseTypography.labelSmall.copy( + fontFamily = GmarketSansFamily, + fontSize = 9.sp + ) ) \ No newline at end of file diff --git a/app/src/main/java/com/sampoom/android/feature/user/ui/LoginScreen.kt b/app/src/main/java/com/sampoom/android/feature/user/ui/LoginScreen.kt index c2e758b..3f0bd19 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/ui/LoginScreen.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/ui/LoginScreen.kt @@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.imePadding import androidx.compose.foundation.layout.padding import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold +import androidx.compose.material3.ScaffoldDefaults import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -67,7 +68,7 @@ fun LoginScreen( onConsumed = { viewModel.consumeError() } ) Scaffold( -// contentWindowInsets = WindowInsets.ime, + contentWindowInsets = ScaffoldDefaults.contentWindowInsets, // snackbarHost = { CommonSnackBarHost(snackBarHostState) } ) { innerPadding -> val focusManager = LocalFocusManager.current diff --git a/app/src/main/java/com/sampoom/android/feature/user/ui/SignUpScreen.kt b/app/src/main/java/com/sampoom/android/feature/user/ui/SignUpScreen.kt index d118ccd..ee1a3b0 100644 --- a/app/src/main/java/com/sampoom/android/feature/user/ui/SignUpScreen.kt +++ b/app/src/main/java/com/sampoom/android/feature/user/ui/SignUpScreen.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.ime +import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll @@ -19,6 +20,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.IconButton import androidx.compose.material3.Scaffold +import androidx.compose.material3.ScaffoldDefaults import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.runtime.Composable @@ -84,7 +86,7 @@ fun SignUpScreen( } ) }, - contentWindowInsets = WindowInsets.ime, + contentWindowInsets = ScaffoldDefaults.contentWindowInsets, // snackbarHost = { CommonSnackBarHost(snackBarHostState) } ) { innerPadding -> val focusManager = LocalFocusManager.current @@ -195,7 +197,7 @@ fun SignUpScreen( CommonButton( onClick = { viewModel.onEvent(SignUpUiEvent.Submit) }, enabled = state.isValid && !state.loading, - modifier = Modifier.fillMaxWidth(), + modifier = Modifier.fillMaxWidth().navigationBarsPadding(), ) { Text( if (state.loading) stringResource(R.string.signup_button_signup_loading) From aa8adaa81a616dc2ced1e4a349da36a1931dfeb2 Mon Sep 17 00:00:00 2001 From: Sangyoon Date: Tue, 28 Oct 2025 09:59:47 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[CHORE]=201.0.2=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EB=B0=B0=ED=8F=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f0bcb85..67ba62b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -32,8 +32,8 @@ android { applicationId = "com.sampoom.android" minSdk = 24 targetSdk = 36 - versionCode = 1 - versionName = "1.0.0" + versionCode = 2 + versionName = "1.0.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }