Skip to content

use buttonTitle #3120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
panasetskaya merged 4 commits into from
Sep 2, 2026
Merged

use buttonTitle #3120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0de4fd
use button title
panasetskaya Sep 2, 2026
1a97736
fix tests
panasetskaya Sep 2, 2026
9d735d8
update strings
panasetskaya Sep 2, 2026
12381bf
remove imports
panasetskaya Sep 2, 2026
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
2 changes: 0 additions & 2 deletions app/core/core-resources/src/androidMain/res/values-sv-rSE/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,6 @@
<string name="HEDVIG_NAME_TEXT">Hedvig</string>
<string name="HOME_ADDONS_READ_MORE_BUTTON">Läs mer</string>
<string name="HOME_DISCOVER_SECTION_TITLE">Upptäck våra försäkringar</string>
<string name="HOME_DISCOVER_SEE_PRICE_BUTTON">Se pris</string>
<string name="HOME_GREETING_SUBTITLE">Hur kan vi hjälpa dig?</string>
<string name="HOME_GREETING_TITLE">Hej %1$s</string>
<string name="HOME_QUICK_ACTIONS_CHANGE_ADDRESS">Ändra adress</string>
Expand Down Expand Up @@ -663,7 +662,6 @@
<string name="ONBOARDING_PHONE_SAVE_ERROR">Kunde inte spara, försök igen</string>
<string name="ONBOARDING_PHONE_SUBTITLE">Så vi kan nå dig om det behövs</string>
<string name="ONBOARDING_PHONE_TITLE">Telefonnummer</string>
<string name="ONBOARDING_SEE_PRICE_BUTTON">Se pris</string>
<string name="ONBOARDING_THEME_DARK_SUBTITLE">Alltid mörkt läge</string>
<string name="ONBOARDING_THEME_LIGHT_SUBTITLE">Alltid ljust läge</string>
<string name="ONBOARDING_THEME_SUBTITLE">Välj hur appen ska se ut</string>
Expand Down
2 changes: 0 additions & 2 deletions app/core/core-resources/src/androidMain/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,6 @@
<string name="HEDVIG_NAME_TEXT">Hedvig</string>
<string name="HOME_ADDONS_READ_MORE_BUTTON">Read more</string>
<string name="HOME_DISCOVER_SECTION_TITLE">Discover our insurances</string>
<string name="HOME_DISCOVER_SEE_PRICE_BUTTON">See price</string>
<string name="HOME_GREETING_SUBTITLE">How can we help?</string>
<string name="HOME_GREETING_TITLE">Hi %1$s</string>
<string name="HOME_QUICK_ACTIONS_CHANGE_ADDRESS">Change address</string>
Expand Down Expand Up @@ -663,7 +662,6 @@
<string name="ONBOARDING_PHONE_SAVE_ERROR">Could not save, please try again</string>
<string name="ONBOARDING_PHONE_SUBTITLE">So we can reach you if we need to</string>
<string name="ONBOARDING_PHONE_TITLE">Phone number</string>
<string name="ONBOARDING_SEE_PRICE_BUTTON">See price</string>
<string name="ONBOARDING_THEME_DARK_SUBTITLE">Always dark</string>
<string name="ONBOARDING_THEME_LIGHT_SUBTITLE">Always light</string>
<string name="ONBOARDING_THEME_SUBTITLE">Choose how the app looks</string>
Expand Down
2 changes: 0 additions & 2 deletions app/core/core-resources/src/commonMain/composeResources/values-sv-rSE/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,6 @@
<string name="HEDVIG_NAME_TEXT">Hedvig</string>
<string name="HOME_ADDONS_READ_MORE_BUTTON">Läs mer</string>
<string name="HOME_DISCOVER_SECTION_TITLE">Upptäck våra försäkringar</string>
<string name="HOME_DISCOVER_SEE_PRICE_BUTTON">Se pris</string>
<string name="HOME_GREETING_SUBTITLE">Hur kan vi hjälpa dig?</string>
<string name="HOME_GREETING_TITLE">Hej %1$s</string>
<string name="HOME_QUICK_ACTIONS_CHANGE_ADDRESS">Ändra adress</string>
Expand Down Expand Up @@ -662,7 +661,6 @@
<string name="ONBOARDING_PHONE_SAVE_ERROR">Kunde inte spara, försök igen</string>
<string name="ONBOARDING_PHONE_SUBTITLE">Så vi kan nå dig om det behövs</string>
<string name="ONBOARDING_PHONE_TITLE">Telefonnummer</string>
<string name="ONBOARDING_SEE_PRICE_BUTTON">Se pris</string>
<string name="ONBOARDING_THEME_DARK_SUBTITLE">Alltid mörkt läge</string>
<string name="ONBOARDING_THEME_LIGHT_SUBTITLE">Alltid ljust läge</string>
<string name="ONBOARDING_THEME_SUBTITLE">Välj hur appen ska se ut</string>
Expand Down
2 changes: 0 additions & 2 deletions app/core/core-resources/src/commonMain/composeResources/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,6 @@
<string name="HEDVIG_NAME_TEXT">Hedvig</string>
<string name="HOME_ADDONS_READ_MORE_BUTTON">Read more</string>
<string name="HOME_DISCOVER_SECTION_TITLE">Discover our insurances</string>
<string name="HOME_DISCOVER_SEE_PRICE_BUTTON">See price</string>
<string name="HOME_GREETING_SUBTITLE">How can we help?</string>
<string name="HOME_GREETING_TITLE">Hi %1$s</string>
<string name="HOME_QUICK_ACTIONS_CHANGE_ADDRESS">Change address</string>
Expand Down Expand Up @@ -662,7 +661,6 @@
<string name="ONBOARDING_PHONE_SAVE_ERROR">Could not save, please try again</string>
<string name="ONBOARDING_PHONE_SUBTITLE">So we can reach you if we need to</string>
<string name="ONBOARDING_PHONE_TITLE">Phone number</string>
<string name="ONBOARDING_SEE_PRICE_BUTTON">See price</string>
<string name="ONBOARDING_THEME_DARK_SUBTITLE">Always dark</string>
<string name="ONBOARDING_THEME_LIGHT_SUBTITLE">Always light</string>
<string name="ONBOARDING_THEME_SUBTITLE">Choose how the app looks</string>
Expand Down
2 changes: 1 addition & 1 deletion app/data/data-contract/src/commonMain/kotlin/com/hedvig/android/data/contract/CrossSell.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ data class CrossSell(
val storeUrl: String,
val pillowImageSmall: ImageAsset,
val pillowImageLarge: ImageAsset,
val buttonText: String? = null, // todo!!
val buttonText: String,
)

