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

Add the old ui to the new one.

Browse source
This commit is contained in:
Thomas Andres Gomez 2025-02-27 19:15:06 +01:00
parent d8ce46fe43
commit f51a83cf6e
38 changed files with 635 additions and 250 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

@ -42,17 +42,21 @@ import com.pixelized.desktop.lwa.ui.navigation.window.destination.CharacterSheet
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.ui.screen.campaign.CampaignScreen
import com.pixelized.desktop.lwa.ui.screen.campaign.CampaignViewModel
import com.pixelized.desktop.lwa.ui.screen.characterSheet.CharacterSheetMainNavHost
import com.pixelized.desktop.lwa.ui.screen.network.NetworkViewModel
import com.pixelized.desktop.lwa.ui.screen.rollhistory.RollHistoryPage
import com.pixelized.desktop.lwa.ui.theme.LwaTheme
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.app_name
import lwacharactersheet.composeapp.generated.resources.network__connect__message
import lwacharactersheet.composeapp.generated.resources.network__disconnect__message
import org.jetbrains.compose.resources.getString
import org.jetbrains.compose.ui.tooling.preview.Preview
import org.koin.compose.koinInject
import org.koin.compose.viewmodel.koinViewModel
val LocalWindowController = compositionLocalOf<WindowController> {
error("Local Window Controller is not yet ready")
@ -84,11 +88,7 @@ fun ApplicationScope.App() {
) {
Window(
onCloseRequest = ::exitApplication,
// state = rememberWindowState(
// width = 320.dp + 64.dp,
// height = 900.dp,
// ),
title = "LwaCharacterSheet",
title = runBlocking { getString(Res.string.app_name) },
onKeyEvent = { event ->
keyEventHandlers.reversed().any { it(event) }
},
@ -125,8 +125,7 @@ fun ApplicationScope.App() {
}
},
content = {
// MainNavHost()
CampaignScreen()
MainScreen()
}
)
NetworkSnackHandler(
@ -141,6 +140,19 @@ fun ApplicationScope.App() {
}
}
@Composable
private fun MainScreen(
campaignViewModel: CampaignViewModel = koinViewModel(),
networkViewModel: NetworkViewModel = koinViewModel(),
) {
LaunchedEffect(Unit) {
networkViewModel.connect()
campaignViewModel.init()
}
MainNavHost()
}
@Composable
private fun WindowsHandler(
windowController: WindowController,