From 4874f74906a889b6a9f566fa9dfcdae610c7233f Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Thu, 12 Nov 2026 12:29:00 +0100 Subject: [PATCH 1/2] Move feature-terminate-insurance sources to KMP source sets --- .../src/{main => androidMain}/AndroidManifest.xml | 0 .../{main => commonMain}/graphql/MutationDeleteContract.graphql | 0 .../graphql/MutationTerminateContract.graphql | 0 .../graphql/QueryTerminationFlowNotification.graphql | 0 .../{main => commonMain}/graphql/QueryTerminationSurvey.graphql | 0 .../terminateinsurance/data/GetTerminationNotificationUseCase.kt | 0 .../terminateinsurance/data/TerminateInsuranceRepository.kt | 0 .../feature/terminateinsurance/data/TerminateInsuranceStep.kt | 0 .../feature/terminateinsurance/data/TerminationSurveyOption.kt | 0 .../terminateinsurance/navigation/TerminateInsuranceDeepLinks.kt | 0 .../navigation/TerminateInsuranceDestination.kt | 0 .../terminateinsurance/navigation/TerminateInsuranceEntries.kt | 0 .../step/choose/ChooseInsuranceToTerminateDestination.kt | 0 .../step/choose/ChooseInsuranceToTerminateViewModel.kt | 0 .../step/deflect/DeflectSuggestionDestination.kt | 0 .../step/deletion/InsuranceDeletionDestination.kt | 0 .../step/redirection/TerminationRedirectionDestination.kt | 0 .../step/survey/TerminationSurveyDestination.kt | 0 .../terminateinsurance/step/survey/TerminationSurveyViewModel.kt | 0 .../step/terminationdate/TerminationDateDestination.kt | 0 .../step/terminationdate/TerminationDateViewModel.kt | 0 .../step/terminationfailure/TerminationFailureDestination.kt | 0 .../step/terminationreview/TerminationConfirmationDestination.kt | 0 .../step/terminationreview/TerminationConfirmationViewModel.kt | 0 .../step/terminationsuccess/TerminationSuccessDestination.kt | 0 .../terminateinsurance/step/unknown/UnknownScreenDestination.kt | 0 .../android/feature/terminateinsurance/ui/TerminationInfo.kt | 0 .../android/feature/terminateinsurance/ui/TerminationInfoCard.kt | 0 .../android/feature/terminateinsurance/ui/TerminationScaffold.kt | 0 .../hedvig/android/feature/terminateinsurance/TestBackstack.kt | 0 .../step/survey/TerminationSurveyPresenterTest.kt | 0 .../terminationreview/TerminationConfirmationPresenterTest.kt | 0 32 files changed, 0 insertions(+), 0 deletions(-) rename app/feature/feature-terminate-insurance/src/{main => androidMain}/AndroidManifest.xml (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/graphql/MutationDeleteContract.graphql (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/graphql/MutationTerminateContract.graphql (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/graphql/QueryTerminationFlowNotification.graphql (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/graphql/QueryTerminationSurvey.graphql (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/data/GetTerminationNotificationUseCase.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceRepository.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceStep.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminationSurveyOption.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceDeepLinks.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceEntries.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/choose/ChooseInsuranceToTerminateDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/choose/ChooseInsuranceToTerminateViewModel.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/deflect/DeflectSuggestionDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/deletion/InsuranceDeletionDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/redirection/TerminationRedirectionDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyViewModel.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateViewModel.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationfailure/TerminationFailureDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationViewModel.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationsuccess/TerminationSuccessDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/step/unknown/UnknownScreenDestination.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationInfo.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationInfoCard.kt (100%) rename app/feature/feature-terminate-insurance/src/{main => commonMain}/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationScaffold.kt (100%) rename app/feature/feature-terminate-insurance/src/{test => jvmTest}/kotlin/com/hedvig/android/feature/terminateinsurance/TestBackstack.kt (100%) rename app/feature/feature-terminate-insurance/src/{test => jvmTest}/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyPresenterTest.kt (100%) rename app/feature/feature-terminate-insurance/src/{test => jvmTest}/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationPresenterTest.kt (100%) diff --git a/app/feature/feature-terminate-insurance/src/main/AndroidManifest.xml b/app/feature/feature-terminate-insurance/src/androidMain/AndroidManifest.xml similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/AndroidManifest.xml rename to app/feature/feature-terminate-insurance/src/androidMain/AndroidManifest.xml diff --git a/app/feature/feature-terminate-insurance/src/main/graphql/MutationDeleteContract.graphql b/app/feature/feature-terminate-insurance/src/commonMain/graphql/MutationDeleteContract.graphql similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/graphql/MutationDeleteContract.graphql rename to app/feature/feature-terminate-insurance/src/commonMain/graphql/MutationDeleteContract.graphql diff --git a/app/feature/feature-terminate-insurance/src/main/graphql/MutationTerminateContract.graphql b/app/feature/feature-terminate-insurance/src/commonMain/graphql/MutationTerminateContract.graphql similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/graphql/MutationTerminateContract.graphql rename to app/feature/feature-terminate-insurance/src/commonMain/graphql/MutationTerminateContract.graphql diff --git a/app/feature/feature-terminate-insurance/src/main/graphql/QueryTerminationFlowNotification.graphql b/app/feature/feature-terminate-insurance/src/commonMain/graphql/QueryTerminationFlowNotification.graphql similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/graphql/QueryTerminationFlowNotification.graphql rename to app/feature/feature-terminate-insurance/src/commonMain/graphql/QueryTerminationFlowNotification.graphql diff --git a/app/feature/feature-terminate-insurance/src/main/graphql/QueryTerminationSurvey.graphql b/app/feature/feature-terminate-insurance/src/commonMain/graphql/QueryTerminationSurvey.graphql similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/graphql/QueryTerminationSurvey.graphql rename to app/feature/feature-terminate-insurance/src/commonMain/graphql/QueryTerminationSurvey.graphql diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/data/GetTerminationNotificationUseCase.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/data/GetTerminationNotificationUseCase.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/data/GetTerminationNotificationUseCase.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/data/GetTerminationNotificationUseCase.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceRepository.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceRepository.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceRepository.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceRepository.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceStep.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceStep.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceStep.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminateInsuranceStep.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminationSurveyOption.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminationSurveyOption.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminationSurveyOption.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/data/TerminationSurveyOption.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceDeepLinks.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceDeepLinks.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceDeepLinks.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceDeepLinks.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceEntries.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceEntries.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceEntries.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/navigation/TerminateInsuranceEntries.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/choose/ChooseInsuranceToTerminateDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/choose/ChooseInsuranceToTerminateDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/choose/ChooseInsuranceToTerminateDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/choose/ChooseInsuranceToTerminateDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/choose/ChooseInsuranceToTerminateViewModel.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/choose/ChooseInsuranceToTerminateViewModel.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/choose/ChooseInsuranceToTerminateViewModel.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/choose/ChooseInsuranceToTerminateViewModel.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/deflect/DeflectSuggestionDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/deflect/DeflectSuggestionDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/deflect/DeflectSuggestionDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/deflect/DeflectSuggestionDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/deletion/InsuranceDeletionDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/deletion/InsuranceDeletionDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/deletion/InsuranceDeletionDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/deletion/InsuranceDeletionDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/redirection/TerminationRedirectionDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/redirection/TerminationRedirectionDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/redirection/TerminationRedirectionDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/redirection/TerminationRedirectionDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyViewModel.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyViewModel.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyViewModel.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyViewModel.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateViewModel.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateViewModel.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateViewModel.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateViewModel.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationfailure/TerminationFailureDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationfailure/TerminationFailureDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationfailure/TerminationFailureDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationfailure/TerminationFailureDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationViewModel.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationViewModel.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationViewModel.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationViewModel.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationsuccess/TerminationSuccessDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationsuccess/TerminationSuccessDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationsuccess/TerminationSuccessDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationsuccess/TerminationSuccessDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/unknown/UnknownScreenDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/unknown/UnknownScreenDestination.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/step/unknown/UnknownScreenDestination.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/unknown/UnknownScreenDestination.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationInfo.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationInfo.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationInfo.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationInfo.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationInfoCard.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationInfoCard.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationInfoCard.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationInfoCard.kt diff --git a/app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationScaffold.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationScaffold.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/main/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationScaffold.kt rename to app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/ui/TerminationScaffold.kt diff --git a/app/feature/feature-terminate-insurance/src/test/kotlin/com/hedvig/android/feature/terminateinsurance/TestBackstack.kt b/app/feature/feature-terminate-insurance/src/jvmTest/kotlin/com/hedvig/android/feature/terminateinsurance/TestBackstack.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/test/kotlin/com/hedvig/android/feature/terminateinsurance/TestBackstack.kt rename to app/feature/feature-terminate-insurance/src/jvmTest/kotlin/com/hedvig/android/feature/terminateinsurance/TestBackstack.kt diff --git a/app/feature/feature-terminate-insurance/src/test/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyPresenterTest.kt b/app/feature/feature-terminate-insurance/src/jvmTest/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyPresenterTest.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/test/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyPresenterTest.kt rename to app/feature/feature-terminate-insurance/src/jvmTest/kotlin/com/hedvig/android/feature/terminateinsurance/step/survey/TerminationSurveyPresenterTest.kt diff --git a/app/feature/feature-terminate-insurance/src/test/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationPresenterTest.kt b/app/feature/feature-terminate-insurance/src/jvmTest/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationPresenterTest.kt similarity index 100% rename from app/feature/feature-terminate-insurance/src/test/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationPresenterTest.kt rename to app/feature/feature-terminate-insurance/src/jvmTest/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationreview/TerminationConfirmationPresenterTest.kt From dfd51c3af68c1908fbb8f0d5a9eb9010a9670b1f Mon Sep 17 00:00:00 2001 From: stylianosgakis Date: Thu, 12 Nov 2026 12:35:16 +0100 Subject: [PATCH 2/2] Convert feature-terminate-insurance to Kotlin Multiplatform The module now builds with the JVM and Android targets and all of its code, including the entries function and deep link provider, compiles from commonMain. java.util.Locale becomes CommonLocale from core-locale; the date picker preview uses previewCommonLocale. Window size classes come from the JetBrains material3-window-size-class artifact that design-system-hedvig already uses. Unused imports of android.R.attr.text and kotlinx.datetime.toJavaLocalDate are dropped. Unit tests run as jvmTest. --- .../build.gradle.kts | 90 ++++++++++--------- .../TerminationDateDestination.kt | 4 +- .../TerminationDateViewModel.kt | 4 +- .../TerminationSuccessDestination.kt | 1 - .../ui/TerminationScaffold.kt | 2 - 5 files changed, 51 insertions(+), 50 deletions(-) diff --git a/app/feature/feature-terminate-insurance/build.gradle.kts b/app/feature/feature-terminate-insurance/build.gradle.kts index 9a438332cc..be8524d229 100644 --- a/app/feature/feature-terminate-insurance/build.gradle.kts +++ b/app/feature/feature-terminate-insurance/build.gradle.kts @@ -1,5 +1,6 @@ plugins { - id("hedvig.android.library") + id("hedvig.multiplatform.library") + id("hedvig.multiplatform.library.android") id("hedvig.gradle.plugin") } @@ -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) + } + } } diff --git a/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateDestination.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateDestination.kt index 2b844795a8..39f0bc7985 100644 --- a/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateDestination.kt +++ b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateDestination.kt @@ -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 @@ -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 @@ -224,7 +224,7 @@ private fun PreviewTerminationDateScreen() { null, null, 2015..2023, - locale = Locale.ROOT, + locale = previewCommonLocale, maxDateInMillis = 2222L, minDateInMillis = 1111L, ), diff --git a/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateViewModel.kt b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateViewModel.kt index 0b77309226..c83385339d 100644 --- a/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateViewModel.kt +++ b/app/feature/feature-terminate-insurance/src/commonMain/kotlin/com/hedvig/android/feature/terminateinsurance/step/terminationdate/TerminationDateViewModel.kt @@ -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 @@ -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 @@ -74,7 +74,7 @@ private class TerminationDatePresenter : MoleculePresenter