data class ImageAsset(
Expand Down
1 change: 1 addition & 0 deletions app/feature/feature-cross-sell-sheet/src/main/graphql/QueryBottomSheetCrossSells.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ fragment CrossSellFragment on CrossSell {
title
description
storeUrl
buttonTitle
pillowImageSmall {
src
id
Expand Down
1 change: 1 addition & 0 deletions ...et/src/main/kotlin/com/hedvig/android/feature/cross/sell/sheet/CrossSellSheetViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ internal fun CrossSellFragment.toCrossSell(): CrossSell {
src = pillowImageLarge.src,
description = pillowImageLarge.alt,
),
buttonText = this.buttonTitle,
)
}
}
Expand Down
1 change: 1 addition & 0 deletions app/feature/feature-home/src/main/graphql/QueryHome.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ fragment HomeCrossSellFragment on CrossSell {
title
description
storeUrl
buttonTitle
pillowImageSmall {
src
id
Expand Down
1 change: 1 addition & 0 deletions ...ture-home/src/main/kotlin/com/hedvig/android/feature/home/home/data/GetHomeDataUseCase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ internal class GetHomeDataUseCaseImpl(
src = pillowImageLarge.src,
description = pillowImageLarge.alt,
),
buttonText = this.buttonTitle,
)
}
}
Expand Down
2 changes: 2 additions & 0 deletions ...-home/src/main/kotlin/com/hedvig/android/feature/home/home/data/GetHomeDataUseCaseDemo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ private val demoCarCrossSell = CrossSell(
"",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "See price",
)

