Update font on dropdown items

CrisisCleanup · Jul 27, 2023 · 702fbe0 · 702fbe0
1 parent 4c26f19
commit 702fbe0
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 13 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 
 android {
     defaultConfig {
-        val buildVersion = 117
+        val buildVersion = 118
         applicationId = "com.crisiscleanup"
         versionCode = buildVersion
         versionName = "0.1.${buildVersion - 100}"

diff --git a/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/ui/ExistingWorksitesList.kt b/core/commoncase/src/main/java/com/crisiscleanup/core/commoncase/ui/ExistingWorksitesList.kt
@@ -8,13 +8,15 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.asImageBitmap
 import com.crisiscleanup.core.common.combineTrimText
 import com.crisiscleanup.core.commoncase.model.CaseSummaryResult
+import com.crisiscleanup.core.designsystem.theme.LocalFontStyles
 import com.crisiscleanup.core.designsystem.theme.listItemOptionPadding
 import com.crisiscleanup.core.designsystem.theme.listRowItemStartPadding
 import com.crisiscleanup.core.designsystem.theme.optionItemPadding
@@ -41,8 +43,14 @@ private fun CaseView(
                     .listRowItemStartPadding()
             ) {
                 with(summary) {
-                    Text(listOf(name, caseNumber).combineTrimText())
-                    Text(listOf(address, city, state).combineTrimText())
+                    Text(
+                        listOf(name, caseNumber).combineTrimText(),
+                        style = LocalFontStyles.current.header4,
+                    )
+                    Text(
+                        listOf(address, city, state).combineTrimText(),
+                        style = MaterialTheme.typography.bodyLarge,
+                    )
                 }
             }
         }

diff --git a/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/DynamicFormInput.kt b/feature/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/DynamicFormInput.kt
@@ -38,6 +38,7 @@ import com.crisiscleanup.core.designsystem.component.CrisisCleanupTextCheckbox
 import com.crisiscleanup.core.designsystem.component.HelpAction
 import com.crisiscleanup.core.designsystem.component.OutlinedClearableTextField
 import com.crisiscleanup.core.designsystem.icon.CrisisCleanupIcons
+import com.crisiscleanup.core.designsystem.theme.LocalFontStyles
 import com.crisiscleanup.core.designsystem.theme.centerAlignTextFieldLabelOffset
 import com.crisiscleanup.core.designsystem.theme.disabledAlpha
 import com.crisiscleanup.core.designsystem.theme.listCheckboxAlignStartOffset
@@ -434,14 +435,24 @@ private fun DropdownItems(
 ) {
     DropdownMenuItem(
         modifier = Modifier.optionItemHeight(),
-        text = { Text("") },
+        text = {
+            Text(
+                "",
+                style = LocalFontStyles.current.header4,
+            )
+        },
         onClick = { onSelect("") },
     )
     for (option in options) {
         key(option.key) {
             DropdownMenuItem(
                 modifier = Modifier.optionItemHeight(),
-                text = { Text(option.value) },
+                text = {
+                    Text(
+                        option.value,
+                        style = LocalFontStyles.current.header4,
+                    )
+                },
                 onClick = { onSelect(option.key) },
             )
         }

diff --git a/...re/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/PropertyDataScreen.kt b/...re/caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/PropertyDataScreen.kt
@@ -32,6 +32,7 @@ import com.crisiscleanup.core.designsystem.component.CrisisCleanupRadioButton
 import com.crisiscleanup.core.designsystem.component.HelpRow
 import com.crisiscleanup.core.designsystem.component.OutlinedClearableTextField
 import com.crisiscleanup.core.designsystem.component.WithHelpDialog
+import com.crisiscleanup.core.designsystem.theme.LocalFontStyles
 import com.crisiscleanup.core.designsystem.theme.listItemDropdownMenuOffset
 import com.crisiscleanup.core.designsystem.theme.listItemHeight
 import com.crisiscleanup.core.designsystem.theme.listItemHorizontalPadding
@@ -211,10 +212,9 @@ private fun PropertyFormResidentNameView(
                 DropdownMenuItem(
                     text = {
                         Text(
-                            LocalAppTranslator.current(
-                                "actions.stop_searching_cases",
-                            ),
+                            LocalAppTranslator.current("actions.stop_searching_cases"),
                             modifier = Modifier.offset(x = 12.dp),
+                            style = LocalFontStyles.current.header4,
                         )
                     },
                     onClick = onStopSuggestions,

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
@@ -57,6 +57,7 @@ import com.crisiscleanup.core.designsystem.component.OutlinedClearableTextField
 import com.crisiscleanup.core.designsystem.component.TopAppBarCancelAction
 import com.crisiscleanup.core.designsystem.component.cancelButtonColors
 import com.crisiscleanup.core.designsystem.icon.CrisisCleanupIcons
+import com.crisiscleanup.core.designsystem.theme.LocalFontStyles
 import com.crisiscleanup.core.designsystem.theme.disabledAlpha
 import com.crisiscleanup.core.designsystem.theme.listCheckboxAlignStartOffset
 import com.crisiscleanup.core.designsystem.theme.listItemDropdownMenuOffset
@@ -486,6 +487,7 @@ private fun LazyListScope.contactSuggestionsItem(
                             Text(
                                 "${contact.name}\n${contact.contactValue}",
                                 Modifier.optionItemPadding(),
+                                style = LocalFontStyles.current.header4,
                             )
                         },
                         onClick = { viewModel.onAddContact(contact) },

diff --git a/...caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/AddFlagScreen.kt b/...caseeditor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/AddFlagScreen.kt
@@ -34,6 +34,7 @@ import com.crisiscleanup.core.designsystem.LocalAppTranslator
 import com.crisiscleanup.core.designsystem.component.AnimatedBusyIndicator
 import com.crisiscleanup.core.designsystem.component.TopAppBarCancelAction
 import com.crisiscleanup.core.designsystem.icon.CrisisCleanupIcons
+import com.crisiscleanup.core.designsystem.theme.LocalFontStyles
 import com.crisiscleanup.core.designsystem.theme.listItemHorizontalPadding
 import com.crisiscleanup.core.designsystem.theme.listItemModifier
 import com.crisiscleanup.core.designsystem.theme.listItemPadding
@@ -208,7 +209,12 @@ private fun FlagsDropdown(
                 key(option.literal) {
                     DropdownMenuItem(
                         modifier = Modifier.optionItemHeight(),
-                        text = { Text(translator(option.literal)) },
+                        text = {
+                            Text(
+                                translator(option.literal),
+                                style = LocalFontStyles.current.header4,
+                            )
+                        },
                         onClick = {
                             onSelectedFlagFlow(option)
                             showDropdown = false

diff --git a/...itor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/UpsetClientFlagView.kt b/...itor/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/UpsetClientFlagView.kt
@@ -32,6 +32,7 @@ import com.crisiscleanup.core.designsystem.LocalAppTranslator
 import com.crisiscleanup.core.designsystem.component.CrisisCleanupRadioButton
 import com.crisiscleanup.core.designsystem.component.CrisisCleanupTextArea
 import com.crisiscleanup.core.designsystem.component.OutlinedClearableTextField
+import com.crisiscleanup.core.designsystem.theme.LocalFontStyles
 import com.crisiscleanup.core.designsystem.theme.listItemDropdownMenuOffset
 import com.crisiscleanup.core.designsystem.theme.listItemHeight
 import com.crisiscleanup.core.designsystem.theme.listItemModifier
@@ -167,6 +168,7 @@ internal fun ColumnScope.UpsetClientFlagView(
                                 Text(
                                     organization.name,
                                     Modifier.optionItemPadding(),
+                                    style = LocalFontStyles.current.header4,
                                 )
                             },
                             onClick = {

diff --git a/...or/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/WrongIncidentFlagView.kt b/...or/src/main/java/com/crisiscleanup/feature/caseeditor/ui/addflag/WrongIncidentFlagView.kt
@@ -34,6 +34,7 @@ import com.crisiscleanup.core.designsystem.LocalAppTranslator
 import com.crisiscleanup.core.designsystem.component.AnimatedBusyIndicator
 import com.crisiscleanup.core.designsystem.component.CrisisCleanupTextCheckbox
 import com.crisiscleanup.core.designsystem.component.OutlinedClearableTextField
+import com.crisiscleanup.core.designsystem.theme.LocalFontStyles
 import com.crisiscleanup.core.designsystem.theme.listItemDropdownMenuOffset
 import com.crisiscleanup.core.designsystem.theme.listItemModifier
 import com.crisiscleanup.core.designsystem.theme.listItemSpacedBy
@@ -150,6 +151,7 @@ internal fun ColumnScope.WrongIncidentFlagView(
                                 Text(
                                     incident.name,
                                     Modifier.optionItemPadding(),
+                                    style = LocalFontStyles.current.header4,
                                 )
                             },
                             onClick = {

diff --git a/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreen.kt b/feature/cases/src/main/java/com/crisiscleanup/feature/cases/ui/CasesScreen.kt
@@ -28,7 +28,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.LocalContentColor
@@ -573,7 +572,7 @@ private fun CasesOverlayElements(
         ) = createRefs()
 
         if (isMapView) {
-            FloatingActionButton(
+            CrisisCleanupFab(
                 modifier = modifier
                     .constrainAs(disasterAction) {
                         start.linkTo(parent.start, margin = actionEdgeSpace)
@@ -583,6 +582,8 @@ private fun CasesOverlayElements(
                 shape = CircleShape,
                 containerColor = incidentDisasterContainerColor,
                 contentColor = incidentDisasterContentColor,
+                // TODO Disable when no incidents are available
+                enabled = true,
             ) {
                 Icon(
                     painter = painterResource(disasterResId),
@@ -617,7 +618,7 @@ private fun CasesOverlayElements(
                 },
             )
 
-            FloatingActionButton(
+            CrisisCleanupFab(
                 modifier = modifier
                     .actionSize()
                     .constrainAs(myLocation) {
@@ -626,6 +627,7 @@ private fun CasesOverlayElements(
                     },
                 onClick = centerOnMyLocation,
                 shape = actionRoundCornerShape,
+                enabled = true,
             ) {
                 Icon(
                     painterResource(R.drawable.ic_my_location),
@@ -713,7 +715,6 @@ private fun CasesCountView(
                 ),
                 color = Color.White,
                 textAlign = TextAlign.Center,
-                style = MaterialTheme.typography.bodyMedium,
             )
         }
     }