diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/accident.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/accident.webp new file mode 100644 index 0000000000..a255a6705a Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/accident.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/car.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/car.webp new file mode 100644 index 0000000000..ade64812d0 Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/car.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/cat.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/cat.webp new file mode 100644 index 0000000000..2ddc90a724 Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/cat.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/dog.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/dog.webp new file mode 100644 index 0000000000..cd1177f950 Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/dog.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/home.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/home.webp new file mode 100644 index 0000000000..71c9bb1c27 Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/home.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/homeowner.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/homeowner.webp new file mode 100644 index 0000000000..695fcd1955 Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/homeowner.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_accident.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_accident.webp deleted file mode 100644 index 3129c5270f..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_accident.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_car.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_car.webp deleted file mode 100644 index b387601102..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_car.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_cat.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_cat.webp deleted file mode 100644 index 1483bf6bb8..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_cat.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_countryhome.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_countryhome.webp deleted file mode 100644 index fa01993713..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_countryhome.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_dog.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_dog.webp deleted file mode 100644 index fbcebcc97e..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_dog.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_home.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_home.webp deleted file mode 100644 index 44e86720e0..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_home.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_homeowner.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_homeowner.webp deleted file mode 100644 index 8b9be21e32..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_homeowner.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_pet.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_pet.webp deleted file mode 100644 index 09f900bf8b..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_pet.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_rental.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_rental.webp deleted file mode 100644 index 608ba011b7..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_rental.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_student.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_student.webp deleted file mode 100644 index b47ba01b36..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_student.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_villa.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_villa.webp deleted file mode 100644 index 286d729b1b..0000000000 Binary files a/app/data/data-contract/src/commonMain/composeResources/drawable/ic_pillow_villa.webp and /dev/null differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/pet.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/pet.webp new file mode 100644 index 0000000000..5cd56d86b9 Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/pet.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/rental.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/rental.webp new file mode 100644 index 0000000000..d12ca15fb8 Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/rental.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/safety.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/safety.webp new file mode 100644 index 0000000000..2110019513 Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/safety.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/student.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/student.webp new file mode 100644 index 0000000000..0344e5767a Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/student.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/vacation.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/vacation.webp new file mode 100644 index 0000000000..dd3ae8c529 Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/vacation.webp differ diff --git a/app/data/data-contract/src/commonMain/composeResources/drawable/villa.webp b/app/data/data-contract/src/commonMain/composeResources/drawable/villa.webp new file mode 100644 index 0000000000..993ea33ff3 Binary files /dev/null and b/app/data/data-contract/src/commonMain/composeResources/drawable/villa.webp differ diff --git a/app/data/data-contract/src/commonMain/kotlin/com/hedvig/android/data/contract/ContractGroup.kt b/app/data/data-contract/src/commonMain/kotlin/com/hedvig/android/data/contract/ContractGroup.kt index d2abd15d63..fd3ba172af 100644 --- a/app/data/data-contract/src/commonMain/kotlin/com/hedvig/android/data/contract/ContractGroup.kt +++ b/app/data/data-contract/src/commonMain/kotlin/com/hedvig/android/data/contract/ContractGroup.kt @@ -1,15 +1,16 @@ package com.hedvig.android.data.contract import hedvigandroid.data_contract.generated.resources.Res -import hedvigandroid.data_contract.generated.resources.ic_pillow_accident -import hedvigandroid.data_contract.generated.resources.ic_pillow_car -import hedvigandroid.data_contract.generated.resources.ic_pillow_cat -import hedvigandroid.data_contract.generated.resources.ic_pillow_countryhome -import hedvigandroid.data_contract.generated.resources.ic_pillow_dog -import hedvigandroid.data_contract.generated.resources.ic_pillow_homeowner -import hedvigandroid.data_contract.generated.resources.ic_pillow_rental -import hedvigandroid.data_contract.generated.resources.ic_pillow_student -import hedvigandroid.data_contract.generated.resources.ic_pillow_villa +import hedvigandroid.data_contract.generated.resources.accident +import hedvigandroid.data_contract.generated.resources.car +import hedvigandroid.data_contract.generated.resources.cat +import hedvigandroid.data_contract.generated.resources.dog +import hedvigandroid.data_contract.generated.resources.home +import hedvigandroid.data_contract.generated.resources.homeowner +import hedvigandroid.data_contract.generated.resources.rental +import hedvigandroid.data_contract.generated.resources.student +import hedvigandroid.data_contract.generated.resources.vacation +import hedvigandroid.data_contract.generated.resources.villa import org.jetbrains.compose.resources.DrawableResource enum class ContractGroup { @@ -23,80 +24,89 @@ enum class ContractGroup { DOG, STUDENT, COUNTRY_HOME, + QASA_LANDLORD, UNKNOWN, } fun ContractGroup.gradientResource(): DrawableResource = when (this) { - ContractGroup.HOMEOWNER -> Res.drawable.ic_pillow_homeowner - ContractGroup.HOUSE -> Res.drawable.ic_pillow_villa - ContractGroup.RENTAL -> Res.drawable.ic_pillow_rental - ContractGroup.STUDENT -> Res.drawable.ic_pillow_student - ContractGroup.ACCIDENT -> Res.drawable.ic_pillow_accident - ContractGroup.CAR -> Res.drawable.ic_pillow_car - ContractGroup.CAT -> Res.drawable.ic_pillow_cat - ContractGroup.DOG -> Res.drawable.ic_pillow_dog - ContractGroup.TRAVEL -> Res.drawable.ic_pillow_homeowner - ContractGroup.COUNTRY_HOME -> Res.drawable.ic_pillow_countryhome - ContractGroup.UNKNOWN -> Res.drawable.ic_pillow_homeowner + ContractGroup.HOMEOWNER -> Res.drawable.homeowner + ContractGroup.HOUSE -> Res.drawable.villa + ContractGroup.RENTAL -> Res.drawable.rental + ContractGroup.STUDENT -> Res.drawable.student + ContractGroup.ACCIDENT -> Res.drawable.accident + ContractGroup.CAR -> Res.drawable.car + ContractGroup.CAT -> Res.drawable.cat + ContractGroup.DOG -> Res.drawable.dog + ContractGroup.TRAVEL -> Res.drawable.homeowner + ContractGroup.COUNTRY_HOME -> Res.drawable.vacation + ContractGroup.UNKNOWN -> Res.drawable.home + ContractGroup.QASA_LANDLORD -> Res.drawable.home } fun ContractGroup.pillowResource(): DrawableResource = when (this) { - ContractGroup.HOMEOWNER -> Res.drawable.ic_pillow_homeowner - ContractGroup.HOUSE -> Res.drawable.ic_pillow_villa - ContractGroup.RENTAL -> Res.drawable.ic_pillow_rental - ContractGroup.STUDENT -> Res.drawable.ic_pillow_student - ContractGroup.ACCIDENT -> Res.drawable.ic_pillow_accident - ContractGroup.CAR -> Res.drawable.ic_pillow_car - ContractGroup.CAT -> Res.drawable.ic_pillow_cat - ContractGroup.DOG -> Res.drawable.ic_pillow_dog - ContractGroup.TRAVEL -> Res.drawable.ic_pillow_homeowner - ContractGroup.COUNTRY_HOME -> Res.drawable.ic_pillow_countryhome - ContractGroup.UNKNOWN -> Res.drawable.ic_pillow_homeowner + ContractGroup.HOMEOWNER -> Res.drawable.homeowner + ContractGroup.HOUSE -> Res.drawable.villa + ContractGroup.RENTAL -> Res.drawable.rental + ContractGroup.STUDENT -> Res.drawable.student + ContractGroup.ACCIDENT -> Res.drawable.accident + ContractGroup.CAR -> Res.drawable.car + ContractGroup.CAT -> Res.drawable.cat + ContractGroup.DOG -> Res.drawable.dog + ContractGroup.TRAVEL -> Res.drawable.homeowner + ContractGroup.COUNTRY_HOME -> Res.drawable.vacation + ContractGroup.UNKNOWN -> Res.drawable.home + ContractGroup.QASA_LANDLORD -> Res.drawable.home } fun String.toContractGroup(): ContractGroup = when (this) { "NO_HOUSE", "DK_HOUSE", "SE_HOUSE", - -> ContractGroup.HOUSE + "SE_HOUSE_BAS", + "SE_HOUSE_MAX" + -> ContractGroup.HOUSE "DK_ACCIDENT", "NO_ACCIDENT", "SE_ACCIDENT", "SE_ACCIDENT_STUDENT", "DK_ACCIDENT_STUDENT", - -> ContractGroup.ACCIDENT + -> ContractGroup.ACCIDENT "DK_TRAVEL", "DK_TRAVEL_STUDENT", "NO_TRAVEL", "NO_TRAVEL_STUDENT", "NO_TRAVEL_YOUTH", - -> ContractGroup.TRAVEL + -> ContractGroup.TRAVEL "DK_HOME_CONTENT_RENT", "DK_HOME_CONTENT_STUDENT_RENT", "NO_HOME_CONTENT_RENT", "SE_APARTMENT_RENT", + "SE_APARTMENT_RENT_MAX", + "SE_APARTMENT_RENT_BAS", "SE_GROUP_APARTMENT_RENT", "SE_QASA_LONG_TERM_RENTAL", "SE_QASA_SHORT_TERM_RENTAL", "NO_HOME_CONTENT_YOUTH_RENT", - -> ContractGroup.RENTAL + -> ContractGroup.RENTAL "NO_HOME_CONTENT_YOUTH_OWN", "DK_HOME_CONTENT_STUDENT_OWN", "DK_HOME_CONTENT_OWN", "NO_HOME_CONTENT_OWN", "SE_APARTMENT_BRF", + "SE_APARTMENT_BRF_BAS", + "SE_APARTMENT_BRF_MAX", "SE_GROUP_APARTMENT_BRF", - -> ContractGroup.HOMEOWNER + -> ContractGroup.HOMEOWNER "NO_HOME_CONTENT_STUDENT_OWN", "NO_HOME_CONTENT_STUDENT_RENT", "SE_APARTMENT_STUDENT_BRF", "SE_APARTMENT_STUDENT_RENT", - -> ContractGroup.STUDENT + -> ContractGroup.STUDENT "SE_CAR_FULL", "SE_CAR_HALF", @@ -104,21 +114,21 @@ fun String.toContractGroup(): ContractGroup = when (this) { "SE_CAR_TRIAL_HALF", "SE_CAR_TRIAL_FULL", "SE_CAR_DECOMMISSIONED", - -> ContractGroup.CAR + -> ContractGroup.CAR "SE_CAT_BASIC", "SE_CAT_PREMIUM", "SE_CAT_STANDARD", - -> ContractGroup.CAT + -> ContractGroup.CAT "SE_DOG_BASIC", "SE_DOG_PREMIUM", "SE_DOG_STANDARD", - -> ContractGroup.DOG + -> ContractGroup.DOG "SE_VACATION_HOME_BAS", "SE_VACATION_HOME_STANDARD", - -> ContractGroup.COUNTRY_HOME + -> ContractGroup.COUNTRY_HOME else -> ContractGroup.UNKNOWN } diff --git a/app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/data/GetInsuranceContractsUseCase.kt b/app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/data/GetInsuranceContractsUseCase.kt index 11bbff6011..1e2c17ea65 100644 --- a/app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/data/GetInsuranceContractsUseCase.kt +++ b/app/feature/feature-insurances/src/main/kotlin/com/hedvig/android/feature/insurances/data/GetInsuranceContractsUseCase.kt @@ -20,6 +20,7 @@ import com.hedvig.android.data.productvariant.toAddonVariant import com.hedvig.android.data.productvariant.toProductVariant import com.hedvig.android.feature.insurances.data.InsuranceContract.EstablishedInsuranceContract import com.hedvig.android.feature.insurances.data.InsuranceContract.PendingInsuranceContract +import com.hedvig.android.logger.logcat import dev.zacsweers.metro.ContributesBinding import dev.zacsweers.metro.Inject import dev.zacsweers.metro.SingleIn