Merge pull request #2267 from HedvigInsurance/fix/document-spacing-2

Use the extracted QuoteCard inside tier flow
HedvigInsurance · Nov 4, 2024 · cc83ae8 · cc83ae8
2 parents fcbd49b + 37cfe8e
commit cc83ae8
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 274 deletions.
diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
@@ -107,7 +107,7 @@ android {
 dependencies {
   implementation(platform(libs.firebase.bom))
   implementation(libs.androidx.activity.compose)
-  implementation(libs.androidx.compose.animation)
+  implementation(libs.androidx.compose.animationCore)
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.material3)
   implementation(libs.androidx.compose.material3.windowSizeClass)

diff --git a/app/app/src/main/kotlin/com/hedvig/android/app/navigation/HedvigNavHost.kt b/app/app/src/main/kotlin/com/hedvig/android/app/navigation/HedvigNavHost.kt
@@ -183,11 +183,6 @@ internal fun HedvigNavHost(
       openUrl = openUrl,
       navigator = navigator,
     )
-    changeTierGraph(
-      navigator = navigator,
-      navController = hedvigAppState.navController,
-      applicationId = hedvigBuildConstants.appId,
-    )
     insuranceGraph(
       nestedGraphs = {
         terminateInsuranceGraph(
@@ -327,7 +322,6 @@ internal fun HedvigNavHost(
     changeTierGraph(
       navigator = navigator,
       navController = hedvigAppState.navController,
-      applicationId = hedvigBuildConstants.appId,
     )
     movingFlowGraph(
       navController = hedvigAppState.navController,

diff --git a/app/audio-player-ui/build.gradle.kts b/app/audio-player-ui/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.androidx.compose.animation)
+  implementation(libs.androidx.compose.animationCore)
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.uiUtil)
   implementation(libs.androidx.lifecycle.compose)

diff --git a/app/feature/feature-choose-tier/build.gradle.kts b/app/feature/feature-choose-tier/build.gradle.kts
@@ -30,7 +30,6 @@ dependencies {
   implementation(projects.composeUi)
   implementation(projects.coreCommonAndroidPublic)
   implementation(projects.coreCommonPublic)
-  implementation(projects.coreFileUpload)
   implementation(projects.coreResources)
   implementation(projects.coreUiData)
   implementation(projects.dataChangetier)
@@ -46,6 +45,7 @@ dependencies {
   implementation(projects.navigationCompose)
   implementation(projects.navigationComposeTyped)
   implementation(projects.navigationCore)
+  implementation(projects.uiTiersAndAddons)
 
   testImplementation(libs.apollo.testingSupport)
   testImplementation(libs.assertK)

diff --git a/...choose-tier/src/main/kotlin/com/hedvig/android/feature/change/tier/di/ChooseTierModule.kt b/...choose-tier/src/main/kotlin/com/hedvig/android/feature/change/tier/di/ChooseTierModule.kt
@@ -1,7 +1,6 @@
 package com.hedvig.android.feature.change.tier.di
 
 import com.apollographql.apollo.ApolloClient
-import com.hedvig.android.core.fileupload.DownloadPdfUseCase
 import com.hedvig.android.data.changetier.data.ChangeTierRepository
 import com.hedvig.android.feature.change.tier.data.GetCurrentContractDataUseCase
 import com.hedvig.android.feature.change.tier.data.GetCurrentContractDataUseCaseImpl
@@ -60,7 +59,6 @@ val chooseTierModule = module {
       params = params.get<SummaryParameters>(),
       tierRepository = get<ChangeTierRepository>(),
       getCurrentContractDataUseCase = get<GetCurrentContractDataUseCase>(),
-      downloadPdfUseCase = get<DownloadPdfUseCase>(),
     )
   }
 

diff --git a/...tier/src/main/kotlin/com/hedvig/android/feature/change/tier/navigation/ChooseTierGraph.kt b/...tier/src/main/kotlin/com/hedvig/android/feature/change/tier/navigation/ChooseTierGraph.kt
@@ -3,7 +3,6 @@ package com.hedvig.android.feature.change.tier.navigation
 import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
-import com.hedvig.android.core.common.android.sharePDF
 import com.hedvig.android.feature.change.tier.ui.chooseinsurance.ChooseInsuranceToChangeTierDestination
 import com.hedvig.android.feature.change.tier.ui.chooseinsurance.ChooseInsuranceViewModel
 import com.hedvig.android.feature.change.tier.ui.comparison.ComparisonDestination
@@ -24,7 +23,7 @@ import com.hedvig.android.navigation.core.Navigator
 import org.koin.androidx.compose.koinViewModel
 import org.koin.core.parameter.parametersOf
 
-fun NavGraphBuilder.changeTierGraph(navigator: Navigator, navController: NavController, applicationId: String) {
+fun NavGraphBuilder.changeTierGraph(navigator: Navigator, navController: NavController) {
   navdestination<StartTierFlowDestination> { _ ->
     val viewModel: StartTierFlowViewModel = koinViewModel {
       parametersOf(this.insuranceId)
@@ -115,9 +114,6 @@ fun NavGraphBuilder.changeTierGraph(navigator: Navigator, navController: NavCont
         onFailure = {
           navigator.navigateUnsafe(ChooseTierDestination.SubmitFailure)
         },
-        sharePdf = {
-          context.sharePDF(it, applicationId)
-        },
         onSuccess = {
           navigator.navigateUnsafe(ChooseTierDestination.SubmitSuccess(this.params.activationDate)) {
             typedPopUpTo<ChooseTierDestination.SelectTierAndDeductible> {