curiosite/LwaApplication
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor package gamemaster into admin + fix itemAnimation

Browse source
This commit is contained in:
Thomas Andres Gomez 2025-11-26 18:16:36 +01:00
parent c4f0b41610
commit ce05e6a4c4
53 changed files with 134 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/App.kt
View file

@ -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.destination.GameMasterWindow
import com.pixelized.desktop.lwa.ui.navigation.window.rememberMaxWindowHeight import com.pixelized.desktop.lwa.ui.navigation.window.rememberMaxWindowHeight
import com.pixelized.desktop.lwa.ui.overlay.roll.RollHostState 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.ui.theme.LwaTheme
import com.pixelized.desktop.lwa.utils.InstallCoil import com.pixelized.desktop.lwa.utils.InstallCoil
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

38
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/Module.kt
View file

@ -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.links.ResourcesViewModel
import com.pixelized.desktop.lwa.ui.screen.campaign.toolbar.network.NetworkFactory 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.campaign.toolbar.network.NetworkViewModel
import com.pixelized.desktop.lwa.ui.screen.gamemaster.GameMasterViewModel import com.pixelized.desktop.lwa.ui.screen.admin.AdminViewModel
import com.pixelized.desktop.lwa.ui.screen.gamemaster.action.GMActionUseCase import com.pixelized.desktop.lwa.ui.screen.admin.action.GMActionUseCase
import com.pixelized.desktop.lwa.ui.screen.gamemaster.action.GMActionViewModel import com.pixelized.desktop.lwa.ui.screen.admin.action.GMActionViewModel
import com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.edit.GMAlterationEditFactory import com.pixelized.desktop.lwa.ui.screen.admin.alteration.edit.GMAlterationEditFactory
import com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.edit.GMAlterationEditViewModel import com.pixelized.desktop.lwa.ui.screen.admin.alteration.edit.GMAlterationEditViewModel
import com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.list.GMAlterationFactory import com.pixelized.desktop.lwa.ui.screen.admin.alteration.list.GMAlterationFactory
import com.pixelized.desktop.lwa.ui.screen.gamemaster.alteration.list.GMAlterationViewModel import com.pixelized.desktop.lwa.ui.screen.admin.alteration.list.GMAlterationViewModel
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.GMCharacterEditFactory import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.GMCharacterEditFactory
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.GMCharacterEditViewModel import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.GMCharacterEditViewModel
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog.GMCharacterSheetCopyDialogFactory import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog.GMCharacterSheetCopyDialogFactory
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog.GMCharacterSheetCopyDialogViewModel import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog.GMCharacterSheetCopyDialogViewModel
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list.GMCharacterFactory import com.pixelized.desktop.lwa.ui.screen.admin.character.list.GMCharacterFactory
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.list.GMCharacterViewModel import com.pixelized.desktop.lwa.ui.screen.admin.character.list.GMCharacterViewModel
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.ui.screen.gamemaster.item.edit.GMItemEditFactory import com.pixelized.desktop.lwa.ui.screen.admin.item.edit.GMItemEditFactory
import com.pixelized.desktop.lwa.ui.screen.gamemaster.item.edit.GMItemEditViewModel import com.pixelized.desktop.lwa.ui.screen.admin.item.edit.GMItemEditViewModel
import com.pixelized.desktop.lwa.ui.screen.gamemaster.item.list.GMItemFactory import com.pixelized.desktop.lwa.ui.screen.admin.item.list.GMItemFactory
import com.pixelized.desktop.lwa.ui.screen.gamemaster.item.list.GMItemViewModel 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.LevelUpFactory
import com.pixelized.desktop.lwa.ui.screen.levelup.LevelUpViewModel import com.pixelized.desktop.lwa.ui.screen.levelup.LevelUpViewModel
import com.pixelized.desktop.lwa.ui.screen.settings.SettingsViewModel import com.pixelized.desktop.lwa.ui.screen.settings.SettingsViewModel
@ -188,7 +188,7 @@ val viewModelDependencies
viewModelOf(::SettingsViewModel) viewModelOf(::SettingsViewModel)
viewModelOf(::LevelUpViewModel) viewModelOf(::LevelUpViewModel)
viewModelOf(::PortraitOverlayViewModel) viewModelOf(::PortraitOverlayViewModel)
viewModelOf(::GameMasterViewModel) viewModelOf(::AdminViewModel)
viewModelOf(::GMCharacterViewModel) viewModelOf(::GMCharacterViewModel)
viewModelOf(::GMCharacterEditViewModel) viewModelOf(::GMCharacterEditViewModel)
viewModelOf(::GMActionViewModel) viewModelOf(::GMActionViewModel)

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/AlterationToggleItem.kt
View file

