From ce05e6a4c4ad14c75314178a1d78f683deb4be8c Mon Sep 17 00:00:00 2001 From: Thomas Andres Gomez Date: Wed, 26 Nov 2025 18:16:36 +0100 Subject: [PATCH] Refactor package gamemaster into admin + fix itemAnimation --- .../kotlin/com/pixelized/desktop/lwa/App.kt | 2 +- .../com/pixelized/desktop/lwa/Module.kt | 38 +++++++++---------- .../alterteration/AlterationToggleItem.kt | 4 +- .../CharacterSheetAlterationDialog.kt | 4 +- .../CharacterSheetAlterationDialogFactory.kt | 4 +- ...CharacterSheetAlterationDialogViewModel.kt | 4 +- .../gamemaster/GMActionDestination.kt | 2 +- .../gamemaster/GMAlterationDestination.kt | 2 +- .../gamemaster/GMAlterationEditDestination.kt | 2 +- .../gamemaster/GMCharacterDestination.kt | 2 +- .../gamemaster/GMCharacterEditDestination.kt | 2 +- .../gamemaster/GMItemDestination.kt | 2 +- .../gamemaster/GMItemEditDestination.kt | 2 +- .../gamemaster/GameMasterDestination.kt | 2 +- .../AdminNavHost.kt} | 2 +- .../AdminScreen.kt} | 12 +++--- .../AdminViewModel.kt} | 4 +- .../{gamemaster => admin}/action/GMAction.kt | 2 +- .../action/GMActionPage.kt | 3 +- .../action/GMActionUseCase.kt | 2 +- .../action/GMActionViewModel.kt | 2 +- .../action/GMEditDialog.kt | 2 +- .../edit/GMAlterationEditFactory.kt | 4 +- .../alteration/edit/GMAlterationEditPage.kt | 6 +-- .../edit/GMAlterationEditViewModel.kt | 4 +- .../alteration/list/GMAlteration.kt | 6 +-- .../alteration/list/GMAlterationFactory.kt | 4 +- .../alteration/list/GMAlterationPage.kt | 9 +++-- .../alteration/list/GMAlterationViewModel.kt | 6 +-- .../character/edit/GMCharacterEditFactory.kt | 8 ++-- .../character/edit/GMCharacterEditPage.kt | 18 ++++----- .../edit/GMCharacterEditViewModel.kt | 8 ++-- .../edit/dialog/GMCharacterSheetCopyDialog.kt | 2 +- .../GMCharacterSheetCopyDialogFactory.kt | 2 +- .../GMCharacterSheetCopyDialogViewModel.kt | 2 +- .../character/edit/item/GMActionField.kt | 2 +- .../character/edit/item/GMSkillFieldUio.kt | 2 +- .../character/list/GMCharacter.kt | 8 ++-- .../character/list/GMCharacterFactory.kt | 6 +-- .../character/list/GMCharacterPage.kt | 8 ++-- .../character/list/GMCharacterViewModel.kt | 6 +-- .../common/GMFilterHeader.kt | 6 +-- .../{gamemaster => admin}/common/GMTab.kt | 2 +- .../{gamemaster => admin}/common/tag/GMTag.kt | 2 +- .../common/tag/GMTagFactory.kt | 2 +- .../item/edit/GMAlterationFieldItemUio.kt | 4 +- .../item/edit/GMItemEditFactory.kt | 5 +-- .../item/edit/GMItemEditPage.kt | 6 +-- .../item/edit/GMItemEditViewModel.kt | 4 +- .../{gamemaster => admin}/item/list/GMItem.kt | 6 +-- .../item/list/GMItemFactory.kt | 4 +- .../item/list/GMItemPage.kt | 8 ++-- .../item/list/GMItemViewModel.kt | 7 ++-- 53 files changed, 134 insertions(+), 134 deletions(-) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster/GameMasterNavHost.kt => admin/AdminNavHost.kt} (97%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster/GameMasterScreen.kt => admin/AdminScreen.kt} (95%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster/GameMasterViewModel.kt => admin/AdminViewModel.kt} (90%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/action/GMAction.kt (96%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/action/GMActionPage.kt (98%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/action/GMActionUseCase.kt (97%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/action/GMActionViewModel.kt (99%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/action/GMEditDialog.kt (98%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/alteration/edit/GMAlterationEditFactory.kt (97%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/alteration/edit/GMAlterationEditPage.kt (98%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/alteration/edit/GMAlterationEditViewModel.kt (96%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/alteration/list/GMAlteration.kt (95%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/alteration/list/GMAlterationFactory.kt (91%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/alteration/list/GMAlterationPage.kt (94%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/alteration/list/GMAlterationViewModel.kt (93%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/edit/GMCharacterEditFactory.kt (99%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/edit/GMCharacterEditPage.kt (97%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/edit/GMCharacterEditViewModel.kt (94%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/edit/dialog/GMCharacterSheetCopyDialog.kt (98%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/edit/dialog/GMCharacterSheetCopyDialogFactory.kt (97%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/edit/dialog/GMCharacterSheetCopyDialogViewModel.kt (96%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/edit/item/GMActionField.kt (98%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/edit/item/GMSkillFieldUio.kt (98%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/list/GMCharacter.kt (96%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/list/GMCharacterFactory.kt (93%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/list/GMCharacterPage.kt (97%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/character/list/GMCharacterViewModel.kt (95%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/common/GMFilterHeader.kt (95%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/common/GMTab.kt (95%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/common/tag/GMTag.kt (98%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/common/tag/GMTagFactory.kt (95%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/item/edit/GMAlterationFieldItemUio.kt (97%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/item/edit/GMItemEditFactory.kt (97%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/item/edit/GMItemEditPage.kt (98%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/item/edit/GMItemEditViewModel.kt (97%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/item/list/GMItem.kt (96%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/item/list/GMItemFactory.kt (91%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/item/list/GMItemPage.kt (94%) rename composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/{gamemaster => admin}/item/list/GMItemViewModel.kt (91%) diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/App.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/App.kt index c2e1415..0f82f46 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/App.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/App.kt @@ -41,7 +41,7 @@ import com.pixelized.desktop.lwa.ui.navigation.window.WindowsNavHost import com.pixelized.desktop.lwa.ui.navigation.window.destination.GameMasterWindow import com.pixelized.desktop.lwa.ui.navigation.window.rememberMaxWindowHeight import com.pixelized.desktop.lwa.ui.overlay.roll.RollHostState -import com.pixelized.desktop.lwa.ui.screen.gamemaster.GameMasterNavHost +import com.pixelized.desktop.lwa.ui.screen.admin.GameMasterNavHost import com.pixelized.desktop.lwa.ui.theme.LwaTheme import com.pixelized.desktop.lwa.utils.InstallCoil import kotlinx.coroutines.launch diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/Module.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/Module.kt index 3e25c6c..38be68b 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/Module.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/Module.kt @@ -47,24 +47,24 @@ import com.pixelized.desktop.lwa.ui.screen.campaign.toolbar.CampaignToolbarViewM import com.pixelized.desktop.lwa.ui.screen.campaign.toolbar.links.ResourcesViewModel import com.pixelized.desktop.lwa.ui.screen.campaign.toolbar.network.NetworkFactory import com.pixelized.desktop.lwa.ui.screen.campaign.toolbar.network.NetworkViewModel -import com.pixelized.desktop.lwa.ui.screen.gamemaster.GameMasterViewModel -import com.pixelized.desktop.lwa.ui.screen.gamemaster.action.GMActionUseCase -import com.pixelized.desktop.lwa.ui.screen.gamemaster.action.GMActionViewModel -import com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.edit.GMAlterationEditFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.edit.GMAlterationEditViewModel -import com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.list.GMAlterationFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.list.GMAlterationViewModel -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.GMCharacterEditFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.GMCharacterEditViewModel -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog.GMCharacterSheetCopyDialogFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog.GMCharacterSheetCopyDialogViewModel -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list.GMCharacterFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list.GMCharacterViewModel -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.item.edit.GMItemEditFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.item.edit.GMItemEditViewModel -import com.pixelized.desktop.lwa.ui.screen.gamemaster.item.list.GMItemFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.item.list.GMItemViewModel +import com.pixelized.desktop.lwa.ui.screen.admin.AdminViewModel +import com.pixelized.desktop.lwa.ui.screen.admin.action.GMActionUseCase +import com.pixelized.desktop.lwa.ui.screen.admin.action.GMActionViewModel +import com.pixelized.desktop.lwa.ui.screen.admin.alteration.edit.GMAlterationEditFactory +import com.pixelized.desktop.lwa.ui.screen.admin.alteration.edit.GMAlterationEditViewModel +import com.pixelized.desktop.lwa.ui.screen.admin.alteration.list.GMAlterationFactory +import com.pixelized.desktop.lwa.ui.screen.admin.alteration.list.GMAlterationViewModel +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.GMCharacterEditFactory +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.GMCharacterEditViewModel +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog.GMCharacterSheetCopyDialogFactory +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog.GMCharacterSheetCopyDialogViewModel +import com.pixelized.desktop.lwa.ui.screen.admin.character.list.GMCharacterFactory +import com.pixelized.desktop.lwa.ui.screen.admin.character.list.GMCharacterViewModel +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.item.edit.GMItemEditFactory +import com.pixelized.desktop.lwa.ui.screen.admin.item.edit.GMItemEditViewModel +import com.pixelized.desktop.lwa.ui.screen.admin.item.list.GMItemFactory +import com.pixelized.desktop.lwa.ui.screen.admin.item.list.GMItemViewModel import com.pixelized.desktop.lwa.ui.screen.levelup.LevelUpFactory import com.pixelized.desktop.lwa.ui.screen.levelup.LevelUpViewModel import com.pixelized.desktop.lwa.ui.screen.settings.SettingsViewModel @@ -188,7 +188,7 @@ val viewModelDependencies viewModelOf(::SettingsViewModel) viewModelOf(::LevelUpViewModel) viewModelOf(::PortraitOverlayViewModel) - viewModelOf(::GameMasterViewModel) + viewModelOf(::AdminViewModel) viewModelOf(::GMCharacterViewModel) viewModelOf(::GMCharacterEditViewModel) viewModelOf(::GMActionViewModel) diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/AlterationToggleItem.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/AlterationToggleItem.kt index e441684..ab7fe81 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/AlterationToggleItem.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/AlterationToggleItem.kt @@ -20,8 +20,8 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTag -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTag +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.lwa @Stable diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialog.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialog.kt index a43c811..af16cd2 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialog.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialog.kt @@ -29,8 +29,8 @@ import androidx.compose.ui.zIndex import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.pixelized.desktop.lwa.ui.composable.character.LwaDialog import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.GMFilterHeader -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.GMFilterHeader +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.utils.extention.calculatePaddings import kotlinx.coroutines.flow.StateFlow diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialogFactory.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialogFactory.kt index f7cb291..9a8ff13 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialogFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialogFactory.kt @@ -1,8 +1,8 @@ package com.pixelized.desktop.lwa.ui.composable.character.alterteration import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.utils.extention.unAccent import com.pixelized.shared.lwa.model.alteration.Alteration import com.pixelized.shared.lwa.model.characterSheet.CharacterSheet diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialogViewModel.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialogViewModel.kt index 5b7d3a6..96e2955 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialogViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialogViewModel.kt @@ -8,8 +8,8 @@ import com.pixelized.desktop.lwa.repository.tag.TagRepository import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackUio import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.utils.extention.unAccent import com.pixelized.shared.lwa.model.alteration.Alteration import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMActionDestination.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMActionDestination.kt index 183deb0..ec998f9 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMActionDestination.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMActionDestination.kt @@ -4,7 +4,7 @@ import androidx.compose.runtime.Stable import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController import androidx.navigation.compose.composable -import com.pixelized.desktop.lwa.ui.screen.gamemaster.action.GMActionPage +import com.pixelized.desktop.lwa.ui.screen.admin.action.GMActionPage @Stable object GMActionDestination { diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMAlterationDestination.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMAlterationDestination.kt index 6e1e2cb..52a7c32 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMAlterationDestination.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMAlterationDestination.kt @@ -3,7 +3,7 @@ package com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController import androidx.navigation.compose.composable -import com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.list.GMAlterationPage +import com.pixelized.desktop.lwa.ui.screen.admin.alteration.list.GMAlterationPage object GMAlterationDestination { private const val ROUTE = "GameMasterAlteration" diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMAlterationEditDestination.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMAlterationEditDestination.kt index b24461a..bcd90ce 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMAlterationEditDestination.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMAlterationEditDestination.kt @@ -7,7 +7,7 @@ import androidx.navigation.NavHostController import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.edit.GMAlterationEditScreen +import com.pixelized.desktop.lwa.ui.screen.admin.alteration.edit.GMAlterationEditScreen import com.pixelized.desktop.lwa.utils.extention.ARG @Stable diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMCharacterDestination.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMCharacterDestination.kt index b1ff699..bcba8d9 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMCharacterDestination.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMCharacterDestination.kt @@ -3,7 +3,7 @@ package com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController import androidx.navigation.compose.composable -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list.GMCharacterPage +import com.pixelized.desktop.lwa.ui.screen.admin.character.list.GMCharacterPage object GMCharacterDestination { private const val ROUTE = "GameMasterCharacter" diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMCharacterEditDestination.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMCharacterEditDestination.kt index e66dda7..6c55483 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMCharacterEditDestination.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMCharacterEditDestination.kt @@ -7,7 +7,7 @@ import androidx.navigation.NavHostController import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.GMCharacterEditPage +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.GMCharacterEditPage import com.pixelized.desktop.lwa.utils.extention.ARG @Stable diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMItemDestination.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMItemDestination.kt index a5246ab..b9f3dd1 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMItemDestination.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMItemDestination.kt @@ -3,7 +3,7 @@ package com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController import androidx.navigation.compose.composable -import com.pixelized.desktop.lwa.ui.screen.gamemaster.item.list.GMItemPage +import com.pixelized.desktop.lwa.ui.screen.admin.item.list.GMItemPage object GMItemDestination { private const val ROUTE = "GameMasterItem" diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMItemEditDestination.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMItemEditDestination.kt index d8e0943..d6cf94a 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMItemEditDestination.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMItemEditDestination.kt @@ -7,7 +7,7 @@ import androidx.navigation.NavHostController import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import com.pixelized.desktop.lwa.ui.screen.gamemaster.item.edit.GMItemEditPage +import com.pixelized.desktop.lwa.ui.screen.admin.item.edit.GMItemEditPage import com.pixelized.desktop.lwa.utils.extention.ARG @Stable diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GameMasterDestination.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GameMasterDestination.kt index 43968cd..f5d0938 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GameMasterDestination.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GameMasterDestination.kt @@ -4,7 +4,7 @@ import androidx.compose.runtime.Stable import androidx.navigation.NavGraphBuilder import androidx.navigation.NavHostController import androidx.navigation.compose.composable -import com.pixelized.desktop.lwa.ui.screen.gamemaster.GameMasterScreen +import com.pixelized.desktop.lwa.ui.screen.admin.GameMasterScreen @Stable object GameMasterDestination { diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterNavHost.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminNavHost.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterNavHost.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminNavHost.kt index e66aa64..7956629 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterNavHost.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminNavHost.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster +package com.pixelized.desktop.lwa.ui.screen.admin import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.material.Surface diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterScreen.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminScreen.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterScreen.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminScreen.kt index 0b99862..bb69657 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminScreen.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster +package com.pixelized.desktop.lwa.ui.screen.admin import androidx.compose.foundation.Image import androidx.compose.foundation.clickable @@ -46,8 +46,8 @@ import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.nav import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.navigateToGameMasterCharacterPage import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.navigateToGameMasterObjectPage import com.pixelized.desktop.lwa.ui.screen.campaign.toolbar.dice.DiceMenu -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.GMTab -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.GMTabUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.GMTab +import com.pixelized.desktop.lwa.ui.screen.admin.common.GMTabUio import com.pixelized.desktop.lwa.ui.theme.color.component.LwaSwitchColors import com.pixelized.desktop.lwa.ui.theme.lwa import lwacharactersheet.composeapp.generated.resources.Res @@ -61,10 +61,10 @@ import org.koin.compose.viewmodel.koinViewModel @Composable fun GameMasterScreen( - gameMasterViewModel: GameMasterViewModel = koinViewModel(), + viewModel: AdminViewModel = koinViewModel(), controller: NavHostController = LocalGMScreenController.current, ) { - val gameMaster = gameMasterViewModel.isGameMaster.collectAsState() + val gameMaster = viewModel.isGameMaster.collectAsState() val isDiceMenuOpen = remember { mutableStateOf(false) } GameMasterContent( @@ -72,7 +72,7 @@ fun GameMasterScreen( controller = controller, isDiceMenuOpen = isDiceMenuOpen, gameMaster = gameMaster, - onGameMaster = gameMasterViewModel::onGameMaster, + onGameMaster = viewModel::onGameMaster, onTab = { when (it) { GMTabUio.Actions -> controller.navigateToGameMasterActionPage() diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterViewModel.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminViewModel.kt similarity index 90% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterViewModel.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminViewModel.kt index 756bb34..a8f9c56 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminViewModel.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster +package com.pixelized.desktop.lwa.ui.screen.admin import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn -class GameMasterViewModel( +class AdminViewModel( private val settingsRepository: SettingsRepository, ): ViewModel() { diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMAction.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMAction.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMAction.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMAction.kt index 28dd014..0d3a2a0 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMAction.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMAction.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.action +package com.pixelized.desktop.lwa.ui.screen.admin.action import androidx.compose.foundation.background import androidx.compose.foundation.clickable diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionPage.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionPage.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionPage.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionPage.kt index 4b824fd..49069b8 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionPage.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionPage.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.action +package com.pixelized.desktop.lwa.ui.screen.admin.action import androidx.compose.foundation.ScrollState import androidx.compose.foundation.layout.Arrangement @@ -14,7 +14,6 @@ import androidx.compose.runtime.State import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp -import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import com.pixelized.desktop.lwa.ui.composable.confirmation.ConfirmationDialog import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackHandler diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionUseCase.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionUseCase.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionUseCase.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionUseCase.kt index e630144..bcb417b 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionUseCase.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionUseCase.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.action +package com.pixelized.desktop.lwa.ui.screen.admin.action import com.pixelized.desktop.lwa.repository.campaign.CampaignRepository import com.pixelized.desktop.lwa.repository.characterSheet.CharacterSheetRepository diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionViewModel.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionViewModel.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionViewModel.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionViewModel.kt index e740823..36a79eb 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionViewModel.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.action +package com.pixelized.desktop.lwa.ui.screen.admin.action import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMEditDialog.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMEditDialog.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMEditDialog.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMEditDialog.kt index 8b519c2..169dc3f 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMEditDialog.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMEditDialog.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.action +package com.pixelized.desktop.lwa.ui.screen.admin.action import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditFactory.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditFactory.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditFactory.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditFactory.kt index 853330a..fa3440d 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditFactory.kt @@ -1,8 +1,8 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.edit +package com.pixelized.desktop.lwa.ui.screen.admin.alteration.edit import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory import com.pixelized.shared.lwa.model.alteration.Alteration import com.pixelized.shared.lwa.model.tag.Tag import com.pixelized.shared.lwa.parser.expression.ExpressionParser diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditPage.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditPage.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditPage.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditPage.kt index de39042..2ac824b 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditPage.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditPage.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.edit +package com.pixelized.desktop.lwa.ui.screen.admin.alteration.edit import androidx.compose.animation.AnimatedContent import androidx.compose.animation.EnterTransition @@ -64,8 +64,8 @@ import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.GMAlterationEditDestination -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagButton -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagButton +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.color.component.LwaButtonColors import com.pixelized.desktop.lwa.ui.theme.lwa import kotlinx.coroutines.CoroutineScope diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditViewModel.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditViewModel.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditViewModel.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditViewModel.kt index d919946..3f02afb 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditViewModel.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.edit +package com.pixelized.desktop.lwa.ui.screen.admin.alteration.edit import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel @@ -9,7 +9,7 @@ import com.pixelized.desktop.lwa.repository.tag.TagRepository import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackUio import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldFlow import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.GMAlterationEditDestination -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.shared.lwa.protocol.rest.APIResponse.ErrorCode import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlteration.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlteration.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlteration.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlteration.kt index 506f336..0a1f0a8 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlteration.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlteration.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.list +package com.pixelized.desktop.lwa.ui.screen.admin.alteration.list import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -26,8 +26,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTag -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTag +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.lwa import lwacharactersheet.composeapp.generated.resources.Res import lwacharactersheet.composeapp.generated.resources.game_master__alteration__delete diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationFactory.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationFactory.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationFactory.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationFactory.kt index 2670f5c..c5facee 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationFactory.kt @@ -1,6 +1,6 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.list +package com.pixelized.desktop.lwa.ui.screen.admin.alteration.list -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory import com.pixelized.desktop.lwa.utils.extention.unAccent import com.pixelized.shared.lwa.model.alteration.Alteration import com.pixelized.shared.lwa.model.tag.Tag diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationPage.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationPage.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationPage.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationPage.kt index 7374bc8..e07b599 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationPage.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationPage.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.list +package com.pixelized.desktop.lwa.ui.screen.admin.alteration.list import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -26,17 +26,17 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import androidx.compose.ui.zIndex import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackHandler import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.navigateToGameMasterAlterationEditPage -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.GMFilterHeader -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.GMFilterHeader +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.color.component.LwaButtonColors import kotlinx.coroutines.launch import lwacharactersheet.composeapp.generated.resources.Res import lwacharactersheet.composeapp.generated.resources.game_master__alteration__create -import lwacharactersheet.composeapp.generated.resources.game_master__create_character_sheet import org.jetbrains.compose.resources.stringResource import org.koin.compose.viewmodel.koinViewModel @@ -93,6 +93,7 @@ private fun GMAlterationContent( modifier = modifier, ) { Surface( + modifier = Modifier.zIndex(1f), // avoid display issue with LazyColumnScope.animateItem() elevation = 1.dp, ) { GMFilterHeader( diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationViewModel.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationViewModel.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationViewModel.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationViewModel.kt index 8ad5b5c..3618b45 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationViewModel.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.list +package com.pixelized.desktop.lwa.ui.screen.admin.alteration.list import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -7,8 +7,8 @@ import com.pixelized.desktop.lwa.repository.tag.TagRepository import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackUio import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.utils.extention.unAccent import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditFactory.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditFactory.kt similarity index 99% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditFactory.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditFactory.kt index 01e91bb..cc8fd92 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditFactory.kt @@ -1,12 +1,12 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit +package com.pixelized.desktop.lwa.ui.screen.admin.character.edit import com.pixelized.desktop.lwa.ui.composable.checkbox.LwaCheckBoxUio import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMActionFieldUio -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMSkillFieldUio -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMActionFieldUio +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMSkillFieldUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory import com.pixelized.desktop.lwa.utils.extention.unpack import com.pixelized.shared.lwa.model.characterSheet.CharacterSheet import com.pixelized.shared.lwa.model.characterSheet.CharacterSheet.CommonSkillId.ACROBATICS_ID diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditPage.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditPage.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditPage.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditPage.kt index d166fb1..464d01b 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditPage.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditPage.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit +package com.pixelized.desktop.lwa.ui.screen.admin.character.edit import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.expandHorizontally @@ -63,14 +63,14 @@ import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.GMCharacterEditDestination -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog.GMCharacterSheetCopyDialog -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog.GMCharacterSheetCopyDialogViewModel -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMActionField -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMActionFieldUio -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMSkillField -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMSkillFieldUio -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagButton -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog.GMCharacterSheetCopyDialog +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog.GMCharacterSheetCopyDialogViewModel +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMActionField +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMActionFieldUio +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMSkillField +import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMSkillFieldUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagButton +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.utils.extention.unpack import kotlinx.coroutines.CoroutineScope diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditViewModel.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditViewModel.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditViewModel.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditViewModel.kt index f3190f4..c332b4d 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditViewModel.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit +package com.pixelized.desktop.lwa.ui.screen.admin.character.edit import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel @@ -7,9 +7,9 @@ import com.pixelized.desktop.lwa.repository.characterSheet.CharacterSheetReposit import com.pixelized.desktop.lwa.repository.tag.TagRepository import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackUio import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.GMCharacterEditDestination -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list.GMCharacterFactory.Companion.NPC_ID -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list.GMCharacterFactory.Companion.PLAYER_ID -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.character.list.GMCharacterFactory.Companion.NPC_ID +import com.pixelized.desktop.lwa.ui.screen.admin.character.list.GMCharacterFactory.Companion.PLAYER_ID +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialog.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialog.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialog.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialog.kt index 2c10f52..d6af673 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialog.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialog.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog +package com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialogFactory.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialogFactory.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialogFactory.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialogFactory.kt index 352d306..8ad7e0c 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialogFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialogFactory.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog +package com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldFlow import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialogViewModel.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialogViewModel.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialogViewModel.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialogViewModel.kt index 01a0e1e..3a4822a 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialogViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialogViewModel.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog +package com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/item/GMActionField.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/item/GMActionField.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/item/GMActionField.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/item/GMActionField.kt index 827def5..0b9330d 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/item/GMActionField.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/item/GMActionField.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item +package com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item import androidx.compose.animation.animateContentSize import androidx.compose.foundation.layout.Arrangement diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/item/GMSkillFieldUio.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/item/GMSkillFieldUio.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/item/GMSkillFieldUio.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/item/GMSkillFieldUio.kt index 6e8e31a..1db7a98 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/item/GMSkillFieldUio.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/item/GMSkillFieldUio.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item +package com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacter.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacter.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacter.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacter.kt index e598c1c..2524dce 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacter.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacter.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list +package com.pixelized.desktop.lwa.ui.screen.admin.character.list import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.PointerMatcher @@ -29,9 +29,9 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.input.pointer.PointerButton import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.unit.dp -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list.GMCharacterItemUio.Action -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTag -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.character.list.GMCharacterItemUio.Action +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTag +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.lwa import lwacharactersheet.composeapp.generated.resources.Res import lwacharactersheet.composeapp.generated.resources.game_master__character_action__add_to_group diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterFactory.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterFactory.kt similarity index 93% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterFactory.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterFactory.kt index 53b7add..b7e6f6d 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterFactory.kt @@ -1,7 +1,7 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list +package com.pixelized.desktop.lwa.ui.screen.admin.character.list -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list.GMCharacterItemUio.Action -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.character.list.GMCharacterItemUio.Action +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.utils.extention.unAccent import com.pixelized.shared.lwa.model.campaign.Campaign import com.pixelized.shared.lwa.model.characterSheet.CharacterSheetPreview diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterPage.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterPage.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterPage.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterPage.kt index b5e8c3a..2086f95 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterPage.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterPage.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list +package com.pixelized.desktop.lwa.ui.screen.admin.character.list import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -32,6 +32,7 @@ import androidx.compose.ui.input.key.type import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp +import androidx.compose.ui.zIndex import com.pixelized.desktop.lwa.LocalBlurController import com.pixelized.desktop.lwa.ui.composable.character.alterteration.CharacterSheetAlterationDialog import com.pixelized.desktop.lwa.ui.composable.character.alterteration.CharacterSheetAlterationDialogViewModel @@ -48,8 +49,8 @@ import com.pixelized.desktop.lwa.ui.screen.campaign.player.detail.CharacterDetai import com.pixelized.desktop.lwa.ui.screen.campaign.player.detail.CharacterDetailPanelViewModel import com.pixelized.desktop.lwa.ui.screen.campaign.player.detail.DetailPanelUio import com.pixelized.desktop.lwa.ui.screen.campaign.player.detail.rememberTransitionAnimation -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.GMFilterHeader -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.GMFilterHeader +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.color.component.LwaButtonColors import kotlinx.coroutines.launch import lwacharactersheet.composeapp.generated.resources.Res @@ -200,6 +201,7 @@ fun GMCharacterContent( modifier = modifier, ) { Surface( + modifier = Modifier.zIndex(1f), // avoid display issue with LazyColumnScope.animateItem() elevation = 1.dp, ) { GMFilterHeader( diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterViewModel.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterViewModel.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterViewModel.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterViewModel.kt index 5f0e35d..fbc4a11 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterViewModel.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list +package com.pixelized.desktop.lwa.ui.screen.admin.character.list import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -8,8 +8,8 @@ import com.pixelized.desktop.lwa.repository.network.NetworkRepository import com.pixelized.desktop.lwa.repository.tag.TagRepository import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow -import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list.GMCharacterItemUio.Action -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.character.list.GMCharacterItemUio.Action +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory import com.pixelized.desktop.lwa.utils.extention.unAccent import com.pixelized.shared.lwa.protocol.websocket.GameMasterEvent import kotlinx.coroutines.flow.MutableStateFlow diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/GMFilterHeader.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/GMFilterHeader.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/GMFilterHeader.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/GMFilterHeader.kt index 178506b..dbb2b3f 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/GMFilterHeader.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/GMFilterHeader.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.common +package com.pixelized.desktop.lwa.ui.screen.admin.common import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -29,8 +29,8 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTag -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTag +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.color.component.LwaTextFieldColors import com.pixelized.desktop.lwa.ui.theme.lwa import kotlinx.coroutines.launch diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/GMTab.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/GMTab.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/GMTab.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/GMTab.kt index 00a5f81..6601f1a 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/GMTab.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/GMTab.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.common +package com.pixelized.desktop.lwa.ui.screen.admin.common import androidx.compose.material.Icon import androidx.compose.material.IconButton diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/tag/GMTag.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/tag/GMTag.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/tag/GMTag.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/tag/GMTag.kt index 3ee7806..abbef92 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/tag/GMTag.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/tag/GMTag.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag +package com.pixelized.desktop.lwa.ui.screen.admin.common.tag import androidx.compose.animation.animateColorAsState import androidx.compose.foundation.clickable diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/tag/GMTagFactory.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/tag/GMTagFactory.kt similarity index 95% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/tag/GMTagFactory.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/tag/GMTagFactory.kt index a585516..31e0821 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/tag/GMTagFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/tag/GMTagFactory.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag +package com.pixelized.desktop.lwa.ui.screen.admin.common.tag import com.pixelized.shared.lwa.model.tag.Tag import java.text.Collator diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMAlterationFieldItemUio.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMAlterationFieldItemUio.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMAlterationFieldItemUio.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMAlterationFieldItemUio.kt index ade2211..79a1eae 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMAlterationFieldItemUio.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMAlterationFieldItemUio.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.item.edit +package com.pixelized.desktop.lwa.ui.screen.admin.item.edit import androidx.compose.animation.AnimatedContent import androidx.compose.animation.SizeTransform @@ -6,8 +6,6 @@ import androidx.compose.animation.animateContentSize import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut -import androidx.compose.animation.slideInVertically -import androidx.compose.animation.slideOutVertically import androidx.compose.animation.togetherWith import androidx.compose.foundation.background import androidx.compose.foundation.interaction.MutableInteractionSource diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditFactory.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditFactory.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditFactory.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditFactory.kt index 0aeeb8f..0204d36 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditFactory.kt @@ -1,9 +1,9 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.item.edit +package com.pixelized.desktop.lwa.ui.screen.admin.item.edit import com.pixelized.desktop.lwa.ui.composable.checkbox.LwaCheckBoxUio import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory import com.pixelized.shared.lwa.model.alteration.Alteration import com.pixelized.shared.lwa.model.item.Item import com.pixelized.shared.lwa.model.tag.Tag @@ -21,7 +21,6 @@ import lwacharactersheet.composeapp.generated.resources.game_master__item__edit_ import lwacharactersheet.composeapp.generated.resources.game_master__item__edit_label import lwacharactersheet.composeapp.generated.resources.game_master__item__edit_thumbnail import org.jetbrains.compose.resources.getString -import java.util.UUID class GMItemEditFactory( private val tagFactory: GMTagFactory, diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditPage.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditPage.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditPage.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditPage.kt index ba778d4..2de4398 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditPage.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditPage.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.item.edit +package com.pixelized.desktop.lwa.ui.screen.admin.item.edit import androidx.compose.animation.AnimatedContent import androidx.compose.animation.EnterTransition @@ -59,8 +59,8 @@ import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.GMItemEditDestination -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagButton -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagButton +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.color.component.LwaButtonColors import com.pixelized.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.utils.extention.calculateHorizontalPaddings diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditViewModel.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditViewModel.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditViewModel.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditViewModel.kt index f4621e1..c534bf7 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditViewModel.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.item.edit +package com.pixelized.desktop.lwa.ui.screen.admin.item.edit import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.ViewModel @@ -10,7 +10,7 @@ import com.pixelized.desktop.lwa.repository.tag.TagRepository import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackUio import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldFlow import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.GMItemEditDestination -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.shared.lwa.protocol.rest.APIResponse.ErrorCode import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItem.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItem.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItem.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItem.kt index cff6ab3..d6dfed6 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItem.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItem.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.item.list +package com.pixelized.desktop.lwa.ui.screen.admin.item.list import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -33,8 +33,8 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTag -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTag +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.lwa import kotlinx.coroutines.launch import lwacharactersheet.composeapp.generated.resources.Res diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemFactory.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemFactory.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemFactory.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemFactory.kt index 6a40880..a8cee78 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemFactory.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemFactory.kt @@ -1,6 +1,6 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.item.list +package com.pixelized.desktop.lwa.ui.screen.admin.item.list -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory import com.pixelized.desktop.lwa.utils.extention.unAccent import com.pixelized.shared.lwa.model.item.Item import com.pixelized.shared.lwa.model.tag.Tag diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemPage.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemPage.kt similarity index 94% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemPage.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemPage.kt index 35473f2..2b794d7 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemPage.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemPage.kt @@ -1,4 +1,4 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.item.list +package com.pixelized.desktop.lwa.ui.screen.admin.item.list import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -27,12 +27,13 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clipToBounds import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import androidx.compose.ui.zIndex import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackHandler import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.navigateToGameMasterItemEditPage -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.GMFilterHeader -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.GMFilterHeader +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.theme.color.component.LwaButtonColors import kotlinx.coroutines.launch import lwacharactersheet.composeapp.generated.resources.Res @@ -93,6 +94,7 @@ private fun GMItemContent( modifier = modifier, ) { Surface( + modifier = Modifier.zIndex(1f), // avoid display issue with LazyColumnScope.animateItem() elevation = 1.dp, ) { GMFilterHeader( diff --git a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemViewModel.kt b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemViewModel.kt similarity index 91% rename from composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemViewModel.kt rename to composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemViewModel.kt index 7204d21..d316fd0 100644 --- a/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemViewModel.kt +++ b/composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemViewModel.kt @@ -1,15 +1,14 @@ -package com.pixelized.desktop.lwa.ui.screen.gamemaster.item.list +package com.pixelized.desktop.lwa.ui.screen.admin.item.list import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.pixelized.desktop.lwa.repository.item.ItemRepository import com.pixelized.desktop.lwa.repository.tag.TagRepository import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackUio -import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagFactory -import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagFactory +import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio import com.pixelized.desktop.lwa.utils.extention.unAccent import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow