From dad36ed6a0fe4a56a692a424528718a1e3bfc8c6 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Sun, 26 Jan 2020 18:17:00 +0100 Subject: [PATCH] ActivityDialogs Translucent again --- .../activities/BolusProgressHelperActivity.kt | 8 ++++---- .../androidaps/activities/DialogAppCompatActivity.kt | 11 +++++++++++ .../androidaps/activities/ErrorHelperActivity.kt | 2 +- .../activities/RequestDexcomPermissionActivity.kt | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt diff --git a/app/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt index 93a0725aaf..fe55cdcdf2 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/BolusProgressHelperActivity.kt @@ -3,12 +3,12 @@ package info.nightscout.androidaps.activities import android.os.Bundle import info.nightscout.androidaps.dialogs.BolusProgressDialog -class BolusProgressHelperActivity : NoSplashAppCompatActivity() { +class BolusProgressHelperActivity : DialogAppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) BolusProgressDialog() - .setHelperActivity(this) - .setInsulin(intent.getDoubleExtra("insulin", 0.0)) - .show(supportFragmentManager, "BolusProgress") + .setHelperActivity(this) + .setInsulin(intent.getDoubleExtra("insulin", 0.0)) + .show(supportFragmentManager, "BolusProgress") } } \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt new file mode 100644 index 0000000000..a1c6dd1236 --- /dev/null +++ b/app/src/main/java/info/nightscout/androidaps/activities/DialogAppCompatActivity.kt @@ -0,0 +1,11 @@ +package info.nightscout.androidaps.activities + +import android.content.Context +import androidx.appcompat.app.AppCompatActivity +import info.nightscout.androidaps.utils.LocaleHelper + +open class DialogAppCompatActivity : AppCompatActivity() { + public override fun attachBaseContext(newBase: Context) { + super.attachBaseContext(LocaleHelper.wrap(newBase)) + } +} diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt index 8ab5c05425..1e9ac6c254 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/ErrorHelperActivity.kt @@ -6,7 +6,7 @@ import info.nightscout.androidaps.dialogs.ErrorDialog import info.nightscout.androidaps.plugins.general.nsclient.NSUpload import info.nightscout.androidaps.utils.SP -class ErrorHelperActivity : NoSplashAppCompatActivity() { +class ErrorHelperActivity : DialogAppCompatActivity() { @Override override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt index 96a399a299..f50212dadd 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/RequestDexcomPermissionActivity.kt @@ -3,7 +3,7 @@ package info.nightscout.androidaps.activities import android.os.Bundle import info.nightscout.androidaps.plugins.source.SourceDexcomPlugin -class RequestDexcomPermissionActivity : NoSplashAppCompatActivity() { +class RequestDexcomPermissionActivity : DialogAppCompatActivity() { private val requestCode = "AndroidAPS <3".map { it.toInt() }.sum()