@ -20,8 +20,8 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.text.style.TextOverflow 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.admin.common.tag.GMTag
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.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.ui.theme.lwa
@Stable @Stable

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialog.kt
View file

@ -29,8 +29,8 @@ import androidx.compose.ui.zIndex
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.pixelized.desktop.lwa.ui.composable.character.LwaDialog import com.pixelized.desktop.lwa.ui.composable.character.LwaDialog
import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio 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.admin.common.GMFilterHeader
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.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.ui.theme.lwa
import com.pixelized.desktop.lwa.utils.extention.calculatePaddings import com.pixelized.desktop.lwa.utils.extention.calculatePaddings
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialogFactory.kt
View file

@ -1,8 +1,8 @@
package com.pixelized.desktop.lwa.ui.composable.character.alterteration package com.pixelized.desktop.lwa.ui.composable.character.alterteration
import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio 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.admin.common.tag.GMTagFactory
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.desktop.lwa.utils.extention.unAccent import com.pixelized.desktop.lwa.utils.extention.unAccent
import com.pixelized.shared.lwa.model.alteration.Alteration import com.pixelized.shared.lwa.model.alteration.Alteration
import com.pixelized.shared.lwa.model.characterSheet.CharacterSheet import com.pixelized.shared.lwa.model.characterSheet.CharacterSheet

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/character/alterteration/CharacterSheetAlterationDialogViewModel.kt
View file

@ -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.error.ErrorSnackUio
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow 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.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio
import com.pixelized.desktop.lwa.utils.extention.unAccent import com.pixelized.desktop.lwa.utils.extention.unAccent
import com.pixelized.shared.lwa.model.alteration.Alteration import com.pixelized.shared.lwa.model.alteration.Alteration
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMActionDestination.kt
View file

