Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
90 changes: 47 additions & 43 deletions app/feature/feature-terminate-insurance/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id("hedvig.android.library")
id("hedvig.multiplatform.library")
id("hedvig.multiplatform.library.android")
id("hedvig.gradle.plugin")
}

Expand All @@ -11,46 +12,49 @@ hedvig {
viewModels()
}

android {
testOptions.unitTests.isReturnDefaultValues = true
}

dependencies {
implementation(libs.apollo.normalizedCache)
implementation(libs.androidx.compose.foundation)
implementation(libs.androidx.compose.material3.windowSizeClass)
implementation(libs.arrow.core)
implementation(libs.coil.compose)
implementation(libs.coroutines.core)
implementation(libs.jetbrains.lifecycle.runtime.compose)
implementation(libs.jetbrains.lifecycle.viewmodel.compose)
implementation(libs.kotlinx.datetime)
implementation(libs.kotlinx.serialization.core)
implementation(projects.apolloCore)
implementation(projects.apolloOctopusPublic)
implementation(projects.composeUi)
implementation(projects.coreCommonPublic)
implementation(projects.coreResources)
implementation(projects.coreUiData)
implementation(projects.dataChangetier)
implementation(projects.dataContract)
implementation(projects.dataTermination)
implementation(projects.designSystemHedvig)
implementation(projects.featureFlags)
implementation(projects.featureTerminateInsuranceNavigation)
implementation(projects.languageCore)
implementation(projects.moleculePublic)
implementation(projects.navigationCommon)
implementation(projects.navigationCompose)
implementation(projects.navigationCore)
implementation(projects.uiTiersAndAddons)

testImplementation(libs.assertK)
testImplementation(libs.coroutines.test)
testImplementation(libs.junit)
testImplementation(libs.turbine)
testImplementation(projects.coreCommonTest)
testImplementation(projects.dataProductVariantPublic)
testImplementation(projects.loggingTest)
testImplementation(projects.moleculeTest)
kotlin {
sourceSets {
commonMain.dependencies {
implementation(libs.apollo.normalizedCache)
implementation(libs.arrow.core)
implementation(libs.coil.compose)
implementation(libs.coroutines.core)
implementation(libs.jetbrains.compose.foundation)
implementation(libs.jetbrains.compose.material3.windowSizeClass)
implementation(libs.jetbrains.compose.ui.tooling.preview)
implementation(libs.jetbrains.lifecycle.runtime.compose)
implementation(libs.jetbrains.lifecycle.viewmodel.compose)
implementation(libs.kotlinx.datetime)
implementation(libs.kotlinx.serialization.core)
implementation(projects.apolloCore)
implementation(projects.apolloOctopusPublic)
implementation(projects.composeUi)
implementation(projects.coreCommonPublic)
implementation(projects.coreLocale)
implementation(projects.coreResources)
implementation(projects.coreUiData)
implementation(projects.dataChangetier)
implementation(projects.dataContract)
implementation(projects.dataTermination)
implementation(projects.designSystemHedvig)
implementation(projects.featureFlags)
implementation(projects.featureTerminateInsuranceNavigation)
implementation(projects.languageCore)
implementation(projects.moleculePublic)
implementation(projects.navigationCommon)
implementation(projects.navigationCompose)
implementation(projects.navigationCore)
implementation(projects.uiTiersAndAddons)
}
jvmTest.dependencies {
implementation(libs.assertK)
implementation(libs.coroutines.test)
implementation(libs.junit)
implementation(libs.turbine)
implementation(projects.coreCommonTest)
implementation(projects.dataProductVariantPublic)
implementation(projects.loggingTest)
implementation(projects.moleculeTest)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.hedvig.android.core.locale.previewCommonLocale
import com.hedvig.android.design.system.hedvig.Checkbox
import com.hedvig.android.design.system.hedvig.CheckboxGroup
import com.hedvig.android.design.system.hedvig.CheckboxOption
Expand Down Expand Up @@ -46,7 +47,6 @@ import hedvig.resources.TERMINATION_FLOW_IMPORTANT_INFORMATION_TEXT
import hedvig.resources.TERMINATION_FLOW_IMPORTANT_INFORMATION_TITLE
import hedvig.resources.TERMINATION_FLOW_I_UNDERSTAND_TEXT
import hedvig.resources.general_continue_button
import java.util.Locale
import kotlin.time.Instant
import kotlinx.datetime.LocalDate
import kotlinx.datetime.TimeZone
Expand Down Expand Up @@ -224,7 +224,7 @@ private fun PreviewTerminationDateScreen() {
null,
null,
2015..2023,
locale = Locale.ROOT,
locale = previewCommonLocale,
maxDateInMillis = 2222L,
minDateInMillis = 1111L,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import com.hedvig.android.core.common.di.ActivityRetainedScope
import com.hedvig.android.core.common.di.HedvigViewModel
import com.hedvig.android.core.locale.CommonLocale
import com.hedvig.android.design.system.hedvig.datepicker.HedvigDatePickerImmutableState
import com.hedvig.android.feature.terminateinsurance.navigation.TerminationDateParameters
import com.hedvig.android.language.LanguageService
Expand All @@ -15,7 +16,6 @@ import com.hedvig.android.molecule.public.MoleculePresenterScope
import com.hedvig.android.molecule.public.MoleculeViewModel
import dev.zacsweers.metro.Assisted
import dev.zacsweers.metro.AssistedInject
import java.util.Locale
import kotlinx.datetime.LocalDate
import kotlinx.datetime.TimeZone
import kotlinx.datetime.atStartOfDayIn
Expand Down Expand Up @@ -74,7 +74,7 @@ private class TerminationDatePresenter : MoleculePresenter<TerminationDateEvent,
}
}

private class DatePickerConfiguration(locale: Locale, minDate: LocalDate, maxDate: LocalDate) {
private class DatePickerConfiguration(locale: CommonLocale, minDate: LocalDate, maxDate: LocalDate) {
private val minDateInMillis = minDate.atStartOfDayIn(TimeZone.UTC).toEpochMilliseconds()
private val maxDateInMillis = maxDate.atStartOfDayIn(TimeZone.UTC).toEpochMilliseconds()
private val yearRange = minDate.year..maxDate.year
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import hedvig.resources.TERMINATION_FLOW_SUCCESS_SUBTITLE_WITH_DATE
import hedvig.resources.TERMINATION_FLOW_SUCCESS_TITLE
import hedvig.resources.general_done_button
import kotlinx.datetime.LocalDate
import kotlinx.datetime.toJavaLocalDate
import org.jetbrains.compose.resources.stringResource

@Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.hedvig.android.feature.terminateinsurance.ui

import android.R.attr.text
import androidx.compose.foundation.layout.ColumnScope
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
Expand Down Expand Up @@ -46,7 +45,6 @@ import hedvig.resources.TERMINATION_Q_03
import hedvig.resources.TOAST_READ_MORE
import hedvig.resources.general_close_button
import kotlinx.datetime.LocalDate
import kotlinx.datetime.toJavaLocalDate
import org.jetbrains.compose.resources.stringResource

@Composable
Expand Down
Loading