Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
77 changes: 62 additions & 15 deletions app/src/main/java/com/sampoom/android/core/ui/theme/Type.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -67,7 +68,7 @@ fun LoginScreen(
onConsumed = { viewModel.consumeError() }
)
Scaffold(
// contentWindowInsets = WindowInsets.ime,
contentWindowInsets = ScaffoldDefaults.contentWindowInsets,
// snackbarHost = { CommonSnackBarHost(snackBarHostState) }
) { innerPadding ->
val focusManager = LocalFocusManager.current
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ 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
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
Expand Down Expand Up @@ -84,7 +86,7 @@ fun SignUpScreen(
}
)
},
contentWindowInsets = WindowInsets.ime,
contentWindowInsets = ScaffoldDefaults.contentWindowInsets,
// snackbarHost = { CommonSnackBarHost(snackBarHostState) }
) { innerPadding ->
val focusManager = LocalFocusManager.current
Expand Down Expand Up @@ -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)
Expand Down