ba7daf8559
- Single system splash (core-splashscreen) kept on screen until the first events load (StartupState), then reveals the ready app — removes the two-stage 'icon then title' splash and the laggy half-loaded entry - Month scrolling: dropped per-row BoxWithConstraints (measured grid width once via onSizeChanged) and resolve bar colours once during packing instead of every recomposition → much smoother scroll - Serialize all event loads behind a Mutex and skip redundant state writes so scroll-triggered month loads no longer pile up / thrash the UI Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
48 lines
2.0 KiB
Kotlin
48 lines
2.0 KiB
Kotlin
package com.scarriffle.calendarr.ui
|
|
|
|
import androidx.compose.foundation.layout.fillMaxSize
|
|
import androidx.compose.material3.MaterialTheme
|
|
import androidx.compose.material3.Surface
|
|
import androidx.compose.runtime.Composable
|
|
import androidx.compose.runtime.CompositionLocalProvider
|
|
import androidx.compose.runtime.collectAsState
|
|
import androidx.compose.runtime.getValue
|
|
import androidx.compose.ui.Modifier
|
|
import androidx.hilt.navigation.compose.hiltViewModel
|
|
import com.scarriffle.calendarr.ui.auth.LoginScreen
|
|
import com.scarriffle.calendarr.ui.auth.ServerSetupScreen
|
|
import com.scarriffle.calendarr.ui.calendar.CalendarScreen
|
|
import com.scarriffle.calendarr.ui.theme.CalendarrTheme
|
|
|
|
@Composable
|
|
fun CalendarrRoot(vm: MainViewModel = hiltViewModel()) {
|
|
val route by vm.route.collectAsState()
|
|
val settings by vm.settings.collectAsState()
|
|
|
|
CalendarrTheme(settings) {
|
|
CompositionLocalProvider(
|
|
LocalLang provides L10n.resolved(settings.language),
|
|
LocalAppSettings provides settings,
|
|
) {
|
|
// The system splash (installSplashScreen) covers startup until the
|
|
// first events are loaded, so there's no in-app splash here.
|
|
Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
|
|
when (route) {
|
|
AppRoute.SETUP -> ServerSetupScreen(onConfigured = vm::onServerConfigured)
|
|
AppRoute.LOGIN -> LoginScreen(
|
|
serverUrl = vm.serverUrl,
|
|
onLoggedIn = vm::onLoggedIn,
|
|
onBack = vm::switchServer,
|
|
)
|
|
AppRoute.MAIN -> CalendarScreen(
|
|
onLogout = vm::logout,
|
|
onSwitchServer = vm::switchServer,
|
|
onSettingsChanged = vm::applyLocalSettings,
|
|
onSettingsSynced = vm::refreshSettings,
|
|
)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|