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

Don't forget to cleanup wallpaper colors changed listener

Browse Source
This commit is contained in:
MM20 2021-09-23 17:16:59 +02:00
parent 6a4739d9bc
commit 9f68d35678
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/src/main/java/de/mm20/launcher2/ui/activity/ComposeActivity.kt
View File

@ -19,7 +19,6 @@ import de.mm20.launcher2.ui.LauncherMainScreen
import de.mm20.launcher2.ui.LauncherTheme import de.mm20.launcher2.ui.LauncherTheme
import de.mm20.launcher2.ui.locals.LocalAppWidgetHost import de.mm20.launcher2.ui.locals.LocalAppWidgetHost
import de.mm20.launcher2.ui.locals.LocalColorScheme import de.mm20.launcher2.ui.locals.LocalColorScheme
import de.mm20.launcher2.ui.locals.LocalWallpaperColors
import de.mm20.launcher2.ui.locals.LocalWindowSize import de.mm20.launcher2.ui.locals.LocalWindowSize
import de.mm20.launcher2.ui.theme.WallpaperColors import de.mm20.launcher2.ui.theme.WallpaperColors
import de.mm20.launcher2.ui.theme.colors.DefaultColorScheme import de.mm20.launcher2.ui.theme.colors.DefaultColorScheme
@ -47,14 +46,18 @@ class ComposeActivity : AppCompatActivity() {
var wallpaperColors by remember { mutableStateOf<WallpaperColors?>(null) } var wallpaperColors by remember { mutableStateOf<WallpaperColors?>(null) }
LaunchedEffect(null) { DisposableEffect(null) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
val wallpaperManager = WallpaperManager.getInstance(this@ComposeActivity) val wallpaperManager = WallpaperManager.getInstance(this@ComposeActivity)
wallpaperManager.addOnColorsChangedListener({ colors, which -> val callback = { colors: android.app.WallpaperColors?, which: Int ->
if (colors != null && which or WallpaperManager.FLAG_SYSTEM != 0) { if (colors != null && which or WallpaperManager.FLAG_SYSTEM != 0) {
wallpaperColors = WallpaperColors.fromPlatformType(colors) wallpaperColors = WallpaperColors.fromPlatformType(colors)
} }
}, Handler(Looper.getMainLooper())) }
wallpaperManager.addOnColorsChangedListener(
callback,
Handler(Looper.getMainLooper())
)
lifecycleScope.launch { lifecycleScope.launch {
val colors = withContext(Dispatchers.IO) { val colors = withContext(Dispatchers.IO) {
@ -62,7 +65,11 @@ class ComposeActivity : AppCompatActivity() {
} ?: return@launch } ?: return@launch
wallpaperColors = WallpaperColors.fromPlatformType(colors) wallpaperColors = WallpaperColors.fromPlatformType(colors)
} }
return@DisposableEffect onDispose {
wallpaperManager.removeOnColorsChangedListener(callback)
}
} }
onDispose {}
} }
if (windowSize.height <= 0 || windowSize.width <= 0) return@setContent if (windowSize.height <= 0 || windowSize.width <= 0) return@setContent