Dialogs -> :core:ui

2022-11-14 10:58:59 +01:00 · 2022-11-14 10:58:59 +01:00 · 359b3f41b5
parent f141d003a4
commit 359b3f41b5
98 changed files with 222 additions and 122 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -187,6 +187,7 @@ dependencies {
    implementation project(':app-wear-shared:shared-impl')
    implementation project(':core:core-main')
    implementation project(':core:fabric')
+    implementation project(':core:ui')
    implementation project(':interfaces')
    implementation project(':ui')
    implementation project(':plugins')
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt
@ -38,13 +38,13 @@ import info.nightscout.androidaps.databinding.ActivityMainBinding
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.constraints.versionChecker.VersionCheckerUtils
 import info.nightscout.androidaps.setupwizard.SetupWizardActivity
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.isRunningRealPumpTest
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.tabs.TabPageAdapter
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.interfaces.AndroidPermission
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@ -37,7 +37,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityWeightedAveragePlugin
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog.show
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.ProtectionType.BIOMETRIC
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.ProtectionType.CUSTOM_PASSWORD
@ -45,6 +44,7 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck.ProtectionTyp
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.ProtectionType.NONE
 import info.nightscout.automation.AutomationPlugin
 import info.nightscout.core.profile.toCurrentUnits
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.profile.Profile
@ -248,7 +248,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
        }
        if (key == rh.gs(R.string.key_openapsama_useautosens) && sp.getBoolean(R.string.key_openapsama_useautosens, false)) {
            activity?.let {
-                show(it, rh.gs(R.string.configbuilder_sensitivity), rh.gs(R.string.sensitivity_warning))
+                OKDialog.show(it, rh.gs(R.string.configbuilder_sensitivity), rh.gs(R.string.sensitivity_warning))
            }
        }
        checkForBiometricFallback(key)
@ -274,7 +274,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
            activity?.let {
                val title = rh.gs(R.string.unsecure_fallback_biometric)
                val message = rh.gs(R.string.master_password_missing, rh.gs(R.string.configbuilder_general), rh.gs(R.string.protection))
-                show(it, title = title, message = message)
+                OKDialog.show(it, title = title, message = message)
            }
        }

@ -286,7 +286,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
            activity?.let {
                val title = rh.gs(R.string.unsecure_fallback_biometric)
                val message = rh.gs(R.string.unsecure_fallback_descriotion_biometric)
-                show(it, title = title, message = message)
+                OKDialog.show(it, title = title, message = message)
            }
        }
    }
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt
@ -5,7 +5,7 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt
@ -28,12 +28,11 @@ import info.nightscout.androidaps.diaconn.events.EventDiaconnG8PumpLogReset
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.alertDialogs.PrefImportSummaryDialog
 import info.nightscout.androidaps.utils.alertDialogs.TwoMessagesAlertDialog
-import info.nightscout.androidaps.utils.alertDialogs.WarningDialog
 import info.nightscout.androidaps.utils.protection.PasswordCheck
 import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
