lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix crash on Android 8.0

Browse Source
This commit is contained in:
MM20 2022-10-25 21:25:52 +02:00
parent 5163189789
commit 98d12d309f
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ui/src/main/java/de/mm20/launcher2/ui/theme/WallpaperColors.kt
View File

@ -13,6 +13,7 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import de.mm20.launcher2.ktx.isAtLeastApiLevel
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
@ -39,35 +40,36 @@ data class WallpaperColors(
} }
} }
@RequiresApi(Build.VERSION_CODES.O_MR1)
@Composable @Composable
fun wallpaperColorsAsState(): State<WallpaperColors> { fun wallpaperColorsAsState(): State<WallpaperColors> {
val scope = rememberCoroutineScope() val scope = rememberCoroutineScope()
val context = LocalContext.current val context = LocalContext.current
val state = remember { mutableStateOf(WallpaperColors()) } val state = remember { mutableStateOf(WallpaperColors()) }
DisposableEffect(null) { if (isAtLeastApiLevel(27)) {
val wallpaperManager = WallpaperManager.getInstance(context) DisposableEffect(null) {
val callback = callback@{ colors: android.app.WallpaperColors?, which: Int -> val wallpaperManager = WallpaperManager.getInstance(context)
if (which and WallpaperManager.FLAG_SYSTEM == 0) return@callback val callback = callback@{ colors: android.app.WallpaperColors?, which: Int ->
if (colors != null) { if (which and WallpaperManager.FLAG_SYSTEM == 0) return@callback
state.value = WallpaperColors.fromPlatformType(colors) if (colors != null) {
} else { state.value = WallpaperColors.fromPlatformType(colors)
state.value = WallpaperColors() } else {
state.value = WallpaperColors()
}
} }
} wallpaperManager.addOnColorsChangedListener(
wallpaperManager.addOnColorsChangedListener( callback,
callback, Handler(Looper.getMainLooper())
Handler(Looper.getMainLooper()) )
)
scope.launch { scope.launch {
val colors = withContext(Dispatchers.IO) { val colors = withContext(Dispatchers.IO) {
wallpaperManager.getWallpaperColors(WallpaperManager.FLAG_SYSTEM) wallpaperManager.getWallpaperColors(WallpaperManager.FLAG_SYSTEM)
} ?: return@launch } ?: return@launch
state.value = WallpaperColors.fromPlatformType(colors) state.value = WallpaperColors.fromPlatformType(colors)
} }
onDispose { onDispose {
wallpaperManager.removeOnColorsChangedListener(callback) wallpaperManager.removeOnColorsChangedListener(callback)
}
} }
} }
return state return state