Always clear icon cache on activity recreation

This commit is contained in:
MM20 2021-12-03 17:20:30 +01:00
parent dbd7fda7fb
commit d7f549795a
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389

View File

@ -12,6 +12,7 @@ import android.content.ActivityNotFoundException
import android.content.ComponentName import android.content.ComponentName
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.res.Configuration
import android.graphics.Color import android.graphics.Color
import android.graphics.Point import android.graphics.Point
import android.os.Bundle import android.os.Bundle
@ -48,10 +49,12 @@ import com.afollestad.materialdialogs.list.listItems
import com.jmedeisis.draglinearlayout.DragLinearLayout import com.jmedeisis.draglinearlayout.DragLinearLayout
import de.mm20.launcher2.favorites.FavoritesViewModel import de.mm20.launcher2.favorites.FavoritesViewModel
import de.mm20.launcher2.icons.DynamicIconController import de.mm20.launcher2.icons.DynamicIconController
import de.mm20.launcher2.icons.IconRepository
import de.mm20.launcher2.ktx.dp import de.mm20.launcher2.ktx.dp
import de.mm20.launcher2.ktx.isBrightColor import de.mm20.launcher2.ktx.isBrightColor
import de.mm20.launcher2.legacy.helper.ActivityStarter import de.mm20.launcher2.legacy.helper.ActivityStarter
import de.mm20.launcher2.permissions.PermissionsManager import de.mm20.launcher2.permissions.PermissionsManager
import de.mm20.launcher2.preferences.ColorSchemes
import de.mm20.launcher2.preferences.LauncherPreferences import de.mm20.launcher2.preferences.LauncherPreferences
import de.mm20.launcher2.search.SearchViewModel import de.mm20.launcher2.search.SearchViewModel
import de.mm20.launcher2.transition.ChangingLayoutTransition import de.mm20.launcher2.transition.ChangingLayoutTransition
@ -188,6 +191,14 @@ class LauncherActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
val iconRepository: IconRepository by inject()
iconRepository.recreate()
recreate()
when(LauncherPreferences.instance.colorScheme) {
ColorSchemes.BLACK -> setTheme(R.style.LauncherTheme_BlackWhiteColors)
else -> setTheme(R.style.LauncherTheme_DefaultColors)
}
if (LauncherPreferences.instance.firstRunVersion < 1) { if (LauncherPreferences.instance.firstRunVersion < 1) {
ActivityCompat.requestPermissions( ActivityCompat.requestPermissions(
this, arrayOf( this, arrayOf(
@ -204,7 +215,6 @@ class LauncherActivity : AppCompatActivity() {
setContentView(R.layout.activity_launcher) setContentView(R.layout.activity_launcher)
overlayView = rootView.overlay overlayView = rootView.overlay
if (LauncherPreferences.instance.dimWallpaper) { if (LauncherPreferences.instance.dimWallpaper) {