Fix copy in claim details bottom sheet

We want the version which has two rows with a subtitle
HedvigInsurance · Nov 14, 2024 · 6e31902 · 6e31902
1 parent 3f11bb6
commit 6e31902
Show file tree

Hide file tree

Showing 4 changed files with 73 additions and 68 deletions.
diff --git a/app/core/core-ui/src/main/kotlin/com/hedvig/android/core/ui/SelectableItem.kt b/app/core/core-ui/src/main/kotlin/com/hedvig/android/core/ui/SelectableItem.kt
diff --git a/...main/kotlin/com/hedvig/android/feature/editcoinsured/ui/AddCoInsuredBottomSheetContent.kt b/...main/kotlin/com/hedvig/android/feature/editcoinsured/ui/AddCoInsuredBottomSheetContent.kt
@@ -9,7 +9,9 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
@@ -49,7 +51,7 @@ import com.hedvig.android.core.designsystem.component.datepicker.HedvigDatePicke
 import com.hedvig.android.core.designsystem.component.textfield.HedvigTextField
 import com.hedvig.android.core.designsystem.preview.HedvigPreview
 import com.hedvig.android.core.designsystem.theme.HedvigTheme
-import com.hedvig.android.core.ui.SelectableHedvigCard
+import com.hedvig.android.core.ui.SelectIndicationCircle
 import com.hedvig.android.core.ui.getLocale
 import com.hedvig.android.core.ui.infocard.VectorWarningCard
 import com.hedvig.android.core.ui.rememberHedvigDateTimeFormatter
@@ -192,6 +194,27 @@ internal fun SelectableCoInsuredList(
   )
 }
 