private val demoPetCrossSell = CrossSell(
Expand All @@ -43,6 +44,7 @@ private val demoPetCrossSell = CrossSell(
"",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "See price",
)

private val demoHomeData = HomeData(
Expand Down
4 changes: 2 additions & 2 deletions ...e/feature-home/src/main/kotlin/com/hedvig/android/feature/home/home/ui/HomeDestination.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ import hedvig.resources.HC_QUICK_ACTIONS_UPGRADE_COVERAGE_SUBTITLE
import hedvig.resources.HC_QUICK_ACTIONS_UPGRADE_COVERAGE_TITLE
import hedvig.resources.HOME_ADDONS_READ_MORE_BUTTON
import hedvig.resources.HOME_DISCOVER_SECTION_TITLE
import hedvig.resources.HOME_DISCOVER_SEE_PRICE_BUTTON
import hedvig.resources.HOME_GREETING_SUBTITLE
import hedvig.resources.HOME_GREETING_TITLE
import hedvig.resources.HOME_QUOTES_SECTION_TITLE
Expand Down Expand Up @@ -1556,7 +1555,6 @@ private fun DiscoverInsurancesSection(
modifier = Modifier.padding(horizontal = 16.dp),
onSheetDismissed = {},
imageLoader = imageLoader,
buttonText = stringResource(string.HOME_DISCOVER_SEE_PRICE_BUTTON),
buttonSize = ButtonSize.Small,
buttonShape = HedvigTheme.shapes.cornerFull,
)
Expand Down Expand Up @@ -1692,6 +1690,7 @@ private fun PreviewHomeScreen(
"",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "See price",
),
bannerText = "50% discount the first year",
discountText = "-50%",
Expand All @@ -1708,6 +1707,7 @@ private fun PreviewHomeScreen(
"",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "See price",
),
),
recommendedAddon = null,
Expand Down
3 changes: 3 additions & 0 deletions ...feature-home/src/test/kotlin/com/hedvig/android/feature/home/home/ui/HomePresenterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ internal class HomePresenterTest {
"url",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "See price",
),
bannerText = "50% discount the first year",
buttonText = "Explore offer",
Expand Down Expand Up @@ -539,6 +540,7 @@ internal class HomePresenterTest {
subtitle = "subt",
pillowImageSmall = ImageAsset("", "", ""),
pillowImageLarge = ImageAsset("", "", ""),
buttonText = "See price",
)
homePresenter.test(HomeUiState.Loading) {
assertThat(awaitItem()).isEqualTo(HomeUiState.Loading)
Expand Down Expand Up @@ -709,6 +711,7 @@ internal class HomePresenterTest {
storeUrl = "url",
pillowImageSmall = ImageAsset("", "", ""),
pillowImageLarge = ImageAsset("", "", ""),
buttonText = "See price",
)
homePresenter.test(HomeUiState.Loading) {
assertThat(awaitItem()).isEqualTo(HomeUiState.Loading)
Expand Down
4 changes: 4 additions & 0 deletions ...es/src/main/kotlin/com/hedvig/android/feature/insurances/data/GetCrossSellsUseCaseDemo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ internal class GetCrossSellsUseCaseDemo : GetCrossSellsUseCase {
"",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "button",
),
CrossSell(
"2",
Expand All @@ -32,6 +33,7 @@ internal class GetCrossSellsUseCaseDemo : GetCrossSellsUseCase {
"",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "button",
),
CrossSell(
"3",
Expand All @@ -40,6 +42,7 @@ internal class GetCrossSellsUseCaseDemo : GetCrossSellsUseCase {
"",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "button",
),
CrossSell(
"4",
Expand All @@ -48,6 +51,7 @@ internal class GetCrossSellsUseCaseDemo : GetCrossSellsUseCase {
"",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "button",
),
),
)
Expand Down
6 changes: 4 additions & 2 deletions ...s/src/main/kotlin/com/hedvig/android/feature/insurances/insurance/InsuranceDestination.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ import androidx.compose.ui.layout.SubcomposeLayout
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.heading
import androidx.compose.ui.semantics.onClick
import androidx.compose.ui.semantics.role
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
Expand Down Expand Up @@ -530,6 +528,7 @@ private fun PreviewInsuranceScreen(
storeUrl = "",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "button",
)
},
quantityOfCancelledInsurances = 1,
Expand Down Expand Up @@ -622,6 +621,7 @@ private class InsuranceUiStateProvider : CollectionPreviewParameterProvider<Insu
storeUrl = "",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "button",
),
),
quantityOfCancelledInsurances = 1,
Expand Down Expand Up @@ -661,6 +661,7 @@ private class InsuranceUiStateProvider : CollectionPreviewParameterProvider<Insu
storeUrl = "",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "button",
),
CrossSell(
id = "2",
Expand All @@ -669,6 +670,7 @@ private class InsuranceUiStateProvider : CollectionPreviewParameterProvider<Insu
storeUrl = "",
ImageAsset("", "", ""),
ImageAsset("", "", ""),
buttonText = "button",
),
),
hasError = false,
Expand Down
1 change: 1 addition & 0 deletions ...in/com/hedvig/android/feature/insurances/insurance/presentation/InsurancePresenterTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ internal class InsurancePresenterTest {
storeUrl = "",
pillowImageSmall = ImageAsset("", "", ""),
pillowImageLarge = ImageAsset("", "", ""),
buttonText = "See price",
),
),
)
Expand Down
1 change: 1 addition & 0 deletions app/feature/feature-onboarding/src/main/graphql/OnboardingQuery.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ query Onboarding {
title
description
storeUrl
buttonTitle
pillowImageSmall {
src
}
Expand Down
1 change: 1 addition & 0 deletions ...e-onboarding/src/main/kotlin/com/hedvig/android/feature/onboarding/data/OnboardingData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,5 @@ internal data class OnboardingCrossSell(
val description: String,
val storeUrl: String,
val pillowImageUrl: String?,
val buttonTitle: String,
)
1 change: 1 addition & 0 deletions ...arding/src/main/kotlin/com/hedvig/android/feature/onboarding/data/OnboardingRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ internal class OnboardingRepositoryImpl(
description = crossSell.description,
storeUrl = crossSell.storeUrl,
pillowImageUrl = crossSell.pillowImageSmall.src,
buttonTitle = crossSell.buttonTitle,
)
},
)
Expand Down
8 changes: 6 additions & 2 deletions ...ain/kotlin/com/hedvig/android/feature/onboarding/ui/bundle/OnboardingBundleDestination.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ import dev.zacsweers.metro.Inject
import hedvig.resources.ONBOARDING_CONTINUE_TO_APP_BUTTON
import hedvig.resources.ONBOARDING_CROSS_SELL_SUBTITLE
import hedvig.resources.ONBOARDING_CROSS_SELL_TITLE
import hedvig.resources.ONBOARDING_SEE_PRICE_BUTTON
import hedvig.resources.Res
import kotlinx.coroutines.launch
import org.jetbrains.compose.resources.stringResource
Expand Down Expand Up @@ -251,7 +250,7 @@ private fun OnboardingCrossSellRow(
}
Spacer(Modifier.width(16.dp))
HedvigButton(
text = stringResource(Res.string.ONBOARDING_SEE_PRICE_BUTTON),
text = crossSell.buttonTitle,
onClick = withOnboardingHaptic { openUrl(crossSell.storeUrl) },
enabled = true,
buttonStyle = ButtonDefaults.ButtonStyle.Secondary,
Expand Down Expand Up @@ -317,34 +316,39 @@ private class OnboardingBundleUiStateProvider : CollectionPreviewParameterProvid
description = "For you, your family and your home",
storeUrl = "https://www.hedvig.com/se/forsakringar/hemforsakring",
pillowImageUrl = null,
buttonTitle = "button",
),
OnboardingCrossSell(
id = "pet",
title = "Pet Insurance",
description = "For your dog or cat",
storeUrl = "https://www.hedvig.com/se/forsakringar/djurforsakring",
pillowImageUrl = null,
buttonTitle = "button",
),
OnboardingCrossSell(
id = "car",
title = "Car insurance",
description = "For you and your car",
storeUrl = "https://www.hedvig.com/se/forsakringar/bilforsakring",
pillowImageUrl = null,
buttonTitle = "button",
),
OnboardingCrossSell(
id = "vacation",
title = "Vacation Home Insurance",
description = "For your cottage or cabin",
storeUrl = "https://www.hedvig.com/se/forsakringar/fritidshusforsakring",
pillowImageUrl = null,
buttonTitle = "button",
),
OnboardingCrossSell(
id = "ppi",
title = "Payment Protection Insurance",
description = "For you if you get unemployed",
storeUrl = "https://www.hedvig.com/se/forsakringar/inkomstforsakring",
pillowImageUrl = null,
buttonTitle = "button",
),
),
),
Expand Down
1 change: 1 addition & 0 deletions ...oarding/src/test/kotlin/com/hedvig/android/feature/onboarding/FakeOnboardingRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ internal fun testOnboardingData(
description = "For your pet",
storeUrl = "https://x",
pillowImageUrl = "https://x",
buttonTitle = "See price",
),
),
): OnboardingData = OnboardingData(
Expand Down
1 change: 1 addition & 0 deletions ...boarding/src/test/kotlin/com/hedvig/android/feature/onboarding/data/OnboardingPathTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class OnboardingPathTest {
description = "For your pet",
storeUrl = "https://x",
pillowImageUrl = "https://x",
buttonTitle = "See price",
),
),
) = OnboardingData(
Expand Down
Loading
Loading