diff --git a/app/core/core-icons/build.gradle.kts b/app/core/core-icons/build.gradle.kts index 26a9e0cb70..c74d2244e8 100644 --- a/app/core/core-icons/build.gradle.kts +++ b/app/core/core-icons/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") } @@ -7,7 +8,11 @@ hedvig { compose() } -dependencies { - implementation(libs.androidx.compose.materialIconsCore) - implementation(libs.jetbrains.compose.ui) +kotlin { + sourceSets { + commonMain.dependencies { + implementation(libs.jetbrains.compose.material.iconsCore) + implementation(libs.jetbrains.compose.ui) + } + } } diff --git a/app/core/core-icons/src/main/AndroidManifest.xml b/app/core/core-icons/src/androidMain/AndroidManifest.xml similarity index 100% rename from app/core/core-icons/src/main/AndroidManifest.xml rename to app/core/core-icons/src/androidMain/AndroidManifest.xml diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/HedvigIcons.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/HedvigIcons.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/HedvigIcons.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/HedvigIcons.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/compose/NotificationCircle.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/compose/NotificationCircle.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/compose/NotificationCircle.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/compose/NotificationCircle.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/compose/NotificationCircleWithSubtractingPadding.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/compose/NotificationCircleWithSubtractingPadding.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/compose/NotificationCircleWithSubtractingPadding.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/compose/NotificationCircleWithSubtractingPadding.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagDenmark.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagDenmark.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagDenmark.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagDenmark.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagNorway.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagNorway.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagNorway.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagNorway.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagSweden.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagSweden.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagSweden.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagSweden.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagUk.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagUk.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagUk.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/flag/FlagUk.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/logo/HedvigLogotype.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/logo/HedvigLogotype.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/logo/HedvigLogotype.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/logo/HedvigLogotype.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/Forever.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/Forever.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/Forever.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/Forever.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/ForeverFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/ForeverFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/ForeverFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/ForeverFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/Home.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/Home.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/Home.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/Home.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/HomeFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/HomeFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/HomeFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/HomeFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/Insurance.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/Insurance.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/Insurance.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/Insurance.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/InsuranceFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/InsuranceFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/InsuranceFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/InsuranceFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/Payments.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/Payments.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/Payments.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/Payments.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/PaymentsFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/PaymentsFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/PaymentsFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/PaymentsFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/Profile.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/Profile.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/Profile.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/Profile.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/ProfileFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/ProfileFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/nav/ProfileFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/nav/ProfileFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/AndroidLogo.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/AndroidLogo.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/AndroidLogo.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/AndroidLogo.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Apartment.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Apartment.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Apartment.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Apartment.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/AppleLogo.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/AppleLogo.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/AppleLogo.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/AppleLogo.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowBack.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowBack.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowBack.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowBack.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowDown.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowDown.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowDown.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowDown.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowForward.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowForward.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowForward.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowForward.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowUp.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowUp.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowUp.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ArrowUp.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Basketball.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Basketball.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Basketball.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Basketball.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Calendar.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Calendar.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Calendar.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Calendar.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Camera.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Camera.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Camera.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Camera.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Certificate.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Certificate.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Certificate.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Certificate.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/CheckmarkInCircle.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/CheckmarkInCircle.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/CheckmarkInCircle.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/CheckmarkInCircle.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/CheckmarkInCircleFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/CheckmarkInCircleFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/CheckmarkInCircleFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/CheckmarkInCircleFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Chevron right.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Chevron right.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Chevron right.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Chevron right.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronDown.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronDown.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronDown.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronDown.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronLeft.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronLeft.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronLeft.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronLeft.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronUp.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronUp.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronUp.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ChevronUp.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ContactInformation.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ContactInformation.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/ContactInformation.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/ContactInformation.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Copy.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Copy.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Copy.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Copy.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/CreditCard.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/CreditCard.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/CreditCard.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/CreditCard.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Deductible.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Deductible.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Deductible.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Deductible.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Document.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Document.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Document.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Document.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Edit.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Edit.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Edit.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Edit.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Eurobonus.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Eurobonus.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Eurobonus.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Eurobonus.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Heart.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Heart.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Heart.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Heart.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Hedvig.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Hedvig.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Hedvig.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Hedvig.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/House.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/House.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/House.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/House.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Info.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Info.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Info.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Info.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/InfoFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/InfoFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/InfoFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/InfoFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Language.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Language.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Language.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Language.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Logout.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Logout.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Logout.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Logout.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Mail.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Mail.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Mail.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Mail.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/MinusInCircle.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/MinusInCircle.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/MinusInCircle.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/MinusInCircle.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/MoreIos.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/MoreIos.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/MoreIos.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/MoreIos.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/MultipleDocuments.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/MultipleDocuments.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/MultipleDocuments.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/MultipleDocuments.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Other.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Other.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Other.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Other.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Pause.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Pause.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Pause.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Pause.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Pictures.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Pictures.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Pictures.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Pictures.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Play.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Play.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Play.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Play.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/PlusInCircle.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/PlusInCircle.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/PlusInCircle.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/PlusInCircle.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Reciept.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Reciept.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Reciept.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Reciept.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/RestartOneArrow.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/RestartOneArrow.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/RestartOneArrow.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/RestartOneArrow.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/RestartTwoArrows.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/RestartTwoArrows.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/RestartTwoArrows.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/RestartTwoArrows.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Search.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Search.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Search.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Search.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Settings.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Settings.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Settings.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Settings.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/StopSign.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/StopSign.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/StopSign.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/StopSign.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/StopSignFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/StopSignFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/StopSignFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/StopSignFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Waiting.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Waiting.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Waiting.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Waiting.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Warning.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Warning.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Warning.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Warning.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/WarningFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/WarningFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/WarningFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/WarningFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Watch.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Watch.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/Watch.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/Watch.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/X.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/X.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/X.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/X.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/XInCircle.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/XInCircle.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/XInCircle.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/XInCircle.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/XInCircleFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/XInCircleFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/normal/XInCircleFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/normal/XInCircleFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/ArrowNorthEast.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/ArrowNorthEast.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/ArrowNorthEast.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/ArrowNorthEast.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/BankId.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/BankId.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/BankId.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/BankId.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Campaign.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Campaign.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Campaign.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Campaign.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Checkmark.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Checkmark.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Checkmark.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Checkmark.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/CircleFilled.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/CircleFilled.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/CircleFilled.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/CircleFilled.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/CircleWithOutline.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/CircleWithOutline.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/CircleWithOutline.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/CircleWithOutline.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Lock.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Lock.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Lock.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Lock.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Minus.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Minus.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Minus.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Minus.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Plus.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Plus.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Plus.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Plus.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Sound.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Sound.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/Sound.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/Sound.kt diff --git a/app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/SquircleWithCheckmark.kt b/app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/SquircleWithCheckmark.kt similarity index 100% rename from app/core/core-icons/src/main/kotlin/com/hedvig/android/core/icons/hedvig/small/SquircleWithCheckmark.kt rename to app/core/core-icons/src/commonMain/kotlin/com/hedvig/android/core/icons/hedvig/small/SquircleWithCheckmark.kt diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 146a92014f..56e8ba93ea 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -66,6 +66,7 @@ jetbrains-navigationevent = "1.1.0" jetbrains-graphics = "1.0.0-alpha09" jetbrains-lifecycle = "2.11.0" jetbrains-material = "1.12.2" +jetbrains-material-icons = "1.7.3" jetbrains-material3 = "1.12.0-alpha03" jetbrainsMarkdown = "0.7.18" arrow = "2.3.0" @@ -117,7 +118,6 @@ androidx-compose-foundation = { module = "androidx.compose.foundation:foundation androidx-compose-foundationLayout = { module = "androidx.compose.foundation:foundation-layout" } androidx-compose-material3 = { module = "androidx.compose.material3:material3" } androidx-compose-material3-windowSizeClass = { module = "androidx.compose.material3:material3-window-size-class" } -androidx-compose-materialIconsCore = { module = "androidx.compose.material:material-icons-core" } androidx-compose-materialRipple = { module = "androidx.compose.material:material-ripple" } androidx-compose-uiTestJunit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-ui-alpha" } androidx-compose-uiTestJunit4Accessibility = { module = "androidx.compose.ui:ui-test-junit4-accessibility", version.ref = "androidx-ui-alpha" } @@ -183,6 +183,7 @@ jetbrains-compose-animation = { module = "org.jetbrains.compose.animation:animat jetbrains-compose-animation-core = { module = "org.jetbrains.compose.animation:animation-core", version.ref = "jetbrains-animation" } jetbrains-compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "jetbrains-compose" } jetbrains-compose-foundation-layout = { module = "org.jetbrains.compose.foundation:foundation-layout", version.ref = "jetbrains-compose" } +jetbrains-compose-material-iconsCore = { module = "org.jetbrains.compose.material:material-icons-core", version.ref = "jetbrains-material-icons" } jetbrains-compose-material-ripple = { module = "org.jetbrains.compose.material:material-ripple", version.ref = "jetbrains-material" } jetbrains-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jetbrains-material3" } jetbrains-compose-material3-windowSizeClass = { module = "org.jetbrains.compose.material3:material3-window-size-class", version.ref = "jetbrains-material3" }