@ -4,7 +4,7 @@ import androidx.compose.runtime.Stable
import androidx.navigation.NavGraphBuilder import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import androidx.navigation.compose.composable 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 @Stable
object GMActionDestination { object GMActionDestination {

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMAlterationDestination.kt
View file

@ -3,7 +3,7 @@ package com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster
import androidx.navigation.NavGraphBuilder import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import androidx.navigation.compose.composable 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 { object GMAlterationDestination {
private const val ROUTE = "GameMasterAlteration" private const val ROUTE = "GameMasterAlteration"

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMAlterationEditDestination.kt
View file

@ -7,7 +7,7 @@ import androidx.navigation.NavHostController
import androidx.navigation.NavType import androidx.navigation.NavType
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
import androidx.navigation.navArgument 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 import com.pixelized.desktop.lwa.utils.extention.ARG
@Stable @Stable

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMCharacterDestination.kt
View file

@ -3,7 +3,7 @@ package com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster
import androidx.navigation.NavGraphBuilder import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import androidx.navigation.compose.composable 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 { object GMCharacterDestination {
private const val ROUTE = "GameMasterCharacter" private const val ROUTE = "GameMasterCharacter"

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMCharacterEditDestination.kt
View file

@ -7,7 +7,7 @@ import androidx.navigation.NavHostController
import androidx.navigation.NavType import androidx.navigation.NavType
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
import androidx.navigation.navArgument 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 import com.pixelized.desktop.lwa.utils.extention.ARG
@Stable @Stable

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMItemDestination.kt
View file

@ -3,7 +3,7 @@ package com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster
import androidx.navigation.NavGraphBuilder import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import androidx.navigation.compose.composable 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 { object GMItemDestination {
private const val ROUTE = "GameMasterItem" private const val ROUTE = "GameMasterItem"

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GMItemEditDestination.kt
View file

@ -7,7 +7,7 @@ import androidx.navigation.NavHostController
import androidx.navigation.NavType import androidx.navigation.NavType
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
import androidx.navigation.navArgument 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 import com.pixelized.desktop.lwa.utils.extention.ARG
@Stable @Stable

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/gamemaster/GameMasterDestination.kt
View file

@ -4,7 +4,7 @@ import androidx.compose.runtime.Stable
import androidx.navigation.NavGraphBuilder import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController import androidx.navigation.NavHostController
import androidx.navigation.compose.composable import androidx.navigation.compose.composable
import com.pixelized.desktop.lwa.ui.screen.gamemaster.GameMasterScreen import com.pixelized.desktop.lwa.ui.screen.admin.GameMasterScreen
@Stable @Stable
object GameMasterDestination { object GameMasterDestination {

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterNavHost.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminNavHost.kt
View file

@ -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.foundation.layout.fillMaxSize
import androidx.compose.material.Surface import androidx.compose.material.Surface

12
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterScreen.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminScreen.kt
View file

@ -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.Image
import androidx.compose.foundation.clickable 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.navigateToGameMasterCharacterPage
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.navigateToGameMasterObjectPage 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.campaign.toolbar.dice.DiceMenu
import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.GMTab import com.pixelized.desktop.lwa.ui.screen.admin.common.GMTab
import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.GMTabUio 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.color.component.LwaSwitchColors
import com.pixelized.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.ui.theme.lwa
import lwacharactersheet.composeapp.generated.resources.Res import lwacharactersheet.composeapp.generated.resources.Res
@ -61,10 +61,10 @@ import org.koin.compose.viewmodel.koinViewModel
@Composable @Composable
fun GameMasterScreen( fun GameMasterScreen(
gameMasterViewModel: GameMasterViewModel = koinViewModel(), viewModel: AdminViewModel = koinViewModel(),
controller: NavHostController = LocalGMScreenController.current, controller: NavHostController = LocalGMScreenController.current,
) { ) {
val gameMaster = gameMasterViewModel.isGameMaster.collectAsState() val gameMaster = viewModel.isGameMaster.collectAsState()
val isDiceMenuOpen = remember { mutableStateOf(false) } val isDiceMenuOpen = remember { mutableStateOf(false) }
GameMasterContent( GameMasterContent(
@ -72,7 +72,7 @@ fun GameMasterScreen(
controller = controller, controller = controller,
isDiceMenuOpen = isDiceMenuOpen, isDiceMenuOpen = isDiceMenuOpen,
gameMaster = gameMaster, gameMaster = gameMaster,
onGameMaster = gameMasterViewModel::onGameMaster, onGameMaster = viewModel::onGameMaster,
onTab = { onTab = {
when (it) { when (it) {
GMTabUio.Actions -> controller.navigateToGameMasterActionPage() GMTabUio.Actions -> controller.navigateToGameMasterActionPage()

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/AdminViewModel.kt
View file

@ -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.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
@ -7,7 +7,7 @@ import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.stateIn
class GameMasterViewModel( class AdminViewModel(
private val settingsRepository: SettingsRepository, private val settingsRepository: SettingsRepository,
): ViewModel() { ): ViewModel() {

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMAction.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMAction.kt
View file

@ -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.background
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable

3
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionPage.kt
View file

@ -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.ScrollState
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement
@ -14,7 +14,6 @@ import androidx.compose.runtime.State
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.pixelized.desktop.lwa.ui.composable.confirmation.ConfirmationDialog import com.pixelized.desktop.lwa.ui.composable.confirmation.ConfirmationDialog
import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackHandler import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackHandler

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionUseCase.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionUseCase.kt
View file

@ -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.campaign.CampaignRepository
import com.pixelized.desktop.lwa.repository.characterSheet.CharacterSheetRepository import com.pixelized.desktop.lwa.repository.characterSheet.CharacterSheetRepository

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMActionViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMActionViewModel.kt
View file

@ -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.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/action/GMEditDialog.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/action/GMEditDialog.kt
View file

@ -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.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditFactory.kt
View file

@ -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.createLwaTextField
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow 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.alteration.Alteration
import com.pixelized.shared.lwa.model.tag.Tag import com.pixelized.shared.lwa.model.tag.Tag
import com.pixelized.shared.lwa.parser.expression.ExpressionParser import com.pixelized.shared.lwa.parser.expression.ExpressionParser

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditPage.kt
View file

@ -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.AnimatedContent
import androidx.compose.animation.EnterTransition 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.composable.textfield.LwaTextFieldUio
import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController 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.navigation.screen.destination.gamemaster.GMAlterationEditDestination
import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagButton import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagButton
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.desktop.lwa.ui.theme.color.component.LwaButtonColors import com.pixelized.desktop.lwa.ui.theme.color.component.LwaButtonColors
import com.pixelized.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.ui.theme.lwa
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/edit/GMAlterationEditViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/edit/GMAlterationEditViewModel.kt
View file

@ -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.SavedStateHandle
import androidx.lifecycle.ViewModel 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.error.ErrorSnackUio
import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldFlow 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.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 com.pixelized.shared.lwa.protocol.rest.APIResponse.ErrorCode
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlteration.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlteration.kt
View file

@ -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.background
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
@ -26,8 +26,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
import androidx.compose.ui.text.style.TextOverflow 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.admin.common.tag.GMTag
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.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.ui.theme.lwa
import lwacharactersheet.composeapp.generated.resources.Res import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.game_master__alteration__delete import lwacharactersheet.composeapp.generated.resources.game_master__alteration__delete

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationFactory.kt
View file

@ -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.desktop.lwa.utils.extention.unAccent
import com.pixelized.shared.lwa.model.alteration.Alteration import com.pixelized.shared.lwa.model.alteration.Alteration
import com.pixelized.shared.lwa.model.tag.Tag import com.pixelized.shared.lwa.model.tag.Tag

9
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationPage.kt
View file

@ -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.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
@ -26,17 +26,17 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
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.error.ErrorSnackHandler
import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio 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.LocalScreenController
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.navigateToGameMasterAlterationEditPage 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.admin.common.GMFilterHeader
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.desktop.lwa.ui.theme.color.component.LwaButtonColors import com.pixelized.desktop.lwa.ui.theme.color.component.LwaButtonColors
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import lwacharactersheet.composeapp.generated.resources.Res import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.game_master__alteration__create 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.jetbrains.compose.resources.stringResource
import org.koin.compose.viewmodel.koinViewModel import org.koin.compose.viewmodel.koinViewModel
@ -93,6 +93,7 @@ private fun GMAlterationContent(
modifier = modifier, modifier = modifier,
) { ) {
Surface( Surface(
modifier = Modifier.zIndex(1f), // avoid display issue with LazyColumnScope.animateItem()
elevation = 1.dp, elevation = 1.dp,
) { ) {
GMFilterHeader( GMFilterHeader(

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/alteration/list/GMAlterationViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/alteration/list/GMAlterationViewModel.kt
View file

@ -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.ViewModel
import androidx.lifecycle.viewModelScope 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.error.ErrorSnackUio
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow 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.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio
import com.pixelized.desktop.lwa.utils.extention.unAccent import com.pixelized.desktop.lwa.utils.extention.unAccent
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditFactory.kt
View file

@ -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.checkbox.LwaCheckBoxUio
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow 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.admin.character.edit.item.GMActionFieldUio
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMSkillFieldUio import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMSkillFieldUio
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.unpack import com.pixelized.desktop.lwa.utils.extention.unpack
import com.pixelized.shared.lwa.model.characterSheet.CharacterSheet import com.pixelized.shared.lwa.model.characterSheet.CharacterSheet
import com.pixelized.shared.lwa.model.characterSheet.CharacterSheet.CommonSkillId.ACROBATICS_ID import com.pixelized.shared.lwa.model.characterSheet.CharacterSheet.CommonSkillId.ACROBATICS_ID

18
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditPage.kt
View file

@ -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.AnimatedVisibility
import androidx.compose.animation.expandHorizontally 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.composable.textfield.LwaTextFieldUio
import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController 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.navigation.screen.destination.gamemaster.GMCharacterEditDestination
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog.GMCharacterSheetCopyDialog import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog.GMCharacterSheetCopyDialog
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.dialog.GMCharacterSheetCopyDialogViewModel import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.dialog.GMCharacterSheetCopyDialogViewModel
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMActionField import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMActionField
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMActionFieldUio import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMActionFieldUio
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMSkillField import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMSkillField
import com.pixelized.desktop.lwa.ui.screen.gamemaster.character.edit.item.GMSkillFieldUio import com.pixelized.desktop.lwa.ui.screen.admin.character.edit.item.GMSkillFieldUio
import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagButton import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagButton
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.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.ui.theme.lwa
import com.pixelized.desktop.lwa.utils.extention.unpack import com.pixelized.desktop.lwa.utils.extention.unpack
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/GMCharacterEditViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/GMCharacterEditViewModel.kt
View file

@ -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.SavedStateHandle
import androidx.lifecycle.ViewModel 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.repository.tag.TagRepository
import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackUio 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.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.admin.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.admin.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.common.tag.GMTagUio
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialog.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialog.kt
View file

@ -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.Arrangement
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialogFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialogFactory.kt
View file

@ -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.LwaTextFieldFlow
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/dialog/GMCharacterSheetCopyDialogViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/dialog/GMCharacterSheetCopyDialogViewModel.kt
View file

@ -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.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/item/GMActionField.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/item/GMActionField.kt
View file

@ -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.animation.animateContentSize
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/edit/item/GMSkillFieldUio.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/edit/item/GMSkillFieldUio.kt
View file

@ -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.Arrangement
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacter.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacter.kt
View file

@ -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.ExperimentalFoundationApi
import androidx.compose.foundation.PointerMatcher 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.input.pointer.PointerButton
import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.unit.dp 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.admin.character.list.GMCharacterItemUio.Action
import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTag import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTag
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.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.ui.theme.lwa
import lwacharactersheet.composeapp.generated.resources.Res import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.game_master__character_action__add_to_group import lwacharactersheet.composeapp.generated.resources.game_master__character_action__add_to_group

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterFactory.kt
View file

@ -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.admin.character.list.GMCharacterItemUio.Action
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.desktop.lwa.utils.extention.unAccent import com.pixelized.desktop.lwa.utils.extention.unAccent
import com.pixelized.shared.lwa.model.campaign.Campaign import com.pixelized.shared.lwa.model.campaign.Campaign
import com.pixelized.shared.lwa.model.characterSheet.CharacterSheetPreview import com.pixelized.shared.lwa.model.characterSheet.CharacterSheetPreview

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterPage.kt
View file

@ -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.Arrangement
import androidx.compose.foundation.layout.Box 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.Dp
import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import com.pixelized.desktop.lwa.LocalBlurController 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.CharacterSheetAlterationDialog
import com.pixelized.desktop.lwa.ui.composable.character.alterteration.CharacterSheetAlterationDialogViewModel 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.CharacterDetailPanelViewModel
import com.pixelized.desktop.lwa.ui.screen.campaign.player.detail.DetailPanelUio 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.campaign.player.detail.rememberTransitionAnimation
import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.GMFilterHeader import com.pixelized.desktop.lwa.ui.screen.admin.common.GMFilterHeader
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.desktop.lwa.ui.theme.color.component.LwaButtonColors import com.pixelized.desktop.lwa.ui.theme.color.component.LwaButtonColors
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import lwacharactersheet.composeapp.generated.resources.Res import lwacharactersheet.composeapp.generated.resources.Res
@ -200,6 +201,7 @@ fun GMCharacterContent(
modifier = modifier, modifier = modifier,
) { ) {
Surface( Surface(
modifier = Modifier.zIndex(1f), // avoid display issue with LazyColumnScope.animateItem()
elevation = 1.dp, elevation = 1.dp,
) { ) {
GMFilterHeader( GMFilterHeader(

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/character/list/GMCharacterViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/character/list/GMCharacterViewModel.kt
View file

@ -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.ViewModel
import androidx.lifecycle.viewModelScope 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.repository.tag.TagRepository
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow 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.admin.character.list.GMCharacterItemUio.Action
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.desktop.lwa.utils.extention.unAccent
import com.pixelized.shared.lwa.protocol.websocket.GameMasterEvent import com.pixelized.shared.lwa.protocol.websocket.GameMasterEvent
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/GMFilterHeader.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/GMFilterHeader.kt
View file

@ -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.AnimatedVisibility
import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeIn
@ -29,8 +29,8 @@ import androidx.compose.ui.unit.Dp
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.LwaTextField
import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio 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.admin.common.tag.GMTag
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.desktop.lwa.ui.theme.color.component.LwaTextFieldColors import com.pixelized.desktop.lwa.ui.theme.color.component.LwaTextFieldColors
import com.pixelized.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.ui.theme.lwa
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/GMTab.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/GMTab.kt
View file

@ -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.Icon
import androidx.compose.material.IconButton import androidx.compose.material.IconButton

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/tag/GMTag.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/tag/GMTag.kt
View file

@ -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.animation.animateColorAsState
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/common/tag/GMTagFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/common/tag/GMTagFactory.kt
View file

@ -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 com.pixelized.shared.lwa.model.tag.Tag
import java.text.Collator import java.text.Collator

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMAlterationFieldItemUio.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMAlterationFieldItemUio.kt
View file

@ -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.AnimatedContent
import androidx.compose.animation.SizeTransform import androidx.compose.animation.SizeTransform
@ -6,8 +6,6 @@ import androidx.compose.animation.animateContentSize
import androidx.compose.animation.core.animateFloatAsState import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith import androidx.compose.animation.togetherWith
import androidx.compose.foundation.background import androidx.compose.foundation.background
import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.MutableInteractionSource

5
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditFactory.kt
View file

@ -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.checkbox.LwaCheckBoxUio
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextField
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow 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.alteration.Alteration
import com.pixelized.shared.lwa.model.item.Item import com.pixelized.shared.lwa.model.item.Item
import com.pixelized.shared.lwa.model.tag.Tag 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_label
import lwacharactersheet.composeapp.generated.resources.game_master__item__edit_thumbnail import lwacharactersheet.composeapp.generated.resources.game_master__item__edit_thumbnail
import org.jetbrains.compose.resources.getString import org.jetbrains.compose.resources.getString
import java.util.UUID
class GMItemEditFactory( class GMItemEditFactory(
private val tagFactory: GMTagFactory, private val tagFactory: GMTagFactory,

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditPage.kt
View file

@ -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.AnimatedContent
import androidx.compose.animation.EnterTransition 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.composable.textfield.LwaTextFieldUio
import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController 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.navigation.screen.destination.gamemaster.GMItemEditDestination
import com.pixelized.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagButton import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagButton
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.desktop.lwa.ui.theme.color.component.LwaButtonColors import com.pixelized.desktop.lwa.ui.theme.color.component.LwaButtonColors
import com.pixelized.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.ui.theme.lwa
import com.pixelized.desktop.lwa.utils.extention.calculateHorizontalPaddings import com.pixelized.desktop.lwa.utils.extention.calculateHorizontalPaddings

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/edit/GMItemEditViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/edit/GMItemEditViewModel.kt
View file

@ -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.SavedStateHandle
import androidx.lifecycle.ViewModel 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.error.ErrorSnackUio
import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldFlow 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.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 com.pixelized.shared.lwa.protocol.rest.APIResponse.ErrorCode
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItem.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItem.kt
View file

@ -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.background
import androidx.compose.foundation.clickable 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.text.style.TextOverflow
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
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.admin.common.tag.GMTag
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.desktop.lwa.ui.theme.lwa import com.pixelized.desktop.lwa.ui.theme.lwa
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import lwacharactersheet.composeapp.generated.resources.Res import lwacharactersheet.composeapp.generated.resources.Res

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemFactory.kt
View file

@ -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.desktop.lwa.utils.extention.unAccent
import com.pixelized.shared.lwa.model.item.Item import com.pixelized.shared.lwa.model.item.Item
import com.pixelized.shared.lwa.model.tag.Tag import com.pixelized.shared.lwa.model.tag.Tag

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemPage.kt
View file

@ -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.Arrangement
import androidx.compose.foundation.layout.Box 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.draw.clipToBounds
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
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.error.ErrorSnackHandler
import com.pixelized.desktop.lwa.ui.composable.textfield.LwaTextFieldUio 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.LocalScreenController
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.gamemaster.navigateToGameMasterItemEditPage 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.admin.common.GMFilterHeader
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.desktop.lwa.ui.theme.color.component.LwaButtonColors import com.pixelized.desktop.lwa.ui.theme.color.component.LwaButtonColors
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import lwacharactersheet.composeapp.generated.resources.Res import lwacharactersheet.composeapp.generated.resources.Res
@ -93,6 +94,7 @@ private fun GMItemContent(
modifier = modifier, modifier = modifier,
) { ) {
Surface( Surface(
modifier = Modifier.zIndex(1f), // avoid display issue with LazyColumnScope.animateItem()
elevation = 1.dp, elevation = 1.dp,
) { ) {
GMFilterHeader( GMFilterHeader(

7
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/item/list/GMItemViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/admin/item/list/GMItemViewModel.kt
View file

@ -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.ViewModel
import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewModelScope
import com.pixelized.desktop.lwa.repository.item.ItemRepository import com.pixelized.desktop.lwa.repository.item.ItemRepository
import com.pixelized.desktop.lwa.repository.tag.TagRepository import com.pixelized.desktop.lwa.repository.tag.TagRepository
import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackUio 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.createLwaTextField
import com.pixelized.desktop.lwa.ui.composable.textfield.createLwaTextFieldFlow 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.desktop.lwa.ui.screen.gamemaster.common.tag.GMTagUio import com.pixelized.desktop.lwa.ui.screen.admin.common.tag.GMTagUio
import com.pixelized.desktop.lwa.utils.extention.unAccent import com.pixelized.desktop.lwa.utils.extention.unAccent
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.MutableStateFlow