diff --git a/src/main/kotlin/com/machiav3lli/fdroid/MainApplication.kt b/src/main/kotlin/com/machiav3lli/fdroid/MainApplication.kt index 0c42764a..987e6b47 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/MainApplication.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/MainApplication.kt @@ -11,6 +11,7 @@ import android.content.ContextWrapper import android.content.Intent import android.content.IntentFilter import android.os.BatteryManager +import androidx.appcompat.app.AppCompatActivity import coil.ImageLoader import coil.ImageLoaderFactory import com.google.android.material.color.DynamicColors @@ -40,6 +41,7 @@ import kotlin.time.Duration.Companion.minutes class MainApplication : Application(), ImageLoaderFactory { lateinit var db: DatabaseX + lateinit var mActivity: AppCompatActivity //lateinit var wm: WorksManager companion object { diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt index 8a4d1c23..7066cf68 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/MainActivityX.kt @@ -73,6 +73,7 @@ class MainActivityX : AppCompatActivity() { @OptIn(ExperimentalAnimationApi::class, ExperimentalMaterial3Api::class) override fun onCreate(savedInstanceState: Bundle?) { + (application as MainApplication).mActivity = this currentTheme = Preferences[Preferences.Key.Theme].getResId(resources.configuration) currentTab = Preferences[Preferences.Key.DefaultTab].getResId(resources.configuration) setCustomTheme() diff --git a/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt index efb32d45..6cb78985 100644 --- a/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt +++ b/src/main/kotlin/com/machiav3lli/fdroid/ui/activities/PrefsActivityX.kt @@ -62,6 +62,7 @@ class PrefsActivityX : AppCompatActivity() { @OptIn(ExperimentalAnimationApi::class, ExperimentalMaterial3Api::class) override fun onCreate(savedInstanceState: Bundle?) { + (application as MainApplication).mActivity = this setCustomTheme() super.onCreate(savedInstanceState)