Feat/puppy guide kmp a11y

app/core/core-resources/src/androidMain/res/values-sv-rSE/strings.xml

@@ -15,6 +15,7 @@
   <string name="A11Y_OF">av</string>
   <string name="A11Y_PAUSE">Pausa</string>
   <string name="A11Y_PLAY">Spela</string>
+  <string name="A11Y_READ_LABEL_HACK">Läst</string>
   <string name="A11Y_SCROLL_DOWN">Skrolla längst ner på sidan</string>
   <plurals name="A11Y_SUBMITTED_VALUES">
     <item quantity="one">Inskickat värde</item>
@@ -522,6 +523,7 @@
   <string name="LETTER_TO_EIR_SUBJECT">Fråga angående skadeanmälan - Fordon reg. %1$s</string>
   <string name="LOGIN_MARKET_PICKER_PREFERENCES">Välj land och språk</string>
   <string name="LOGOUT_BUTTON">Logga ut</string>
+  <string name="MANAGE_BILLING_METHODS_BUTTON">Manage your payment methods</string>
   <string name="MANUAL_CHARGE_CANCELLATION_WARNING">Aktivera ditt försäkringsskydd igen genom att kontakta oss när din betalning har registrerats</string>
   <string name="MARKETING_GET_HEDVIG">Få ett prisförslag</string>
   <string name="MISSING_CONTACT_INFO_CARD_BUTTON">Se över kontaktuppgifter</string>
@@ -680,7 +682,7 @@
   <string name="PROFILE_ROW_TRAVEL_CERTIFICATE">Reseintyg</string>
   <string name="PROFILE_TITLE">Din profil</string>
   <string name="PUPPY_GUIDE_GO_BUTTON">Se guider</string>
-  <string name="PUPPY_GUIDE_INFO">I valpguiden hittar du användbara artiklar som hjälper dig med allt från första veterinärbesöket till hur du väljer rätt foder.</string>
+  <string name="PUPPY_GUIDE_INFO">I valpguiden får du svar på de vanligaste frågorna som rör valpens första tid.</string>
   <string name="PUPPY_GUIDE_LABEL">Utvalda guider</string>
   <string name="PUPPY_GUIDE_LABEL_READ">Läst</string>
   <string name="PUPPY_GUIDE_RATING_NOT_HELPFUL">Inte hjälpsam</string>
@@ -997,6 +999,7 @@
   <string name="USER_ERROR_PROTECTED_IDENTITY_KIVRA_BLOCK">Vi kan tyvärr inte ge dig ett pris. Var god se till att du har Kivras digitala brevlåda och försök igen.\n\nDu kan skaffa digital brevlåda hos Kivra här: https://kivra.se/sv/privat/sa-funkar-det/digitala-brev-brevlada</string>
   <string name="VOICEOVER_BUNDLE_DISCOUNT_TAG">Rabattnamn: %s</string>
   <string name="VOICEOVER_CHANGE_VALUE">ändra värde</string>
+  <string name="VOICEOVER_CHAT_IMAGE">Bild</string>
   <string name="VOICEOVER_MORE_INFO">Tryck för mer information</string>
   <string name="VOICE_OVER_CAMPAIGN_IMAGE_DESCRIPTION">Kampanjikon</string>
   <string name="VOICE_OVER_INFO_IMAGE_DESCRIPTION">Informationsikon</string>
@@ -1279,6 +1282,20 @@
   <string name="offer_screen_MULTIPLE_INSURANCES_coverage_paragraph">Läs om ditt fullständiga försäkringsskydd nedan.</string>
   <string name="onboarding_contextual_menu_app_info_label">Appinformation</string>
   <string name="onboarding_embark_flow_information_modal_title">Information</string>
+  <string name="ongoing_shop_session_action_button">Fortsätt köpet</string>
+  <string name="ongoing_shop_session_dismiss_offer">Avvisa erbjudandet</string>
+  <plurals name="ongoing_shop_session_offer_expires_in_days">
+    <item quantity="one">Erbjudandet löper ut om %1$d dag</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d dagar</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_hours">
+    <item quantity="one">Erbjudandet löper ut om %1$d timme</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d timmar</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_minutes">
+    <item quantity="one">Erbjudandet löper ut om %1$d minut</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d minuter</item>
+  </plurals>
   <string name="open_chat">Skriv meddelande</string>
   <string name="pay_in_confirmation_direct_debit_headline">Autogiro är anslutet!</string>
   <string name="pay_in_error_body">Vi kunde inte ansluta ditt bankkonto. Vänligen försök igen eller skriv till oss direkt i appen.</string>

