From 90fb5ac182484d951e49f80cd851fb8c98716a44 Mon Sep 17 00:00:00 2001 From: hue Date: Thu, 27 Jul 2023 01:05:39 -0400 Subject: [PATCH] Update fonts --- app/build.gradle.kts | 2 +- .../core/designsystem/component/FilterChip.kt | 4 ++-- .../com/crisiscleanup/core/ui/MapOverlayMessage.kt | 2 +- .../feature/authentication/AuthenticateScreen.kt | 5 +++-- .../feature/caseeditor/ui/EditExistingCaseScreen.kt | 2 +- .../feature/caseeditor/ui/ExistingWorkTypeViews.kt | 2 +- .../feature/caseeditor/ui/LocationSearch.kt | 3 ++- .../feature/caseeditor/ui/ShareCaseScreen.kt | 2 +- .../feature/caseeditor/ui/TransferWorkTypesScreen.kt | 3 ++- .../feature/cases/ui/SelectIncidentScreen.kt | 2 +- .../feature/dashboard/DashboardScreen.kt | 2 +- .../feature/syncinsights/ui/SyncInsightsScreen.kt | 11 ++++++----- .../java/com/crisiscleanup/feature/team/TeamScreen.kt | 2 +- 13 files changed, 23 insertions(+), 19 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index e8ca8a019..75267f0a3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,7 +12,7 @@ plugins { android { defaultConfig { - val buildVersion = 118 + val buildVersion = 119 applicationId = "com.crisiscleanup" versionCode = buildVersion versionName = "0.1.${buildVersion - 100}" diff --git a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/FilterChip.kt b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/FilterChip.kt index 89f7fdb93..d20e6b2dc 100644 --- a/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/FilterChip.kt +++ b/core/designsystem/src/main/java/com/crisiscleanup/core/designsystem/component/FilterChip.kt @@ -24,7 +24,7 @@ fun SelectableFilterChip( enabled: Boolean = true, leadingIcon: (@Composable () -> Unit)? = null, label: @Composable () -> Unit, - textStyle: TextStyle = MaterialTheme.typography.bodyMedium, + textStyle: TextStyle = MaterialTheme.typography.bodySmall, chipBorder: SelectableChipBorder = ChipDefaults.filterChipBorder(), chipColors: SelectableChipColors = ChipDefaults.filterChipColors(selected), ) = FilterChip( @@ -52,7 +52,7 @@ fun CrisisCleanupFilterChip( enabled: Boolean = true, leadingIcon: (@Composable () -> Unit)? = null, label: @Composable () -> Unit, - textStyle: TextStyle = MaterialTheme.typography.bodyMedium, + textStyle: TextStyle = MaterialTheme.typography.bodySmall, ) = SelectableFilterChip( selected, onClick, diff --git a/core/ui/src/main/java/com/crisiscleanup/core/ui/MapOverlayMessage.kt b/core/ui/src/main/java/com/crisiscleanup/core/ui/MapOverlayMessage.kt index 8956433d1..d746ff365 100644 --- a/core/ui/src/main/java/com/crisiscleanup/core/ui/MapOverlayMessage.kt +++ b/core/ui/src/main/java/com/crisiscleanup/core/ui/MapOverlayMessage.kt @@ -33,7 +33,7 @@ fun BoxScope.MapOverlayMessage( Text( text = message, modifier = Modifier.textMessagePadding(), - style = MaterialTheme.typography.bodyMedium, + style = MaterialTheme.typography.bodySmall, ) } } diff --git a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticateScreen.kt b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticateScreen.kt index 9f4d7a636..4c6cf696e 100644 --- a/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticateScreen.kt +++ b/feature/authentication/src/main/java/com/crisiscleanup/feature/authentication/AuthenticateScreen.kt @@ -36,6 +36,7 @@ import com.crisiscleanup.core.designsystem.component.CrisisCleanupButton import com.crisiscleanup.core.designsystem.component.OutlinedClearableTextField import com.crisiscleanup.core.designsystem.component.OutlinedObfuscatingTextField import com.crisiscleanup.core.designsystem.theme.DayNightPreviews +import com.crisiscleanup.core.designsystem.theme.LocalFontStyles import com.crisiscleanup.core.designsystem.theme.fillWidthPadded import com.crisiscleanup.feature.authentication.model.AuthenticationState import com.crisiscleanup.core.common.R as commonR @@ -132,7 +133,7 @@ private fun ConditionalErrorMessage(errorMessage: String) { Text( modifier = fillWidthPadded, text = errorMessage, - style = MaterialTheme.typography.bodyMedium, + style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.error, ) } @@ -157,7 +158,7 @@ private fun LoginScreen( Text( modifier = fillWidthPadded, text = translator("actions.login", R.string.login), - style = MaterialTheme.typography.headlineMedium + style = LocalFontStyles.current.header2, ) val authErrorMessage by viewModel.errorMessage diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditExistingCaseScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditExistingCaseScreen.kt index 3dc6193c6..52accab78 100644 --- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditExistingCaseScreen.kt +++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/EditExistingCaseScreen.kt @@ -604,7 +604,7 @@ private fun LazyListScope.flagItems( worksite.flags?.let { flags -> if (flags.isNotEmpty()) { item(key = "section-content-flags") { - ProvideTextStyle(value = MaterialTheme.typography.bodyMedium) { + ProvideTextStyle(value = MaterialTheme.typography.bodySmall) { FlowRow( listItemModifier, horizontalArrangement = listItemSpacedBy, diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingWorkTypeViews.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingWorkTypeViews.kt index 5c23a2f02..26f510bb5 100644 --- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingWorkTypeViews.kt +++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ExistingWorkTypeViews.kt @@ -105,7 +105,7 @@ private fun WorkTypeSummaryView( Text( jobSummary, modifier.padding(top = edgeSpacingHalf), - style = MaterialTheme.typography.bodyMedium, + style = MaterialTheme.typography.bodySmall, ) } diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationSearch.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationSearch.kt index bc1d8e3ea..b694fc698 100644 --- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationSearch.kt +++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/LocationSearch.kt @@ -23,6 +23,7 @@ import com.crisiscleanup.core.commoncase.model.CaseSummaryResult import com.crisiscleanup.core.commoncase.ui.listCaseResults import com.crisiscleanup.core.designsystem.LocalAppTranslator import com.crisiscleanup.core.designsystem.component.BusyIndicatorFloatingTopCenter +import com.crisiscleanup.core.designsystem.theme.LocalFontStyles import com.crisiscleanup.core.designsystem.theme.listItemModifier import com.crisiscleanup.core.designsystem.theme.listItemOptionPadding import com.crisiscleanup.core.designsystem.theme.textMessagePadding @@ -94,7 +95,7 @@ private fun ListTitle( Text( if (textResId == 0) text else stringResource(textResId), modifier = listItemModifier, - style = MaterialTheme.typography.headlineSmall, + style = LocalFontStyles.current.header3, ) } diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ShareCaseScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ShareCaseScreen.kt index c68133979..6658c0928 100644 --- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ShareCaseScreen.kt +++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/ShareCaseScreen.kt @@ -122,7 +122,7 @@ fun CaseEditShareCaseRoute( Text( notSharableMessage, listItemModifier, - style = MaterialTheme.typography.headlineSmall, + style = LocalFontStyles.current.header5, ) } } diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/TransferWorkTypesScreen.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/TransferWorkTypesScreen.kt index 7e7d5d335..a52ff5f53 100644 --- a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/TransferWorkTypesScreen.kt +++ b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/TransferWorkTypesScreen.kt @@ -26,6 +26,7 @@ import com.crisiscleanup.core.designsystem.component.LinkifyHtmlText import com.crisiscleanup.core.designsystem.component.LinkifyPhoneEmailText import com.crisiscleanup.core.designsystem.component.TopAppBarBackAction import com.crisiscleanup.core.designsystem.component.cancelButtonColors +import com.crisiscleanup.core.designsystem.theme.LocalFontStyles import com.crisiscleanup.core.designsystem.theme.listCheckboxAlignStartOffset import com.crisiscleanup.core.designsystem.theme.listItemHorizontalPadding import com.crisiscleanup.core.designsystem.theme.listItemModifier @@ -135,7 +136,7 @@ internal fun TransferWorkTypesView( translator("workTypeRequestModal.contacts"), // TODO Common dimensions textModifier, - style = MaterialTheme.typography.titleMedium, + style = LocalFontStyles.current.header4, ) for (s in contacts) { LinkifyPhoneEmailText( diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/SelectIncidentScreen.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/SelectIncidentScreen.kt index 935cc1b54..2a313f86b 100644 --- a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/SelectIncidentScreen.kt +++ b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/SelectIncidentScreen.kt @@ -181,7 +181,7 @@ private fun NoIncidentsContent( Text( modifier = modifier.padding(textPadding), text = LocalAppTranslator.current("info.no_incidents_to_select"), - style = MaterialTheme.typography.titleLarge, + style = LocalFontStyles.current.header3, ) CrisisCleanupTextButton( modifier = modifier diff --git a/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardScreen.kt b/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardScreen.kt index 37be78734..409a83b12 100644 --- a/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardScreen.kt +++ b/feature/dashboard/src/main/java/com/crisiscleanup/feature/dashboard/DashboardScreen.kt @@ -33,7 +33,7 @@ internal fun DashboardScreen( .fillMaxWidth() .padding(48.dp), textAlign = TextAlign.Center, - style = MaterialTheme.typography.bodyMedium + style = MaterialTheme.typography.bodySmall ) } } \ No newline at end of file diff --git a/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/ui/SyncInsightsScreen.kt b/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/ui/SyncInsightsScreen.kt index e577f79cd..f3687600f 100644 --- a/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/ui/SyncInsightsScreen.kt +++ b/feature/syncinsights/src/main/java/com/crisiscleanup/feature/syncinsights/ui/SyncInsightsScreen.kt @@ -20,6 +20,7 @@ import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.crisiscleanup.core.designsystem.component.CrisisCleanupTextButton +import com.crisiscleanup.core.designsystem.theme.LocalFontStyles import com.crisiscleanup.core.designsystem.theme.listItemBottomPadding import com.crisiscleanup.core.designsystem.theme.listItemModifier import com.crisiscleanup.core.designsystem.theme.listItemPadding @@ -41,7 +42,7 @@ internal fun SyncInsightsRoute( Text( "Sync insights", Modifier.weight(1f), - style = MaterialTheme.typography.headlineSmall, + style = LocalFontStyles.current.header5, ) if (pendingSync.isNotEmpty()) { @@ -80,7 +81,7 @@ internal fun SyncInsightsRoute( Text( "Pending", modifier = listItemModifier, - style = MaterialTheme.typography.titleMedium, + style = LocalFontStyles.current.header4, ) } items( @@ -91,7 +92,7 @@ internal fun SyncInsightsRoute( Text( it, modifier = listItemModifier, - style = MaterialTheme.typography.bodyMedium, + style = MaterialTheme.typography.bodySmall, ) } } @@ -102,7 +103,7 @@ internal fun SyncInsightsRoute( Text( "Logs", modifier = listItemModifier, - style = MaterialTheme.typography.titleMedium, + style = LocalFontStyles.current.header4, ) } @@ -141,7 +142,7 @@ private fun SyncLogDetail(log: SyncLogItem) = with(log.syncLog) { if (!log.isContinuingLogType) { Text( "$logType ${log.relativeTime}", - style = MaterialTheme.typography.titleSmall + style = LocalFontStyles.current.header5, ) } Text(message) diff --git a/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamScreen.kt b/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamScreen.kt index c5cc5a448..7c48a74e3 100644 --- a/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamScreen.kt +++ b/feature/team/src/main/java/com/crisiscleanup/feature/team/TeamScreen.kt @@ -33,7 +33,7 @@ internal fun TeamScreen( .fillMaxWidth() .padding(48.dp), textAlign = TextAlign.Center, - style = MaterialTheme.typography.bodyMedium + style = MaterialTheme.typography.bodySmall ) } } \ No newline at end of file