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

Refactor the ui package.

Browse source
This commit is contained in:
Thomas Andres Gomez 2025-02-20 18:04:38 +01:00
parent 0c613c5b72
commit 6385d4c8bd
59 changed files with 960 additions and 968 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,22 +29,22 @@ import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.ApplicationScope
import androidx.compose.ui.window.Window
import com.pixelized.desktop.lwa.composable.key.KeyEventHandler
import com.pixelized.desktop.lwa.composable.key.LocalKeyEventHandlers
import com.pixelized.desktop.lwa.navigation.screen.destination.CharacterSheetDestination
import com.pixelized.desktop.lwa.navigation.screen.destination.CharacterSheetEditDestination
import com.pixelized.desktop.lwa.navigation.window.WindowController
import com.pixelized.desktop.lwa.navigation.window.WindowsNavHost
import com.pixelized.desktop.lwa.navigation.window.destination.CharacterSheetEditWindow
import com.pixelized.desktop.lwa.navigation.window.destination.CharacterSheetWindow
import com.pixelized.desktop.lwa.navigation.window.destination.RollHistoryWindow
import com.pixelized.desktop.lwa.navigation.window.rememberMaxWindowHeight
import com.pixelized.desktop.lwa.ui.composable.key.KeyEventHandler
import com.pixelized.desktop.lwa.ui.composable.key.LocalKeyEventHandlers
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.CharacterSheetDestination
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.CharacterSheetEditDestination
import com.pixelized.desktop.lwa.ui.navigation.window.WindowController
import com.pixelized.desktop.lwa.ui.navigation.window.WindowsNavHost
import com.pixelized.desktop.lwa.ui.navigation.window.destination.CharacterSheetEditWindow
import com.pixelized.desktop.lwa.ui.navigation.window.destination.CharacterSheetWindow
import com.pixelized.desktop.lwa.ui.navigation.window.destination.RollHistoryWindow
import com.pixelized.desktop.lwa.ui.navigation.window.rememberMaxWindowHeight
import com.pixelized.desktop.lwa.repository.network.NetworkRepository
import com.pixelized.desktop.lwa.repository.network.NetworkRepository.Status
import com.pixelized.desktop.lwa.screen.campaign.CampaignScreen
import com.pixelized.desktop.lwa.screen.characterSheet.CharacterSheetMainNavHost
import com.pixelized.desktop.lwa.screen.rollhistory.RollHistoryPage
import com.pixelized.desktop.lwa.theme.LwaTheme
import com.pixelized.desktop.lwa.ui.screen.campaign.player.CampaignScreen
import com.pixelized.desktop.lwa.ui.screen.characterSheet.CharacterSheetMainNavHost
import com.pixelized.desktop.lwa.ui.screen.rollhistory.RollHistoryPage
import com.pixelized.desktop.lwa.ui.theme.LwaTheme
import kotlinx.coroutines.launch
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.network__connect__message

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

@ -16,22 +16,22 @@ import com.pixelized.desktop.lwa.repository.settings.SettingsRepository
import com.pixelized.desktop.lwa.repository.alteration.AlterationStore
import com.pixelized.desktop.lwa.repository.alteration.AlterationRepository
import com.pixelized.desktop.lwa.repository.settings.SettingsStore
import com.pixelized.desktop.lwa.screen.characterSheet.detail.CharacterSheetFactory
import com.pixelized.desktop.lwa.screen.characterSheet.detail.CharacterSheetViewModel
import com.pixelized.desktop.lwa.screen.characterSheet.edit.CharacterSheetEditFactory
import com.pixelized.desktop.lwa.screen.characterSheet.edit.CharacterSheetEditViewModel
import com.pixelized.desktop.lwa.screen.characterSheet.edit.common.SkillFieldFactory
import com.pixelized.desktop.lwa.screen.main.MainPageViewModel
import com.pixelized.desktop.lwa.screen.network.NetworkFactory
import com.pixelized.desktop.lwa.screen.network.NetworkViewModel
import com.pixelized.desktop.lwa.screen.roll.RollViewModel
import com.pixelized.desktop.lwa.screen.rollhistory.RollHistoryViewModel
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.CharacterSheetFactory
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.CharacterSheetViewModel
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.CharacterSheetEditFactory
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.CharacterSheetEditViewModel
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.common.SkillFieldFactory
import com.pixelized.desktop.lwa.ui.screen.main.MainPageViewModel
import com.pixelized.desktop.lwa.ui.screen.network.NetworkFactory
import com.pixelized.desktop.lwa.ui.screen.network.NetworkViewModel
import com.pixelized.desktop.lwa.ui.screen.roll.RollViewModel
import com.pixelized.desktop.lwa.ui.screen.rollhistory.RollHistoryViewModel
import com.pixelized.desktop.lwa.parser.dice.DiceParser
import com.pixelized.desktop.lwa.parser.word.WordParser
import com.pixelized.desktop.lwa.parser.expression.ExpressionParser
import com.pixelized.desktop.lwa.screen.campaign.player.detail.CharacterDetailViewModel
import com.pixelized.desktop.lwa.screen.campaign.player.detail.CharacterDiminishedViewModel
import com.pixelized.desktop.lwa.screen.campaign.player.ribbon.PlayerRibbonViewModel
import com.pixelized.desktop.lwa.ui.screen.campaign.player.detail.CharacterDetailViewModel
import com.pixelized.desktop.lwa.ui.screen.campaign.player.detail.CharacterDiminishedViewModel
import com.pixelized.desktop.lwa.ui.screen.campaign.player.ribbon.PlayerRibbonViewModel
import kotlinx.serialization.json.Json
import org.koin.core.module.dsl.factoryOf
import org.koin.core.module.dsl.singleOf

