From 7d9afc91bbe49eee56b15be9337e8fd1ac2d021e Mon Sep 17 00:00:00 2001 From: Davide Depau Date: Sun, 12 Jan 2020 19:35:05 +0100 Subject: [PATCH] Completely kill internal night mode management on >= Pie --- .../depau/etchdroid/ui/activities/ActivityBase.kt | 15 +++++++++++---- .../ui/activities/ConfirmationActivity.kt | 2 +- .../etchdroid/ui/activities/StartActivity.kt | 2 +- .../ui/misc/DoNotShowAgainDialogFragment.kt | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/depau/etchdroid/ui/activities/ActivityBase.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/ActivityBase.kt index 6a5bfb8..84c7a94 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/activities/ActivityBase.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/ActivityBase.kt @@ -3,6 +3,7 @@ package eu.depau.etchdroid.ui.activities import android.Manifest import android.content.Intent import android.content.pm.PackageManager +import android.content.res.Configuration import android.net.Uri import android.os.Build import android.os.Bundle @@ -19,7 +20,7 @@ import me.jfenn.attribouter.Attribouter abstract class ActivityBase : AppCompatActivity() { - protected lateinit var nightModeHelper: NightModeHelper + protected var nightModeHelper: NightModeHelper? = null val DISMISSED_DIALOGS_PREFS = "dismissed_dialogs" val READ_REQUEST_CODE = 42 val READ_EXTERNAL_STORAGE_PERMISSION = 29 @@ -38,8 +39,11 @@ abstract class ActivityBase : AppCompatActivity() { editor.apply() } + internal val isNightMode: Boolean + get() = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES != 0 + fun showAndroidPieAlertDialog(callback: () -> Unit) { - val dialogFragment = DoNotShowAgainDialogFragment(nightModeHelper.nightMode) + val dialogFragment = DoNotShowAgainDialogFragment(isNightMode) dialogFragment.title = getString(R.string.android_pie_bug) dialogFragment.message = getString(R.string.android_pie_bug_dialog_text) dialogFragment.positiveButton = getString(R.string.i_understand) @@ -72,7 +76,10 @@ abstract class ActivityBase : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - nightModeHelper = NightModeHelper(this, R.style.AppTheme) + + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) { + nightModeHelper = NightModeHelper(this, R.style.AppTheme) + } } override fun onCreateOptionsMenu(menu: Menu): Boolean { @@ -108,7 +115,7 @@ abstract class ActivityBase : AppCompatActivity() { return true } R.id.action_nightmode -> { - nightModeHelper.toggle() + nightModeHelper?.toggle() return true } else -> super.onOptionsItemSelected(item) diff --git a/app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt index de1e7e0..0992bb4 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/ConfirmationActivity.kt @@ -43,7 +43,7 @@ class ConfirmationActivity : ActivityBase() { fun showDataLossAlertDialog() { - val dialogFragment = DoNotShowAgainDialogFragment(nightModeHelper.nightMode) + val dialogFragment = DoNotShowAgainDialogFragment(isNightMode) dialogFragment.title = getString(R.string.warning) dialogFragment.message = getString(R.string.dataloss_confirmation_dialog_message) dialogFragment.positiveButton = getString(R.string.confirm_flash_image) diff --git a/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt b/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt index a61cd29..8037fc5 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/activities/StartActivity.kt @@ -85,7 +85,7 @@ class StartActivity : ActivityBase() { } fun showDMGBetaAlertDialog(callback: () -> Unit) { - val dialogFragment = DoNotShowAgainDialogFragment(nightModeHelper.nightMode) + val dialogFragment = DoNotShowAgainDialogFragment(isNightMode) dialogFragment.title = getString(R.string.here_be_dragons) dialogFragment.message = getString(R.string.dmg_alert_dialog_text) dialogFragment.positiveButton = getString(R.string.i_understand) diff --git a/app/src/main/java/eu/depau/etchdroid/ui/misc/DoNotShowAgainDialogFragment.kt b/app/src/main/java/eu/depau/etchdroid/ui/misc/DoNotShowAgainDialogFragment.kt index dc51347..ac9cc34 100644 --- a/app/src/main/java/eu/depau/etchdroid/ui/misc/DoNotShowAgainDialogFragment.kt +++ b/app/src/main/java/eu/depau/etchdroid/ui/misc/DoNotShowAgainDialogFragment.kt @@ -21,7 +21,7 @@ class DoNotShowAgainDialogFragment(nightMode: Boolean) : DialogFragment() { constructor() : this(false) init { - setStyle(DialogFragment.STYLE_NORMAL, dialogTheme) + setStyle(STYLE_NORMAL, dialogTheme) } interface DialogListener {