0
0
mirror of https://github.com/florisboard/florisboard.git synced 2024-09-20 12:02:19 +02:00

Fix blank screen on initial app launch after install (#1537)

This commit is contained in:
Patrick Goldinger 2022-02-14 00:20:46 +01:00
parent 9c05096184
commit 3f85e1167c
2 changed files with 4 additions and 23 deletions

View File

@ -154,9 +154,9 @@ dependencies {
implementation("com.google.accompanist:accompanist-flowlayout:0.23.0")
implementation("com.google.accompanist:accompanist-insets:0.23.0")
implementation("com.google.accompanist:accompanist-systemuicontroller:0.23.0")
implementation("dev.patrickgold.jetpref:jetpref-datastore-model:0.1.0-beta06")
implementation("dev.patrickgold.jetpref:jetpref-datastore-ui:0.1.0-beta06")
implementation("dev.patrickgold.jetpref:jetpref-material-ui:0.1.0-beta06")
implementation("dev.patrickgold.jetpref:jetpref-datastore-model:0.1.0-beta08")
implementation("dev.patrickgold.jetpref:jetpref-datastore-ui:0.1.0-beta08")
implementation("dev.patrickgold.jetpref:jetpref-material-ui:0.1.0-beta08")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
implementation("androidx.room:room-runtime:2.4.1")

View File

@ -19,8 +19,6 @@ package dev.patrickgold.florisboard.app
import android.content.Context
import android.content.res.Configuration
import android.os.Bundle
import android.view.View
import android.view.ViewTreeObserver
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.animation.ExperimentalAnimationApi
@ -109,29 +107,12 @@ class FlorisAppActivity : ComponentActivity() {
ProvideWindowInsets(windowInsetsAnimationsEnabled = false) {
Surface(color = MaterialTheme.colors.background) {
SystemUiApp()
if (isDatastoreReady) {
AppContent()
}
AppContent()
}
}
}
}
}
// PreDraw observer for SplashScreen
val content = findViewById<View>(android.R.id.content)
content.viewTreeObserver.addOnPreDrawListener(
object : ViewTreeObserver.OnPreDrawListener {
override fun onPreDraw(): Boolean {
return if (isDatastoreReady) {
content.viewTreeObserver.removeOnPreDrawListener(this)
true
} else {
false
}
}
}
)
}
override fun onPause() {