app/core/core-resources/src/androidMain/res/values/strings.xml

@@ -15,6 +15,7 @@
   <string name="A11Y_OF">of</string>
   <string name="A11Y_PAUSE">Pause</string>
   <string name="A11Y_PLAY">Play</string>
+  <string name="A11Y_READ_LABEL_HACK">Red</string>
   <string name="A11Y_SCROLL_DOWN">Scroll to bottom</string>
   <plurals name="A11Y_SUBMITTED_VALUES">
     <item quantity="one">Submitted value</item>
@@ -522,6 +523,7 @@
   <string name="LETTER_TO_EIR_SUBJECT">Question regarding claim, Vehicle reg. %1$s</string>
   <string name="LOGIN_MARKET_PICKER_PREFERENCES">Preferences</string>
   <string name="LOGOUT_BUTTON">Logout</string>
+  <string name="MANAGE_BILLING_METHODS_BUTTON">Manage your payment methods</string>
   <string name="MANUAL_CHARGE_CANCELLATION_WARNING">Activate your coverage again by contacting us once your payment has been processed</string>
   <string name="MARKETING_GET_HEDVIG">Get a price quote</string>
   <string name="MISSING_CONTACT_INFO_CARD_BUTTON">Review contact info</string>
@@ -997,6 +999,7 @@
   <string name="USER_ERROR_PROTECTED_IDENTITY_KIVRA_BLOCK">Sorry, we couldn’t generate a price. Please make sure you have Kivra\'s digital mailbox and then try again. \n\nYou can get Kivra\'s digital mailbox here: https://kivra.se/en/private/how-it-works/digital-letters-mailbox.</string>
   <string name="VOICEOVER_BUNDLE_DISCOUNT_TAG">Discount name: %s</string>
   <string name="VOICEOVER_CHANGE_VALUE">change value</string>
+  <string name="VOICEOVER_CHAT_IMAGE">Image</string>
   <string name="VOICEOVER_MORE_INFO">Tap for more info</string>
   <string name="VOICE_OVER_CAMPAIGN_IMAGE_DESCRIPTION">Campaign image</string>
   <string name="VOICE_OVER_INFO_IMAGE_DESCRIPTION">Information image</string>
@@ -1279,6 +1282,20 @@
   <string name="offer_screen_MULTIPLE_INSURANCES_coverage_paragraph">Read the full coverage of your insurances below. </string>
   <string name="onboarding_contextual_menu_app_info_label">App information</string>
   <string name="onboarding_embark_flow_information_modal_title">Information</string>
+  <string name="ongoing_shop_session_action_button">Continue purchase</string>
+  <string name="ongoing_shop_session_dismiss_offer">Dismiss offer</string>
+  <plurals name="ongoing_shop_session_offer_expires_in_days">
+    <item quantity="one">The offer expires in %1$d day</item>
+    <item quantity="other">The offer expires in %1$d days</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_hours">
+    <item quantity="one">The offer expires in %1$d hour</item>
+    <item quantity="other">The offer expires in %1$d hours</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_minutes">
+    <item quantity="one">The offer expires in %1$d minute</item>
+    <item quantity="other">The offer expires in %1$d minutes</item>
+  </plurals>
   <string name="open_chat">Write message</string>
   <string name="pay_in_confirmation_direct_debit_headline">Direct debit connected!</string>
   <string name="pay_in_error_body">We were unable to add your payment method. Please try again or send us a message here in the app.</string>

app/core/core-resources/src/commonMain/composeResources/values-sv-rSE/strings.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <string name="swedish">Svenska</string>
   <string name="english_swedish">English</string>
@@ -15,6 +14,7 @@
   <string name="A11Y_OF">av</string>
   <string name="A11Y_PAUSE">Pausa</string>
   <string name="A11Y_PLAY">Spela</string>
+  <string name="A11Y_READ_LABEL_HACK">Läst</string>
   <string name="A11Y_SCROLL_DOWN">Skrolla längst ner på sidan</string>
   <plurals name="A11Y_SUBMITTED_VALUES">
     <item quantity="one">Inskickat värde</item>
@@ -522,6 +522,7 @@
   <string name="LETTER_TO_EIR_SUBJECT">Fråga angående skadeanmälan - Fordon reg. %1$s</string>
   <string name="LOGIN_MARKET_PICKER_PREFERENCES">Välj land och språk</string>
   <string name="LOGOUT_BUTTON">Logga ut</string>