9
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/repository/characterSheet/CharacterSheetStore.kt
View file

@ -12,6 +12,7 @@ import kotlinx.coroutines.launch
import kotlinx.serialization.encodeToString
import kotlinx.serialization.json.Json
import java.io.File
import java.text.Collator
class CharacterSheetStore(
private val factory: CharacterSheetJsonFactory,
@ -62,9 +63,7 @@ class CharacterSheetStore(
data.add(sheet)
}
}
.sortedBy {
it.name
}
.sortedWith(compareBy(Collator.getInstance()) { it.name })
}
fun delete(id: String): Boolean {
@ -104,9 +103,7 @@ class CharacterSheetStore(
throw JsonConversionException(root = exception)
}
}
?.sortedBy {
it.name
}
?.sortedWith(compareBy(Collator.getInstance()) { it.name })
?: emptyList()
}

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/composable/blur/BlurContent.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/blur/BlurContent.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.composable.blur
package com.pixelized.desktop.lwa.ui.composable.blur
import androidx.compose.animation.animateColor
import androidx.compose.animation.core.animateDp
@ -16,7 +16,7 @@ import androidx.compose.ui.draw.drawWithContent
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.theme.color.LwaColorPalette
import com.pixelized.desktop.lwa.ui.theme.color.LwaColorPalette
@Stable
class BlurContentController(

96
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/composable/decoratedBox/DecoratedBox.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/decoratedBox/DecoratedBox.kt
View file

@ -1,49 +1,49 @@
package com.pixelized.desktop.lwa.composable.decoratedBox
import androidx.compose.desktop.ui.tooling.preview.Preview
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.utils.preview.ContentPreview
@Composable
fun DecoratedBox(
modifier: Modifier = Modifier,
border: Color = Color(0xFF909090),
content: @Composable BoxScope.() -> Unit,
) {
Box(
modifier = Modifier
.border(width = 1.dp, color = border, shape = RoundedCornerShape(size = 16.dp))
.padding(all = 2.dp)
.border(width = 1.dp, color = border, shape = RectangleShape)
.then(other = modifier),
content = content,
)
}
@Composable
@Preview
private fun DecoratedBoxPreview() {
ContentPreview {
DecoratedBox {
Box(
modifier = Modifier.width(width = 128.dp).height(64.dp),
contentAlignment = Alignment.Center,
) {
Text("Test")
}
}
}
package com.pixelized.desktop.lwa.ui.composable.decoratedBox
import androidx.compose.desktop.ui.tooling.preview.Preview
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.RectangleShape
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.utils.preview.ContentPreview
@Composable
fun DecoratedBox(
modifier: Modifier = Modifier,
border: Color = Color(0xFF909090),
content: @Composable BoxScope.() -> Unit,
) {
Box(
modifier = Modifier
.border(width = 1.dp, color = border, shape = RoundedCornerShape(size = 16.dp))
.padding(all = 2.dp)
.border(width = 1.dp, color = border, shape = RectangleShape)
.then(other = modifier),
content = content,
)
}
@Composable
@Preview
private fun DecoratedBoxPreview() {
ContentPreview {
DecoratedBox {
Box(
modifier = Modifier.width(width = 128.dp).height(64.dp),
contentAlignment = Alignment.Center,
) {
Text("Test")
}
}
}
}

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/composable/error/snack/ErrorSnackUio.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/error/ErrorSnackUio.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.composable.error.snack
package com.pixelized.desktop.lwa.ui.composable.error
import androidx.compose.material.SnackbarDuration
import androidx.compose.material.SnackbarHostState

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/composable/key/KeyHandler.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/key/KeyHandler.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.composable.key
package com.pixelized.desktop.lwa.ui.composable.key
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/composable/tooltip/Tooltip.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/composable/tooltip/Tooltip.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.composable.tooltip
package com.pixelized.desktop.lwa.ui.composable.tooltip
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.TooltipArea

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/navigation/screen/MainNavHost.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/MainNavHost.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.navigation.screen
package com.pixelized.desktop.lwa.ui.navigation.screen
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
@ -6,9 +6,9 @@ import androidx.compose.runtime.compositionLocalOf
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.rememberNavController
import com.pixelized.desktop.lwa.navigation.screen.destination.MainDestination
import com.pixelized.desktop.lwa.navigation.screen.destination.composableMainPage
import com.pixelized.desktop.lwa.navigation.screen.destination.composableNetworkPage
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.MainDestination
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.composableMainPage
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.composableNetworkPage
val LocalScreenController = compositionLocalOf<NavHostController> {
error("MainNavHost controller is not yet ready")

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/navigation/screen/destination/CharacterSheetDestination.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/CharacterSheetDestination.kt
View file

@ -1,11 +1,11 @@
package com.pixelized.desktop.lwa.navigation.screen.destination
package com.pixelized.desktop.lwa.ui.navigation.screen.destination
import androidx.lifecycle.SavedStateHandle
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController
import androidx.navigation.compose.composable
import androidx.navigation.navArgument
import com.pixelized.desktop.lwa.screen.characterSheet.detail.CharacterSheetPage
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.CharacterSheetPage
import com.pixelized.desktop.lwa.utils.extention.ARG
object CharacterSheetDestination {

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/navigation/screen/destination/CharacterSheetEditDestination.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/CharacterSheetEditDestination.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.navigation.screen.destination
package com.pixelized.desktop.lwa.ui.navigation.screen.destination
import androidx.lifecycle.SavedStateHandle
import androidx.navigation.NavGraphBuilder
@ -6,7 +6,7 @@ import androidx.navigation.NavHostController
import androidx.navigation.NavType
import androidx.navigation.compose.composable
import androidx.navigation.navArgument
import com.pixelized.desktop.lwa.screen.characterSheet.edit.CharacterSheetEditPage
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.CharacterSheetEditPage
import com.pixelized.desktop.lwa.utils.extention.ARG
object CharacterSheetEditDestination {

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/navigation/screen/destination/MainDestination.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/MainDestination.kt
View file

@ -1,9 +1,9 @@
package com.pixelized.desktop.lwa.navigation.screen.destination
package com.pixelized.desktop.lwa.ui.navigation.screen.destination
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController
import androidx.navigation.compose.composable
import com.pixelized.desktop.lwa.screen.main.MainPage
import com.pixelized.desktop.lwa.ui.screen.main.MainPage
object MainDestination {
private const val ROUTE = "main"

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/navigation/screen/destination/NetworkDestination.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/NetworkDestination.kt
View file

@ -1,9 +1,9 @@
package com.pixelized.desktop.lwa.navigation.screen.destination
package com.pixelized.desktop.lwa.ui.navigation.screen.destination
import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavHostController
import androidx.navigation.compose.composable
import com.pixelized.desktop.lwa.screen.network.NetworkPage
import com.pixelized.desktop.lwa.ui.screen.network.NetworkPage
object NetworkDestination {
private const val ROUTE = "network"

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/navigation/window/WindowNavHost.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/window/WindowNavHost.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.navigation.window
package com.pixelized.desktop.lwa.ui.navigation.window
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
@ -15,9 +15,9 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Window
import androidx.compose.ui.window.WindowState
import androidx.compose.ui.window.rememberWindowState
import com.pixelized.desktop.lwa.composable.key.KeyEventHandler
import com.pixelized.desktop.lwa.composable.key.LocalKeyEventHandlers
import com.pixelized.desktop.lwa.navigation.window.destination.Window
import com.pixelized.desktop.lwa.ui.composable.key.KeyEventHandler
import com.pixelized.desktop.lwa.ui.composable.key.LocalKeyEventHandlers
import com.pixelized.desktop.lwa.ui.navigation.window.destination.Window
import java.awt.Toolkit
val LocalWindow = compositionLocalOf<Window> {

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/navigation/window/destination/CharacterSheetEditWindow.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/window/destination/CharacterSheetEditWindow.kt
View file

@ -1,9 +1,9 @@
package com.pixelized.desktop.lwa.navigation.window.destination
package com.pixelized.desktop.lwa.ui.navigation.window.destination
import androidx.compose.runtime.Stable
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.navigation.window.WindowController
import com.pixelized.desktop.lwa.ui.navigation.window.WindowController
@Stable
class CharacterSheetEditWindow(

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/navigation/window/destination/CharacterSheetWindow.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/window/destination/CharacterSheetWindow.kt
View file

@ -1,9 +1,9 @@
package com.pixelized.desktop.lwa.navigation.window.destination
package com.pixelized.desktop.lwa.ui.navigation.window.destination
import androidx.compose.runtime.Stable
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.navigation.window.WindowController
import com.pixelized.desktop.lwa.ui.navigation.window.WindowController
@Stable
class CharacterSheetWindow(

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/navigation/window/destination/RollHistoryWindow.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/window/destination/RollHistoryWindow.kt
View file

@ -1,9 +1,9 @@
package com.pixelized.desktop.lwa.navigation.window.destination
package com.pixelized.desktop.lwa.ui.navigation.window.destination
import androidx.compose.runtime.Stable
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.navigation.window.WindowController
import com.pixelized.desktop.lwa.ui.navigation.window.WindowController
@Stable
class RollHistoryWindow(

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/navigation/window/destination/Window.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/window/destination/Window.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.navigation.window.destination
package com.pixelized.desktop.lwa.ui.navigation.window.destination
import androidx.compose.runtime.Stable
import androidx.compose.ui.unit.DpSize

15
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/campaign/CampaignScreen.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/player/CampaignScreen.kt
View file

@ -1,6 +1,5 @@
package com.pixelized.desktop.lwa.screen.campaign
package com.pixelized.desktop.lwa.ui.screen.campaign.player
import androidx.compose.desktop.ui.tooling.preview.Preview
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxHeight
@ -25,12 +24,12 @@ import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.composable.key.KeyHandler
import com.pixelized.desktop.lwa.screen.campaign.player.detail.CharacterDetail
import com.pixelized.desktop.lwa.screen.campaign.player.detail.CharacterDetailViewModel
import com.pixelized.desktop.lwa.screen.campaign.player.detail.CharacterDiminishedViewModel
import com.pixelized.desktop.lwa.screen.campaign.player.ribbon.PlayerRibbon
import com.pixelized.desktop.lwa.screen.characterSheet.detail.dialog.DiminishedStatDialog
import com.pixelized.desktop.lwa.ui.composable.key.KeyHandler
import com.pixelized.desktop.lwa.ui.screen.campaign.player.detail.CharacterDetail
import com.pixelized.desktop.lwa.ui.screen.campaign.player.detail.CharacterDetailViewModel
import com.pixelized.desktop.lwa.ui.screen.campaign.player.detail.CharacterDiminishedViewModel
import com.pixelized.desktop.lwa.ui.screen.campaign.player.ribbon.PlayerRibbon
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.dialog.DiminishedStatDialog
import org.koin.compose.viewmodel.koinViewModel
@Composable

5
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/campaign/player/detail/CharacterDetail.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/player/detail/CharacterDetail.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.campaign.player.detail
package com.pixelized.desktop.lwa.ui.screen.campaign.player.detail
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.fadeIn
@ -33,8 +33,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.screen.characterSheet.detail.dialog.DiminishedStatDialog
import com.pixelized.desktop.lwa.theme.lwa
import com.pixelized.desktop.lwa.ui.theme.lwa
import kotlinx.coroutines.launch
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.ic_close_24dp

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/campaign/player/detail/CharacterDetailViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/player/detail/CharacterDetailViewModel.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.campaign.player.detail
package com.pixelized.desktop.lwa.ui.screen.campaign.player.detail
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/campaign/player/detail/CharacterDiminishedViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/player/detail/CharacterDiminishedViewModel.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.campaign.player.detail
package com.pixelized.desktop.lwa.ui.screen.campaign.player.detail
import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateOf
@ -6,7 +6,7 @@ import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.TextFieldValue
import androidx.lifecycle.ViewModel
import com.pixelized.desktop.lwa.repository.characterSheet.CharacterSheetRepository
import com.pixelized.desktop.lwa.screen.characterSheet.detail.dialog.DiminishedStatDialogUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.dialog.DiminishedStatDialogUio
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.character_sheet__diminished__label
import org.jetbrains.compose.resources.getString

7
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/campaign/player/ribbon/PlayerPortrait.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/player/ribbon/PlayerPortrait.kt
View file

@ -1,15 +1,13 @@
package com.pixelized.desktop.lwa.screen.campaign.player.ribbon
package com.pixelized.desktop.lwa.ui.screen.campaign.player.ribbon
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
@ -28,6 +26,7 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import coil3.compose.AsyncImage
import com.pixelized.desktop.lwa.ui.composable.decoratedBox.DecoratedBox
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.ic_heart_24dp
import lwacharactersheet.composeapp.generated.resources.ic_water_drop_24dp
@ -56,7 +55,7 @@ fun PlayerPortrait(
character: PlayerPortraitUio,
onCharacter: (id: String) -> Unit,
) {
Box(
DecoratedBox(
modifier = modifier
.size(size = size)
.clip(shape = remember { RoundedCornerShape(8.dp) })

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/campaign/player/ribbon/PlayerRibbon.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/player/ribbon/PlayerRibbon.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.campaign.player.ribbon
package com.pixelized.desktop.lwa.ui.screen.campaign.player.ribbon
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.lazy.LazyColumn

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/campaign/player/ribbon/PlayerRibbonViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/player/ribbon/PlayerRibbonViewModel.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.campaign.player.ribbon
package com.pixelized.desktop.lwa.ui.screen.campaign.player.ribbon
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/CharacterSheetNavHost.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/CharacterSheetNavHost.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet
package com.pixelized.desktop.lwa.ui.screen.characterSheet
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material.Surface
@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.rememberNavController
import com.pixelized.desktop.lwa.navigation.screen.LocalScreenController
import com.pixelized.desktop.lwa.navigation.screen.destination.composableCharacterSheetEditPage
import com.pixelized.desktop.lwa.navigation.screen.destination.composableCharacterSheetPage
import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.composableCharacterSheetEditPage
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.composableCharacterSheetPage
@Composable
fun CharacterSheetMainNavHost(

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/detail/CharacterSheetFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/detail/CharacterSheetFactory.kt
View file

@ -1,13 +1,13 @@
package com.pixelized.desktop.lwa.screen.characterSheet.detail
package com.pixelized.desktop.lwa.ui.screen.characterSheet.detail
import com.pixelized.desktop.lwa.business.ExpressionUseCase
import com.pixelized.desktop.lwa.composable.tooltip.TooltipUio
import com.pixelized.desktop.lwa.ui.composable.tooltip.TooltipUio
import com.pixelized.desktop.lwa.repository.alteration.model.FieldAlteration
import com.pixelized.desktop.lwa.repository.characterSheet.SkillDescriptionFactory
import com.pixelized.desktop.lwa.repository.characterSheet.model.CharacterSheet
import com.pixelized.desktop.lwa.repository.characterSheet.model.CharacterSheet.CharacteristicId
import com.pixelized.desktop.lwa.screen.characterSheet.detail.CharacterSheetPageUio.Characteristic
import com.pixelized.desktop.lwa.screen.characterSheet.detail.CharacterSheetPageUio.Node
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.CharacterSheetPageUio.Characteristic
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.CharacterSheetPageUio.Node
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.character_sheet__characteristics__cha
import lwacharactersheet.composeapp.generated.resources.character_sheet__characteristics__con

1380
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/detail/CharacterSheetPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/detail/CharacterSheetPage.kt
View file

File diff suppressed because it is too large Load diff

10
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/detail/CharacterSheetViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/detail/CharacterSheetViewModel.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.detail
package com.pixelized.desktop.lwa.ui.screen.characterSheet.detail
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State
@ -9,13 +9,13 @@ import androidx.compose.ui.text.input.TextFieldValue
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.pixelized.desktop.lwa.navigation.screen.destination.CharacterSheetDestination
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.CharacterSheetDestination
import com.pixelized.desktop.lwa.repository.alteration.AlterationRepository
import com.pixelized.desktop.lwa.repository.characterSheet.CharacterSheetRepository
import com.pixelized.desktop.lwa.repository.characterSheet.model.CharacterSheet
import com.pixelized.desktop.lwa.screen.characterSheet.detail.dialog.CharacterSheetDeleteConfirmationDialogUio
import com.pixelized.desktop.lwa.screen.characterSheet.detail.dialog.DiminishedStatDialogUio
import com.pixelized.desktop.lwa.screen.characterSheet.detail.dialog.StatChangeDialogUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.dialog.CharacterSheetDeleteConfirmationDialogUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.dialog.DiminishedStatDialogUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.dialog.StatChangeDialogUio
import com.pixelized.desktop.lwa.utils.extention.collectAsState
import kotlinx.coroutines.flow.combine
import lwacharactersheet.composeapp.generated.resources.Res

5
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/detail/dialog/CharacterSheetDeleteConfirmationDialog.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/detail/dialog/CharacterSheetDeleteConfirmationDialog.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.detail.dialog
package com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.dialog
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.SizeTransform
@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.Text
@ -31,7 +30,7 @@ import androidx.compose.ui.input.key.Key
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.composable.decoratedBox.DecoratedBox
import com.pixelized.desktop.lwa.ui.composable.decoratedBox.DecoratedBox
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.character_sheet__delete_dialog__description

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/detail/dialog/CharacterSheetStatDialog.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/detail/dialog/CharacterSheetStatDialog.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.detail.dialog
package com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.dialog
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.SizeTransform
@ -41,7 +41,7 @@ import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.composable.decoratedBox.DecoratedBox
import com.pixelized.desktop.lwa.ui.composable.decoratedBox.DecoratedBox
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.dialog__cancel_action
import lwacharactersheet.composeapp.generated.resources.dialog__confirm_action

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/detail/dialog/DiminishedStatDialog.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/detail/dialog/DiminishedStatDialog.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.detail.dialog
package com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.dialog
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.SizeTransform
@ -41,7 +41,7 @@ import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.composable.decoratedBox.DecoratedBox
import com.pixelized.desktop.lwa.ui.composable.decoratedBox.DecoratedBox
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.dialog__cancel_action
import lwacharactersheet.composeapp.generated.resources.dialog__confirm_action

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/detail/preview/rememberCharacterSheetPagePreview.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/detail/preview/rememberCharacterSheetPagePreview.kt
View file

@ -1,11 +1,11 @@
package com.pixelized.desktop.lwa.screen.characterSheet.detail.preview
package com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.preview
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
import androidx.compose.runtime.remember
import com.pixelized.desktop.lwa.repository.characterSheet.model.CharacterSheet.CharacteristicId
import com.pixelized.desktop.lwa.screen.characterSheet.detail.CharacterSheetPageUio
import com.pixelized.desktop.lwa.screen.characterSheet.detail.CharacterSheetPageUio.Characteristic
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.CharacterSheetPageUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.CharacterSheetPageUio.Characteristic
@Composable

12
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/CharacterSheetEditFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/CharacterSheetEditFactory.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit
import androidx.compose.runtime.State
import androidx.compose.runtime.derivedStateOf
@ -6,11 +6,11 @@ import androidx.compose.runtime.mutableStateOf
import com.pixelized.desktop.lwa.business.CharacterSheetUseCase
import com.pixelized.desktop.lwa.repository.characterSheet.SkillDescriptionFactory
import com.pixelized.desktop.lwa.repository.characterSheet.model.CharacterSheet
import com.pixelized.desktop.lwa.screen.characterSheet.edit.common.SkillFieldFactory
import com.pixelized.desktop.lwa.screen.characterSheet.edit.common.occupation
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.ActionFieldUio
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.BaseSkillFieldUio
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.SimpleFieldUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.common.SkillFieldFactory
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.common.occupation
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.ActionFieldUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.BaseSkillFieldUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.SimpleFieldUio
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.character_sheet_edit__actions__action_label
import lwacharactersheet.composeapp.generated.resources.character_sheet_edit__actions__name_label

28
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/CharacterSheetEditPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/CharacterSheetEditPage.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit
import androidx.compose.animation.animateContentSize
import androidx.compose.foundation.layout.Arrangement
@ -27,19 +27,19 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.LocalWindowController
import com.pixelized.desktop.lwa.composable.decoratedBox.DecoratedBox
import com.pixelized.desktop.lwa.navigation.screen.LocalScreenController
import com.pixelized.desktop.lwa.navigation.window.LocalWindow
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.ActionField
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.ActionFieldUio
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.BaseSkillFieldUio
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.BaseSkillForm
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.SimpleField
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.SimpleFieldUio
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.SkillFieldUio
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.SkillForm
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapper
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
import com.pixelized.desktop.lwa.ui.composable.decoratedBox.DecoratedBox
import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController
import com.pixelized.desktop.lwa.ui.navigation.window.LocalWindow
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.ActionField
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.ActionFieldUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.BaseSkillFieldUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.BaseSkillForm
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.SimpleField
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.SimpleFieldUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.SkillFieldUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.SkillForm
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapper
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
import kotlinx.coroutines.launch
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.character_sheet__skills__common_title

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/CharacterSheetEditViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/CharacterSheetEditViewModel.kt
View file

@ -1,13 +1,13 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit
import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateOf
import androidx.lifecycle.SavedStateHandle
import androidx.lifecycle.ViewModel
import com.pixelized.desktop.lwa.navigation.screen.destination.CharacterSheetEditDestination
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.CharacterSheetEditDestination
import com.pixelized.desktop.lwa.repository.characterSheet.CharacterSheetRepository
import com.pixelized.desktop.lwa.screen.characterSheet.edit.common.SkillFieldFactory
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.ActionFieldUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.common.SkillFieldFactory
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.ActionFieldUio
import kotlinx.coroutines.runBlocking
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.character_sheet_edit__actions__action_label

12
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/common/SkillFieldFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/common/SkillFieldFactory.kt
View file

@ -1,15 +1,15 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit.common
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.common
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Delete
import androidx.compose.runtime.State
import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.mutableStateOf
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.SkillFieldUio
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option.ActionOption
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option.CheckedOption
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option.OptionUio
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.SkillFieldUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option.ActionOption
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option.CheckedOption
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option.OptionUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.character_sheet_edit__delete__label
import lwacharactersheet.composeapp.generated.resources.character_sheet_edit__occupation__label

10
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/composable/ActionField.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/composable/ActionField.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit.composable
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@ -17,10 +17,10 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option.ActionOption
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option.DropDownActionMenuItem
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapper
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option.ActionOption
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option.DropDownActionMenuItem
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapper
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
@Stable
data class ActionFieldUio(

10
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/composable/BaseSkillField.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/composable/BaseSkillField.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit.composable
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@ -24,10 +24,10 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option.CheckedOption
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option.DropDownCheckedMenuItem
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapper
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option.CheckedOption
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option.DropDownCheckedMenuItem
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapper
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.character_sheet_edit__skills__base_label
import org.jetbrains.compose.resources.stringResource

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/composable/SimpleField.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/composable/SimpleField.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit.composable
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
@ -12,8 +12,8 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapper
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapper
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
@Stable
class SimpleFieldUio(

10
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/composable/SpecialSkillField.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/composable/SpecialSkillField.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit.composable
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@ -18,10 +18,10 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option.DropDownMenuItemWrapper
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option.OptionUio
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapper
import com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option.DropDownMenuItemWrapper
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option.OptionUio
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapper
import com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield.TextFieldWrapperUio
@Stable
class SkillFieldUio(

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/composable/option/ActionOption.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/composable/option/ActionOption.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option
import androidx.compose.foundation.layout.padding
import androidx.compose.material.DropdownMenuItem

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/composable/option/CheckedOption.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/composable/option/CheckedOption.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/composable/option/Option.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/composable/option/Option.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.option
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.option
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/characterSheet/edit/composable/textfield/FormWrapper.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/characterSheet/edit/composable/textfield/FormWrapper.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.characterSheet.edit.composable.textfield
package com.pixelized.desktop.lwa.ui.screen.characterSheet.edit.composable.textfield
import androidx.compose.foundation.layout.height
import androidx.compose.material.MaterialTheme

13
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/main/MainPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/main/MainPage.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.main
package com.pixelized.desktop.lwa.ui.screen.main
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@ -22,14 +22,13 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.DpSize
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.LocalWindowController
import com.pixelized.desktop.lwa.navigation.screen.LocalScreenController
import com.pixelized.desktop.lwa.navigation.screen.destination.navigateToNetwork
import com.pixelized.desktop.lwa.navigation.window.destination.navigateToCharacterSheet
import com.pixelized.desktop.lwa.navigation.window.destination.navigateToCharacterSheetEdit
import com.pixelized.desktop.lwa.navigation.window.destination.navigateToRollHistory
import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.navigateToNetwork
import com.pixelized.desktop.lwa.ui.navigation.window.destination.navigateToCharacterSheet
import com.pixelized.desktop.lwa.ui.navigation.window.destination.navigateToCharacterSheetEdit
import com.pixelized.desktop.lwa.ui.navigation.window.destination.navigateToRollHistory
import kotlinx.coroutines.runBlocking
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.character_sheet_edit__create__title

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/main/MainPageViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/main/MainPageViewModel.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.main
package com.pixelized.desktop.lwa.ui.screen.main
import androidx.compose.runtime.Composable
import androidx.compose.runtime.State

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/network/NetworkFactory.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/network/NetworkFactory.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.network
package com.pixelized.desktop.lwa.ui.screen.network
import com.pixelized.desktop.lwa.repository.network.NetworkRepository.Status

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/network/NetworkPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/network/NetworkPage.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.network
package com.pixelized.desktop.lwa.ui.screen.network
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.fadeIn
@ -39,9 +39,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.LocalSnackHost
import com.pixelized.desktop.lwa.composable.blur.BlurContent
import com.pixelized.desktop.lwa.composable.error.snack.ErrorSnack
import com.pixelized.desktop.lwa.navigation.screen.LocalScreenController
import com.pixelized.desktop.lwa.ui.composable.blur.BlurContent
import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnack
import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.network__host__label
import lwacharactersheet.composeapp.generated.resources.network__player_name__label

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/network/NetworkViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/network/NetworkViewModel.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.network
package com.pixelized.desktop.lwa.ui.screen.network
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
@ -9,8 +9,8 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.pixelized.desktop.lwa.composable.blur.BlurContentController
import com.pixelized.desktop.lwa.composable.error.snack.ErrorSnackUio
import com.pixelized.desktop.lwa.ui.composable.blur.BlurContentController
import com.pixelized.desktop.lwa.ui.composable.error.ErrorSnackUio
import com.pixelized.desktop.lwa.repository.network.NetworkRepository
import com.pixelized.desktop.lwa.repository.settings.SettingsRepository
import com.pixelized.desktop.lwa.utils.extention.collectAsState

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/roll/RollPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/roll/RollPage.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.roll
package com.pixelized.desktop.lwa.ui.screen.roll
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.SizeTransform
@ -48,8 +48,8 @@ import androidx.compose.ui.input.key.type
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.composable.key.KeyHandler
import com.pixelized.desktop.lwa.screen.roll.DifficultyUio.Difficulty
import com.pixelized.desktop.lwa.ui.composable.key.KeyHandler
import com.pixelized.desktop.lwa.ui.screen.roll.DifficultyUio.Difficulty
import com.pixelized.desktop.lwa.utils.DisableInteractionSource
import kotlinx.coroutines.launch
import lwacharactersheet.composeapp.generated.resources.Res

6
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/roll/RollViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/roll/RollViewModel.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.roll
package com.pixelized.desktop.lwa.ui.screen.roll
import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.Spring
@ -11,8 +11,8 @@ import com.pixelized.desktop.lwa.business.ExpressionUseCase
import com.pixelized.desktop.lwa.repository.characterSheet.CharacterSheetRepository
import com.pixelized.desktop.lwa.repository.characterSheet.model.CharacterSheet
import com.pixelized.desktop.lwa.repository.roll_history.RollHistoryRepository
import com.pixelized.desktop.lwa.screen.characterSheet.detail.CharacterSheetPageUio
import com.pixelized.desktop.lwa.screen.roll.DifficultyUio.Difficulty
import com.pixelized.desktop.lwa.ui.screen.characterSheet.detail.CharacterSheetPageUio
import com.pixelized.desktop.lwa.ui.screen.roll.DifficultyUio.Difficulty
import kotlinx.coroutines.Job
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.delay

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/rollhistory/RollHistoryItem.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/rollhistory/RollHistoryItem.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.rollhistory
package com.pixelized.desktop.lwa.ui.screen.rollhistory
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/rollhistory/RollHistoryPage.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/rollhistory/RollHistoryPage.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.rollhistory
package com.pixelized.desktop.lwa.ui.screen.rollhistory
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.PaddingValues

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/screen/rollhistory/RollHistoryViewModel.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/rollhistory/RollHistoryViewModel.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.screen.rollhistory
package com.pixelized.desktop.lwa.ui.screen.rollhistory
import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateOf

92
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/theme/LwaTheme.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/theme/LwaTheme.kt
View file

@ -1,47 +1,47 @@
package com.pixelized.desktop.lwa.theme
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.Stable
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.runtime.remember
import com.pixelized.desktop.lwa.theme.color.LwaColorTheme
import com.pixelized.desktop.lwa.theme.color.darkLwaColorTheme
val LocalLwaTheme = compositionLocalOf<LwaTheme> {
error("Local Snack Controller is not yet ready")
}
val MaterialTheme.lwa: LwaTheme
@Composable
@Stable
get() = LocalLwaTheme.current
@Stable
data class LwaTheme(
val color: LwaColorTheme,
)
@Composable
fun LwaTheme(
content: @Composable () -> Unit,
) {
val lwaColorTheme = darkLwaColorTheme()
val theme = remember {
LwaTheme(
color = lwaColorTheme,
)
}
CompositionLocalProvider(
LocalLwaTheme provides theme
) {
MaterialTheme(
colors = lwaColorTheme.base,
typography = MaterialTheme.typography,
shapes = MaterialTheme.shapes,
content = content,
)
}
package com.pixelized.desktop.lwa.ui.theme
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.Stable
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.runtime.remember
import com.pixelized.desktop.lwa.ui.theme.color.LwaColorTheme
import com.pixelized.desktop.lwa.ui.theme.color.darkLwaColorTheme
val LocalLwaTheme = compositionLocalOf<LwaTheme> {
error("Local Snack Controller is not yet ready")
}
val MaterialTheme.lwa: LwaTheme
@Composable
@Stable
get() = LocalLwaTheme.current
@Stable
data class LwaTheme(
val color: LwaColorTheme,
)
@Composable
fun LwaTheme(
content: @Composable () -> Unit,
) {
val lwaColorTheme = darkLwaColorTheme()
val theme = remember {
LwaTheme(
color = lwaColorTheme,
)
}
CompositionLocalProvider(
LocalLwaTheme provides theme
) {
MaterialTheme(
colors = lwaColorTheme.base,
typography = MaterialTheme.typography,
shapes = MaterialTheme.shapes,
content = content,
)
}
}

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/theme/color/LwaColorPalette.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/theme/color/LwaColorPalette.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.theme.color
package com.pixelized.desktop.lwa.ui.theme.color
import androidx.compose.ui.graphics.Color

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/theme/color/LwaColorTheme.kt → composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/theme/color/LwaColorTheme.kt
View file

@ -1,4 +1,4 @@
package com.pixelized.desktop.lwa.theme.color
package com.pixelized.desktop.lwa.ui.theme.color
import androidx.compose.material.Colors
import androidx.compose.material.darkColors

2
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/utils/preview/ContentPreview.kt
View file

@ -8,7 +8,7 @@ import androidx.compose.material.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import com.pixelized.desktop.lwa.theme.LwaTheme
import com.pixelized.desktop.lwa.ui.theme.LwaTheme
@Composable
fun ContentPreview(