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

Add splashscreen.

Browse source
This commit is contained in:
Thomas Andres Gomez 2025-04-12 09:41:23 +02:00
parent 05cc533cbf
commit 7dd5ade1f5
9 changed files with 138 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
composeApp/src/commonMain/composeResources/values/strings.xml
View file

@ -6,7 +6,8 @@
<string name="error__missing_character_sheet__label">La feuille de personnage est introuvable</string>
<string name="error__default__action">Ok</string>
<string name="app_name">La table de Lwa</string>
<string name="app_name">La Table de Lwa</string>
<string name="app_version">version : %1$s</string>
<string name="dialog__confirm_action">Confirmer</string>
<string name="dialog__cancel_action">Annuler</string>
@ -231,7 +232,6 @@
<string name="level_up__skill_level">niv : %1$d -</string>
<string name="game_master__title">Admin</string>
<string name="game_master__version">version : %1$s</string>
<string name="game_master__action">GameMaster</string>
<string name="game_master__action__save">Sauvegarder</string>
<string name="game_master__character__filter">Filtrer par nom :</string>

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

@ -6,7 +6,8 @@ import androidx.compose.runtime.compositionLocalOf
import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.rememberNavController
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.MainDestination
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.SplashDestination
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.composableSplash
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.composableLevelUp
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.composableMainPage
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.composableSettingsPage
@ -18,7 +19,7 @@ val LocalScreenController = compositionLocalOf<NavHostController> {
@Composable
fun MainNavHost(
controller: NavHostController = rememberNavController(),
startDestination: String = MainDestination.navigationRoute(),
startDestination: String = SplashDestination.navigationRoute(),
) {
CompositionLocalProvider(
LocalScreenController provides controller,
@ -27,6 +28,7 @@ fun MainNavHost(
navController = controller,
startDestination = startDestination,
) {
composableSplash()
composableMainPage()
composableSettingsPage()
composableLevelUp()

27
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/navigation/screen/destination/SplashDestination.kt Normal file
View file

@ -0,0 +1,27 @@
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.ui.screen.splash.SplashScreen
object SplashDestination {
private const val ROUTE = "splash"
fun baseRoute() = ROUTE
fun navigationRoute() = ROUTE
}
fun NavGraphBuilder.composableSplash() {
composable(
route = SplashDestination.baseRoute(),
) {
SplashScreen()
}
}
fun NavHostController.navigateToSplash() {
val route = SplashDestination.navigationRoute()
navigate(route = route)
}

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

@ -90,14 +90,7 @@ fun CampaignScreen(
},
main = {
Box(
modifier = Modifier.matchParentSize(),
contentAlignment = Alignment.BottomCenter,
) {
PortraitOverlay(
modifier = Modifier.padding(all = 8.dp)
)
}
},
chat = {
CampaignChat(
@ -105,6 +98,16 @@ fun CampaignScreen(
chatViewModel = campaignChatViewModel,
)
},
overlay = {
Box(
modifier = Modifier.matchParentSize(),
contentAlignment = Alignment.Center,
) {
PortraitOverlay(
modifier = Modifier.padding(all = 8.dp),
)
}
},
leftPanel = {
PlayerRibbon(
modifier = Modifier.fillMaxHeight(),
@ -239,6 +242,7 @@ private fun CampaignLayout(
bottom: @Composable () -> Unit,
main: @Composable () -> Unit,
chat: @Composable () -> Unit,
overlay: @Composable () -> Unit,
leftPanel: @Composable () -> Unit,
rightPanel: @Composable () -> Unit,
leftOverlay: @Composable () -> Unit,
@ -281,7 +285,7 @@ private fun CampaignLayout(
Box(
modifier = Modifier
.align(alignment = Alignment.BottomEnd)
.onSizeChanged { }
.onSizeChanged { chatOverlayState.value = it.toDp(density) },
) {
chat()
}
@ -292,13 +296,6 @@ private fun CampaignLayout(
) {
leftPanel()
}
Box(
modifier = Modifier
.align(alignment = Alignment.CenterStart)
.onSizeChanged { leftOverlayState.value = it.toDp(density) },
) {
leftOverlay()
}
Box(
modifier = Modifier
.align(alignment = Alignment.CenterEnd)
@ -306,6 +303,20 @@ private fun CampaignLayout(
) {
rightPanel()
}
Box(
modifier = Modifier
.align(alignment = Alignment.Center)
.fillMaxSize(),
) {
overlay()
}
Box(
modifier = Modifier
.align(alignment = Alignment.CenterStart)
.onSizeChanged { leftOverlayState.value = it.toDp(density) },
) {
leftOverlay()
}
Box(
modifier = Modifier
.align(alignment = Alignment.CenterEnd)

12
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/player/ribbon/CharacterRibbonViewModel.kt
View file

@ -50,9 +50,13 @@ abstract class CharacterRibbonViewModel(
settings: Settings,
): Boolean
abstract val enableCharacterSheet: Boolean
abstract fun enableCharacterSheet(
settings: Settings,
): Boolean
abstract val enableCharacterStats: Boolean
abstract fun enableCharacterStats(
settings: Settings,
): Boolean
/**
* This flow is a tad complex so there is an explanation of wtf it's about :
@ -82,8 +86,8 @@ abstract class CharacterRibbonViewModel(
characterSheet = sheet,
alterations = alterations,
hideOverruled = hideOverruled,
enableCharacterSheet = enableCharacterSheet || settings.isGameMaster ?: false,
enableCharacterStats = enableCharacterStats || settings.isGameMaster ?: false,
enableCharacterSheet = enableCharacterSheet(settings = settings),
enableCharacterStats = enableCharacterStats(settings = settings),
)
}
},

8
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/campaign/player/ribbon/npc/NpcRibbonViewModel.kt
View file

@ -36,7 +36,11 @@ class NpcRibbonViewModel(
return !campaign.options.showNpcs && settings.isGameMaster == true
}
override val enableCharacterSheet = false
override fun enableCharacterSheet(settings: Settings) : Boolean {
return settings.isGameMaster ?: false
}
override val enableCharacterStats = false
override fun enableCharacterStats(settings: Settings) : Boolean {
return settings.isGameMaster ?: false
}
}

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

@ -36,7 +36,7 @@ class PlayerRibbonViewModel(
return !campaign.options.showParty && settings.isGameMaster == true
}
override val enableCharacterSheet = true
override fun enableCharacterSheet(settings: Settings) = true
override val enableCharacterStats = true
override fun enableCharacterStats(settings: Settings) = true
}

4
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/gamemaster/GameMasterScreen.kt
View file

@ -45,7 +45,7 @@ import com.pixelized.desktop.lwa.ui.theme.lwa
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.game_master__action
import lwacharactersheet.composeapp.generated.resources.game_master__title
import lwacharactersheet.composeapp.generated.resources.game_master__version
import lwacharactersheet.composeapp.generated.resources.app_version
import org.jetbrains.compose.resources.stringResource
import org.koin.compose.viewmodel.koinViewModel
@ -95,7 +95,7 @@ private fun GameMasterContent(
Text(
modifier = Modifier.alignByBaseline(),
style = MaterialTheme.lwa.typography.base.caption,
text = stringResource(Res.string.game_master__version, BuildKonfig.version),
text = stringResource(Res.string.app_version, BuildKonfig.version),
)
}
},

60
composeApp/src/commonMain/kotlin/com/pixelized/desktop/lwa/ui/screen/splash/SplashScreen.kt Normal file
View file

@ -0,0 +1,60 @@
package com.pixelized.desktop.lwa.ui.screen.splash
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.material.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.pixelized.desktop.lwa.BuildKonfig
import com.pixelized.desktop.lwa.ui.navigation.screen.LocalScreenController
import com.pixelized.desktop.lwa.ui.navigation.screen.destination.navigateToMainPage
import com.pixelized.desktop.lwa.ui.theme.lwa
import kotlinx.coroutines.delay
import lwacharactersheet.composeapp.generated.resources.Res
import lwacharactersheet.composeapp.generated.resources.app_name
import lwacharactersheet.composeapp.generated.resources.app_version
import org.jetbrains.compose.resources.stringResource
@Composable
fun SplashScreen() {
val screen = LocalScreenController.current
Surface {
SplashContent(
modifier = Modifier
.fillMaxSize()
.padding(all = 16.dp),
)
}
LaunchedEffect(Unit) {
delay(3000)
screen.navigateToMainPage()
}
}
@Composable
private fun SplashContent(
modifier: Modifier = Modifier,
) {
Box(
modifier = modifier,
) {
Text(
modifier = Modifier.align(Alignment.Center),
style = MaterialTheme.lwa.typography.base.h3,
text = stringResource(Res.string.app_name)
)
Text(
modifier = Modifier.align(Alignment.BottomEnd),
style = MaterialTheme.lwa.typography.base.caption,
text = stringResource(Res.string.app_version, BuildKonfig.version)
)
}
}