+  <string name="MANAGE_BILLING_METHODS_BUTTON">Manage your payment methods</string>
   <string name="MANUAL_CHARGE_CANCELLATION_WARNING">Aktivera ditt försäkringsskydd igen genom att kontakta oss när din betalning har registrerats</string>
   <string name="MARKETING_GET_HEDVIG">Få ett prisförslag</string>
   <string name="MISSING_CONTACT_INFO_CARD_BUTTON">Se över kontaktuppgifter</string>
@@ -680,7 +681,7 @@
   <string name="PROFILE_ROW_TRAVEL_CERTIFICATE">Reseintyg</string>
   <string name="PROFILE_TITLE">Din profil</string>
   <string name="PUPPY_GUIDE_GO_BUTTON">Se guider</string>
-  <string name="PUPPY_GUIDE_INFO">I valpguiden hittar du användbara artiklar som hjälper dig med allt från första veterinärbesöket till hur du väljer rätt foder.</string>
+  <string name="PUPPY_GUIDE_INFO">I valpguiden får du svar på de vanligaste frågorna som rör valpens första tid.</string>
   <string name="PUPPY_GUIDE_LABEL">Utvalda guider</string>
   <string name="PUPPY_GUIDE_LABEL_READ">Läst</string>
   <string name="PUPPY_GUIDE_RATING_NOT_HELPFUL">Inte hjälpsam</string>
@@ -997,6 +998,7 @@
   <string name="USER_ERROR_PROTECTED_IDENTITY_KIVRA_BLOCK">Vi kan tyvärr inte ge dig ett pris. Var god se till att du har Kivras digitala brevlåda och försök igen.\n\nDu kan skaffa digital brevlåda hos Kivra här: https://kivra.se/sv/privat/sa-funkar-det/digitala-brev-brevlada</string>
   <string name="VOICEOVER_BUNDLE_DISCOUNT_TAG">Rabattnamn: %1$s</string>
   <string name="VOICEOVER_CHANGE_VALUE">ändra värde</string>
+  <string name="VOICEOVER_CHAT_IMAGE">Bild</string>
   <string name="VOICEOVER_MORE_INFO">Tryck för mer information</string>
   <string name="VOICE_OVER_CAMPAIGN_IMAGE_DESCRIPTION">Kampanjikon</string>
   <string name="VOICE_OVER_INFO_IMAGE_DESCRIPTION">Informationsikon</string>
@@ -1279,6 +1281,20 @@
   <string name="offer_screen_MULTIPLE_INSURANCES_coverage_paragraph">Läs om ditt fullständiga försäkringsskydd nedan.</string>
   <string name="onboarding_contextual_menu_app_info_label">Appinformation</string>
   <string name="onboarding_embark_flow_information_modal_title">Information</string>
+  <string name="ongoing_shop_session_action_button">Fortsätt köpet</string>
+  <string name="ongoing_shop_session_dismiss_offer">Avvisa erbjudandet</string>
+  <plurals name="ongoing_shop_session_offer_expires_in_days">
+    <item quantity="one">Erbjudandet löper ut om %1$d dag</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d dagar</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_hours">
+    <item quantity="one">Erbjudandet löper ut om %1$d timme</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d timmar</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_minutes">
+    <item quantity="one">Erbjudandet löper ut om %1$d minut</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d minuter</item>
+  </plurals>
   <string name="open_chat">Skriv meddelande</string>
   <string name="pay_in_confirmation_direct_debit_headline">Autogiro är anslutet!</string>
   <string name="pay_in_error_body">Vi kunde inte ansluta ditt bankkonto. Vänligen försök igen eller skriv till oss direkt i appen.</string>

app/core/core-resources/src/commonMain/composeResources/values/strings.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <string name="swedish">Svenska</string>
   <string name="english_swedish">English</string>
@@ -15,6 +14,7 @@
   <string name="A11Y_OF">of</string>
   <string name="A11Y_PAUSE">Pause</string>
   <string name="A11Y_PLAY">Play</string>
+  <string name="A11Y_READ_LABEL_HACK">Red</string>
   <string name="A11Y_SCROLL_DOWN">Scroll to bottom</string>
   <plurals name="A11Y_SUBMITTED_VALUES">
     <item quantity="one">Submitted value</item>