@ -173,10 +172,10 @@ class ImportExportPrefsImpl @Inject constructor(

    private fun assureMasterPasswordSet(activity: FragmentActivity, @StringRes wrongPwdTitle: Int): Boolean {
        if (!sp.contains(R.string.key_master_password) || (sp.getString(R.string.key_master_password, "") == "")) {
-            WarningDialog.showWarning(activity,
-                                      rh.gs(wrongPwdTitle),
-                                      rh.gs(R.string.master_password_missing, rh.gs(R.string.configbuilder_general), rh.gs(R.string.protection)),
-                                      R.string.nav_preferences, {
+            info.nightscout.core.ui.dialogs.WarningDialog.showWarning(activity,
+                                                                      rh.gs(wrongPwdTitle),
+                                                                      rh.gs(R.string.master_password_missing, rh.gs(R.string.configbuilder_general), rh.gs(R.string.protection)),
+                                                                      R.string.nav_preferences, {
                                          val intent = Intent(activity, PreferencesActivity::class.java).apply {
                                              putExtra("id", R.xml.pref_general)
                                          }
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt
@ -18,10 +18,10 @@ import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSett
 import info.nightscout.androidaps.plugins.general.overview.OverviewData
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.DashHistoryDatabase
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryDatabase
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.PREFERENCES
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.impl.AppRepository
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
@ -46,7 +46,6 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.ui.SingleClickButton
 import info.nightscout.androidaps.utils.ui.UIRunnable
@ -56,6 +55,7 @@ import info.nightscout.core.iob.displayText
 import info.nightscout.core.profile.toSignedUnitsString
 import info.nightscout.core.profile.toTargetRangeString
 import info.nightscout.core.profile.toUnits
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.wizard.QuickWizard
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt
@ -16,8 +16,8 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNo
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewCalcProgress
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventIobCalculationProgress
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Overview
 import info.nightscout.interfaces.plugin.PluginBase
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt
@ -21,8 +21,8 @@ import info.nightscout.androidaps.databinding.OverviewQuickwizardlistItemBinding
 import info.nightscout.androidaps.plugins.general.overview.dialogs.EditQuickWizardDialog
 import info.nightscout.androidaps.plugins.general.overview.events.EventQuickWizardChange
 import info.nightscout.androidaps.utils.ActionModeHelper
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.wizard.QuickWizard
 import info.nightscout.core.wizard.QuickWizardEntry
 import info.nightscout.interfaces.dragHelpers.ItemTouchHelperAdapter
--- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
+++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt
@ -12,8 +12,8 @@ import info.nightscout.androidaps.databinding.ActivitySetupwizardBinding
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.setupwizard.elements.SWItem
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.locale.LocaleHelper.update
 import info.nightscout.plugins.sync.nsShared.events.EventNSClientStatus
 import info.nightscout.rx.AapsSchedulers
--- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/PrefImportSummaryDialog.kt
@ -94,7 +94,7 @@ object PrefImportSummaryDialog {

                MaterialAlertDialogBuilder(context, R.style.DialogTheme)
                    .setCustomTitle(
-                        AlertDialogHelper.buildCustomTitle(
+                        info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(
                            context,
                            context.getString(R.string.check_preferences_details_title),
                            R.drawable.ic_header_log,
@ -111,7 +111,7 @@ object PrefImportSummaryDialog {

        val builder = MaterialAlertDialogBuilder(context, theme)
            .setMessage(context.getString(messageRes))
-            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, context.getString(R.string.nav_import), headerIcon, theme))
+            .setCustomTitle(info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(R.string.nav_import), headerIcon, theme))
            .setView(innerLayout)
            .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int ->
                dialog.dismiss()
--- a/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/utils/alertDialogs/TwoMessagesAlertDialog.kt
@ -23,9 +23,9 @@ object TwoMessagesAlertDialog {
        MaterialAlertDialogBuilder(context, R.style.DialogTheme)
            .setMessage(message)
            .setCustomTitle(
-                AlertDialogHelper.buildCustomTitle(
+                info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(
                    context, title, icon
-                        ?: R.drawable.ic_check_while_48dp
+                        ?: R.drawable.ic_check_white_48dp
                )
            )
            .setView(secondMessageLayout)
--- a/automation/build.gradle
+++ b/automation/build.gradle
@ -20,6 +20,7 @@ dependencies {
    implementation project(':graphview')
    implementation project(':core:core-main')
    implementation project(':core:fabric')
+    implementation project(':core:ui')
    implementation project(':database:entities')
    implementation project(':database:impl')
    implementation project(':app-wear-shared:rx')
--- a/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt
+++ b/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt
@ -25,7 +25,6 @@ import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActionModeHelper
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.automation.databinding.AutomationEventItemBinding
 import info.nightscout.automation.databinding.AutomationFragmentBinding
 import info.nightscout.automation.dialogs.EditEventDialog
@ -33,6 +32,7 @@ import info.nightscout.automation.events.EventAutomationDataChanged
 import info.nightscout.automation.events.EventAutomationUpdateGui
 import info.nightscout.automation.triggers.TriggerConnector
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.interfaces.dragHelpers.ItemTouchHelperAdapter
--- a/core/core-main/build.gradle
+++ b/core/core-main/build.gradle
@ -20,6 +20,7 @@ dependencies {
    implementation project(':database:entities')
    implementation project(':database:impl')
    implementation project(':interfaces')
+    implementation project(':core:ui')

    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
    api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
--- a/core/core-main/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt
+++ b/core/core-main/src/main/java/info/nightscout/androidaps/activities/DaggerAppCompatActivityWithResult.kt
@ -6,8 +6,8 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.app.ActivityCompat
 import dagger.android.support.DaggerAppCompatActivity
 import info.nightscout.androidaps.plugins.general.maintenance.PrefsFileContract
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.main.R
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.maintenance.ImportExportPrefs
 import info.nightscout.interfaces.permissions.OptimizationPermissionContract
 import info.nightscout.rx.logging.AAPSLogger
--- a/core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
+++ b/core/core-main/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt
@ -11,10 +11,10 @@ import android.provider.Settings
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import info.nightscout.core.main.R
 import info.nightscout.androidaps.extensions.safeEnable
+import info.nightscout.core.main.R
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.shared.interfaces.ResourceHelper
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import javax.inject.Inject
 import javax.inject.Singleton

--- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
+++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/protection/PasswordCheck.kt
@ -15,7 +15,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import info.nightscout.androidaps.plugins.general.maintenance.PrefFileListProvider
 import info.nightscout.androidaps.utils.CryptoUtil
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.AlertDialogHelper
 import info.nightscout.core.main.R
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.shared.sharedPreferences.SP
@ -76,7 +75,7 @@ class PasswordCheck @Inject constructor(

        alertDialogBuilder
            .setCancelable(false)
-            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key))
+            .setCustomTitle(info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key))
            .setPositiveButton(context.getString(R.string.ok)) { _, _ -> validatePassword() }
            .setNegativeButton(context.getString(R.string.cancel)) { dialog, _ ->
                cancel?.invoke()
@ -119,7 +118,7 @@ class PasswordCheck @Inject constructor(

        alertDialogBuilder
            .setCancelable(false)
-            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key))
+            .setCustomTitle(info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key))
            .setPositiveButton(context.getString(R.string.ok)) { _, _ ->
                val enteredPassword = userInput.text.toString()
                val enteredPassword2 = userInput2.text.toString()
@ -192,7 +191,7 @@ class PasswordCheck @Inject constructor(

        alertDialogBuilder
            .setCancelable(false)
-            .setCustomTitle(AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key))
+            .setCustomTitle(info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key))
            .setPositiveButton(context.getString(R.string.ok)) { _, _ -> validatePassword() }
            .setNegativeButton(context.getString(R.string.cancel)
            ) { dialog, _ ->
--- a/core/core-main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
+++ b/core/core-main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt
@ -9,11 +9,11 @@ import info.nightscout.androidaps.extensions.highValueToUnitsToString
 import info.nightscout.androidaps.extensions.lowValueToUnitsToString
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.iob.round
 import info.nightscout.core.main.R
 import info.nightscout.core.profile.fromMgdlToUnits
 import info.nightscout.core.profile.toMgdl
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.TemporaryTarget
@ -372,8 +372,8 @@ class BolusWizard @Inject constructor(
                carbTimer.removeAutomationEventEatReminder()
            if (sp.getBoolean(R.string.key_usebolusadvisor, false) && Profile.toMgdl(bg, profile.units) > 180 && carbs > 0 && carbTime >= 0)
                OKDialog.showYesNoCancel(ctx, rh.gs(R.string.bolus_advisor), rh.gs(R.string.bolus_advisor_message),
-                                         { bolusAdvisorProcessing(ctx) },
-                                         { commonProcessing(ctx) }
+                                                                         { bolusAdvisorProcessing(ctx) },
+                                                                         { commonProcessing(ctx) }
                )
            else
                commonProcessing(ctx)
--- a/core/core-main/src/main/res/values/strings.xml
+++ b/core/core-main/src/main/res/values/strings.xml
@ -170,8 +170,6 @@
    <string name="btwatchdog_title">BT Watchdog</string>
    <string name="btwatchdog_summary">Switches off the phone\'s bluetooth for one second if no connection to the pump is possible. This may help on some phones where the bluetooth stack freezes.</string>
    <string name="pairing">Pairing</string>
-    <string name="yes">Yes</string>
-    <string name="no">No</string>
    <string name="loopdisabled">LOOP DISABLED BY CONSTRAINTS</string>
    <string name="bolusdelivered">Bolus %1$.2f U delivered successfully</string>
    <string name="virtualpump_resultok">OK</string>
@ -271,13 +269,6 @@
    <string name="limitingbolus">Limiting bolus to %1$.1f U because of %2$s</string>
    <string name="pumpNotInitializedProfileNotSet">Pump not initialized, profile not set!</string>

-    <!--    Dialogs-->
-    <string name="confirmation">Confirmation</string>
-    <string name="message">Message</string>
-    <string name="ok">OK</string>
-    <string name="cancel">Cancel</string>
-    <string name="dismiss">DISMISS</string>
-
    <!--    BlePreCheck-->
    <string name="ble_not_supported">Bluetooth Low Energy not supported.</string>
    <string name="ble_not_supported_or_not_paired">Bluetooth Low Energy not supported or device not paired.</string>
--- a/core/ui/.gitignore
+++ b/core/ui/.gitignore
@ -0,0 +1 @@
+/build
--- a/core/ui/build.gradle
+++ b/core/ui/build.gradle
@ -0,0 +1,19 @@
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
+apply from: "${project.rootDir}/core/core-main/android_dependencies.gradle"
+//apply from: "${project.rootDir}/core/core-main/android_module_dependencies.gradle"
+//apply from: "${project.rootDir}/core/core-main/jacoco_global.gradle"
+
+android {
+    namespace 'info.nightscout.core.ui'
+}
+
+dependencies {
+
+    implementation "androidx.core:core-ktx:$core_version"
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
+    implementation "com.google.android.material:material:$material_version"
+}
--- a/core/ui/consumer-rules.pro
+++ b/core/ui/consumer-rules.pro
--- a/core/ui/proguard-rules.pro
+++ b/core/ui/proguard-rules.pro
@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
--- a/core/ui/src/androidTest/java/info/nightscout/core/ui/ExampleInstrumentedTest.kt
+++ b/core/ui/src/androidTest/java/info/nightscout/core/ui/ExampleInstrumentedTest.kt
@ -0,0 +1,23 @@
+package info.nightscout.core.ui
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("info.nightscout.core.ui.test", appContext.packageName)
+    }
+}
--- a/core/ui/src/main/AndroidManifest.xml
+++ b/core/ui/src/main/AndroidManifest.xml
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest>
+
+</manifest>
--- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
+++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/AlertDialogHelper.kt
@ -1,4 +1,4 @@
-package info.nightscout.androidaps.utils.alertDialogs
+package info.nightscout.core.ui.dialogs

 import android.content.Context
 import android.view.LayoutInflater
@ -10,7 +10,7 @@ import androidx.annotation.LayoutRes
 import androidx.annotation.StyleRes
 import androidx.appcompat.view.ContextThemeWrapper
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import info.nightscout.core.main.R
+import info.nightscout.core.ui.R

 object AlertDialogHelper {

@ -19,7 +19,7 @@ object AlertDialogHelper {
        MaterialAlertDialogBuilder(ContextThemeWrapper(context, themeResId))

    fun buildCustomTitle(context: Context, title: String,
-                         @DrawableRes iconResource: Int = R.drawable.ic_check_while_48dp,
+                         @DrawableRes iconResource: Int = R.drawable.ic_check_white_48dp,
                         @StyleRes themeResId: Int = R.style.AppTheme,
                         @LayoutRes layoutResource: Int = R.layout.dialog_alert_custom_title): View? {
        val titleLayout = LayoutInflater.from(ContextThemeWrapper(context, themeResId)).inflate(layoutResource, null)
--- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
+++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/OKDialog.kt
@ -1,17 +1,22 @@
-package info.nightscout.androidaps.utils.alertDialogs
+package info.nightscout.core.ui.dialogs

 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.DialogInterface
+import android.os.Handler
+import android.os.Looper
 import android.os.SystemClock
 import android.text.Spanned
 import androidx.fragment.app.FragmentActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import info.nightscout.core.main.R
-import info.nightscout.shared.extensions.runOnUiThread
+import info.nightscout.core.ui.R

 object OKDialog {

+    private fun runOnUiThread(theRunnable: Runnable?) = theRunnable?.let {
+        Handler(Looper.getMainLooper()).post(it)
+    }
+
    @SuppressLint("InflateParams")
    fun show(context: Context, title: String, message: String, runnable: Runnable? = null) {
        var okClicked = false
--- a/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
+++ b/core/core-main/src/main/java/info/nightscout/androidaps/utils/alertDialogs/WarningDialog.kt
@ -1,18 +1,23 @@
-package info.nightscout.androidaps.utils.alertDialogs
+package info.nightscout.core.ui.dialogs

 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.DialogInterface
+import android.os.Handler
+import android.os.Looper
 import android.os.SystemClock
 import androidx.annotation.StringRes
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import info.nightscout.core.main.R
-import info.nightscout.shared.extensions.runOnUiThread
+import info.nightscout.core.ui.R

 // if you need error dialog - duplicate to ErrorDialog and make it and use: AppThemeErrorDialog & R.drawable.ic_header_error instead

 object WarningDialog {

+    private fun runOnUiThread(theRunnable: Runnable?) = theRunnable?.let {
+        Handler(Looper.getMainLooper()).post(it)
+    }
+
    @SuppressLint("InflateParams")
    fun showWarning(context: Context, title: String, message: String, @StringRes positiveButton: Int = -1, ok: (() -> Unit)? = null, cancel: (() -> Unit)? = null) {
        var okClicked = false
@ -25,11 +30,7 @@ object WarningDialog {
                    okClicked = true
                    dialog.dismiss()
                    SystemClock.sleep(100)
-                    if (cancel != null) {
-                        runOnUiThread(Runnable {
-                            cancel()
-                        })
-                    }
+                    if (cancel != null) runOnUiThread { cancel() }
                }
            }

@ -40,11 +41,7 @@ object WarningDialog {
                    okClicked = true
                    dialog.dismiss()
                    SystemClock.sleep(100)
-                    if (ok != null) {
-                        runOnUiThread(Runnable {
-                            ok()
-                        })
-                    }
+                    if (ok != null) runOnUiThread { ok() }
                }
            }
        }
@ -52,5 +49,4 @@ object WarningDialog {
        val dialog = builder.show()
        dialog.setCanceledOnTouchOutside(true)
    }
-
 }
--- a/core/core-main/src/main/res/drawable/ic_check_while_48dp.xml
+++ b/core/core-main/src/main/res/drawable/ic_check_while_48dp.xml
--- a/core/core-main/src/main/res/drawable/ic_close.xml
+++ b/core/core-main/src/main/res/drawable/ic_close.xml
--- a/core/core-main/src/main/res/drawable/ic_header_warning.xml
+++ b/core/core-main/src/main/res/drawable/ic_header_warning.xml
--- a/core/core-main/src/main/res/drawable/launch_screen.xml
+++ b/core/core-main/src/main/res/drawable/launch_screen.xml
--- a/core/core-main/src/main/res/layout/dialog_alert_custom_title.xml
+++ b/core/core-main/src/main/res/layout/dialog_alert_custom_title.xml
--- a/core/core-main/src/main/res/values-night/colors.xml
+++ b/core/core-main/src/main/res/values-night/colors.xml
--- a/core/core-main/src/main/res/values-night/styles.xml
+++ b/core/core-main/src/main/res/values-night/styles.xml
--- a/core/core-main/src/main/res/values/attrs.xml
+++ b/core/core-main/src/main/res/values/attrs.xml
--- a/core/core-main/src/main/res/values/colors.xml
+++ b/core/core-main/src/main/res/values/colors.xml
--- a/core/core-main/src/main/res/values/dimens.xml
+++ b/core/core-main/src/main/res/values/dimens.xml
--- a/core/ui/src/main/res/values/strings.xml
+++ b/core/ui/src/main/res/values/strings.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    Dialogs-->
+    <string name="confirmation">Confirmation</string>
+    <string name="message">Message</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
+    <string name="dismiss">DISMISS</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+
+</resources>
--- a/core/core-main/src/main/res/values/styles.xml
+++ b/core/core-main/src/main/res/values/styles.xml
--- a/core/ui/src/test/java/info/nightscout/core/ui/ExampleUnitTest.kt
+++ b/core/ui/src/test/java/info/nightscout/core/ui/ExampleUnitTest.kt
@ -0,0 +1,17 @@
+package info.nightscout.core.ui
+
+import org.junit.Assert.*
+import org.junit.Test
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
--- a/implementation/build.gradle
+++ b/implementation/build.gradle
@ -24,4 +24,5 @@ dependencies {
    implementation project(':interfaces')
    implementation project(':core:core-main')
    implementation project(':core:fabric')
+    implementation project(':core:ui')
 }
--- a/implementation/src/main/java/info/nightscout/implementation/AndroidPermissionImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/AndroidPermissionImpl.kt
@ -15,7 +15,7 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import info.nightscout.androidaps.activities.DaggerAppCompatActivityWithResult
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.AndroidPermission
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.notifications.Notification
--- a/plugins/build.gradle
+++ b/plugins/build.gradle
@ -23,6 +23,7 @@ dependencies {
    implementation project(':graphview')
    implementation project(':core:core-main')
    implementation project(':core:fabric')
+    implementation project(':core:ui')
    implementation project(':interfaces')
    implementation project(':ns-sdk')

--- a/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt
@ -18,8 +18,8 @@ import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.receivers.ReceiverStatusStore
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
--- a/plugins/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt
@ -13,11 +13,11 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.extensions.toStringMedium
 import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.ui.SingleClickButton
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.impl.AppRepository
--- a/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt
@ -21,10 +21,10 @@ import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog.showConfirmation
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.profile.ProfileStoreObject
 import info.nightscout.core.profile.fromMgdlToUnits
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.Constants
@ -133,7 +133,7 @@ class AutotuneFragment : DaggerFragment() {
            val localName = rh.gs(R.string.autotune_tunedprofile_name) + " " + dateUtil.dateAndTimeString(autotunePlugin.lastRun)
            val circadian = sp.getBoolean(R.string.key_autotune_circadian_ic_isf, false)
            autotunePlugin.tunedProfile?.let { tunedProfile ->
-                showConfirmation(requireContext(),
+                OKDialog.showConfirmation(requireContext(),
                                 rh.gs(R.string.autotune_copy_localprofile_button),
                                 rh.gs(R.string.autotune_copy_local_profile_message) + "\n" + localName,
                                 Runnable {
@ -151,7 +151,7 @@ class AutotuneFragment : DaggerFragment() {

        binding.autotuneUpdateProfile.setOnClickListener {
            val localName = autotunePlugin.pumpProfile.profilename
-            showConfirmation(requireContext(),
+            OKDialog.showConfirmation(requireContext(),
                             rh.gs(R.string.autotune_update_input_profile_button),
                             rh.gs(R.string.autotune_update_local_profile_message, localName),
                             Runnable {
@ -171,7 +171,7 @@ class AutotuneFragment : DaggerFragment() {

        binding.autotuneRevertProfile.setOnClickListener {
            val localName = autotunePlugin.pumpProfile.profilename
-            showConfirmation(requireContext(),
+            OKDialog.showConfirmation(requireContext(),
                             rh.gs(R.string.autotune_revert_input_profile_button),
                             rh.gs(R.string.autotune_revert_local_profile_message, localName),
                             Runnable {
@ -231,7 +231,7 @@ class AutotuneFragment : DaggerFragment() {
            val circadian = sp.getBoolean(R.string.key_autotune_circadian_ic_isf, false)
            tunedProfile?.let { tunedP ->
                tunedP.profileStore(circadian)?.let {
-                    showConfirmation(requireContext(),
+                    OKDialog.showConfirmation(requireContext(),
                                     rh.gs(R.string.activate_profile) + ": " + tunedP.profilename + " ?",
                                     Runnable {
                                         uel.log(
--- a/plugins/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt
@ -13,10 +13,10 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.Food
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
--- a/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt
@ -15,8 +15,8 @@ import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.interfaces.smsCommunicator.SmsCommunicator
--- a/plugins/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt
@ -13,10 +13,10 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.DecimalFormatter
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.core.fabric.FabricPrivacy
 import info.nightscout.core.profile.fromMgdlToUnits
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.Constants
--- a/plugins/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
@ -13,9 +13,9 @@ import info.nightscout.androidaps.extensions.pureProfileFromJson
 import info.nightscout.androidaps.receivers.DataWorkerStorage
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.profile.ProfileStoreObject
 import info.nightscout.core.profile.toMgdl
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.GlucoseUnit
--- a/plugins/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt
@ -19,8 +19,8 @@ import info.nightscout.androidaps.extensions.directionToIcon
 import info.nightscout.androidaps.extensions.valueToUnitsString
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActionModeHelper
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
--- a/plugins/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt
@ -14,8 +14,8 @@ import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.plugin.ActivePlugin
--- a/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatus.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatus.kt
@ -6,7 +6,7 @@ import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.utils.DefaultValueHelper
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.interfaces.Config
--- a/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt
+++ b/plugins/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt
@ -3,7 +3,7 @@ package info.nightscout.plugins.sync.tidepool.comm
 import android.content.Context
 import android.os.PowerManager
 import android.os.SystemClock
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.plugins.R
 import info.nightscout.plugins.sync.tidepool.events.EventTidepoolStatus
--- a/pump/dana/build.gradle
+++ b/pump/dana/build.gradle
@ -36,5 +36,7 @@ dependencies {
    api "androidx.room:room-ktx:$room_version"
    api "androidx.room:room-runtime:$room_version"
    api "androidx.room:room-rxjava3:$room_version"
+    implementation project(path: ':core:ui')
+    implementation project(path: ':core:ui')
    kapt "androidx.room:room-compiler:$room_version"
 }
--- a/pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
+++ b/pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt
@ -16,10 +16,10 @@ import info.nightscout.androidaps.dana.databinding.DanarFragmentBinding
 import info.nightscout.androidaps.dana.events.EventDanaRNewStatus
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.WarnColors
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.userEntry.UserEntryMapper.Action
 import info.nightscout.androidaps.utils.userEntry.UserEntryMapper.Sources
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.pump.Dana
 import info.nightscout.interfaces.pump.Pump
--- a/pump/danars/build.gradle
+++ b/pump/danars/build.gradle
@ -33,6 +33,7 @@ android {
 dependencies {
    implementation project(':core:core-main')
    implementation project(':core:fabric')
+    implementation project(':core:ui')
    implementation project(':pump:dana')
    implementation project(':app-wear-shared:rx')
    implementation project(':app-wear-shared:shared')
--- a/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
+++ b/pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt
@ -8,10 +8,10 @@ import info.nightscout.androidaps.danars.R
 import info.nightscout.androidaps.danars.databinding.DanarsEnterPinActivityBinding
 import info.nightscout.androidaps.danars.services.BLEComm
 import info.nightscout.androidaps.extensions.hexStringToByteArray
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.textValidator.DefaultEditTextValidator
 import info.nightscout.androidaps.utils.textValidator.EditTextValidator
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.events.EventPumpStatusChanged
 import info.nightscout.shared.sharedPreferences.SP
--- a/pump/eopatch/build.gradle
+++ b/pump/eopatch/build.gradle
@ -28,6 +28,7 @@ dependencies {
    implementation project(':database:impl')
    implementation project(':core:core-main')
    implementation project(':core:fabric')
+    implementation project(':core:ui')
    implementation project(':interfaces')

    //RxAndroidBle
--- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchActivity.kt
+++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchActivity.kt
@ -19,7 +19,6 @@ import info.nightscout.androidaps.plugins.pump.eopatch.extension.replaceFragment
 import info.nightscout.androidaps.plugins.pump.eopatch.extension.takeOne
 import info.nightscout.androidaps.plugins.pump.eopatch.ui.dialogs.ProgressDialogHelper
 import info.nightscout.androidaps.plugins.pump.eopatch.ui.viewmodel.EopatchViewModel
-import info.nightscout.androidaps.utils.alertDialogs.AlertDialogHelper

 class EopatchActivity : EoBaseActivity<ActivityEopatchBinding>() {

@ -157,7 +156,7 @@ class EopatchActivity : EoBaseActivity<ActivityEopatchBinding>() {
                        if (patchStep.value?.isSafeDeactivation == true || connectionTryCnt >= 2) {
                            val cancelLabel = commCheckCancelLabel.value ?: getString(R.string.cancel)
                            val message = "${getString(R.string.patch_comm_error_during_discard_desc_2)}\n${getString(R.string.patch_communication_check_helper_2)}"
-                            mPatchCommCheckDialog = AlertDialogHelper.Builder(this@EopatchActivity)
+                            mPatchCommCheckDialog = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity)
                                .setTitle(R.string.patch_communication_failed)
                                .setMessage(message)
                                .setCancelable(false)
@ -171,7 +170,7 @@ class EopatchActivity : EoBaseActivity<ActivityEopatchBinding>() {
                        } else {
                            val cancelLabel = commCheckCancelLabel.value ?: getString(R.string.cancel)
                            val message = "${getString(R.string.patch_communication_check_helper_1)}\n${getString(R.string.patch_communication_check_helper_2)}"
-                            mPatchCommCheckDialog = AlertDialogHelper.Builder(this@EopatchActivity)
+                            mPatchCommCheckDialog = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity)
                                .setTitle(R.string.patch_communication_failed)
                                .setMessage(message)
                                .setCancelable(false)
@ -187,7 +186,7 @@ class EopatchActivity : EoBaseActivity<ActivityEopatchBinding>() {

                    EventType.SHOW_BONDED_DIALOG           -> {
                        dismissProgressDialog()
-                        AlertDialogHelper.Builder(this@EopatchActivity)
+                        info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity)
                            .setTitle(R.string.patch_communication_succeed)
                            .setMessage(R.string.patch_communication_succeed_message)
                            .setPositiveButton(R.string.confirm) { _, _ ->
@ -196,7 +195,7 @@ class EopatchActivity : EoBaseActivity<ActivityEopatchBinding>() {
                    }

                    EventType.SHOW_CHANGE_PATCH_DIALOG     -> {
-                        AlertDialogHelper.Builder(this@EopatchActivity).apply {
+                        info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity).apply {
                            setTitle(R.string.string_discard_patch)
                            setMessage(
                                when {
@ -219,7 +218,7 @@ class EopatchActivity : EoBaseActivity<ActivityEopatchBinding>() {
                    }
                    // EventType.SHOW_BONDED_DIALOG           -> this@EopatchActivity.finish()
                    EventType.SHOW_DISCARD_DIALOG          -> {
-                        AlertDialogHelper.Builder(this@EopatchActivity).apply {
+                        info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity).apply {
                            setTitle(R.string.string_discard_patch)
                            if (isBolusActive) {
                                setMessage(R.string.patch_change_confirm_bolus_is_active_desc)
--- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt
+++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt
@ -15,7 +15,6 @@ import info.nightscout.androidaps.plugins.pump.eopatch.databinding.FragmentEopat
 import info.nightscout.androidaps.plugins.pump.eopatch.extension.takeOne
 import info.nightscout.androidaps.plugins.pump.eopatch.ui.viewmodel.EopatchOverviewViewModel
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.AlertDialogHelper
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
@ -94,7 +93,7 @@ class EopatchOverviewFragment: EoBaseFragment<FragmentEopatchOverviewBinding>()
    private fun suspend() {
        binding.viewmodel?.apply {
            activity?.let {
-                val builder = AlertDialogHelper.Builder(it)
+                val builder = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(it)
                val msg = getSuspendDialogText()

                val dialog = builder.setTitle(R.string.string_suspend)
@ -113,7 +112,7 @@ class EopatchOverviewFragment: EoBaseFragment<FragmentEopatchOverviewBinding>()
    private fun resume() {
        binding.viewmodel?.apply {
            activity?.let {
-                val builder = AlertDialogHelper.Builder(it)
+                val builder = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(it)
                val dialog = builder.setTitle(R.string.string_resume_insulin_delivery_title)
                    .setMessage(R.string.string_resume_insulin_delivery_message)
                    .setPositiveButton(R.string.confirm) { _, _ ->
@ -134,7 +133,7 @@ class EopatchOverviewFragment: EoBaseFragment<FragmentEopatchOverviewBinding>()
    private fun openPauseTimePicker() {
        binding.viewmodel?.apply {
            activity?.let{
-                val builder = AlertDialogHelper.Builder(it)
+                val builder = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(it)
                val listArr = requireContext().resources.getStringArray(R.array.suspend_duration_array)
                var select = 0
                val dialog = builder.setTitle(R.string.string_suspend_time_insulin_delivery_title)
--- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/CommonDialog.kt
+++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/CommonDialog.kt
@ -5,7 +5,6 @@ import android.content.DialogInterface
 import android.os.Bundle
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.plugins.pump.eopatch.R
-import info.nightscout.androidaps.utils.alertDialogs.AlertDialogHelper
 import info.nightscout.rx.logging.AAPSLogger
 import javax.inject.Inject

@ -23,7 +22,7 @@ class CommonDialog : DaggerDialogFragment() {

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        return activity?.let{
-            val builder = AlertDialogHelper.Builder(it).apply {
+            val builder = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(it).apply {
                if(title != 0) setTitle(title)
                if(message != 0) setMessage(message)
                setPositiveButton(positiveBtn,
--- a/pump/medtronic/build.gradle
+++ b/pump/medtronic/build.gradle
@ -20,6 +20,7 @@ dependencies {
    implementation project(':app-wear-shared:rx')
    implementation project(':app-wear-shared:shared')
    implementation project(':core:core-main')
+    implementation project(':core:ui')
    implementation project(':pump:pump-common')
    implementation project(':pump:pump-core')
    implementation project(':pump:rileylink')
--- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
+++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicFragment.kt
@ -23,8 +23,8 @@ import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPu
 import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil
 import info.nightscout.androidaps.utils.WarnColors
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.interfaces.queue.Callback
--- a/pump/omnipod-dash/build.gradle
+++ b/pump/omnipod-dash/build.gradle
@ -40,6 +40,7 @@ dependencies {
    implementation project(':libraries')
    implementation project(':core:core-main')
    implementation project(':core:fabric')
+    implementation project(':core:ui')
    implementation project(':pump:pump-common')
    implementation project(':pump:omnipod-common')
    implementation project(':interfaces')
--- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
+++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodManagementActivity.kt
@ -13,8 +13,8 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definitio
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.DashPodActivationWizardActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.DashPodDeactivationWizardActivity
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.interfaces.queue.CommandQueue
 import info.nightscout.interfaces.ui.ActivityNames
--- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
+++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/OmnipodDashOverviewFragment.kt
@ -25,10 +25,10 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definitio
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodConstants
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.notifications.Notification
--- a/pump/omnipod-eros/build.gradle
+++ b/pump/omnipod-eros/build.gradle
@ -33,6 +33,7 @@ dependencies {
    implementation project(':libraries')
    implementation project(':core:core-main')
    implementation project(':core:fabric')
+    implementation project(':core:ui')
    implementation project(':pump:pump-common')
    implementation project(':pump:pump-core')
    implementation project(':pump:rileylink')
--- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
+++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodManagementActivity.kt
@ -24,9 +24,9 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodE
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandReadPulseLog
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.ErosPodActivationWizardActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.ErosPodDeactivationWizardActivity
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.interfaces.queue.Callback
 import info.nightscout.interfaces.queue.CommandQueue
@ -87,7 +87,7 @@ class ErosPodManagementActivity : NoSplashAppCompatActivity() {

        binding.buttonDiscardPod.setOnClickListener {
            OKDialog.showConfirmation(this,
-                                      rh.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation), Thread {
+                                                                      rh.gs(R.string.omnipod_common_pod_management_discard_pod_confirmation), Thread {
                    aapsOmnipodManager.discardPodState()
                })
        }
--- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
+++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/OmnipodErosOverviewFragment.kt
@ -34,10 +34,10 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodE
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandGetPodStatus
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.ui.UIRunnable
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.ActivePlugin
--- a/pump/pump-common/build.gradle
+++ b/pump/pump-common/build.gradle
@ -27,4 +27,5 @@ dependencies {
    }

    api "com.google.code.gson:gson:$gson_version"
+    implementation project(path: ':core:ui')
 }
--- a/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt
+++ b/pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/ui/PumpBLEConfigActivity.kt
@ -27,7 +27,7 @@ import info.nightscout.androidaps.plugins.pump.common.databinding.PumpBleConfigA
 import info.nightscout.androidaps.plugins.pump.common.driver.PumpBLESelector
 import info.nightscout.androidaps.plugins.pump.common.driver.PumpBLESelectorText
 import info.nightscout.androidaps.plugins.pump.common.driver.PumpDriverConfigurationCapable
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
--- a/pump/rileylink/build.gradle
+++ b/pump/rileylink/build.gradle
@ -19,6 +19,7 @@ dependencies {
    implementation project(':app-wear-shared:rx')
    implementation project(':app-wear-shared:shared')
    implementation project(':core:core-main')
+    implementation project(':core:ui')
    implementation project(':pump:pump-common')
    implementation project(':pump:pump-core')
    implementation project(':interfaces')
--- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt
+++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt
@ -34,7 +34,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.databinding.RileyLinkBleConfigActivityBinding
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
--- a/settings.gradle
+++ b/settings.gradle
@ -31,3 +31,4 @@ include ':pump:rileylink'
 include ':openhumans'
 include ':automation'
 include ':interfaces'
+include ':core:ui'
--- a/ui/build.gradle
+++ b/ui/build.gradle
@ -25,4 +25,5 @@ dependencies {
    implementation project(':core:core-main')
    implementation project(':core:fabric')
    implementation project(':interfaces')
+    implementation project(path: ':core:ui')
 }
--- a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt
@ -12,8 +12,8 @@ import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
 import info.nightscout.androidaps.data.ProfileSealed
 import info.nightscout.androidaps.interfaces.stats.TddCalculator
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.EffectiveProfileSwitch
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.plugin.ActivePlugin
--- a/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt
@ -8,8 +8,8 @@ import info.nightscout.androidaps.interfaces.stats.DexcomTirCalculator
 import info.nightscout.androidaps.interfaces.stats.TddCalculator
 import info.nightscout.androidaps.interfaces.stats.TirCalculator
 import info.nightscout.androidaps.logging.UserEntryLogger
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.rx.AapsSchedulers
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt
@ -21,8 +21,8 @@ import info.nightscout.androidaps.extensions.iobCalc
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActionModeHelper
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
 import info.nightscout.database.entities.Carbs
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt
@ -14,19 +14,19 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.database.impl.AppRepository
-import info.nightscout.database.impl.transactions.InvalidateAAPSStartedTherapyEventTransaction
-import info.nightscout.database.impl.transactions.InvalidateTherapyEventTransaction
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActionModeHelper
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.Translator
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.database.impl.AppRepository
+import info.nightscout.database.impl.transactions.InvalidateAAPSStartedTherapyEventTransaction
+import info.nightscout.database.impl.transactions.InvalidateTherapyEventTransaction
 import info.nightscout.interfaces.BuildHelper
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt
@ -20,8 +20,8 @@ import info.nightscout.androidaps.extensions.isInProgress
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActionModeHelper
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt
@ -23,8 +23,8 @@ import info.nightscout.androidaps.extensions.getCustomizedName
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActionModeHelper
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt
@ -24,8 +24,8 @@ import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActionModeHelper
 import info.nightscout.androidaps.utils.ToastUtils
 import info.nightscout.androidaps.utils.Translator
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt
@ -21,8 +21,8 @@ import info.nightscout.androidaps.extensions.toTemporaryBasal
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ActionModeHelper
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.ExtendedBolus
 import info.nightscout.database.entities.TemporaryBasal
 import info.nightscout.database.entities.UserEntry.Action
--- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt
+++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt
@ -14,9 +14,9 @@ import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
--- a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt
@ -9,9 +9,9 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.profile.fromMgdlToUnits
 import info.nightscout.core.profile.toCurrentUnitsString
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
--- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt
@ -15,10 +15,10 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProv
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.protection.ProtectionCheck.Protection.BOLUS
 import info.nightscout.core.profile.toMgdl
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
--- a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt
@ -15,9 +15,9 @@ import info.nightscout.androidaps.extensions.fromConstant
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.utils.Translator
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.core.profile.fromMgdlToUnits
 import info.nightscout.core.profile.toCurrentUnitsString
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
--- a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt
@ -10,8 +10,8 @@ import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.constraints.Constraint
--- a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt
@ -11,8 +11,8 @@ import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
--- a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt
@ -14,11 +14,11 @@ import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.extensions.toSignedString
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.core.profile.toMgdl
 import info.nightscout.core.pumpExtensions.insertBolusTransaction
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
--- a/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt
@ -13,9 +13,9 @@ import androidx.fragment.app.FragmentManager
 import dagger.android.support.DaggerDialogFragment
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.core.fabric.FabricPrivacy
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
--- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt
@ -14,9 +14,9 @@ import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.core.profile.toMgdl
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
--- a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt
@ -10,8 +10,8 @@ import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
 import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.interfaces.constraints.Constraint
--- a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt
@ -12,10 +12,10 @@ import info.nightscout.androidaps.dialogs.DialogFragmentWithDate
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.DefaultValueHelper
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.core.profile.toCurrentUnitsString
 import info.nightscout.core.profile.toMgdl
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.TemporaryTarget
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
--- a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt
+++ b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt
@ -13,10 +13,10 @@ import info.nightscout.androidaps.extensions.formatColor
 import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.DecimalFormatter
 import info.nightscout.androidaps.utils.ToastUtils
-import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.core.pumpExtensions.insertBolusTransaction
 import info.nightscout.core.pumpExtensions.insertCarbsTransaction
+import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.database.impl.AppRepository