diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-11-12 15:23:26 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-11-12 15:23:26 +0100 |
| commit | c83883562ca44b88c08fcf675c2058ea71c7f199 (patch) | |
| tree | e63ceeee8ce6ea32505bbcfbfd5c933d8d08f10a | |
| parent | b73e60bc44fef951f151347be27c2af69adaa300 (diff) | |
| parent | e3661fa5605906b205332ff2cbad47c2699bec59 (diff) | |
| download | mullvadvpn-c83883562ca44b88c08fcf675c2058ea71c7f199.tar.xz mullvadvpn-c83883562ca44b88c08fcf675c2058ea71c7f199.zip | |
Merge branch 'extra-top-bar-droid-1533'
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index a4ae131139..d6f8b08279 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -51,9 +51,6 @@ class MainActivity : ComponentActivity(), AndroidScopeComponent { override fun onCreate(savedInstanceState: Bundle?) { loadKoinModules(listOf(uiModule, paymentModule)) - // Tell the system that we will draw behind the status bar and navigation bar - WindowCompat.setDecorFitsSystemWindows(window, false) - lifecycle.addObserver(noDaemonViewModel) installSplashScreen().setKeepOnScreenCondition { @@ -61,6 +58,11 @@ class MainActivity : ComponentActivity(), AndroidScopeComponent { isReadyNextDraw = splashCompleteRepository.isSplashComplete() !isReady } + + // Tell the system that we will draw behind the status bar and navigation bar + // This needs to be called after installSplashScreen() + WindowCompat.setDecorFitsSystemWindows(window, false) + super.onCreate(savedInstanceState) // Needs to be before set content since we want to access the intent in compose |