@@ -522,6 +522,7 @@
   <string name="LETTER_TO_EIR_SUBJECT">Question regarding claim, Vehicle reg. %1$s</string>
   <string name="LOGIN_MARKET_PICKER_PREFERENCES">Preferences</string>
   <string name="LOGOUT_BUTTON">Logout</string>
+  <string name="MANAGE_BILLING_METHODS_BUTTON">Manage your payment methods</string>
   <string name="MANUAL_CHARGE_CANCELLATION_WARNING">Activate your coverage again by contacting us once your payment has been processed</string>
   <string name="MARKETING_GET_HEDVIG">Get a price quote</string>
   <string name="MISSING_CONTACT_INFO_CARD_BUTTON">Review contact info</string>
@@ -997,6 +998,7 @@
   <string name="USER_ERROR_PROTECTED_IDENTITY_KIVRA_BLOCK">Sorry, we couldn’t generate a price. Please make sure you have Kivra's digital mailbox and then try again. \n\nYou can get Kivra's digital mailbox here: https://kivra.se/en/private/how-it-works/digital-letters-mailbox.</string>
   <string name="VOICEOVER_BUNDLE_DISCOUNT_TAG">Discount name: %1$s</string>
   <string name="VOICEOVER_CHANGE_VALUE">change value</string>
+  <string name="VOICEOVER_CHAT_IMAGE">Image</string>
   <string name="VOICEOVER_MORE_INFO">Tap for more info</string>
   <string name="VOICE_OVER_CAMPAIGN_IMAGE_DESCRIPTION">Campaign image</string>
   <string name="VOICE_OVER_INFO_IMAGE_DESCRIPTION">Information image</string>
@@ -1279,6 +1281,20 @@
   <string name="offer_screen_MULTIPLE_INSURANCES_coverage_paragraph">Read the full coverage of your insurances below. </string>
   <string name="onboarding_contextual_menu_app_info_label">App information</string>
   <string name="onboarding_embark_flow_information_modal_title">Information</string>
+  <string name="ongoing_shop_session_action_button">Continue purchase</string>
+  <string name="ongoing_shop_session_dismiss_offer">Dismiss offer</string>
+  <plurals name="ongoing_shop_session_offer_expires_in_days">
+    <item quantity="one">The offer expires in %1$d day</item>
+    <item quantity="other">The offer expires in %1$d days</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_hours">
+    <item quantity="one">The offer expires in %1$d hour</item>
+    <item quantity="other">The offer expires in %1$d hours</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_minutes">
+    <item quantity="one">The offer expires in %1$d minute</item>
+    <item quantity="other">The offer expires in %1$d minutes</item>
+  </plurals>
   <string name="open_chat">Write message</string>
   <string name="pay_in_confirmation_direct_debit_headline">Direct debit connected!</string>
   <string name="pay_in_error_body">We were unable to add your payment method. Please try again or send us a message here in the app.</string>

app/feature/feature-help-center/src/commonMain/kotlin/com/hedvig/android/feature/help/center/home/HelpCenterHomeDestination.kt