+@Composable
+private fun SelectableHedvigCard(text: String, isSelected: Boolean, onClick: () -> Unit) {
+  HedvigCard(onClick = onClick) {
+    Row(
+      verticalAlignment = Alignment.CenterVertically,
+      modifier = Modifier
+        .heightIn(72.dp)
+        .fillMaxWidth()
+        .padding(horizontal = 16.dp, vertical = 10.dp),
+    ) {
+      Text(
+        text = text,
+        style = MaterialTheme.typography.headlineSmall,
+        modifier = Modifier.weight(1f),
+      )
+      Spacer(Modifier.width(8.dp))
+      SelectIndicationCircle(isSelected)
+    }
+  }
+}
+
 @Composable
 private fun FetchFromSsnFields(
   ssn: String?,

diff --git a/...enter/src/main/kotlin/com/hedvig/android/feature/help/center/data/GetQuickLinksUseCase.kt b/...enter/src/main/kotlin/com/hedvig/android/feature/help/center/data/GetQuickLinksUseCase.kt
@@ -32,7 +32,7 @@ internal class GetQuickLinksUseCase(
           add(
             StandaloneQuickLink(
               quickLinkDestination = QuickLinkDestination.OuterDestination.QuickLinkChangeAddress,
-              titleRes = R.string.HC_QUICK_ACTIONS_CHANGE_ADDRESS_TITLE,
+              titleRes = R.string.insurance_details_change_address_button,
               hintTextRes = R.string.HC_QUICK_ACTIONS_CHANGE_ADDRESS_SUBTITLE,
             ),
           )

diff --git a/...ig/android/feature/insurances/insurancedetail/yourinfo/EditInsuranceBottomSheetContent.kt b/...ig/android/feature/insurances/insurancedetail/yourinfo/EditInsuranceBottomSheetContent.kt
@@ -22,8 +22,11 @@ import androidx.lifecycle.compose.dropUnlessResumed
 import com.hedvig.android.core.designsystem.component.button.HedvigContainedButton
 import com.hedvig.android.core.designsystem.component.button.HedvigTextButton
 import com.hedvig.android.core.designsystem.preview.HedvigPreview
-import com.hedvig.android.core.designsystem.theme.HedvigTheme
-import com.hedvig.android.core.ui.SelectableHedvigCard
+import com.hedvig.android.design.system.hedvig.ChosenState.Chosen
+import com.hedvig.android.design.system.hedvig.ChosenState.NotChosen
+import com.hedvig.android.design.system.hedvig.HedvigText
+import com.hedvig.android.design.system.hedvig.HedvigTheme
+import com.hedvig.android.design.system.hedvig.RadioOptionRightAligned
 import hedvig.resources.R
 
 @Composable
@@ -54,42 +57,57 @@ internal fun EditInsuranceBottomSheetContent(
       verticalArrangement = Arrangement.spacedBy(4.dp),
     ) {
       if (allowChangeAddress) {
-        SelectableHedvigCard(
-          text = stringResource(R.string.insurance_details_change_address_button),
-          isSelected = selectedItemIndex == 0,
-          onClick = {
-            selectedItemIndex = if (selectedItemIndex == 0) {
-              -1
-            } else {
-              0
-            }
-          },
-        )
+         RadioOptionRightAligned(
+           chosenState = if (selectedItemIndex == 0) Chosen else NotChosen,
+           onClick = { selectedItemIndex = 0 },
+           optionContent = {
+             Column {
+               HedvigText(
+                 text = stringResource(R.string.insurance_details_change_address_button),
+               )
+               HedvigText(
+                 text = stringResource(R.string.HC_QUICK_ACTIONS_CHANGE_ADDRESS_SUBTITLE),
+                 color = HedvigTheme.colorScheme.textSecondary,
+                 style = HedvigTheme.typography.label,
+               )
+             }
+           },
+         )
       }
       if (allowEditCoInsured) {
-        SelectableHedvigCard(
-          text = stringResource(R.string.CONTRACT_EDIT_COINSURED),
-          isSelected = selectedItemIndex == 1,
-          onClick = {
-            selectedItemIndex = if (selectedItemIndex == 1) {
-              -1
-            } else {
-              1
+        RadioOptionRightAligned(
+          optionContent = {
+            Column {
+              HedvigText(
+                text = stringResource(R.string.CONTRACT_EDIT_COINSURED),
+              )
+              HedvigText(
+                text = stringResource(R.string.HC_QUICK_ACTIONS_CO_INSURED_SUBTITLE),
+                color = HedvigTheme.colorScheme.textSecondary,
+                style = HedvigTheme.typography.label,
+              )
             }
           },
+          chosenState = if (selectedItemIndex == 1) Chosen else NotChosen,
+          onClick = { selectedItemIndex = 1 },
         )
       }
       if (allowChangeTier) {
-        SelectableHedvigCard(
-          text = stringResource(R.string.insurance_details_change_coverage),
-          isSelected = selectedItemIndex == 2,
-          onClick = {
-            selectedItemIndex = if (selectedItemIndex == 2) {
-              -1
-            } else {
-              2
+        RadioOptionRightAligned(
+          optionContent = {
+            Column {
+              HedvigText(
+                text = stringResource(R.string.insurance_details_change_coverage),
+              )
+              HedvigText(
+                text = stringResource(R.string.HC_QUICK_ACTIONS_UPGRADE_COVERAGE_SUBTITLE),
+                color = HedvigTheme.colorScheme.textSecondary,
+                style = HedvigTheme.typography.label,
+              )
             }
           },
+          chosenState = if (selectedItemIndex == 2) Chosen else NotChosen,
+          onClick = { selectedItemIndex = 2 },
         )
       }
     }
@@ -119,7 +137,7 @@ internal fun EditInsuranceBottomSheetContent(
 @Composable
 @HedvigPreview
 private fun PreviewEditInsuranceBottomSheetContent() {
-  HedvigTheme {
+  com.hedvig.android.core.designsystem.theme.HedvigTheme {
     Surface(color = MaterialTheme.colorScheme.background) {
       EditInsuranceBottomSheetContent(
         allowChangeAddress = true,