Skip to content

Refactor/104 update edge-to-edge configuration #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarcelMilka merged 1 commit into from
Apr 4, 2026
Merged

Refactor/104 update edge-to-edge configuration #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/src/main/java/eu/project/sia/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@ class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {

super.onCreate(savedInstanceState)
enableEdgeToEdge()

installSplashScreen().setKeepOnScreenCondition {
applicationViewModel.applicationStartupState.value is ApplicationStartupState.Pending
}

enableEdgeToEdge()

setContent {

val applicationStartupState by applicationViewModel.applicationStartupState.collectAsStateWithLifecycle()
Expand Down
4 changes: 2 additions & 2 deletions scaffold/src/main/java/eu/project/scaffold/ApplicationScaffold.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ import androidx.navigation.compose.navigation
import androidx.navigation.compose.rememberNavController
import eu.project.authenticate.welcomeScreen.impl.welcomeImpl
import eu.project.common.navigation.Navigation
import eu.project.design_system.theme.SiaTheme
import eu.project.floatingActionButton.impl.floatingActionButtonImpl
import eu.project.home.impl.homeImpl
import eu.project.saved.exportResult.impl.exportResultImpl
import eu.project.saved.exportWords.impl.exportWordsImpl
import eu.project.saved.savedWords.impl.savedWordsImpl
import eu.project.topBar.impl.topBarImpl
import eu.project.transcribe.selectAudio.impl.selectAudioImpl
import eu.project.ui.theme.Background

@OptIn(ExperimentalLayoutApi::class)
@Composable
Expand All @@ -33,7 +33,7 @@ fun ApplicationScaffold(startRoute: Navigation) {
Scaffold(
modifier = Modifier
.fillMaxSize(),
containerColor = Background,
containerColor = SiaTheme.color.surface.background,
contentWindowInsets = WindowInsets.statusBars,
floatingActionButtonPosition = FabPosition.Center,
topBar = {
Expand Down
Loading