From f86f489a1e34ebce4829d4febd6674f84be3ab69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Ma=C5=A1a?= Date: Wed, 6 Sep 2023 22:43:38 +0200 Subject: [PATCH 1/3] Replace custom parcelable expect/actual by moko:parcelize --- .../wfrp_master/common/core/shared/Parcelable.kt | 9 --------- .../wfrp_master/common/changelog/ChangelogScreen.kt | 4 ++-- .../wfrp_master/common/changelog/ChangelogScreenModel.kt | 4 ++-- .../religion/blessings/dialog/AddBlessingDialog.kt | 4 ++-- .../religion/miracles/dialog/AddMiracleDialog.kt | 4 ++-- .../common/character/skills/dialog/AddSkillDialog.kt | 4 ++-- .../common/character/talents/dialog/AddTalentDialog.kt | 4 ++-- .../common/character/traits/dialog/AddTraitDialog.kt | 4 ++-- .../compendium/career/CompendiumCareerDetailScreen.kt | 4 ++-- .../wfrp_master/common/compendium/domain/Blessing.kt | 2 +- .../wfrp_master/common/compendium/domain/Career.kt | 4 ++-- .../common/compendium/domain/CompendiumItem.kt | 2 +- .../wfrp_master/common/compendium/domain/Miracle.kt | 2 +- .../wfrp_master/common/compendium/domain/Skill.kt | 2 +- .../wfrp_master/common/compendium/domain/Spell.kt | 2 +- .../wfrp_master/common/compendium/domain/Talent.kt | 2 +- .../wfrp_master/common/compendium/domain/Trait.kt | 2 +- .../wfrp_master/common/compendium/domain/Trapping.kt | 4 ++-- .../frantisekmasa/wfrp_master/common/core/auth/UserId.kt | 4 ++-- .../wfrp_master/common/core/domain/Ambitions.kt | 4 ++-- .../wfrp_master/common/core/domain/Expression.kt | 4 ++-- .../wfrp_master/common/core/domain/HitLocation.kt | 4 ++-- .../wfrp_master/common/core/domain/Money.kt | 4 ++-- .../common/core/domain/character/Character.kt | 4 ++-- .../common/core/domain/character/CharacterItem.kt | 2 +- .../common/core/domain/character/CurrentConditions.kt | 4 ++-- .../common/core/domain/character/SocialStatus.kt | 4 ++-- .../common/core/domain/character/WoundsModifiers.kt | 4 ++-- .../common/core/domain/identifiers/CharacterId.kt | 4 ++-- .../common/core/domain/identifiers/EncounterId.kt | 4 ++-- .../wfrp_master/common/core/domain/party/Invitation.kt | 4 ++-- .../wfrp_master/common/core/domain/party/Party.kt | 4 ++-- .../wfrp_master/common/core/domain/party/PartyId.kt | 4 ++-- .../common/core/domain/party/combat/Advantage.kt | 4 ++-- .../common/core/domain/party/combat/Combat.kt | 4 ++-- .../common/core/domain/party/combat/GroupAdvantage.kt | 4 ++-- .../common/core/domain/party/settings/Settings.kt | 4 ++-- .../wfrp_master/common/core/domain/religion/Blessing.kt | 2 +- .../wfrp_master/common/core/domain/religion/Miracle.kt | 2 +- .../wfrp_master/common/core/domain/rolls/TestResult.kt | 4 ++-- .../wfrp_master/common/core/domain/skills/Skill.kt | 2 +- .../wfrp_master/common/core/domain/spells/Spell.kt | 2 +- .../wfrp_master/common/core/domain/talents/Talent.kt | 2 +- .../wfrp_master/common/core/domain/time/DateTime.kt | 4 ++-- .../wfrp_master/common/core/domain/time/ImperialDate.kt | 4 ++-- .../wfrp_master/common/core/domain/traits/Trait.kt | 2 +- .../core/domain/trappings/AmmunitionRangeExpression.kt | 4 ++-- .../wfrp_master/common/core/domain/trappings/Armour.kt | 4 ++-- .../common/core/domain/trappings/ArmourFlaw.kt | 2 +- .../common/core/domain/trappings/ArmourPoints.kt | 4 ++-- .../common/core/domain/trappings/ArmourQuality.kt | 2 +- .../common/core/domain/trappings/ArmourType.kt | 4 ++-- .../common/core/domain/trappings/DamageExpression.kt | 4 ++-- .../common/core/domain/trappings/Encumbrance.kt | 4 ++-- .../common/core/domain/trappings/InventoryItem.kt | 2 +- .../common/core/domain/trappings/MeleeWeaponGroup.kt | 4 ++-- .../common/core/domain/trappings/RangedWeaponGroup.kt | 4 ++-- .../wfrp_master/common/core/domain/trappings/Reach.kt | 4 ++-- .../common/core/domain/trappings/TrappingFeature.kt | 2 +- .../common/core/domain/trappings/TrappingType.kt | 4 ++-- .../common/core/domain/trappings/WeaponEquip.kt | 4 ++-- .../common/core/domain/trappings/WeaponFlaw.kt | 2 +- .../common/core/domain/trappings/WeaponQuality.kt | 2 +- .../core/domain/trappings/WeaponRangeExpression.kt | 4 ++-- .../wfrp_master/common/core/shared/Parcelable.kt | 9 --------- .../wfrp_master/common/core/ui/StatBlock.kt | 4 ++-- .../wfrp_master/common/core/ui/dialogs/DialogState.kt | 2 +- .../wfrp_master/common/core/ui/forms/CareerSelectBox.kt | 4 ++-- .../wfrp_master/common/encounters/domain/Wounds.kt | 4 ++-- .../common/gameMaster/calendar/ImperialCalendar.kt | 4 ++-- .../wfrp_master/common/skillTest/SkillTestDialog.kt | 4 ++-- .../wfrp_master/common/core/shared/Parcelable.kt | 5 ----- 72 files changed, 117 insertions(+), 140 deletions(-) delete mode 100644 common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt delete mode 100644 common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt delete mode 100644 common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt diff --git a/common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt b/common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt deleted file mode 100644 index 1160f092b..000000000 --- a/common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt +++ /dev/null @@ -1,9 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.core.shared - -import java.io.Serializable -import android.os.Parcelable as AndroidParcelable -import kotlinx.parcelize.Parcelize as KotlinxParcelize - -actual interface Parcelable : AndroidParcelable, Serializable - -actual typealias Parcelize = KotlinxParcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreen.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreen.kt index 98a6ea23b..fe839acfa 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreen.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreen.kt @@ -26,8 +26,6 @@ import com.halilibo.richtext.markdown.Markdown import com.halilibo.richtext.ui.RichText import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.shared.IO -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.shared.rememberUrlOpener import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.BackButton import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.EmptyUI @@ -35,6 +33,8 @@ import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.FullScreenProgress import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.HorizontalLine import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.Spacing import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.rememberScreenModel +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreenModel.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreenModel.kt index 8405b9928..6c9dd98c8 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreenModel.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreenModel.kt @@ -2,8 +2,8 @@ package cz.frantisekmasa.wfrp_master.common.changelog import androidx.compose.runtime.Immutable import cafe.adriel.voyager.core.model.ScreenModel -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import io.github.aakira.napier.Napier import io.ktor.client.HttpClient import io.ktor.client.call.body diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/blessings/dialog/AddBlessingDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/blessings/dialog/AddBlessingDialog.kt index 252014bf9..1112b6299 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/blessings/dialog/AddBlessingDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/blessings/dialog/AddBlessingDialog.kt @@ -9,10 +9,10 @@ import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.character.CompendiumItemChooser import cz.frantisekmasa.wfrp_master.common.character.religion.blessings.BlessingsScreenModel import cz.frantisekmasa.wfrp_master.common.core.domain.religion.Blessing -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.shared.Resources import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource @Composable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/miracles/dialog/AddMiracleDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/miracles/dialog/AddMiracleDialog.kt index fb8b41305..66a67a9a6 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/miracles/dialog/AddMiracleDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/miracles/dialog/AddMiracleDialog.kt @@ -9,10 +9,10 @@ import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.character.CompendiumItemChooser import cz.frantisekmasa.wfrp_master.common.character.religion.miracles.MiraclesScreenModel import cz.frantisekmasa.wfrp_master.common.core.domain.religion.Miracle -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.shared.Resources import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource @Composable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/skills/dialog/AddSkillDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/skills/dialog/AddSkillDialog.kt index d7927dd69..3a15381db 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/skills/dialog/AddSkillDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/skills/dialog/AddSkillDialog.kt @@ -10,10 +10,10 @@ import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.character.CompendiumItemChooser import cz.frantisekmasa.wfrp_master.common.character.skills.SkillsScreenModel import cz.frantisekmasa.wfrp_master.common.core.domain.Stats -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.shared.Resources import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource @Composable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/dialog/AddTalentDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/dialog/AddTalentDialog.kt index 6728650e4..b9ac4b537 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/dialog/AddTalentDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/dialog/AddTalentDialog.kt @@ -9,10 +9,10 @@ import com.benasher44.uuid.Uuid import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.character.CompendiumItemChooser import cz.frantisekmasa.wfrp_master.common.character.talents.TalentsScreenModel -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.shared.Resources import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource @Composable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/traits/dialog/AddTraitDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/traits/dialog/AddTraitDialog.kt index b8a401178..60fb414ec 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/traits/dialog/AddTraitDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/traits/dialog/AddTraitDialog.kt @@ -12,11 +12,11 @@ import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.character.CompendiumItemChooser import cz.frantisekmasa.wfrp_master.common.character.traits.TraitsScreenModel import cz.frantisekmasa.wfrp_master.common.compendium.domain.Trait -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.shared.Resources import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.FullScreenProgress +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/career/CompendiumCareerDetailScreen.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/career/CompendiumCareerDetailScreen.kt index 72ea06e9f..b13611ccd 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/career/CompendiumCareerDetailScreen.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/career/CompendiumCareerDetailScreen.kt @@ -47,8 +47,6 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.Characteristic import cz.frantisekmasa.wfrp_master.common.core.domain.localizedName import cz.frantisekmasa.wfrp_master.common.core.domain.party.Party import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.shared.Resources import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.BackButton import cz.frantisekmasa.wfrp_master.common.core.ui.flow.collectWithLifecycle @@ -63,6 +61,8 @@ import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.LocalPersistentSn import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.tabs.TabPager import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.tabs.tab import cz.frantisekmasa.wfrp_master.common.core.ui.text.SingleLineTextValue +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Blessing.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Blessing.kt index fdf909072..8d5ade123 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Blessing.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Blessing.kt @@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 import cz.frantisekmasa.wfrp_master.common.core.common.requireMaxLength -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Career.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Career.kt index 786f778d4..3e7aa4007 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Career.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Career.kt @@ -5,8 +5,8 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.Characteristic import cz.frantisekmasa.wfrp_master.common.core.domain.SocialClass import cz.frantisekmasa.wfrp_master.common.core.domain.character.Race import cz.frantisekmasa.wfrp_master.common.core.domain.character.SocialStatus -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/CompendiumItem.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/CompendiumItem.kt index 14f793ee9..4b1dee85a 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/CompendiumItem.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/CompendiumItem.kt @@ -1,8 +1,8 @@ package cz.frantisekmasa.wfrp_master.common.compendium.domain import com.benasher44.uuid.Uuid -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable import cz.frantisekmasa.wfrp_master.common.core.utils.duplicateName +import dev.icerock.moko.parcelize.Parcelable sealed class CompendiumItem> : Parcelable { abstract val id: Uuid diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Miracle.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Miracle.kt index e67a0b10d..1fb468dda 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Miracle.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Miracle.kt @@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 import cz.frantisekmasa.wfrp_master.common.core.common.requireMaxLength -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Skill.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Skill.kt index 823f182fd..6aa5ac9e8 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Skill.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Skill.kt @@ -5,7 +5,7 @@ import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 import cz.frantisekmasa.wfrp_master.common.core.common.requireMaxLength import cz.frantisekmasa.wfrp_master.common.core.domain.Characteristic -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Spell.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Spell.kt index c271906a8..e9d55272a 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Spell.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Spell.kt @@ -3,7 +3,7 @@ package cz.frantisekmasa.wfrp_master.common.compendium.domain import androidx.compose.runtime.Immutable import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Talent.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Talent.kt index 2acabd0ba..0b1f4a44c 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Talent.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Talent.kt @@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 import cz.frantisekmasa.wfrp_master.common.core.common.requireMaxLength -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Trait.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Trait.kt index c65c2f42b..cc63a8e1d 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Trait.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Trait.kt @@ -3,7 +3,7 @@ package cz.frantisekmasa.wfrp_master.common.compendium.domain import androidx.compose.runtime.Immutable import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Trapping.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Trapping.kt index 2034ca9d3..9d614fc6f 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Trapping.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/Trapping.kt @@ -20,8 +20,8 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.Reach import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.WeaponFlaw import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.WeaponQuality import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.WeaponRangeExpression -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/auth/UserId.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/auth/UserId.kt index a63268404..abc825d92 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/auth/UserId.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/auth/UserId.kt @@ -1,7 +1,7 @@ package cz.frantisekmasa.wfrp_master.common.core.auth -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Ambitions.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Ambitions.kt index bd4b7de1f..ddcf30a2c 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Ambitions.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Ambitions.kt @@ -1,8 +1,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain import androidx.compose.runtime.Immutable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Expression.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Expression.kt index 8ab633939..548d4aba3 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Expression.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Expression.kt @@ -20,8 +20,8 @@ import com.github.h0tk3y.betterParse.lexer.regexToken import com.github.h0tk3y.betterParse.parser.ParseException import com.github.h0tk3y.betterParse.parser.Parser import cz.frantisekmasa.wfrp_master.common.core.domain.rolls.Dice -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize class InvalidExpression(cause: Throwable?) : Exception(cause) diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/HitLocation.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/HitLocation.kt index 3f8217995..61185692d 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/HitLocation.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/HitLocation.kt @@ -2,8 +2,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Money.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Money.kt index 8b97b45f1..25a633b65 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Money.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Money.kt @@ -1,8 +1,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain import androidx.compose.runtime.Immutable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable import kotlin.math.min diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Character.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Character.kt index 28bfffa3b..8f91acda8 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Character.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Character.kt @@ -10,10 +10,10 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.Money import cz.frantisekmasa.wfrp_master.common.core.domain.Size import cz.frantisekmasa.wfrp_master.common.core.domain.Stats import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.Encumbrance -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.utils.duplicateName import cz.frantisekmasa.wfrp_master.common.encounters.domain.Wounds +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/CharacterItem.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/CharacterItem.kt index f1399abff..c29a44466 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/CharacterItem.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/CharacterItem.kt @@ -4,7 +4,7 @@ import androidx.compose.runtime.Stable import com.benasher44.uuid.Uuid import cz.frantisekmasa.wfrp_master.common.character.effects.CharacterEffect import cz.frantisekmasa.wfrp_master.common.compendium.domain.CompendiumItem -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable +import dev.icerock.moko.parcelize.Parcelable interface CharacterItem, C : CompendiumItem> : Parcelable { val id: Uuid diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/CurrentConditions.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/CurrentConditions.kt index 0ecee0ada..be1284d36 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/CurrentConditions.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/CurrentConditions.kt @@ -2,8 +2,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.character import androidx.compose.runtime.Immutable import androidx.compose.runtime.Stable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable @Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/SocialStatus.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/SocialStatus.kt index 670504ec4..3152914a2 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/SocialStatus.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/SocialStatus.kt @@ -3,8 +3,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.character import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.NamedEnum -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/WoundsModifiers.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/WoundsModifiers.kt index 450a13b81..d5fe900dc 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/WoundsModifiers.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/WoundsModifiers.kt @@ -1,8 +1,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.character import androidx.compose.runtime.Immutable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable @Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/CharacterId.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/CharacterId.kt index 530d2f455..bb39e2142 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/CharacterId.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/CharacterId.kt @@ -1,8 +1,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.identifiers import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize @Parcelize data class CharacterId(val partyId: PartyId, val id: String) : Parcelable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/EncounterId.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/EncounterId.kt index 0cea9b4f2..45760af10 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/EncounterId.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/identifiers/EncounterId.kt @@ -2,8 +2,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.identifiers import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable import java.util.UUID diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Invitation.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Invitation.kt index 72f6aa9f4..06fe6924e 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Invitation.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Invitation.kt @@ -1,7 +1,7 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.party -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Party.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Party.kt index de465aed1..9a19b2b45 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Party.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Party.kt @@ -10,8 +10,8 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.party.combat.Combatant import cz.frantisekmasa.wfrp_master.common.core.domain.party.settings.Settings import cz.frantisekmasa.wfrp_master.common.core.domain.time.DateTime import cz.frantisekmasa.wfrp_master.common.core.domain.time.ImperialDate -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/PartyId.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/PartyId.kt index 23cb6fb06..1569a1d3c 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/PartyId.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/PartyId.kt @@ -4,8 +4,8 @@ import androidx.compose.runtime.Immutable import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 import com.benasher44.uuid.uuidFrom -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable import kotlin.jvm.JvmInline diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/Advantage.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/Advantage.kt index 68a117ef6..23feaaccb 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/Advantage.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/Advantage.kt @@ -1,8 +1,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.party.combat import androidx.compose.runtime.Immutable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable import kotlin.jvm.JvmInline diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/Combat.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/Combat.kt index 1874a737b..d59dfc1a5 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/Combat.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/Combat.kt @@ -2,8 +2,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.party.combat import androidx.compose.runtime.Immutable import com.benasher44.uuid.Uuid -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/GroupAdvantage.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/GroupAdvantage.kt index 5ea2e65b0..ed777a8ab 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/GroupAdvantage.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/combat/GroupAdvantage.kt @@ -1,7 +1,7 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.party.combat -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable @Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/settings/Settings.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/settings/Settings.kt index 614b52cb7..4fc11703a 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/settings/Settings.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/settings/Settings.kt @@ -8,8 +8,8 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.Expression import cz.frantisekmasa.wfrp_master.common.core.domain.NamedEnum import cz.frantisekmasa.wfrp_master.common.core.domain.Stats import cz.frantisekmasa.wfrp_master.common.core.domain.party.combat.Advantage -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource import kotlinx.serialization.Serializable import kotlin.jvm.JvmInline diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/religion/Blessing.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/religion/Blessing.kt index 22f4f2799..0019844cb 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/religion/Blessing.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/religion/Blessing.kt @@ -5,7 +5,7 @@ import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 import cz.frantisekmasa.wfrp_master.common.core.common.requireMaxLength import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItem -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable import cz.frantisekmasa.wfrp_master.common.compendium.domain.Blessing as CompendiumBlessing diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/religion/Miracle.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/religion/Miracle.kt index b1e2eb0fa..98b215eb0 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/religion/Miracle.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/religion/Miracle.kt @@ -5,7 +5,7 @@ import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 import cz.frantisekmasa.wfrp_master.common.core.common.requireMaxLength import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItem -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable import cz.frantisekmasa.wfrp_master.common.compendium.domain.Miracle as CompendiumMiracle diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/rolls/TestResult.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/rolls/TestResult.kt index c4b5f72d4..137ce7b57 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/rolls/TestResult.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/rolls/TestResult.kt @@ -3,8 +3,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.rolls import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.NamedEnum -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/skills/Skill.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/skills/Skill.kt index e1cce741e..5664e7551 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/skills/Skill.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/skills/Skill.kt @@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable import com.benasher44.uuid.Uuid import cz.frantisekmasa.wfrp_master.common.core.domain.Characteristic import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItem -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable import cz.frantisekmasa.wfrp_master.common.compendium.domain.Skill as CompendiumSkill diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/spells/Spell.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/spells/Spell.kt index 89ab5f380..99c479dce 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/spells/Spell.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/spells/Spell.kt @@ -5,7 +5,7 @@ import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 import cz.frantisekmasa.wfrp_master.common.compendium.domain.SpellLore import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItem -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable import cz.frantisekmasa.wfrp_master.common.compendium.domain.Spell as CompendiumSpell diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/talents/Talent.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/talents/Talent.kt index 399505d30..958ffc2f3 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/talents/Talent.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/talents/Talent.kt @@ -9,7 +9,7 @@ import cz.frantisekmasa.wfrp_master.common.character.effects.CharacteristicChang import cz.frantisekmasa.wfrp_master.common.character.effects.HardyWoundsModification import cz.frantisekmasa.wfrp_master.common.core.common.requireMaxLength import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItem -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable import cz.frantisekmasa.wfrp_master.common.compendium.domain.Talent as CompendiumTalent diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/time/DateTime.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/time/DateTime.kt index 3617a4422..895de8f92 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/time/DateTime.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/time/DateTime.kt @@ -1,8 +1,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.time import androidx.compose.runtime.Immutable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/time/ImperialDate.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/time/ImperialDate.kt index 724f51957..795eda804 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/time/ImperialDate.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/time/ImperialDate.kt @@ -2,8 +2,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.time import androidx.compose.runtime.Immutable import arrow.core.Either -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable import kotlin.jvm.JvmInline diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/traits/Trait.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/traits/Trait.kt index 7b9092205..01e202524 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/traits/Trait.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/traits/Trait.kt @@ -9,7 +9,7 @@ import cz.frantisekmasa.wfrp_master.common.character.effects.ConstructWoundsModi import cz.frantisekmasa.wfrp_master.common.character.effects.SizeChange import cz.frantisekmasa.wfrp_master.common.character.effects.SwarmWoundsModification import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItem -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable import cz.frantisekmasa.wfrp_master.common.compendium.domain.Trait as CompendiumTrait diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/AmmunitionRangeExpression.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/AmmunitionRangeExpression.kt index 70402b3ce..588e7d2a8 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/AmmunitionRangeExpression.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/AmmunitionRangeExpression.kt @@ -5,8 +5,8 @@ import androidx.compose.runtime.Immutable import androidx.compose.runtime.Stable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.Expression -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource import kotlinx.serialization.Serializable import kotlin.jvm.JvmInline diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Armour.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Armour.kt index a0b6793c7..3d5a56a13 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Armour.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Armour.kt @@ -3,8 +3,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import androidx.compose.runtime.Stable import cz.frantisekmasa.wfrp_master.common.core.domain.HitLocation -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourFlaw.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourFlaw.kt index ad9ecacb0..2d2738ae8 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourFlaw.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourFlaw.kt @@ -2,7 +2,7 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourPoints.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourPoints.kt index de683be97..5fc03697c 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourPoints.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourPoints.kt @@ -1,8 +1,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable import kotlin.jvm.JvmInline diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourQuality.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourQuality.kt index aff9534f2..2bdb13584 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourQuality.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourQuality.kt @@ -2,7 +2,7 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourType.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourType.kt index 394fd012c..5e9af55fe 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourType.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/ArmourType.kt @@ -3,8 +3,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.NamedEnum -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/DamageExpression.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/DamageExpression.kt index cc290d14b..370c15a84 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/DamageExpression.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/DamageExpression.kt @@ -6,8 +6,8 @@ import androidx.compose.runtime.Stable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.Damage import cz.frantisekmasa.wfrp_master.common.core.domain.Expression -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource import kotlinx.serialization.Serializable import kotlin.jvm.JvmInline diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Encumbrance.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Encumbrance.kt index 4917241ad..51f8bae72 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Encumbrance.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Encumbrance.kt @@ -2,8 +2,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.core.domain.Stats -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable import java.text.DecimalFormat import kotlin.jvm.JvmInline diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/InventoryItem.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/InventoryItem.kt index cc1bd80dc..8135942f3 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/InventoryItem.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/InventoryItem.kt @@ -6,8 +6,8 @@ import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 import cz.frantisekmasa.wfrp_master.common.compendium.domain.Trapping import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItem -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.utils.duplicateName +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/MeleeWeaponGroup.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/MeleeWeaponGroup.kt index 9ed17b16d..2223f9676 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/MeleeWeaponGroup.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/MeleeWeaponGroup.kt @@ -3,8 +3,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.NamedEnum -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/RangedWeaponGroup.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/RangedWeaponGroup.kt index eaba48495..b57f246c9 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/RangedWeaponGroup.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/RangedWeaponGroup.kt @@ -3,8 +3,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.NamedEnum -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Reach.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Reach.kt index 4a19fe00a..e877c6162 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Reach.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Reach.kt @@ -3,8 +3,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.NamedEnum -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/TrappingFeature.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/TrappingFeature.kt index 21fe13a18..2040d084b 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/TrappingFeature.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/TrappingFeature.kt @@ -1,7 +1,7 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import cz.frantisekmasa.wfrp_master.common.core.domain.NamedEnum -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable +import dev.icerock.moko.parcelize.Parcelable interface TrappingFeature : NamedEnum, Parcelable { val hasRating: Boolean diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/TrappingType.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/TrappingType.kt index e4c8d9530..9f796c351 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/TrappingType.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/TrappingType.kt @@ -3,8 +3,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.character.trappings.TrappingTypeOption import cz.frantisekmasa.wfrp_master.common.core.domain.HitLocation -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponEquip.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponEquip.kt index b9bc6cb68..bfd0f4d47 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponEquip.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponEquip.kt @@ -3,8 +3,8 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.NamedEnum -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponFlaw.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponFlaw.kt index fc2030fc8..b458dbefd 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponFlaw.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponFlaw.kt @@ -2,7 +2,7 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponQuality.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponQuality.kt index 606846f2d..acb0e6ccb 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponQuality.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponQuality.kt @@ -2,7 +2,7 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.trappings import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.Str -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource @Parcelize diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponRangeExpression.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponRangeExpression.kt index 2f6aede70..4e1aac424 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponRangeExpression.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/WeaponRangeExpression.kt @@ -5,8 +5,8 @@ import androidx.compose.runtime.Immutable import androidx.compose.runtime.Stable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.Expression -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.StringResource import kotlinx.serialization.Serializable import kotlin.jvm.JvmInline diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt deleted file mode 100644 index 4ebcdfacc..000000000 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt +++ /dev/null @@ -1,9 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.core.shared - -expect interface Parcelable - -@OptIn(ExperimentalMultiplatform::class) -@OptionalExpectation -@Target(AnnotationTarget.CLASS) -@Retention(AnnotationRetention.BINARY) -expect annotation class Parcelize() diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/StatBlock.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/StatBlock.kt index 37e1954af..df7bad9d9 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/StatBlock.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/StatBlock.kt @@ -53,10 +53,10 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.skills.Skill import cz.frantisekmasa.wfrp_master.common.core.domain.spells.Spell import cz.frantisekmasa.wfrp_master.common.core.domain.talents.Talent import cz.frantisekmasa.wfrp_master.common.core.domain.traits.Trait -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.Spacing +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource @Immutable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/dialogs/DialogState.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/dialogs/DialogState.kt index 8955c39b7..1afdda2b0 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/dialogs/DialogState.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/dialogs/DialogState.kt @@ -1,7 +1,7 @@ package cz.frantisekmasa.wfrp_master.common.core.ui.dialogs import androidx.compose.runtime.Composable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable +import dev.icerock.moko.parcelize.Parcelable sealed class DialogState { class Closed : DialogState() diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/CareerSelectBox.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/CareerSelectBox.kt index 5bf127d08..5f8de2254 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/CareerSelectBox.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/CareerSelectBox.kt @@ -33,8 +33,6 @@ import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.compendium.domain.Career import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character import cz.frantisekmasa.wfrp_master.common.core.domain.character.SocialStatus -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.shared.Resources import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.BackButton import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton @@ -45,6 +43,8 @@ import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.SearchableList import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.Spacing import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.defaultBackgroundColor import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.SaveAction +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource sealed interface SelectedCareer : Parcelable { diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/domain/Wounds.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/domain/Wounds.kt index 05f6cfade..8d50d66a1 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/domain/Wounds.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/domain/Wounds.kt @@ -2,8 +2,8 @@ package cz.frantisekmasa.wfrp_master.common.encounters.domain import androidx.compose.runtime.Immutable import cz.frantisekmasa.wfrp_master.common.core.domain.Size -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Serializable import kotlin.math.max import kotlin.math.min diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/gameMaster/calendar/ImperialCalendar.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/gameMaster/calendar/ImperialCalendar.kt index b871fa796..9e7666976 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/gameMaster/calendar/ImperialCalendar.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/gameMaster/calendar/ImperialCalendar.kt @@ -45,10 +45,10 @@ import androidx.compose.ui.text.toUpperCase import androidx.compose.ui.unit.dp import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.time.ImperialDate -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.Spacing import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.SubheadBar +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource @Composable diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/skillTest/SkillTestDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/skillTest/SkillTestDialog.kt index a86ce5320..723c67191 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/skillTest/SkillTestDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/skillTest/SkillTestDialog.kt @@ -12,9 +12,9 @@ import cz.frantisekmasa.wfrp_master.common.compendium.domain.Skill import cz.frantisekmasa.wfrp_master.common.core.domain.Expression import cz.frantisekmasa.wfrp_master.common.core.domain.rolls.Dice import cz.frantisekmasa.wfrp_master.common.core.domain.rolls.TestResult -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable -import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog +import dev.icerock.moko.parcelize.Parcelable +import dev.icerock.moko.parcelize.Parcelize import dev.icerock.moko.resources.compose.stringResource import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async diff --git a/common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt b/common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt deleted file mode 100644 index 39b093544..000000000 --- a/common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Parcelable.kt +++ /dev/null @@ -1,5 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.core.shared - -import java.io.Serializable - -actual interface Parcelable : Serializable From f3615db4151f8a5080b904a4076758e6fd192e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Ma=C5=A1a?= Date: Wed, 6 Sep 2023 22:45:18 +0200 Subject: [PATCH 2/3] Remove expect/actual for Dispatchers.IO --- .../wfrp_master/common/core/shared/Dispatchers.kt | 6 ------ .../wfrp_master/common/ambitions/ChangeAmbitionsDialog.kt | 1 - .../wfrp_master/common/changelog/ChangelogAction.kt | 1 - .../wfrp_master/common/changelog/ChangelogScreen.kt | 1 - .../character/characteristics/ExperiencePointsDialog.kt | 1 - .../common/character/conditions/ConditionsScreen.kt | 1 - .../wfrp_master/common/character/effects/EffectManager.kt | 1 - .../wfrp_master/common/character/religion/ReligionScreen.kt | 1 - .../common/character/spells/SpellsScreenModel.kt | 1 - .../common/character/talents/TalentsScreenModel.kt | 1 - .../common/character/talents/dialog/TimesTakenForm.kt | 1 - .../common/character/trappings/TransactionDialog.kt | 1 - .../common/characterCreation/CharacterCreationScreen.kt | 1 - .../wfrp_master/common/combat/ConditionsDialog.kt | 1 - .../common/core/cache/CharacterRepositoryIdentityMap.kt | 1 - .../common/core/cache/PartyRepositoryIdentityMap.kt | 1 - .../functions/CloudFunctionCharacterAvatarChanger.kt | 1 - .../wfrp_master/common/core/shared/Dispatchers.kt | 6 ------ .../wfrp_master/common/core/ui/forms/FormDialog.kt | 1 - .../wfrp_master/common/encounters/ChooseNpcDialog.kt | 1 - .../wfrp_master/common/encounters/EncountersScreenModel.kt | 1 - .../wfrp_master/common/invitation/InvitationScreenModel.kt | 1 - .../wfrp_master/common/partyList/CreatePartyDialog.kt | 1 - .../wfrp_master/common/partyList/LeavePartyDialog.kt | 1 - .../wfrp_master/common/partyList/RemovePartyDialog.kt | 1 - .../wfrp_master/common/partySettings/AdvantageCapItem.kt | 1 - .../common/partySettings/InitiativeStrategyItem.kt | 1 - .../wfrp_master/common/partySettings/RenamePartyDialog.kt | 1 - .../cz/frantisekmasa/wfrp_master/common/core/shared/IO.kt | 6 ------ 29 files changed, 44 deletions(-) delete mode 100644 common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Dispatchers.kt delete mode 100644 common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Dispatchers.kt delete mode 100644 common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/IO.kt diff --git a/common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Dispatchers.kt b/common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Dispatchers.kt deleted file mode 100644 index 43af5f77d..000000000 --- a/common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Dispatchers.kt +++ /dev/null @@ -1,6 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.core.shared - -import kotlinx.coroutines.Dispatchers - -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -actual val Dispatchers.IO get() = Dispatchers.IO diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/ambitions/ChangeAmbitionsDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/ambitions/ChangeAmbitionsDialog.kt index 382a8fc2a..02b3f4408 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/ambitions/ChangeAmbitionsDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/ambitions/ChangeAmbitionsDialog.kt @@ -17,7 +17,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.Ambitions -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog import cz.frantisekmasa.wfrp_master.common.core.ui.forms.TextInput diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogAction.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogAction.kt index d0f7f0743..d392a2722 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogAction.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogAction.kt @@ -14,7 +14,6 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberCoroutineScope import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.LocalStaticConfiguration -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.flow.collectWithLifecycle import cz.frantisekmasa.wfrp_master.common.core.ui.theme.Theme import cz.frantisekmasa.wfrp_master.common.settings.SettingsScreenModel diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreen.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreen.kt index fe839acfa..3973f12fa 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreen.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/changelog/ChangelogScreen.kt @@ -25,7 +25,6 @@ import cafe.adriel.voyager.core.screen.Screen import com.halilibo.richtext.markdown.Markdown import com.halilibo.richtext.ui.RichText import cz.frantisekmasa.wfrp_master.common.Str -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.shared.rememberUrlOpener import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.BackButton import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.EmptyUI diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/characteristics/ExperiencePointsDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/characteristics/ExperiencePointsDialog.kt index 09f9aca3b..56d7512f5 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/characteristics/ExperiencePointsDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/characteristics/ExperiencePointsDialog.kt @@ -19,7 +19,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.input.KeyboardType import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.character.Points -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog import cz.frantisekmasa.wfrp_master.common.core.ui.forms.InputValue diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/conditions/ConditionsScreen.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/conditions/ConditionsScreen.kt index 8f6bd6227..63541d4d3 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/conditions/ConditionsScreen.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/conditions/ConditionsScreen.kt @@ -24,7 +24,6 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character import cz.frantisekmasa.wfrp_master.common.core.domain.character.Condition import cz.frantisekmasa.wfrp_master.common.core.domain.character.CurrentConditions import cz.frantisekmasa.wfrp_master.common.core.domain.localizedName -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.shared.Resources import cz.frantisekmasa.wfrp_master.common.core.shared.drawableResource import cz.frantisekmasa.wfrp_master.common.core.ui.forms.NumberPicker diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/effects/EffectManager.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/effects/EffectManager.kt index 436d8387a..378aee9d6 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/effects/EffectManager.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/effects/EffectManager.kt @@ -5,7 +5,6 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterReposi import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId import cz.frantisekmasa.wfrp_master.common.core.domain.talents.TalentRepository import cz.frantisekmasa.wfrp_master.common.core.domain.traits.TraitRepository -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.firebase.firestore.Transaction import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/ReligionScreen.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/ReligionScreen.kt index ef03074d4..f51846d45 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/ReligionScreen.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/religion/ReligionScreen.kt @@ -17,7 +17,6 @@ import cz.frantisekmasa.wfrp_master.common.character.religion.blessings.Blessing import cz.frantisekmasa.wfrp_master.common.character.religion.miracles.MiraclesCard import cz.frantisekmasa.wfrp_master.common.character.religion.miracles.MiraclesScreenModel import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.forms.NumberPicker import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.TopPanel import dev.icerock.moko.resources.compose.stringResource diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/spells/SpellsScreenModel.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/spells/SpellsScreenModel.kt index de9b9e8ce..00a989073 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/spells/SpellsScreenModel.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/spells/SpellsScreenModel.kt @@ -8,7 +8,6 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyRepository import cz.frantisekmasa.wfrp_master.common.core.domain.spells.Spell import cz.frantisekmasa.wfrp_master.common.core.domain.spells.SpellRepository -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import cz.frantisekmasa.wfrp_master.common.compendium.domain.Spell as CompendiumSpell diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/TalentsScreenModel.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/TalentsScreenModel.kt index 88e053f3c..131cc81ec 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/TalentsScreenModel.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/TalentsScreenModel.kt @@ -11,7 +11,6 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyRepository import cz.frantisekmasa.wfrp_master.common.core.domain.talents.Talent import cz.frantisekmasa.wfrp_master.common.core.domain.talents.TalentRepository -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.firebase.firestore.Firestore import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/dialog/TimesTakenForm.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/dialog/TimesTakenForm.kt index 578583198..c588b2754 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/dialog/TimesTakenForm.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/talents/dialog/TimesTakenForm.kt @@ -24,7 +24,6 @@ import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.character.talents.TalentsScreenModel import cz.frantisekmasa.wfrp_master.common.compendium.domain.exceptions.CompendiumItemNotFound import cz.frantisekmasa.wfrp_master.common.core.domain.talents.Talent -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton import cz.frantisekmasa.wfrp_master.common.core.ui.forms.NumberPicker import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.FullScreenProgress diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/TransactionDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/TransactionDialog.kt index 15bf53d87..2288c35ab 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/TransactionDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/TransactionDialog.kt @@ -30,7 +30,6 @@ import androidx.compose.ui.text.style.TextAlign import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.Money import cz.frantisekmasa.wfrp_master.common.core.domain.character.NotEnoughMoney -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog import cz.frantisekmasa.wfrp_master.common.core.ui.forms.InputValue diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/characterCreation/CharacterCreationScreen.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/characterCreation/CharacterCreationScreen.kt index e6284c209..cabedb961 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/characterCreation/CharacterCreationScreen.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/characterCreation/CharacterCreationScreen.kt @@ -48,7 +48,6 @@ import cz.frantisekmasa.wfrp_master.common.compendium.domain.Career import cz.frantisekmasa.wfrp_master.common.core.auth.UserId import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterType import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.BackButton import cz.frantisekmasa.wfrp_master.common.core.ui.forms.FormData import cz.frantisekmasa.wfrp_master.common.core.ui.navigation.LocalNavigationTransaction diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/combat/ConditionsDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/combat/ConditionsDialog.kt index d2dc7ac32..8f22aa5d3 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/combat/ConditionsDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/combat/ConditionsDialog.kt @@ -9,7 +9,6 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.character.conditions.ConditionsForm -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog import cz.frantisekmasa.wfrp_master.common.encounters.CombatantItem diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/cache/CharacterRepositoryIdentityMap.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/cache/CharacterRepositoryIdentityMap.kt index dcd67457e..b00ab8d95 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/cache/CharacterRepositoryIdentityMap.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/cache/CharacterRepositoryIdentityMap.kt @@ -5,7 +5,6 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterNotFound import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterRepository import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/cache/PartyRepositoryIdentityMap.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/cache/PartyRepositoryIdentityMap.kt index 81b52348c..6c1ec9567 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/cache/PartyRepositoryIdentityMap.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/cache/PartyRepositoryIdentityMap.kt @@ -5,7 +5,6 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.party.Party import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyNotFound import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyRepository -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/firebase/functions/CloudFunctionCharacterAvatarChanger.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/firebase/functions/CloudFunctionCharacterAvatarChanger.kt index 536c8c15b..4b7c1049a 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/firebase/functions/CloudFunctionCharacterAvatarChanger.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/firebase/functions/CloudFunctionCharacterAvatarChanger.kt @@ -2,7 +2,6 @@ package cz.frantisekmasa.wfrp_master.common.core.firebase.functions import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterAvatarChanger import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.firebase.functions.CloudFunctions import io.ktor.util.encodeBase64 import kotlinx.coroutines.Dispatchers diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Dispatchers.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Dispatchers.kt deleted file mode 100644 index 8f54b2173..000000000 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Dispatchers.kt +++ /dev/null @@ -1,6 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.core.shared - -import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers - -expect val Dispatchers.IO: CoroutineDispatcher diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/FormDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/FormDialog.kt index f3e711e34..e6ba08312 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/FormDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/FormDialog.kt @@ -16,7 +16,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.BackButton import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton import cz.frantisekmasa.wfrp_master.common.core.ui.navigation.LocalNavigationTransaction diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/ChooseNpcDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/ChooseNpcDialog.kt index 992cc3214..b9d422b45 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/ChooseNpcDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/ChooseNpcDialog.kt @@ -12,7 +12,6 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import cz.frantisekmasa.wfrp_master.common.Str -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.shared.Resources import cz.frantisekmasa.wfrp_master.common.core.ui.CharacterAvatar import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/EncountersScreenModel.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/EncountersScreenModel.kt index 6d64374fc..77808eff8 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/EncountersScreenModel.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/EncountersScreenModel.kt @@ -5,7 +5,6 @@ import cafe.adriel.voyager.core.model.coroutineScope import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.EncounterId import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId import cz.frantisekmasa.wfrp_master.common.core.logging.Reporter -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.encounters.domain.Encounter import cz.frantisekmasa.wfrp_master.common.encounters.domain.EncounterRepository import kotlinx.coroutines.Deferred diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/invitation/InvitationScreenModel.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/invitation/InvitationScreenModel.kt index 197414945..2d1b53eec 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/invitation/InvitationScreenModel.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/invitation/InvitationScreenModel.kt @@ -5,7 +5,6 @@ import cz.frantisekmasa.wfrp_master.common.core.auth.UserId import cz.frantisekmasa.wfrp_master.common.core.domain.party.Invitation import cz.frantisekmasa.wfrp_master.common.core.domain.party.Party import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyRepository -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.invitation.domain.InvitationProcessingResult import cz.frantisekmasa.wfrp_master.common.invitation.domain.InvitationProcessor import io.github.aakira.napier.Napier diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/CreatePartyDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/CreatePartyDialog.kt index b54a4c6bb..5d3dc8339 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/CreatePartyDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/CreatePartyDialog.kt @@ -20,7 +20,6 @@ import cz.frantisekmasa.wfrp_master.common.core.auth.LocalUser import cz.frantisekmasa.wfrp_master.common.core.connectivity.CouldNotConnectToBackend import cz.frantisekmasa.wfrp_master.common.core.domain.party.Party import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog import cz.frantisekmasa.wfrp_master.common.core.ui.forms.Rules diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/LeavePartyDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/LeavePartyDialog.kt index 2d455386e..575ad08d0 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/LeavePartyDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/LeavePartyDialog.kt @@ -13,7 +13,6 @@ import androidx.compose.runtime.setValue import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.auth.LocalUser import cz.frantisekmasa.wfrp_master.common.core.domain.party.Party -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.AlertDialog import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.Spacing import dev.icerock.moko.resources.compose.stringResource diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/RemovePartyDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/RemovePartyDialog.kt index 98077fc27..abaa4258f 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/RemovePartyDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partyList/RemovePartyDialog.kt @@ -14,7 +14,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.text.font.FontWeight import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.party.Party -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.AlertDialog import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.Spacing import cz.frantisekmasa.wfrp_master.common.core.ui.scaffolding.LocalPersistentSnackbarHolder diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/AdvantageCapItem.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/AdvantageCapItem.kt index 4b8d99877..72a880c5b 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/AdvantageCapItem.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/AdvantageCapItem.kt @@ -26,7 +26,6 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.Stats import cz.frantisekmasa.wfrp_master.common.core.domain.party.settings.AdvantageCapExpression import cz.frantisekmasa.wfrp_master.common.core.domain.party.settings.AdvantageSystem import cz.frantisekmasa.wfrp_master.common.core.domain.party.settings.Settings -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog import cz.frantisekmasa.wfrp_master.common.core.ui.forms.TextInput diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/InitiativeStrategyItem.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/InitiativeStrategyItem.kt index 32505358a..f56783b29 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/InitiativeStrategyItem.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/InitiativeStrategyItem.kt @@ -14,7 +14,6 @@ import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.localizedName import cz.frantisekmasa.wfrp_master.common.core.domain.party.Party import cz.frantisekmasa.wfrp_master.common.core.domain.party.settings.InitiativeStrategy -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.SelectionDialog import cz.frantisekmasa.wfrp_master.common.core.utils.launchLogged import dev.icerock.moko.resources.compose.stringResource diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/RenamePartyDialog.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/RenamePartyDialog.kt index 4cb86f261..38e11f4ca 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/RenamePartyDialog.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/partySettings/RenamePartyDialog.kt @@ -18,7 +18,6 @@ import androidx.compose.ui.Modifier import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.connectivity.CouldNotConnectToBackend import cz.frantisekmasa.wfrp_master.common.core.domain.party.Party -import cz.frantisekmasa.wfrp_master.common.core.shared.IO import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.CloseButton import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.FullScreenDialog import cz.frantisekmasa.wfrp_master.common.core.ui.forms.Rules diff --git a/common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/IO.kt b/common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/IO.kt deleted file mode 100644 index 43af5f77d..000000000 --- a/common/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/IO.kt +++ /dev/null @@ -1,6 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.core.shared - -import kotlinx.coroutines.Dispatchers - -@Suppress("EXTENSION_SHADOWED_BY_MEMBER") -actual val Dispatchers.IO get() = Dispatchers.IO From c69ba306df65dbf7298efaa32b69406b4f102ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Ma=C5=A1a?= Date: Wed, 6 Sep 2023 23:03:19 +0200 Subject: [PATCH 3/3] Remove dead code --- .../common/firebase/firestore/Firestore.kt | 1 - .../common/firebase/firestore/Firestore.kt | 1 - .../common/firebase/firestore/SetOptions.kt | 7 +-- .../common/firebase/firestore/Firestore.kt | 2 - .../common/auth/AuthenticationManager.kt | 4 -- .../common/character/CharacterScreenModel.kt | 11 ---- .../trappings/EncumbranceWithIcon.kt | 35 ----------- .../compendium/career/CareerScreenModel.kt | 44 -------------- .../domain/importer/ImportFailed.kt | 3 - .../domain/importer/parsers/PDFBox.kt | 6 -- .../wfrp_master/common/core/auth/UserId.kt | 4 -- .../core/domain/CharacterEffectSource.kt | 3 - .../common/core/domain/Characteristic.kt | 17 ------ .../common/core/domain/character/Points.kt | 6 -- .../common/core/domain/party/Party.kt | 2 - .../common/core/domain/party/PartyId.kt | 2 - .../common/core/domain/trappings/Armour.kt | 7 --- .../domain/trappings/RangedWeaponGroup.kt | 3 +- .../common/core/firebase/Schema.kt | 1 - .../common/core/shared/Resources.kt | 1 - .../common/core/ui/CharacteristicsTable.kt | 58 ------------------- .../wfrp_master/common/core/ui/forms/Rules.kt | 1 - .../wfrp_master/common/core/utils/mapItems.kt | 7 --- .../common/encounters/domain/Wounds.kt | 2 - .../commonMain/resources/drawable/ic_dead.xml | 5 -- 25 files changed, 3 insertions(+), 230 deletions(-) delete mode 100644 common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/EncumbranceWithIcon.kt delete mode 100644 common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/career/CareerScreenModel.kt delete mode 100644 common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/ImportFailed.kt delete mode 100644 common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/CharacterEffectSource.kt delete mode 100644 common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/CharacteristicsTable.kt delete mode 100644 common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/utils/mapItems.kt delete mode 100644 common/src/commonMain/resources/drawable/ic_dead.xml diff --git a/common/firebase/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt b/common/firebase/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt index 1e62fdf5c..2c0b73891 100644 --- a/common/firebase/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt +++ b/common/firebase/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt @@ -7,7 +7,6 @@ actual class Firestore( private val firestore: FirebaseFirestore ) { actual fun collection(collectionPath: String) = CollectionReference(firestore.collection(collectionPath)) - actual fun document(documentPath: String) = DocumentReference(firestore.document(documentPath)) actual suspend fun runTransaction(block: suspend (Transaction) -> Unit) { val batch = firestore.batch() diff --git a/common/firebase/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt b/common/firebase/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt index c732b57ae..200ea38a6 100644 --- a/common/firebase/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt +++ b/common/firebase/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt @@ -2,6 +2,5 @@ package cz.frantisekmasa.wfrp_master.common.firebase.firestore expect class Firestore { fun collection(collectionPath: String): CollectionReference - fun document(documentPath: String): DocumentReference suspend fun runTransaction(block: suspend (Transaction) -> Unit) } diff --git a/common/firebase/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/SetOptions.kt b/common/firebase/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/SetOptions.kt index 1869ff07a..cba3f318f 100644 --- a/common/firebase/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/SetOptions.kt +++ b/common/firebase/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/SetOptions.kt @@ -1,16 +1,13 @@ package cz.frantisekmasa.wfrp_master.common.firebase.firestore class SetOptions private constructor( - internal val merge: Boolean, internal val fieldsMask: List?, ) { companion object { - private val MERGE = SetOptions(merge = true, fieldsMask = null) + private val MERGE = SetOptions(fieldsMask = null) fun mergeFields(fields: Iterable): SetOptions { - return SetOptions(merge = true, fieldsMask = fields.toList()) + return SetOptions(fieldsMask = fields.toList()) } - - fun merge() = MERGE } } diff --git a/common/firebase/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt b/common/firebase/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt index 88eef7a74..861be3d9f 100644 --- a/common/firebase/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt +++ b/common/firebase/src/jvmMain/kotlin/cz/frantisekmasa/wfrp_master/common/firebase/firestore/Firestore.kt @@ -7,8 +7,6 @@ actual class Firestore( ) { actual fun collection(collectionPath: String) = CollectionReference(firestore.collection(collectionPath)) - actual fun document(documentPath: String) = DocumentReference(firestore.document(documentPath)) - actual suspend fun runTransaction(block: suspend (Transaction) -> Unit) { val batch = firestore.batch() diff --git a/common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/auth/AuthenticationManager.kt b/common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/auth/AuthenticationManager.kt index 5f95c986e..1ce6e7921 100644 --- a/common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/auth/AuthenticationManager.kt +++ b/common/src/androidMain/kotlin/cz/frantisekmasa/wfrp_master/common/auth/AuthenticationManager.kt @@ -75,8 +75,6 @@ class AuthenticationManager(private val auth: FirebaseAuth) : UserProvider { } } - fun isAuthenticated() = auth.currentUser != null - suspend fun signInWithGoogleToken(idToken: String): Boolean { val credential = GoogleAuthProvider.getCredential(idToken, null) @@ -162,8 +160,6 @@ class AuthenticationManager(private val auth: FirebaseAuth) : UserProvider { } } - fun getUserId() = auth.currentUser?.uid ?: error("User is not authenticated") - private fun googleClient(context: Context, webClientId: String) = GoogleSignIn.getClient( context, GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN) diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/CharacterScreenModel.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/CharacterScreenModel.kt index c1259f8ac..dbbd7673d 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/CharacterScreenModel.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/CharacterScreenModel.kt @@ -6,7 +6,6 @@ import cz.frantisekmasa.wfrp_master.common.compendium.domain.Career import cz.frantisekmasa.wfrp_master.common.core.auth.UserProvider import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterAvatarChanger -import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterNotFound import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterRepository import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterType import cz.frantisekmasa.wfrp_master.common.core.domain.compendium.Compendium @@ -70,16 +69,6 @@ class CharacterScreenModel( characters.save(characterId.partyId, change(character)) } - suspend fun characterExists(): Boolean { - return try { - characters.get(characterId) - - true - } catch (e: CharacterNotFound) { - false - } - } - suspend fun archive() { // TODO: Remove this character from combat (see [Combat::removeNpc()]) val character = characters.get(characterId) diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/EncumbranceWithIcon.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/EncumbranceWithIcon.kt deleted file mode 100644 index c578ada44..000000000 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/character/trappings/EncumbranceWithIcon.kt +++ /dev/null @@ -1,35 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.character.trappings - -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.size -import androidx.compose.material.Icon -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import cz.frantisekmasa.wfrp_master.common.Str -import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.Encumbrance -import cz.frantisekmasa.wfrp_master.common.core.shared.Resources -import cz.frantisekmasa.wfrp_master.common.core.shared.drawableResource -import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.Spacing -import dev.icerock.moko.resources.compose.stringResource - -@Composable -fun EncumbranceWithIcon(encumbrance: Encumbrance) { - if (encumbrance == Encumbrance.Zero) { - return - } - - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(Spacing.tiny) - ) { - Icon( - drawableResource(Resources.Drawable.TrappingEncumbrance), - stringResource(Str.trappings_icon_encumbrance), - Modifier.size(Spacing.medium), - ) - Text(encumbrance.toString()) - } -} diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/career/CareerScreenModel.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/career/CareerScreenModel.kt deleted file mode 100644 index 80398b10f..000000000 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/career/CareerScreenModel.kt +++ /dev/null @@ -1,44 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.compendium.career - -import arrow.core.Either -import cafe.adriel.voyager.core.model.ScreenModel -import com.benasher44.uuid.Uuid -import cz.frantisekmasa.wfrp_master.common.compendium.domain.Career -import cz.frantisekmasa.wfrp_master.common.compendium.domain.exceptions.CompendiumItemNotFound -import cz.frantisekmasa.wfrp_master.common.core.domain.compendium.Compendium -import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId -import kotlinx.coroutines.flow.Flow - -class CareerScreenModel( - private val careerCompendium: Compendium, -) : ScreenModel { - - fun getCareer(partyId: PartyId, careerId: Uuid): Flow> { - return careerCompendium.getLive(partyId, careerId) - } - - suspend fun update(partyId: PartyId, career: Career) { - careerCompendium.saveItems(partyId, listOf(career)) - } - - suspend fun saveLevel(partyId: PartyId, careerId: Uuid, level: Career.Level) { - val career = careerCompendium.getItem(partyId, careerId) - - val existingIndex = career.levels.indexOfFirst { it.id == level.id } - - if (existingIndex == -1) { - careerCompendium.saveItems( - partyId, - listOf(career.copy(levels = career.levels + level)), - ) - } else { - val levels = career.levels.toMutableList() - levels[existingIndex] = level - - careerCompendium.saveItems( - partyId, - listOf(career.copy(levels = levels)), - ) - } - } -} diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/ImportFailed.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/ImportFailed.kt deleted file mode 100644 index b062f937c..000000000 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/ImportFailed.kt +++ /dev/null @@ -1,3 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.compendium.domain.importer - -class ImportFailed(message: String) : Exception(message) diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/PDFBox.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/PDFBox.kt index d776c9039..37ad89119 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/PDFBox.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/compendium/domain/importer/parsers/PDFBox.kt @@ -10,7 +10,6 @@ expect class TextPosition { fun getX(): Float fun getEndX(): Float fun getY(): Float - fun getEndY(): Float fun getWidth(): Float fun getHeight(): Float fun getFont(): Font @@ -53,8 +52,3 @@ expect abstract class RectangleFinder constructor(page: Page) { fun processPage(page: Page) } - -data class Point( - val x: Float, - val y: Float, -) diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/auth/UserId.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/auth/UserId.kt index abc825d92..90d0bcca7 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/auth/UserId.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/auth/UserId.kt @@ -13,9 +13,5 @@ value class UserId internal constructor(private val value: String) : Parcelable require(value.isNotBlank()) { "UserId cannot be blank" } } - companion object { - fun fromString(userId: String): UserId = UserId(userId) - } - override fun toString() = value } diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/CharacterEffectSource.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/CharacterEffectSource.kt deleted file mode 100644 index 2569419bf..000000000 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/CharacterEffectSource.kt +++ /dev/null @@ -1,3 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.core.domain - -sealed interface CharacterEffectSource diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Characteristic.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Characteristic.kt index e5225d147..2279963e1 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Characteristic.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/Characteristic.kt @@ -2,7 +2,6 @@ package cz.frantisekmasa.wfrp_master.common.core.domain import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable -import androidx.compose.runtime.Stable import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.shared.Resources import dev.icerock.moko.resources.StringResource @@ -23,22 +22,6 @@ enum class Characteristic( WEAPON_SKILL(Str.characteristics_weapon_skill, Str.characteristics_weapon_skill_shortcut), WILL_POWER(Str.characteristics_will_power, Str.characteristics_will_power_shortcut); - @Stable - fun getShortcutName(): String { - return when (this) { - AGILITY -> "Ag" - BALLISTIC_SKILL -> "BS" - DEXTERITY -> "Dex" - INITIATIVE -> "I" - INTELLIGENCE -> "Int" - FELLOWSHIP -> "Fel" - STRENGTH -> "S" - TOUGHNESS -> "T" - WEAPON_SKILL -> "WS" - WILL_POWER -> "WP" - } - } - fun characteristicValue(characteristics: Stats): Int = when (this) { AGILITY -> characteristics.agility BALLISTIC_SKILL -> characteristics.ballisticSkill diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Points.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Points.kt index ebb3a3f30..cb97768c2 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Points.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Points.kt @@ -4,7 +4,6 @@ import cz.frantisekmasa.wfrp_master.common.Str import cz.frantisekmasa.wfrp_master.common.core.domain.NamedEnum import dev.icerock.moko.resources.StringResource import kotlinx.serialization.Serializable -import kotlin.math.min @Serializable data class Points( @@ -31,11 +30,6 @@ data class Points( require(spentExperience >= 0) } - fun withFate(newFate: Int) = copy( - fate = newFate, - fortune = min(fortune, newFate) - ) - fun modify(pool: PointPool, value: Int): Result { return runCatching { when (pool) { diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Party.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Party.kt index 9a19b2b45..48afa243a 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Party.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/Party.kt @@ -44,8 +44,6 @@ data class Party( val playersCount: Int get() = users.size - 1 - val players: List get() = users.filter { it != gameMasterId } - fun updateAmbitions(ambitions: Ambitions) = copy(ambitions = ambitions) fun rename(name: String) = copy(name = name) diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/PartyId.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/PartyId.kt index 1569a1d3c..9ca85cb61 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/PartyId.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/party/PartyId.kt @@ -3,7 +3,6 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.party import androidx.compose.runtime.Immutable import com.benasher44.uuid.Uuid import com.benasher44.uuid.uuid4 -import com.benasher44.uuid.uuidFrom import dev.icerock.moko.parcelize.Parcelable import dev.icerock.moko.parcelize.Parcelize import kotlinx.serialization.Contextual @@ -16,7 +15,6 @@ import kotlin.jvm.JvmInline @Immutable value class PartyId(@Contextual private val value: Uuid) : Parcelable { companion object { - fun fromString(id: String): PartyId = PartyId(uuidFrom(id)) fun generate(): PartyId = PartyId(uuid4()) } diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Armour.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Armour.kt index 3d5a56a13..3d468150a 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Armour.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/Armour.kt @@ -26,11 +26,6 @@ data class Armour( } } - @Stable - fun isZero(): Boolean { - return shield == 0 && HitLocation.values().all { armourPoints(it).value == 0 } - } - @Stable fun armourPoints(location: HitLocation) = ArmourPoints( when (location) { @@ -54,8 +49,6 @@ data class Armour( ) companion object { - const val MAX_VALUE = 99 - fun fromItems(items: List): Armour = fromArmourPieces(items) + fromWornShields(items) diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/RangedWeaponGroup.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/RangedWeaponGroup.kt index b57f246c9..c499e517b 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/RangedWeaponGroup.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/trappings/RangedWeaponGroup.kt @@ -11,7 +11,6 @@ import dev.icerock.moko.resources.StringResource @Immutable enum class RangedWeaponGroup( override val translatableName: StringResource, - val needsAmmo: Boolean = true ) : NamedEnum, Parcelable { BLACKPOWDER(Str.weapons_ranged_groups_blackpowder), BOW(Str.weapons_ranged_groups_bow), @@ -20,5 +19,5 @@ enum class RangedWeaponGroup( ENGINEERING(Str.weapons_ranged_groups_engineering), EXPLOSIVES(Str.weapons_ranged_groups_explosives), SLING(Str.weapons_ranged_groups_sling), - THROWING(Str.weapons_ranged_groups_throwing, needsAmmo = false), + THROWING(Str.weapons_ranged_groups_throwing), } diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/firebase/Schema.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/firebase/Schema.kt index 5b54a22b2..a42aec2db 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/firebase/Schema.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/firebase/Schema.kt @@ -3,7 +3,6 @@ package cz.frantisekmasa.wfrp_master.common.core.firebase object Schema { const val Parties = "parties" const val Characters = "characters" - const val CharacterFeatures = "features" object Party { const val Encounters = "encounters" diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Resources.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Resources.kt index 8b09120e3..4c5782079 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Resources.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/shared/Resources.kt @@ -15,7 +15,6 @@ object Resources { WeaponSkill("drawable/ic_weapon_skill.xml"), WillPower("drawable/ic_will_power.xml"), - Dead("drawable/ic_dead.xml"), DefaultAvatarIcon("drawable/ic_face.xml"), Character("drawable/ic_character.xml"), DiceRoll("drawable/ic_dice_roll.xml"), diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/CharacteristicsTable.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/CharacteristicsTable.kt deleted file mode 100644 index 90c220584..000000000 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/CharacteristicsTable.kt +++ /dev/null @@ -1,58 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.core.ui - -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.material.MaterialTheme -import androidx.compose.material.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp -import cz.frantisekmasa.wfrp_master.common.core.domain.Characteristic -import cz.frantisekmasa.wfrp_master.common.core.domain.Stats -import dev.icerock.moko.resources.compose.stringResource - -@Composable -fun CharacteristicsTable(characteristics: Stats) { - Row(horizontalArrangement = Arrangement.SpaceEvenly, modifier = Modifier.fillMaxWidth()) { - Column(horizontalAlignment = Alignment.CenterHorizontally) { - CharacteristicItem(Characteristic.WEAPON_SKILL, characteristics.weaponSkill) - CharacteristicItem(Characteristic.AGILITY, characteristics.agility) - } - - Column(horizontalAlignment = Alignment.CenterHorizontally) { - CharacteristicItem(Characteristic.BALLISTIC_SKILL, characteristics.ballisticSkill) - CharacteristicItem(Characteristic.DEXTERITY, characteristics.dexterity) - } - - Column(horizontalAlignment = Alignment.CenterHorizontally) { - CharacteristicItem(Characteristic.STRENGTH, characteristics.strength) - CharacteristicItem(Characteristic.INTELLIGENCE, characteristics.intelligence) - } - - Column(horizontalAlignment = Alignment.CenterHorizontally) { - CharacteristicItem(Characteristic.TOUGHNESS, characteristics.toughness) - CharacteristicItem(Characteristic.WILL_POWER, characteristics.willPower) - } - - Column(horizontalAlignment = Alignment.CenterHorizontally) { - CharacteristicItem(Characteristic.INITIATIVE, characteristics.initiative) - CharacteristicItem(Characteristic.FELLOWSHIP, characteristics.fellowship) - } - } -} - -@Composable -private fun CharacteristicItem(characteristic: Characteristic, value: Int) { - Column(horizontalAlignment = Alignment.CenterHorizontally) { - Text(stringResource(characteristic.shortcut), style = MaterialTheme.typography.subtitle1) - Text( - value.toString(), - Modifier.padding(vertical = 12.dp), - style = MaterialTheme.typography.h5 - ) - } -} diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/Rules.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/Rules.kt index 1e68714d1..9d6a78c43 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/Rules.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/ui/forms/Rules.kt @@ -30,7 +30,6 @@ class Rules(private vararg val rules: Rule) : Rule { * - Do not have *unexpected* validation rules for user */ fun withEmptyMessage(rule: Rule) = Rule { if (rule.errorMessage(it) != null) "" else null } - fun withEmptyMessage(validate: (String) -> Boolean): Rule = CallbackRule("", validate) fun IfNotBlank(rule: Rule): Rule = Rule { if (it.isBlank()) { diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/utils/mapItems.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/utils/mapItems.kt deleted file mode 100644 index 63e001a79..000000000 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/utils/mapItems.kt +++ /dev/null @@ -1,7 +0,0 @@ -package cz.frantisekmasa.wfrp_master.common.core.utils - -import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.map - -fun Flow>.mapItems(transformation: (T) -> R) = - map { items -> items.map(transformation) } diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/domain/Wounds.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/domain/Wounds.kt index 8d50d66a1..d974f9601 100644 --- a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/domain/Wounds.kt +++ b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/encounters/domain/Wounds.kt @@ -19,8 +19,6 @@ data class Wounds( fun lose(lost: Int): Wounds = copy(current = max(0, current - lost)) companion object { - fun fromMax(max: Int) = Wounds(max, max) - // See rulebook page 341 fun calculateMax( size: Size, diff --git a/common/src/commonMain/resources/drawable/ic_dead.xml b/common/src/commonMain/resources/drawable/ic_dead.xml deleted file mode 100644 index ed32a7834..000000000 --- a/common/src/commonMain/resources/drawable/ic_dead.xml +++ /dev/null @@ -1,5 +0,0 @@ - - -