@@ -47,6 +47,9 @@ import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.semantics.heading
+import androidx.compose.ui.semantics.isTraversalGroup
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -420,7 +423,10 @@ private fun ContentWithoutSearch(
         modifier = Modifier
           .padding(horizontal = 20.dp),
       ) {
-        HedvigText(stringResource(Res.string.HC_HOME_VIEW_QUESTION))
+        HedvigText(stringResource(Res.string.HC_HOME_VIEW_QUESTION),
+          modifier = Modifier.semantics {
+            heading()
+          })
         HedvigText(
           text = stringResource(Res.string.HC_HOME_VIEW_ANSWER),
           color = HedvigTheme.colorScheme.textSecondary,
@@ -497,14 +503,13 @@ private fun ContentWithoutSearch(
 @Composable
 private fun PuppyGuideCard(onClick: () -> Unit, modifier: Modifier = Modifier) {
   HedvigCard(
-    onClick = onClick,
     color = HedvigTheme.colorScheme.backgroundPrimary,
     borderColor = HedvigTheme.colorScheme.borderSecondary,
     modifier = modifier
       .fillMaxWidth()
       .shadow(1.dp, HedvigTheme.shapes.cornerXLarge),
   ) {
-    Column {
+    Column{
       Box(Modifier.align(Alignment.CenterHorizontally)) {
         Image(
           painter = painterResource(Res.drawable.hundar_badar_pet),

app/feature/feature-help-center/src/commonMain/kotlin/com/hedvig/android/feature/help/center/puppyguide/PuppyArticleDestination.kt

@@ -211,7 +211,7 @@ private fun PuppyArticleSuccessScreen(
           HedvigTheme.typography.bodySmall
             .copy(color = HedvigTheme.colorScheme.textSecondaryTranslucent),
         ) {
-          MarkdownText(uiState.story.content, withArticleStyle = true)
+          MarkdownText(uiState.story.content.replace(Regex("\n\\s*\n"), "\n\n\u200b\n\n"), withArticleStyle = true)
         }
         Spacer(Modifier.height(48.dp))
         HedvigText(stringResource(Res.string.PUPPY_GUIDE_RATING_QUESTION))

app/feature/feature-help-center/src/commonMain/kotlin/com/hedvig/android/feature/help/center/puppyguide/PuppyGuideDestination.kt

@@ -48,8 +48,14 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.hideFromAccessibility
+import androidx.compose.ui.semantics.onClick
+import androidx.compose.ui.semantics.role
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import androidx.compose.ui.unit.Dp
@@ -74,6 +80,7 @@ import com.hedvig.android.design.system.hedvig.icon.Checkmark
 import com.hedvig.android.design.system.hedvig.icon.HedvigIcons
 import com.hedvig.android.design.system.hedvig.rememberPreviewImageLoader
 import com.hedvig.android.feature.help.center.data.PuppyGuideStory
+import hedvig.resources.A11Y_READ_LABEL_HACK
 import hedvig.resources.PUPPY_GUIDE_INFO
 import hedvig.resources.PUPPY_GUIDE_LABEL_READ
 import hedvig.resources.PUPPY_GUIDE_TITLE
@@ -197,7 +204,7 @@ private fun PuppyGuideSuccessScreen(
             ) {
               Image(
                 painter = painterResource(Res.drawable.hundar_badar_pet),
-                contentDescription = null,
+                contentDescription = EmptyContentDescription,
                 contentScale = ContentScale.Crop,
                 alignment = Alignment.Center,
                 modifier = Modifier
@@ -342,8 +349,19 @@ private fun ArticleItem(
   shape: Shape = HedvigTheme.shapes.cornerMedium,
 ) {
   val interactionSource = remember { MutableInteractionSource() }
+  val isRead = story.isRead || story.rating != null
+  val readAudioLabel = stringResource(Res.string.A11Y_READ_LABEL_HACK)
+  val audioDescription = "${story.title}, ${story.subtitle}. ${if (isRead) readAudioLabel else ""}."
   Column(
     modifier
+      .clearAndSetSemantics {
+        contentDescription = audioDescription
+        role = Role.Button
+        onClick(label = null) {
+          onNavigateToArticle(story)
+          true
+        }
+      }
       .width(size)
       .clickable(
         interactionSource = interactionSource,
@@ -372,7 +390,7 @@ private fun ArticleItem(
           .size(size)
           .clip(shape),
       )
-      if (story.isRead || story.rating != null) {
+      if (isRead) {
         Box(
           modifier = Modifier
             .matchParentSize()
@@ -386,8 +404,6 @@ private fun ArticleItem(
     HedvigText(
       story.title,
       style = HedvigTheme.typography.label,
-      maxLines = 1,
-      overflow = TextOverflow.Ellipsis,
     )
     HedvigText(
       story.subtitle,
@@ -400,7 +416,9 @@ private fun ArticleItem(
 @Composable
 private fun ReadLabel(modifier: Modifier = Modifier) {
   Surface(
-    modifier = modifier,
+    modifier = modifier.semantics {
+      hideFromAccessibility()
+    },
     shape = HedvigTheme.shapes.cornerXSmall,
     color = HedvigTheme.colorScheme.buttonSecondaryAltResting,
   ) {

app/feature/feature-help-center/src/commonMain/kotlin/com/hedvig/android/feature/help/center/ui/MarkdownText.kt

@@ -122,7 +122,7 @@ fun MarkdownText(markdown: String, modifier: Modifier = Modifier, withArticleSty
     colors = markdownColors,
     typography = markdownTypography,
     padding = object : MarkdownPadding {
-      override val block: Dp = 6.dp
+      override val block: Dp = 0.dp
       override val blockQuote: PaddingValues = PaddingValues(0.dp)
       override val blockQuoteBar: PaddingValues.Absolute = PaddingValues.Absolute(0.dp)
       override val blockQuoteText: PaddingValues = PaddingValues(0.dp)