From 38d3c0cc3191ade9d6496976704498b6d76163c2 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 26 Sep 2023 21:51:59 +0200 Subject: [PATCH] remove dependency --- app/src/main/kotlin/app/aaps/MainActivity.kt | 2 +- .../aaps/activities/HistoryBrowseActivity.kt | 2 +- .../app/aaps/activities/HistoryBrowserData.kt | 2 +- .../aaps/workflow/CalculationWorkflowImpl.kt | 2 +- build.gradle | 1 + core/interfaces/build.gradle | 2 ++ .../interfaces/utils/fabric/FabricPrivacy.kt | 15 +++++++++++++ .../core/main/utils/worker/LoggingWorker.kt | 2 +- .../implementation/di/ImplementationModule.kt | 3 +++ .../profile/ProfileFunctionImpl.kt | 2 +- .../queue/CommandQueueImplementation.kt | 2 +- .../resources/ResourceHelperImpl.kt | 2 +- .../utils/fabric/FabricPrivacyImpl.kt | 21 ++++++++++--------- .../queue/CommandQueueImplementationTest.kt | 2 +- .../pump/insight/LocalInsightFragment.java | 2 +- .../app/aaps/plugins/aps/OpenAPSFragment.kt | 2 +- .../plugins/aps/autotune/AutotuneFragment.kt | 2 +- .../app/aaps/plugins/aps/loop/LoopFragment.kt | 2 +- .../app/aaps/plugins/aps/loop/LoopPlugin.kt | 2 +- .../aps/openAPSAMA/OpenAPSAMAPlugin.kt | 2 +- .../aaps/plugins/aps/loop/LoopPluginTest.kt | 2 +- .../plugins/automation/AutomationFragment.kt | 2 +- .../plugins/automation/AutomationPlugin.kt | 2 +- .../automation/dialogs/EditEventDialog.kt | 2 +- .../automation/dialogs/EditTriggerDialog.kt | 2 +- .../automation/services/LocationService.kt | 2 +- .../plugins/automation/BolusTimerImplTest.kt | 2 +- .../plugins/automation/CarbTimerImplTest.kt | 2 +- .../configBuilder/ConfigBuilderFragment.kt | 2 +- .../maintenance/MaintenanceFragment.kt | 2 +- .../setupwizard/SetupWizardActivity.kt | 2 +- .../setupwizard/elements/SWPlugin.kt | 2 +- .../bgQualityCheck/BgQualityCheckPlugin.kt | 2 +- .../objectives/ObjectivesFragment.kt | 10 ++++----- .../objectives/dialogs/NtpProgressDialog.kt | 2 +- .../BgQualityCheckPluginTest.kt | 3 +-- .../IobCobCalculatorPlugin.kt | 2 +- .../main/general/actions/ActionsFragment.kt | 2 +- .../plugins/main/general/food/FoodFragment.kt | 2 +- .../main/general/overview/OverviewFragment.kt | 2 +- .../general/overview/OverviewMenusImpl.kt | 2 +- .../main/general/overview/OverviewPlugin.kt | 2 +- .../persistentNotification/DummyService.kt | 2 +- .../PersistentNotificationPlugin.kt | 2 +- .../SmsCommunicatorFragment.kt | 2 +- .../smsCommunicator/SmsCommunicatorPlugin.kt | 2 +- .../activities/SmsCommunicatorOtpActivity.kt | 2 +- .../plugins/main/general/wear/WearFragment.kt | 2 +- .../plugins/main/general/wear/WearPlugin.kt | 2 +- .../wear/activities/CwfInfosActivity.kt | 2 +- .../wear/wearintegration/DataHandlerMobile.kt | 2 +- .../DataLayerListenerServiceMobile.kt | 2 +- .../plugins/main/profile/ProfileFragment.kt | 2 +- .../aaps/plugins/source/BGSourceFragment.kt | 2 +- .../app/aaps/plugins/source/GlunovoPlugin.kt | 2 +- .../aaps/plugins/source/IntelligoPlugin.kt | 2 +- .../dataBroadcaster/DataBroadcastPlugin.kt | 2 +- .../plugins/sync/nsShared/NSClientFragment.kt | 2 +- .../plugins/sync/nsclient/NSClientPlugin.kt | 2 +- .../plugins/sync/nsclient/ReceiverDelegate.kt | 2 +- .../sync/nsclient/services/NSClientService.kt | 2 +- .../sync/nsclientV3/NSClientV3Plugin.kt | 2 +- .../plugins/sync/tidepool/TidepoolFragment.kt | 2 +- .../plugins/sync/tidepool/TidepoolPlugin.kt | 2 +- .../aaps/plugins/sync/xdrip/XdripFragment.kt | 2 +- .../aaps/plugins/sync/xdrip/XdripPlugin.kt | 2 +- .../sync/nsclient/ReceiverDelegateTest.kt | 2 +- .../nsclientV3/workers/DataSyncWorkerTest.kt | 2 +- .../nsclientV3/workers/LoadBgWorkerTest.kt | 2 +- .../nightscout/pump/combo/ComboFragment.kt | 2 +- .../info/nightscout/pump/dana/DanaFragment.kt | 4 ++-- .../dana/activities/DanaHistoryActivity.kt | 2 +- .../activities/DanaUserOptionsActivity.kt | 2 +- .../danaRKorean/DanaRKoreanPlugin.kt | 4 ++-- .../androidaps/danaRv2/DanaRv2Plugin.java | 4 ++-- .../androidaps/danar/DanaRPlugin.java | 4 ++-- .../AbstractDanaRExecutionService.java | 4 ++-- .../nightscout/pump/danars/DanaRSPlugin.kt | 6 +++--- .../danars/activities/EnterPinActivity.kt | 2 +- .../danars/dialogs/PairingProgressDialog.kt | 2 +- .../pump/danars/services/DanaRSService.kt | 2 +- .../pump/diaconn/DiaconnG8Fragment.kt | 2 +- .../pump/diaconn/DiaconnG8Plugin.kt | 6 +++--- .../activities/DiaconnG8HistoryActivity.kt | 2 +- .../DiaconnG8UserOptionsActivity.kt | 2 +- .../pump/diaconn/service/DiaconnG8Service.kt | 2 +- .../plugins/pump/eopatch/EopatchPumpPlugin.kt | 2 +- .../pump/eopatch/alarm/AlarmManager.kt | 2 +- .../pump/medtronic/MedtronicFragment.kt | 4 ++-- .../pump/medtronic/MedtronicPumpPlugin.kt | 2 +- .../nightscout/pump/medtrum/MedtrumPlugin.kt | 6 +++--- .../pump/medtrum/services/MedtrumService.kt | 2 +- .../omnipod/dash/OmnipodDashPumpPlugin.kt | 2 +- .../dash/ui/DashPodManagementActivity.kt | 6 +++--- .../dash/ui/OmnipodDashOverviewFragment.kt | 6 +++--- .../action/DashInsertCannulaViewModel.kt | 2 +- .../omnipod/eros/OmnipodErosPumpPlugin.java | 2 +- .../eros/ui/ErosPodManagementActivity.kt | 6 +++--- .../eros/ui/OmnipodErosOverviewFragment.kt | 4 ++-- pump/pump-common/build.gradle | 1 - .../pump/common/PumpPluginAbstract.kt | 2 +- .../pump/virtual/VirtualPumpFragment.kt | 4 ++-- .../pump/virtual/VirtualPumpPlugin.kt | 2 +- .../pump/virtual/VirtualPumpPluginUTest.kt | 2 +- .../aaps/shared/tests/TestBaseWithProfile.kt | 2 +- .../ui/activities/ProfileHelperActivity.kt | 2 +- .../ui/activities/QuickWizardListActivity.kt | 8 +++---- .../app/aaps/ui/activities/StatsActivity.kt | 2 +- .../aaps/ui/activities/TDDStatsActivity.kt | 2 +- .../fragments/TreatmentsBolusCarbsFragment.kt | 2 +- .../fragments/TreatmentsCareportalFragment.kt | 2 +- .../TreatmentsExtendedBolusesFragment.kt | 2 +- .../TreatmentsProfileSwitchFragment.kt | 2 +- .../fragments/TreatmentsTempTargetFragment.kt | 2 +- .../TreatmentsTemporaryBasalsFragment.kt | 2 +- .../fragments/TreatmentsUserEntryFragment.kt | 2 +- .../kotlin/app/aaps/ui/dialogs/LoopDialog.kt | 2 +- .../app/aaps/ui/dialogs/WizardDialog.kt | 2 +- 118 files changed, 171 insertions(+), 151 deletions(-) create mode 100644 core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/fabric/FabricPrivacy.kt rename core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt => implementation/src/main/kotlin/app/aaps/implementation/utils/fabric/FabricPrivacyImpl.kt (89%) diff --git a/app/src/main/kotlin/app/aaps/MainActivity.kt b/app/src/main/kotlin/app/aaps/MainActivity.kt index 1ccd5e2a35..fdc5b20cfc 100644 --- a/app/src/main/kotlin/app/aaps/MainActivity.kt +++ b/app/src/main/kotlin/app/aaps/MainActivity.kt @@ -49,9 +49,9 @@ import app.aaps.core.interfaces.rx.events.EventRebuildTabs import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import app.aaps.core.interfaces.ui.IconsProvider +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils import app.aaps.core.main.utils.CryptoUtil -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.UIRunnable import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.locale.LocaleHelper diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt index 5ab29d1384..a9d92c10e1 100644 --- a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt +++ b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt @@ -26,8 +26,8 @@ import app.aaps.core.interfaces.rx.events.EventScale import app.aaps.core.interfaces.rx.events.EventUpdateOverviewGraph import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.events.EventIobCalculationProgress -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.databinding.ActivityHistorybrowseBinding diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt index a6cde726c5..cd14cf4874 100644 --- a/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt +++ b/app/src/main/kotlin/app/aaps/activities/HistoryBrowserData.kt @@ -10,8 +10,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.database.impl.AppRepository import app.aaps.implementation.overview.OverviewDataImpl diff --git a/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt b/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt index 4013d433d8..7017bc35e6 100644 --- a/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt +++ b/app/src/main/kotlin/app/aaps/workflow/CalculationWorkflowImpl.kt @@ -21,8 +21,8 @@ import app.aaps.core.interfaces.rx.events.EventOfflineChange import app.aaps.core.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.rx.events.EventTherapyEventChange import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.core.main.workflow.CalculationWorkflow.Companion.JOB import app.aaps.core.main.workflow.CalculationWorkflow.Companion.MAIN_CALCULATION diff --git a/build.gradle b/build.gradle index 1f87c17d26..e42f6b01a7 100644 --- a/build.gradle +++ b/build.gradle @@ -50,6 +50,7 @@ buildscript { wearable_version = '2.9.0' play_services_wearable_version = '18.1.0' play_services_location_version = '21.0.1' + play_services_measurement_version = '21.3.0' kotlinx_datetime_version = '0.4.1' kotlinx_serialization_version = '1.6.0' diff --git a/core/interfaces/build.gradle b/core/interfaces/build.gradle index 08314b4acf..23a82717bd 100644 --- a/core/interfaces/build.gradle +++ b/core/interfaces/build.gradle @@ -37,6 +37,8 @@ dependencies { api 'org.slf4j:slf4j-api:1.7.36' // 2.0.x breaks logging. Code change needed api 'com.github.tony19:logback-android:2.0.0' + api "com.google.android.gms:play-services-measurement-api:$play_services_measurement_version" + api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlinx_serialization_version" api "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinx_serialization_version" api "com.caverock:androidsvg:$caverock_androidsvg_version" diff --git a/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/fabric/FabricPrivacy.kt b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/fabric/FabricPrivacy.kt new file mode 100644 index 0000000000..a40b3f6537 --- /dev/null +++ b/core/interfaces/src/main/kotlin/app/aaps/core/interfaces/utils/fabric/FabricPrivacy.kt @@ -0,0 +1,15 @@ +package app.aaps.core.interfaces.utils.fabric + +import android.os.Bundle +import app.aaps.core.interfaces.rx.weardata.EventData +import com.google.firebase.analytics.FirebaseAnalytics + +interface FabricPrivacy { + val firebaseAnalytics: FirebaseAnalytics + fun logCustom(name: String, event: Bundle) + fun logCustom(event: String) + fun logMessage(message: String) + fun logException(throwable: Throwable) + fun fabricEnabled(): Boolean + fun logWearException(wearException: EventData.WearException) +} \ No newline at end of file diff --git a/core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt b/core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt index aba26436a5..11266949a4 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/utils/worker/LoggingWorker.kt @@ -3,9 +3,9 @@ package app.aaps.core.main.utils.worker import android.content.Context import androidx.work.CoroutineWorker import androidx.work.WorkerParameters -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.HasAndroidInjector import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext diff --git a/implementation/src/main/kotlin/app/aaps/implementation/di/ImplementationModule.kt b/implementation/src/main/kotlin/app/aaps/implementation/di/ImplementationModule.kt index d840ec985f..3318588006 100644 --- a/implementation/src/main/kotlin/app/aaps/implementation/di/ImplementationModule.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/di/ImplementationModule.kt @@ -31,6 +31,7 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.Translator import app.aaps.core.interfaces.utils.TrendCalculator +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.graph.OverviewData import app.aaps.implementation.alerts.LocalAlertUtilsImpl import app.aaps.implementation.androidNotification.NotificationHolderImpl @@ -66,6 +67,7 @@ import app.aaps.implementation.utils.DecimalFormatterImpl import app.aaps.implementation.utils.HardLimitsImpl import app.aaps.implementation.utils.TranslatorImpl import app.aaps.implementation.utils.TrendCalculatorImpl +import app.aaps.implementation.utils.fabric.FabricPrivacyImpl import dagger.Binds import dagger.Module import dagger.android.ContributesAndroidInjector @@ -86,6 +88,7 @@ abstract class ImplementationModule { @Module interface Bindings { + @Binds fun bindFabricPrivacy(fabricPrivacyImpl: FabricPrivacyImpl): FabricPrivacy @Binds fun bindPersistenceLayer(persistenceLayerImpl: PersistenceLayerImpl): PersistenceLayer @Binds fun bindActivePlugin(pluginStore: PluginStore): ActivePlugin @Binds fun bindOverviewData(overviewData: OverviewDataImpl): OverviewData diff --git a/implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileFunctionImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileFunctionImpl.kt index 36fce02347..92db8d8728 100644 --- a/implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileFunctionImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/profile/ProfileFunctionImpl.kt @@ -17,9 +17,9 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.fromConstant import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.database.ValueWrapper import app.aaps.database.entities.ProfileSwitch import app.aaps.database.impl.AppRepository diff --git a/implementation/src/main/kotlin/app/aaps/implementation/queue/CommandQueueImplementation.kt b/implementation/src/main/kotlin/app/aaps/implementation/queue/CommandQueueImplementation.kt index 08ac386f23..9f41eacf24 100644 --- a/implementation/src/main/kotlin/app/aaps/implementation/queue/CommandQueueImplementation.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/queue/CommandQueueImplementation.kt @@ -38,11 +38,11 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.extensions.getCustomizedName import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.utils.HtmlHelper import app.aaps.database.ValueWrapper import app.aaps.database.entities.EffectiveProfileSwitch diff --git a/implementation/src/main/kotlin/app/aaps/implementation/resources/ResourceHelperImpl.kt b/implementation/src/main/kotlin/app/aaps/implementation/resources/ResourceHelperImpl.kt index 06315632f6..2a61d18e00 100644 --- a/implementation/src/main/kotlin/app/aaps/implementation/resources/ResourceHelperImpl.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/resources/ResourceHelperImpl.kt @@ -19,7 +19,7 @@ import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.view.ContextThemeWrapper import androidx.core.content.ContextCompat import app.aaps.core.interfaces.resources.ResourceHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.getThemeColor import app.aaps.core.ui.locale.LocaleHelper import java.util.Locale diff --git a/core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt b/implementation/src/main/kotlin/app/aaps/implementation/utils/fabric/FabricPrivacyImpl.kt similarity index 89% rename from core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt rename to implementation/src/main/kotlin/app/aaps/implementation/utils/fabric/FabricPrivacyImpl.kt index ae77244182..7caeedd42d 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/utils/fabric/FabricPrivacy.kt +++ b/implementation/src/main/kotlin/app/aaps/implementation/utils/fabric/FabricPrivacyImpl.kt @@ -1,4 +1,4 @@ -package app.aaps.core.main.utils.fabric +package app.aaps.implementation.utils.fabric import android.os.Bundle import app.aaps.annotations.OpenForTesting @@ -6,6 +6,7 @@ import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.rx.weardata.EventData import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import com.google.firebase.analytics.FirebaseAnalytics import com.google.firebase.analytics.ktx.analytics import com.google.firebase.crashlytics.FirebaseCrashlytics @@ -24,12 +25,12 @@ import javax.inject.Singleton */ @OpenForTesting @Singleton -class FabricPrivacy @Inject constructor( +class FabricPrivacyImpl @Inject constructor( private val aapsLogger: AAPSLogger, private val sp: SP -) { +) : FabricPrivacy { - val firebaseAnalytics: FirebaseAnalytics = Firebase.analytics + override val firebaseAnalytics: FirebaseAnalytics = Firebase.analytics init { firebaseAnalytics.setAnalyticsCollectionEnabled(!java.lang.Boolean.getBoolean("disableFirebase") && fabricEnabled()) @@ -38,7 +39,7 @@ class FabricPrivacy @Inject constructor( // Analytics logCustom @Suppress("unused") - fun logCustom(name: String, event: Bundle) { + override fun logCustom(name: String, event: Bundle) { try { if (fabricEnabled()) { firebaseAnalytics.logEvent(name, event) @@ -69,7 +70,7 @@ class FabricPrivacy @Inject constructor( } // Analytics logCustom - fun logCustom(event: String) { + override fun logCustom(event: String) { try { if (fabricEnabled()) { firebaseAnalytics.logEvent(event, Bundle()) @@ -84,22 +85,22 @@ class FabricPrivacy @Inject constructor( } // Crashlytics log message - fun logMessage(message: String) { + override fun logMessage(message: String) { aapsLogger.info(LTag.CORE, "Crashlytics log message: $message") FirebaseCrashlytics.getInstance().log(message) } // Crashlytics logException - fun logException(throwable: Throwable) { + override fun logException(throwable: Throwable) { aapsLogger.error("Crashlytics log exception: ", throwable) FirebaseCrashlytics.getInstance().recordException(throwable) } - fun fabricEnabled(): Boolean { + override fun fabricEnabled(): Boolean { return sp.getBoolean(R.string.key_enable_fabric, true) } - fun logWearException(wearException: EventData.WearException) { + override fun logWearException(wearException: EventData.WearException) { aapsLogger.debug(LTag.WEAR, "logWearException") FirebaseCrashlytics.getInstance().apply { setCustomKey("wear_exception", true) diff --git a/implementation/src/test/kotlin/app/aaps/implementation/queue/CommandQueueImplementationTest.kt b/implementation/src/test/kotlin/app/aaps/implementation/queue/CommandQueueImplementationTest.kt index 5631692f77..37ee030a38 100644 --- a/implementation/src/test/kotlin/app/aaps/implementation/queue/CommandQueueImplementationTest.kt +++ b/implementation/src/test/kotlin/app/aaps/implementation/queue/CommandQueueImplementationTest.kt @@ -23,8 +23,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.database.ValueWrapper import app.aaps.database.entities.Bolus import app.aaps.database.impl.AppRepository diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java index 683db8dee2..e6ef0c20e3 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightFragment.java @@ -19,7 +19,6 @@ import java.util.List; import javax.inject.Inject; -import app.aaps.core.main.utils.fabric.FabricPrivacy; import app.aaps.core.interfaces.queue.Callback; import app.aaps.core.interfaces.queue.CommandQueue; import app.aaps.core.interfaces.resources.ResourceHelper; @@ -27,6 +26,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers; import app.aaps.core.interfaces.rx.bus.RxBus; import app.aaps.core.interfaces.utils.DateUtil; import app.aaps.core.interfaces.utils.DecimalFormatter; +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy; import dagger.android.support.DaggerFragment; import info.nightscout.androidaps.insight.R; import info.nightscout.androidaps.plugins.pump.insight.app_layer.parameter_blocks.TBROverNotificationBlock; diff --git a/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/OpenAPSFragment.kt b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/OpenAPSFragment.kt index 8aa1d1ff3d..a103b8ed91 100644 --- a/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/OpenAPSFragment.kt +++ b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/OpenAPSFragment.kt @@ -21,7 +21,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.utils.DateUtil -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.aps.databinding.OpenapsFragmentBinding import app.aaps.plugins.aps.events.EventOpenAPSUpdateGui import app.aaps.plugins.aps.events.EventResetOpenAPSGui diff --git a/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotuneFragment.kt b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotuneFragment.kt index 3f7fda86b1..eed1cecc12 100644 --- a/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotuneFragment.kt +++ b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotuneFragment.kt @@ -37,8 +37,8 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.MidnightTime import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.SafeParse +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.elements.WeekDay import app.aaps.database.entities.UserEntry diff --git a/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopFragment.kt b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopFragment.kt index cffda1bbf5..9ca349bbe8 100644 --- a/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopFragment.kt +++ b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopFragment.kt @@ -21,9 +21,9 @@ import app.aaps.core.interfaces.rx.events.EventLoopUpdateGui import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.pump.toHtml -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.utils.HtmlHelper import app.aaps.plugins.aps.R import app.aaps.plugins.aps.databinding.LoopFragmentBinding diff --git a/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopPlugin.kt b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopPlugin.kt index f5b58f927b..678403d4c2 100644 --- a/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopPlugin.kt +++ b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopPlugin.kt @@ -55,13 +55,13 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.extensions.convertedToAbsolute import app.aaps.core.main.extensions.convertedToPercent import app.aaps.core.main.extensions.plannedRemainingMinutes import app.aaps.core.main.iob.json -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.nssdk.interfaces.RunningConfiguration import app.aaps.database.ValueWrapper import app.aaps.database.entities.DeviceStatus diff --git a/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt index e684082ea3..12cc40dc73 100644 --- a/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt +++ b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt @@ -25,9 +25,9 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.extensions.target -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.utils.MidnightUtils import app.aaps.database.ValueWrapper import app.aaps.database.impl.AppRepository diff --git a/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt index 7f1a0c0b10..963d8496c7 100644 --- a/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt +++ b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt @@ -17,7 +17,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.nssdk.interfaces.RunningConfiguration import app.aaps.database.impl.AppRepository import app.aaps.shared.tests.TestBase diff --git a/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationFragment.kt b/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationFragment.kt index 88f9a254e5..95f124eca7 100644 --- a/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationFragment.kt +++ b/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationFragment.kt @@ -27,8 +27,8 @@ import app.aaps.core.interfaces.logging.UserEntryLogger import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.utils.ActionModeHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.dragHelpers.ItemTouchHelperAdapter import app.aaps.core.ui.dragHelpers.OnStartDragListener diff --git a/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationPlugin.kt b/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationPlugin.kt index fb7a77d21c..89e821b52b 100644 --- a/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationPlugin.kt +++ b/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationPlugin.kt @@ -28,7 +28,7 @@ import app.aaps.core.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.automation.actions.Action import app.aaps.plugins.automation.actions.ActionAlarm import app.aaps.plugins.automation.actions.ActionCarePortalEvent diff --git a/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditEventDialog.kt b/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditEventDialog.kt index cad9f0206a..f5f13cbee9 100644 --- a/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditEventDialog.kt +++ b/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditEventDialog.kt @@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.toast.ToastUtils import app.aaps.plugins.automation.AutomationEventObject import app.aaps.plugins.automation.AutomationPlugin diff --git a/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditTriggerDialog.kt b/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditTriggerDialog.kt index efd6de629e..5f637063b4 100644 --- a/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditTriggerDialog.kt +++ b/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditTriggerDialog.kt @@ -6,7 +6,7 @@ import android.view.View import android.view.ViewGroup import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.automation.databinding.AutomationDialogEditTriggerBinding import app.aaps.plugins.automation.events.EventAutomationUpdateTrigger import app.aaps.plugins.automation.events.EventTriggerChanged diff --git a/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/services/LocationService.kt b/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/services/LocationService.kt index 5c754d2099..be75bdb19b 100644 --- a/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/services/LocationService.kt +++ b/plugins/automation/src/main/kotlin/app/aaps/plugins/automation/services/LocationService.kt @@ -22,7 +22,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventAppExit import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.T -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.automation.R import app.aaps.plugins.automation.events.EventLocationChange import com.google.android.gms.location.LocationServices diff --git a/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/BolusTimerImplTest.kt b/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/BolusTimerImplTest.kt index 4bbad52c94..05c5a35952 100644 --- a/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/BolusTimerImplTest.kt +++ b/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/BolusTimerImplTest.kt @@ -10,7 +10,7 @@ import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.automation.services.LocationServiceHelper import app.aaps.plugins.automation.triggers.Trigger import app.aaps.plugins.automation.ui.TimerUtil diff --git a/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/CarbTimerImplTest.kt b/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/CarbTimerImplTest.kt index 9a9e92063c..cdc4949442 100644 --- a/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/CarbTimerImplTest.kt +++ b/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/CarbTimerImplTest.kt @@ -10,7 +10,7 @@ import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.automation.services.LocationServiceHelper import app.aaps.plugins.automation.triggers.Trigger import app.aaps.plugins.automation.ui.TimerUtil diff --git a/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/configBuilder/ConfigBuilderFragment.kt b/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/configBuilder/ConfigBuilderFragment.kt index 471abec321..ef53c6dcff 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/configBuilder/ConfigBuilderFragment.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/configBuilder/ConfigBuilderFragment.kt @@ -14,7 +14,7 @@ import app.aaps.core.interfaces.protection.ProtectionCheck.Protection.PREFERENCE import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.ui.UiInteraction -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.configuration.R import app.aaps.plugins.configuration.configBuilder.events.EventConfigBuilderUpdateGui import app.aaps.plugins.configuration.databinding.ConfigbuilderFragmentBinding diff --git a/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/MaintenanceFragment.kt b/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/MaintenanceFragment.kt index 06c7369772..61bc51211b 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/MaintenanceFragment.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/maintenance/MaintenanceFragment.kt @@ -25,8 +25,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.sync.DataSyncSelectorXdrip import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.graph.OverviewData -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.utils.HtmlHelper import app.aaps.database.entities.UserEntry.Action diff --git a/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/SetupWizardActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/SetupWizardActivity.kt index 39aff3bd55..1b952e2bf1 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/SetupWizardActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/SetupWizardActivity.kt @@ -18,7 +18,7 @@ import app.aaps.core.interfaces.rx.events.EventSWSyncStatus import app.aaps.core.interfaces.rx.events.EventSWUpdate import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.locale.LocaleHelper.update import app.aaps.plugins.configuration.R diff --git a/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWPlugin.kt b/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWPlugin.kt index 05f6d514c5..99324aed19 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWPlugin.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/plugins/configuration/setupwizard/elements/SWPlugin.kt @@ -7,7 +7,7 @@ import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.plugin.PluginType import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.ui.UiInteraction -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.configuration.configBuilder.events.EventConfigBuilderUpdateGui import app.aaps.plugins.configuration.setupwizard.SWDefinition import dagger.android.HasAndroidInjector diff --git a/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt index bd77df8941..3c2e801e6a 100644 --- a/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt @@ -1,7 +1,6 @@ package app.aaps.plugins.constraints.bgQualityCheck import androidx.annotation.DrawableRes -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck import app.aaps.core.interfaces.constraints.Constraint import app.aaps.core.interfaces.constraints.PluginConstraints @@ -18,6 +17,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventBucketedDataCreated import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.HasAndroidInjector import info.nightscout.plugins.constraints.R import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesFragment.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesFragment.kt index 333e03528a..20876fd14d 100644 --- a/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesFragment.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/ObjectivesFragment.kt @@ -26,20 +26,20 @@ import app.aaps.core.interfaces.rx.events.EventNtpStatus import app.aaps.core.interfaces.rx.events.EventSWUpdate import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.utils.HtmlHelper import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.ValueWithUnit -import dagger.android.support.DaggerFragment -import info.nightscout.plugins.constraints.R -import info.nightscout.plugins.constraints.databinding.ObjectivesFragmentBinding -import info.nightscout.plugins.constraints.databinding.ObjectivesItemBinding import app.aaps.plugins.constraints.objectives.activities.ObjectivesExamDialog import app.aaps.plugins.constraints.objectives.dialogs.NtpProgressDialog import app.aaps.plugins.constraints.objectives.events.EventObjectivesUpdateGui import app.aaps.plugins.constraints.objectives.objectives.Objective.ExamTask +import dagger.android.support.DaggerFragment +import info.nightscout.plugins.constraints.R +import info.nightscout.plugins.constraints.databinding.ObjectivesFragmentBinding +import info.nightscout.plugins.constraints.databinding.ObjectivesItemBinding import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git a/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt index 37fd6367b6..7616477109 100644 --- a/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt +++ b/plugins/constraints/src/main/kotlin/app/aaps/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt @@ -5,13 +5,13 @@ import android.os.SystemClock import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventNtpStatus +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.support.DaggerDialogFragment import info.nightscout.plugins.constraints.databinding.DialogNtpProgressBinding import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt b/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt index ebbe467a9b..538a9efd64 100644 --- a/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt +++ b/plugins/constraints/src/test/kotlin/app/aaps/plugins/constraints/bgQualityCheck/BgQualityCheckPluginTest.kt @@ -8,10 +8,9 @@ import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.database.entities.GlucoseValue -import app.aaps.plugins.constraints.bgQualityCheck.BgQualityCheckPlugin import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt index 33be2cc5a2..a28b0b1e7d 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt @@ -33,6 +33,7 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.MidnightTime import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.convertedToAbsolute import app.aaps.core.main.extensions.iobCalc import app.aaps.core.main.extensions.toTemporaryBasal @@ -42,7 +43,6 @@ import app.aaps.core.main.iob.copy import app.aaps.core.main.iob.determineBasalJson import app.aaps.core.main.iob.plus import app.aaps.core.main.iob.round -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.workflow.CalculationWorkflow import app.aaps.database.ValueWrapper import app.aaps.database.entities.Bolus diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/actions/ActionsFragment.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/actions/ActionsFragment.kt index 78771f25cc..c7b9601999 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/actions/ActionsFragment.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/actions/ActionsFragment.kt @@ -31,9 +31,9 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.toStringMedium import app.aaps.core.main.extensions.toStringShort -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.UIRunnable import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.elements.SingleClickButton diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/food/FoodFragment.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/food/FoodFragment.kt index d8261edb91..f326ff4791 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/food/FoodFragment.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/food/FoodFragment.kt @@ -21,7 +21,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventFoodDatabaseChanged import app.aaps.core.interfaces.ui.UiInteraction -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.UIRunnable import app.aaps.core.ui.dialogs.OKDialog import app.aaps.database.entities.Food diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt index 16bd440723..275cce6216 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewFragment.kt @@ -76,12 +76,12 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.TrendCalculator +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.extensions.directionToIcon import app.aaps.core.main.graph.OverviewData import app.aaps.core.main.iob.displayText import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.wizard.QuickWizard import app.aaps.core.ui.UIRunnable import app.aaps.core.ui.dialogs.OKDialog diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt index 133bbe3c0a..771a47d5f5 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewMenusImpl.kt @@ -19,7 +19,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventRefreshOverview import app.aaps.core.interfaces.rx.events.EventScale import app.aaps.core.interfaces.sharedPreferences.SP -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.main.R import com.google.gson.Gson import javax.inject.Inject diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewPlugin.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewPlugin.kt index ad0000a770..5cdadaed99 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewPlugin.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/overview/OverviewPlugin.kt @@ -20,6 +20,7 @@ import app.aaps.core.interfaces.rx.events.EventNewHistoryData import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import app.aaps.core.interfaces.rx.events.EventUpdateOverviewCalcProgress import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.events.EventIobCalculationProgress import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.graph.OverviewData @@ -30,7 +31,6 @@ import app.aaps.core.main.utils.extensions.storeBoolean import app.aaps.core.main.utils.extensions.storeDouble import app.aaps.core.main.utils.extensions.storeInt import app.aaps.core.main.utils.extensions.storeString -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.validators.ValidatingEditTextPreference import app.aaps.plugins.main.R diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/DummyService.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/DummyService.kt index 7832bc2577..c17c2d0e88 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/DummyService.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/DummyService.kt @@ -11,7 +11,7 @@ import app.aaps.core.interfaces.notifications.NotificationHolder import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventAppExit -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.DaggerService import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/PersistentNotificationPlugin.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/PersistentNotificationPlugin.kt index f545709407..e9f46e8f65 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/PersistentNotificationPlugin.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/persistentNotification/PersistentNotificationPlugin.kt @@ -26,10 +26,10 @@ import app.aaps.core.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.rx.events.EventRefreshOverview import app.aaps.core.interfaces.ui.IconsProvider import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.toStringShort import app.aaps.core.main.iob.generateCOBString import app.aaps.core.main.iob.round -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.plugins.main.R import dagger.android.HasAndroidInjector import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorFragment.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorFragment.kt index df59b2b61c..310952cb8f 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorFragment.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorFragment.kt @@ -9,7 +9,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.smsCommunicator.Sms import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import app.aaps.core.interfaces.utils.DateUtil -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.utils.HtmlHelper import app.aaps.plugins.main.databinding.SmscommunicatorFragmentBinding import app.aaps.plugins.main.general.smsCommunicator.events.EventSmsCommunicatorUpdateGui diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorPlugin.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorPlugin.kt index a8a10c0410..ac8d67dbc4 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorPlugin.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/SmsCommunicatorPlugin.kt @@ -46,11 +46,11 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.iob.generateCOBString import app.aaps.core.main.iob.round -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.utils.worker.LoggingWorker import app.aaps.core.utils.receivers.DataWorkerStorage import app.aaps.core.validators.ValidatingEditTextPreference diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt index eaaa1f87df..2ad26795a3 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt @@ -13,7 +13,7 @@ import android.view.WindowManager import app.aaps.core.interfaces.logging.UserEntryLogger import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearFragment.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearFragment.kt index 543dd4b05f..acda63dfc0 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearFragment.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearFragment.kt @@ -19,7 +19,7 @@ import app.aaps.core.interfaces.rx.weardata.EventData import app.aaps.core.interfaces.rx.weardata.ResFileMap import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.toast.ToastUtils import app.aaps.plugins.main.R import app.aaps.plugins.main.databinding.WearFragmentBinding diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearPlugin.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearPlugin.kt index 960a55befc..dca07701f7 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearPlugin.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/WearPlugin.kt @@ -20,7 +20,7 @@ import app.aaps.core.interfaces.rx.weardata.CwfData import app.aaps.core.interfaces.rx.weardata.CwfMetadataKey import app.aaps.core.interfaces.rx.weardata.EventData import app.aaps.core.interfaces.sharedPreferences.SP -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.main.R import app.aaps.plugins.main.general.wear.wearintegration.DataHandlerMobile import app.aaps.plugins.main.general.wear.wearintegration.DataLayerListenerServiceMobileHelper diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/activities/CwfInfosActivity.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/activities/CwfInfosActivity.kt index dc98255dd8..da5087d9ad 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/activities/CwfInfosActivity.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/activities/CwfInfosActivity.kt @@ -21,8 +21,8 @@ import app.aaps.core.interfaces.rx.weardata.ResFileMap import app.aaps.core.interfaces.rx.weardata.ViewKeys import app.aaps.core.interfaces.rx.weardata.ZipWatchfaceFormat import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.plugins.main.R import app.aaps.plugins.main.databinding.CwfInfosActivityBinding diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataHandlerMobile.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataHandlerMobile.kt index d05105cd10..c656803333 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataHandlerMobile.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataHandlerMobile.kt @@ -39,6 +39,7 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.TrendCalculator +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.extensions.convertedToAbsolute import app.aaps.core.main.extensions.toStringShort @@ -46,7 +47,6 @@ import app.aaps.core.main.extensions.valueToUnits import app.aaps.core.main.graph.data.GlucoseValueDataPoint import app.aaps.core.main.iob.generateCOBString import app.aaps.core.main.iob.round -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.wizard.BolusWizard import app.aaps.core.main.wizard.QuickWizard import app.aaps.core.main.wizard.QuickWizardEntry diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataLayerListenerServiceMobile.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataLayerListenerServiceMobile.kt index 5f89f9ef09..ec3685409c 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataLayerListenerServiceMobile.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/general/wear/wearintegration/DataLayerListenerServiceMobile.kt @@ -18,7 +18,7 @@ import app.aaps.core.interfaces.rx.events.EventMobileToWear import app.aaps.core.interfaces.rx.events.EventWearUpdateGui import app.aaps.core.interfaces.rx.weardata.EventData import app.aaps.core.interfaces.sharedPreferences.SP -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.database.impl.AppRepository import app.aaps.plugins.main.R import app.aaps.plugins.main.general.wear.WearPlugin diff --git a/plugins/main/src/main/kotlin/app/aaps/plugins/main/profile/ProfileFragment.kt b/plugins/main/src/main/kotlin/app/aaps/plugins/main/profile/ProfileFragment.kt index f621a5cc0b..5eb7f3d41d 100644 --- a/plugins/main/src/main/kotlin/app/aaps/plugins/main/profile/ProfileFragment.kt +++ b/plugins/main/src/main/kotlin/app/aaps/plugins/main/profile/ProfileFragment.kt @@ -26,8 +26,8 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.SafeParse +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.database.entities.UserEntry import app.aaps.database.entities.ValueWithUnit diff --git a/plugins/source/src/main/kotlin/app/aaps/plugins/source/BGSourceFragment.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/BGSourceFragment.kt index fb5e4f67cb..e6b02b1e07 100644 --- a/plugins/source/src/main/kotlin/app/aaps/plugins/source/BGSourceFragment.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/BGSourceFragment.kt @@ -28,9 +28,9 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventNewBG import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.directionToIcon import app.aaps.core.main.utils.ActionModeHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.database.entities.GlucoseValue import app.aaps.database.entities.UserEntry.Action diff --git a/plugins/source/src/main/kotlin/app/aaps/plugins/source/GlunovoPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/GlunovoPlugin.kt index 91e2863418..5c0ffbfd65 100644 --- a/plugins/source/src/main/kotlin/app/aaps/plugins/source/GlunovoPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/GlunovoPlugin.kt @@ -16,7 +16,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.source.BgSource import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.database.entities.GlucoseValue import app.aaps.database.entities.TherapyEvent import app.aaps.database.entities.UserEntry diff --git a/plugins/source/src/main/kotlin/app/aaps/plugins/source/IntelligoPlugin.kt b/plugins/source/src/main/kotlin/app/aaps/plugins/source/IntelligoPlugin.kt index a931ab3117..b46843d241 100644 --- a/plugins/source/src/main/kotlin/app/aaps/plugins/source/IntelligoPlugin.kt +++ b/plugins/source/src/main/kotlin/app/aaps/plugins/source/IntelligoPlugin.kt @@ -18,7 +18,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.source.BgSource import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.database.entities.GlucoseValue import app.aaps.database.entities.TherapyEvent import app.aaps.database.entities.UserEntry diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt index dfc0fc9bdf..a4c8fb3c9e 100644 --- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt +++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/dataBroadcaster/DataBroadcastPlugin.kt @@ -28,10 +28,10 @@ import app.aaps.core.interfaces.rx.events.EventLoopUpdateGui import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.durationInMinutes import app.aaps.core.main.extensions.toStringFull import app.aaps.core.main.iob.round -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.plugins.sync.R import app.aaps.shared.impl.extensions.safeQueryBroadcastReceivers import dagger.android.HasAndroidInjector diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsShared/NSClientFragment.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsShared/NSClientFragment.kt index 9fdccfc397..b3b0d61e12 100644 --- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsShared/NSClientFragment.kt +++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsShared/NSClientFragment.kt @@ -30,7 +30,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventNSClientNewLog import app.aaps.core.interfaces.rx.events.EventNSClientRestart import app.aaps.core.interfaces.sharedPreferences.SP -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.utils.HtmlHelper import app.aaps.database.entities.UserEntry diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/NSClientPlugin.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/NSClientPlugin.kt index 30442830b0..bd14432a61 100644 --- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/NSClientPlugin.kt +++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/NSClientPlugin.kt @@ -32,8 +32,8 @@ import app.aaps.core.interfaces.sync.NsClient import app.aaps.core.interfaces.sync.Sync import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.toJson -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.plugins.sync.R import app.aaps.plugins.sync.nsShared.NSClientFragment import app.aaps.plugins.sync.nsShared.events.EventNSClientStatus diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/ReceiverDelegate.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/ReceiverDelegate.kt index 944e8e0ffd..cf20d81516 100644 --- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/ReceiverDelegate.kt +++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/ReceiverDelegate.kt @@ -9,7 +9,7 @@ import app.aaps.core.interfaces.rx.events.EventChargingState import app.aaps.core.interfaces.rx.events.EventNetworkChange import app.aaps.core.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.sharedPreferences.SP -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.sync.R import app.aaps.plugins.sync.nsShared.events.EventConnectivityOptionChanged import io.reactivex.rxjava3.disposables.CompositeDisposable diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/services/NSClientService.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/services/NSClientService.kt index 436945ce33..fe4bb89b3b 100644 --- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/services/NSClientService.kt +++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclient/services/NSClientService.kt @@ -24,8 +24,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T.Companion.mins +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.events.EventNewNotification -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.nssdk.localmodel.devicestatus.NSDeviceStatus import app.aaps.core.utils.JsonHelper.safeGetString import app.aaps.core.utils.JsonHelper.safeGetStringAllowNull diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/NSClientV3Plugin.kt index 970857c0be..284874ec86 100644 --- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/NSClientV3Plugin.kt +++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/nsclientV3/NSClientV3Plugin.kt @@ -47,7 +47,7 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.nssdk.NSAndroidClientImpl import app.aaps.core.nssdk.interfaces.NSAndroidClient import app.aaps.core.nssdk.mapper.toNSDeviceStatus diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/tidepool/TidepoolFragment.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/tidepool/TidepoolFragment.kt index 4b4629ec84..d1fefe3e0d 100644 --- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/tidepool/TidepoolFragment.kt +++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/tidepool/TidepoolFragment.kt @@ -15,7 +15,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.sync.R import app.aaps.plugins.sync.databinding.TidepoolFragmentBinding import app.aaps.plugins.sync.tidepool.comm.TidepoolUploader diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/tidepool/TidepoolPlugin.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/tidepool/TidepoolPlugin.kt index de99411edb..7f15472842 100644 --- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/tidepool/TidepoolPlugin.kt +++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/tidepool/TidepoolPlugin.kt @@ -22,7 +22,7 @@ import app.aaps.core.interfaces.sync.Sync import app.aaps.core.interfaces.sync.Tidepool import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.T -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.utils.HtmlHelper import app.aaps.plugins.sync.R import app.aaps.plugins.sync.nsShared.events.EventConnectivityOptionChanged diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/xdrip/XdripFragment.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/xdrip/XdripFragment.kt index eb64020c88..7db27d3e91 100644 --- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/xdrip/XdripFragment.kt +++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/xdrip/XdripFragment.kt @@ -20,7 +20,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.plugins.sync.R import app.aaps.plugins.sync.databinding.XdripFragmentBinding diff --git a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/xdrip/XdripPlugin.kt b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/xdrip/XdripPlugin.kt index 8a572c6af5..9e02360d10 100644 --- a/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/xdrip/XdripPlugin.kt +++ b/plugins/sync/src/main/kotlin/app/aaps/plugins/sync/xdrip/XdripPlugin.kt @@ -39,10 +39,10 @@ import app.aaps.core.interfaces.sync.XDripBroadcast import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.toStringShort import app.aaps.core.main.iob.generateCOBString import app.aaps.core.main.iob.round -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.toast.ToastUtils import app.aaps.core.utils.HtmlHelper import app.aaps.plugins.sync.R diff --git a/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclient/ReceiverDelegateTest.kt b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclient/ReceiverDelegateTest.kt index 5558016d8d..4b14f655a5 100644 --- a/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclient/ReceiverDelegateTest.kt +++ b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclient/ReceiverDelegateTest.kt @@ -5,7 +5,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.events.EventChargingState import app.aaps.core.interfaces.rx.events.EventNetworkChange import app.aaps.core.interfaces.sharedPreferences.SP -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.sync.R import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat diff --git a/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt index f6c9dd82b5..c69d8c45f9 100644 --- a/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt +++ b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt @@ -5,7 +5,7 @@ import androidx.work.ListenableWorker.Result.Success import androidx.work.testing.TestListenableWorkerBuilder import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.sync.NsClient -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.plugins.sync.nsclientV3.DataSyncSelectorV3 import app.aaps.plugins.sync.nsclientV3.NSClientV3Plugin import app.aaps.shared.tests.TestBase diff --git a/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt index 16bde12e49..6c6ca3f05d 100644 --- a/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt +++ b/plugins/sync/src/test/kotlin/app/aaps/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt @@ -15,7 +15,7 @@ import app.aaps.core.interfaces.source.NSClientSource import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.nssdk.interfaces.NSAndroidClient import app.aaps.core.nssdk.remotemodel.LastModified import app.aaps.core.utils.receivers.DataWorkerStorage diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt index 9f982b6c96..6bba1c7b0c 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboFragment.kt @@ -7,7 +7,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.core.interfaces.resources.ResourceHelper @@ -15,6 +14,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventQueueChanged import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.support.DaggerFragment import info.nightscout.pump.combo.data.ComboErrorUtil import info.nightscout.pump.combo.data.ComboErrorUtil.DisplayType diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt index 84ce1b23fa..a0bfb4488a 100644 --- a/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt +++ b/pump/dana/src/main/java/info/nightscout/pump/dana/DanaFragment.kt @@ -9,7 +9,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -34,8 +33,9 @@ import app.aaps.core.interfaces.userEntry.UserEntryMapper.Action import app.aaps.core.interfaces.userEntry.UserEntryMapper.Sources import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import dagger.android.support.DaggerFragment +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog +import dagger.android.support.DaggerFragment import info.nightscout.pump.dana.activities.DanaHistoryActivity import info.nightscout.pump.dana.activities.DanaUserOptionsActivity import info.nightscout.pump.dana.databinding.DanarFragmentBinding diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt index fabc5db86b..88a76dc972 100644 --- a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt +++ b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaHistoryActivity.kt @@ -8,7 +8,6 @@ import android.widget.AdapterView import android.widget.ArrayAdapter import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin @@ -25,6 +24,7 @@ import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.dana.R import info.nightscout.pump.dana.comm.RecordTypes diff --git a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt index 08c08ed938..809f2a63ef 100644 --- a/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt +++ b/pump/dana/src/main/java/info/nightscout/pump/dana/activities/DanaUserOptionsActivity.kt @@ -2,7 +2,6 @@ package info.nightscout.pump.dana.activities import android.content.Context import android.os.Bundle -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -15,6 +14,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventInitializationChanged import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.R diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt index a54dff1916..3ccd7348b3 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt @@ -6,8 +6,6 @@ import android.content.Intent import android.content.ServiceConnection import android.os.IBinder import app.aaps.annotations.OpenForTesting -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -30,6 +28,8 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.Round +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.main.constraints.ConstraintObject import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService import info.nightscout.androidaps.danar.AbstractDanaRPlugin diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java index c166dcc53d..8c6649f95d 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java @@ -12,8 +12,6 @@ import javax.inject.Inject; import javax.inject.Singleton; import app.aaps.annotations.OpenForTesting; -import app.aaps.core.main.constraints.ConstraintObject; -import app.aaps.core.main.utils.fabric.FabricPrivacy; import app.aaps.core.interfaces.constraints.ConstraintsChecker; import app.aaps.core.interfaces.logging.AAPSLogger; import app.aaps.core.interfaces.logging.LTag; @@ -37,6 +35,8 @@ import app.aaps.core.interfaces.utils.DateUtil; import app.aaps.core.interfaces.utils.DecimalFormatter; import app.aaps.core.interfaces.utils.Round; import app.aaps.core.interfaces.utils.T; +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy; +import app.aaps.core.main.constraints.ConstraintObject; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService; import info.nightscout.androidaps.danar.AbstractDanaRPlugin; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java index b0ca803e80..6740bef327 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java @@ -12,8 +12,6 @@ import javax.inject.Inject; import javax.inject.Singleton; import app.aaps.annotations.OpenForTesting; -import app.aaps.core.main.constraints.ConstraintObject; -import app.aaps.core.main.utils.fabric.FabricPrivacy; import app.aaps.core.interfaces.constraints.ConstraintsChecker; import app.aaps.core.interfaces.logging.AAPSLogger; import app.aaps.core.interfaces.logging.LTag; @@ -35,6 +33,8 @@ import app.aaps.core.interfaces.ui.UiInteraction; import app.aaps.core.interfaces.utils.DateUtil; import app.aaps.core.interfaces.utils.DecimalFormatter; import app.aaps.core.interfaces.utils.Round; +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy; +import app.aaps.core.main.constraints.ConstraintObject; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.danar.services.DanaRExecutionService; import info.nightscout.pump.dana.DanaPump; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java index 857b538390..bfbcaea03a 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java @@ -20,7 +20,6 @@ import java.util.UUID; import javax.inject.Inject; -import app.aaps.core.main.utils.fabric.FabricPrivacy; import app.aaps.core.interfaces.logging.AAPSLogger; import app.aaps.core.interfaces.logging.LTag; import app.aaps.core.interfaces.notifications.Notification; @@ -38,6 +37,8 @@ import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged; import app.aaps.core.interfaces.sharedPreferences.SP; import app.aaps.core.interfaces.ui.UiInteraction; import app.aaps.core.interfaces.utils.DateUtil; +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy; +import app.aaps.core.ui.toast.ToastUtils; import dagger.android.DaggerService; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.danar.R; @@ -55,7 +56,6 @@ import info.nightscout.androidaps.danar.comm.MsgHistoryRefill; import info.nightscout.androidaps.danar.comm.MsgHistorySuspend; import info.nightscout.androidaps.danar.comm.MsgPCCommStart; import info.nightscout.androidaps.danar.comm.MsgPCCommStop; -import app.aaps.core.ui.toast.ToastUtils; import info.nightscout.pump.dana.DanaPump; import info.nightscout.pump.dana.comm.RecordTypes; import io.reactivex.rxjava3.disposables.CompositeDisposable; diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt index 0244ad3127..acd242c277 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/DanaRSPlugin.kt @@ -7,8 +7,6 @@ import android.content.ServiceConnection import android.os.IBinder import android.text.format.DateFormat import androidx.preference.Preference -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.constraints.Constraint import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.constraints.PluginConstraints @@ -45,8 +43,10 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.T -import dagger.android.HasAndroidInjector +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.ui.toast.ToastUtils +import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.DanaFragment import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.comm.RecordTypes diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt index 2201a7769b..d244d9fcdb 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/EnterPinActivity.kt @@ -7,7 +7,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import app.aaps.core.interfaces.sharedPreferences.SP -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.utils.hexStringToByteArray diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt index c0e7344801..e5d08ddb9e 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/dialogs/PairingProgressDialog.kt @@ -9,10 +9,10 @@ import android.view.View import android.view.ViewGroup import android.view.Window import android.view.WindowManager -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.support.DaggerDialogFragment import info.nightscout.pump.danars.activities.PairingHelperActivity import info.nightscout.pump.danars.databinding.DanarsPairingProgressDialogBinding diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt index e1ac8c8467..f62a832b41 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/DanaRSService.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.os.Binder import android.os.IBinder import android.os.SystemClock -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.logging.AAPSLogger @@ -33,6 +32,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.DaggerService import dagger.android.HasAndroidInjector import info.nightscout.pump.dana.DanaPump diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt index 964e278d8a..84b6e1dd1e 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Fragment.kt @@ -8,7 +8,6 @@ import android.os.HandlerThread import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin @@ -27,6 +26,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.support.DaggerFragment import info.nightscout.pump.diaconn.activities.DiaconnG8HistoryActivity import info.nightscout.pump.diaconn.activities.DiaconnG8UserOptionsActivity diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt index ac2aa5edb7..96ebe852ac 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/DiaconnG8Plugin.kt @@ -8,8 +8,6 @@ import android.os.IBinder import android.text.format.DateFormat import androidx.preference.Preference import androidx.preference.PreferenceFragmentCompat -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.constraints.Constraint import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.constraints.PluginConstraints @@ -48,8 +46,10 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.T -import dagger.android.HasAndroidInjector +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.ui.toast.ToastUtils +import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.database.DiaconnHistoryDatabase import info.nightscout.pump.diaconn.events.EventDiaconnG8DeviceChange import info.nightscout.pump.diaconn.service.DiaconnG8Service diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt index 5bdc24cf81..e1e59482f2 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt @@ -9,7 +9,6 @@ import android.widget.ArrayAdapter import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.queue.Callback @@ -21,6 +20,7 @@ import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.diaconn.R import info.nightscout.pump.diaconn.common.RecordTypes diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt index 7c95ad3e7c..0ae28d6e71 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8UserOptionsActivity.kt @@ -5,7 +5,6 @@ import android.os.Bundle import android.view.View import android.widget.AdapterView import android.widget.ArrayAdapter -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin @@ -14,6 +13,7 @@ import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.diaconn.DiaconnG8Pump diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt index 5a926c4f74..37436308c4 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/DiaconnG8Service.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.os.Binder import android.os.IBinder import android.os.SystemClock -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -32,6 +31,7 @@ import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.DaggerService import dagger.android.HasAndroidInjector import info.nightscout.pump.diaconn.DiaconnG8Plugin diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt index 78ed7e1b27..89d28165fd 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt @@ -1,7 +1,6 @@ package info.nightscout.androidaps.plugins.pump.eopatch import android.os.SystemClock -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.notifications.Notification @@ -32,6 +31,7 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.eopatch.alarm.IAlarmManager import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPatchManager diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt index ad4258368c..c64bd1e253 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt @@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.pump.eopatch.alarm import android.content.Context import android.content.Intent -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.notifications.Notification @@ -15,6 +14,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import info.nightscout.androidaps.plugins.pump.eopatch.EoPatchRxBus import info.nightscout.androidaps.plugins.pump.eopatch.R import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.A005 diff --git 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 index 6f3d6c02b1..7e455f238e 100644 --- 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 @@ -8,7 +8,6 @@ import android.os.HandlerThread import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin @@ -26,6 +25,8 @@ import app.aaps.core.interfaces.rx.events.EventRefreshButtonState import app.aaps.core.interfaces.rx.events.EventTempBasalChange import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.ui.dialogs.OKDialog import dagger.android.support.DaggerFragment import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState @@ -40,7 +41,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.driver.MedtronicPumpSta import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpValuesChanged import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil -import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.pump.common.defs.PumpDeviceState import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt index 615db4d16e..e70142a1a0 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/MedtronicPumpPlugin.kt @@ -34,7 +34,7 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.TimeChangeType -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.utils.DateTimeUtil import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt index abb67c58cc..e40762b526 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/MedtrumPlugin.kt @@ -11,8 +11,6 @@ import android.text.format.DateFormat import androidx.preference.EditTextPreference import androidx.preference.ListPreference import androidx.preference.PreferenceFragmentCompat -import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -46,10 +44,12 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.TimeChangeType -import dagger.android.HasAndroidInjector +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils import app.aaps.core.validators.ValidatingEditTextPreference +import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.comm.enums.MedtrumPumpState import info.nightscout.pump.medtrum.services.MedtrumService import info.nightscout.pump.medtrum.ui.MedtrumOverviewFragment diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt index eb0448d5ff..91057b7aaf 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/MedtrumService.kt @@ -6,7 +6,6 @@ import android.content.Intent import android.os.Binder import android.os.IBinder import android.os.SystemClock -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -32,6 +31,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.DaggerService import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumPlugin diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt index bc8c0493a2..47a3f9c819 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/OmnipodDashPumpPlugin.kt @@ -41,7 +41,7 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.TimeChangeType -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.utils.DateTimeUtil import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType diff --git 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 index 73088348b5..88f9c87be3 100644 --- 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 @@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui import android.content.Context import android.content.Intent import android.os.Bundle -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.queue.CommandQueue @@ -12,6 +11,9 @@ import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventQueueChanged import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.dialogs.OKDialog import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.queue.command.CommandPlayTestBeep import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.PodActivationWizardActivity @@ -20,8 +22,6 @@ 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 app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity -import app.aaps.core.ui.dialogs.OKDialog import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git 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 index 39e82a5943..31266c0a8c 100644 --- 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 @@ -8,7 +8,6 @@ import android.os.SystemClock import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.notifications.Notification @@ -25,6 +24,9 @@ import app.aaps.core.interfaces.rx.events.EventQueueChanged import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.ui.UIRunnable +import app.aaps.core.ui.dialogs.OKDialog import dagger.android.support.DaggerFragment import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewButtonsBinding import info.nightscout.androidaps.plugins.pump.omnipod.common.databinding.OmnipodCommonOverviewPodInfoBinding @@ -41,8 +43,6 @@ 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 app.aaps.core.ui.UIRunnable -import app.aaps.core.ui.dialogs.OKDialog import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import org.apache.commons.lang3.StringUtils diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt index ca94c110ae..c55a459c6e 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/wizard/activation/viewmodel/action/DashInsertCannulaViewModel.kt @@ -1,7 +1,6 @@ package info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.viewmodel.action import androidx.annotation.StringRes -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.notifications.Notification @@ -15,6 +14,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventDismissNotification import app.aaps.core.interfaces.sharedPreferences.SP +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.omnipod.common.definition.OmnipodCommandType import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.InsertCannulaViewModel diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java index 86d7c7aa81..a308bb6b10 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java @@ -67,7 +67,7 @@ import app.aaps.core.interfaces.utils.DecimalFormatter; import app.aaps.core.interfaces.utils.Round; import app.aaps.core.interfaces.utils.T; import app.aaps.core.interfaces.utils.TimeChangeType; -import app.aaps.core.main.utils.fabric.FabricPrivacy; +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy; import app.aaps.core.utils.DateTimeUtil; import dagger.android.HasAndroidInjector; import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange; diff --git 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 index 307ce6cadb..95c58fd590 100644 --- 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 @@ -5,7 +5,6 @@ import android.content.Intent import android.os.Bundle import android.os.Handler import android.os.HandlerThread -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.queue.Callback @@ -15,6 +14,9 @@ import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventQueueChanged import app.aaps.core.interfaces.ui.UiInteraction +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.dialogs.OKDialog import dagger.android.HasAndroidInjector import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.dialog.RileyLinkStatusActivity @@ -33,8 +35,6 @@ 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 app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity -import app.aaps.core.ui.dialogs.OKDialog import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git 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 index a5acdad887..6f0ffd5450 100644 --- 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 @@ -8,7 +8,6 @@ import android.text.TextUtils import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.notifications.Notification import app.aaps.core.interfaces.plugin.ActivePlugin @@ -24,6 +23,8 @@ import app.aaps.core.interfaces.rx.events.EventQueueChanged import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.ui.dialogs.OKDialog import dagger.android.support.DaggerFragment import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState @@ -49,7 +50,6 @@ 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 app.aaps.core.ui.dialogs.OKDialog import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import org.apache.commons.lang3.StringUtils diff --git a/pump/pump-common/build.gradle b/pump/pump-common/build.gradle index 1f69307954..1eac553e61 100644 --- a/pump/pump-common/build.gradle +++ b/pump/pump-common/build.gradle @@ -16,7 +16,6 @@ android { dependencies { implementation project(':core:interfaces') - implementation project(':core:main') implementation project(':core:utils') implementation('com.thoughtworks.xstream:xstream:1.4.20') { diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt index 78b016968d..b204793e3a 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/PumpPluginAbstract.kt @@ -4,7 +4,6 @@ import android.content.Context import android.content.Intent import android.content.ServiceConnection import android.text.format.DateFormat -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.constraints.PluginConstraints import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag @@ -30,6 +29,7 @@ import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import com.google.gson.Gson import com.google.gson.GsonBuilder import dagger.android.HasAndroidInjector diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt index 2ec74087bd..a4dd016ac6 100644 --- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt +++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpFragment.kt @@ -6,8 +6,6 @@ import android.os.HandlerThread import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import app.aaps.core.main.extensions.toStringFull -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.iob.IobCobCalculator import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.pump.defs.DoseStepSize @@ -21,6 +19,8 @@ import app.aaps.core.interfaces.rx.events.EventTempBasalChange import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.main.extensions.toStringFull import dagger.android.support.DaggerFragment import info.nightscout.pump.virtual.databinding.VirtualPumpFragmentBinding import info.nightscout.pump.virtual.events.EventVirtualPumpUpdateGui diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt index c85058413e..b7bc75cdee 100644 --- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt +++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/VirtualPumpPlugin.kt @@ -34,10 +34,10 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.TimeChangeType +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.extensions.convertedToAbsolute import app.aaps.core.main.extensions.plannedRemainingMinutes -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.utils.fabric.InstanceId import dagger.android.HasAndroidInjector import info.nightscout.pump.virtual.events.EventVirtualPumpUpdateGui diff --git a/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt b/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt index 87d569ab52..639275a25d 100644 --- a/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt +++ b/pump/virtual/src/test/java/info/nightscout/pump/virtual/VirtualPumpPluginUTest.kt @@ -1,6 +1,5 @@ package info.nightscout.pump.virtual -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.db.PersistenceLayer import app.aaps.core.interfaces.iob.IobCobCalculator @@ -12,6 +11,7 @@ import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.shared.tests.TestBase import dagger.android.AndroidInjector import org.junit.jupiter.api.Assertions diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt index 664083d83a..7adbd5f31f 100644 --- a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt +++ b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt @@ -13,9 +13,9 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.pureProfileFromJson import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.database.entities.EffectiveProfileSwitch import app.aaps.database.entities.embedments.InsulinConfiguration import app.aaps.implementation.profile.ProfileStoreObject diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/ProfileHelperActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/ProfileHelperActivity.kt index 66562a4f58..cc26c98954 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/ProfileHelperActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/ProfileHelperActivity.kt @@ -18,8 +18,8 @@ import app.aaps.core.interfaces.stats.TddCalculator import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.profile.ProfileSealed -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/QuickWizardListActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/QuickWizardListActivity.kt index 2f3975914a..182dc3177e 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/QuickWizardListActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/QuickWizardListActivity.kt @@ -16,16 +16,16 @@ import androidx.fragment.app.FragmentManager import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import app.aaps.core.main.utils.ActionModeHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy -import app.aaps.core.main.wizard.QuickWizard -import app.aaps.core.main.wizard.QuickWizardEntry import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy +import app.aaps.core.main.utils.ActionModeHelper +import app.aaps.core.main.wizard.QuickWizard +import app.aaps.core.main.wizard.QuickWizardEntry import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.dragHelpers.ItemTouchHelperAdapter diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/StatsActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/StatsActivity.kt index 13adcabdf1..4c0d080105 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/StatsActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/StatsActivity.kt @@ -11,7 +11,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.stats.DexcomTirCalculator import app.aaps.core.interfaces.stats.TddCalculator import app.aaps.core.interfaces.stats.TirCalculator -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.core.ui.dialogs.OKDialog import app.aaps.database.entities.UserEntry.Action diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/TDDStatsActivity.kt b/ui/src/main/kotlin/app/aaps/ui/activities/TDDStatsActivity.kt index 73a1e28706..cd9f715f31 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/TDDStatsActivity.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/TDDStatsActivity.kt @@ -28,7 +28,7 @@ import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.T -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import app.aaps.database.entities.TotalDailyDose import app.aaps.database.impl.AppRepository diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt index 9f6c333ce2..d489828a9e 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt @@ -29,9 +29,9 @@ import app.aaps.core.interfaces.rx.events.EventTreatmentChange import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.iobCalc import app.aaps.core.main.utils.ActionModeHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils import app.aaps.database.entities.Bolus diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsCareportalFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsCareportalFragment.kt index fd6af63c65..2552e260d0 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsCareportalFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsCareportalFragment.kt @@ -26,8 +26,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.Translator +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.utils.ActionModeHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils import app.aaps.database.entities.TherapyEvent diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt index d57dcdbef0..d21dc7e2e6 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt @@ -26,10 +26,10 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.iobCalc import app.aaps.core.main.extensions.isInProgress import app.aaps.core.main.utils.ActionModeHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils import app.aaps.database.entities.ExtendedBolus diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt index 1b11777da3..cfb702eb17 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt @@ -32,10 +32,10 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.getCustomizedName import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.ActionModeHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils import app.aaps.database.entities.UserEntry.Action diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTempTargetFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTempTargetFragment.kt index fc0d9c8bdd..275fd3582b 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTempTargetFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTempTargetFragment.kt @@ -29,11 +29,11 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.Translator +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.friendlyDescription import app.aaps.core.main.extensions.highValueToUnitsToString import app.aaps.core.main.extensions.lowValueToUnitsToString import app.aaps.core.main.utils.ActionModeHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils import app.aaps.database.ValueWrapper diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt index f272d0f930..072a941257 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt @@ -28,11 +28,11 @@ import app.aaps.core.interfaces.rx.events.EventTempBasalChange import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.extensions.iobCalc import app.aaps.core.main.extensions.toStringFull import app.aaps.core.main.extensions.toTemporaryBasal import app.aaps.core.main.utils.ActionModeHelper -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils import app.aaps.database.ValueWrapper diff --git a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsUserEntryFragment.kt b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsUserEntryFragment.kt index 1f0c929c97..43b629ddee 100644 --- a/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsUserEntryFragment.kt +++ b/ui/src/main/kotlin/app/aaps/ui/activities/fragments/TreatmentsUserEntryFragment.kt @@ -22,7 +22,7 @@ import app.aaps.core.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.userEntry.UserEntryPresentationHelper import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T -import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils import app.aaps.database.entities.UserEntry diff --git a/ui/src/main/kotlin/app/aaps/ui/dialogs/LoopDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/LoopDialog.kt index bd995baf15..96fd063b3a 100644 --- a/ui/src/main/kotlin/app/aaps/ui/dialogs/LoopDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/LoopDialog.kt @@ -36,8 +36,8 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.ui.dialogs.OKDialog import app.aaps.core.ui.toast.ToastUtils import app.aaps.database.entities.OfflineEvent diff --git a/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardDialog.kt b/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardDialog.kt index 32246363a1..a9b36c150f 100644 --- a/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardDialog.kt +++ b/ui/src/main/kotlin/app/aaps/ui/dialogs/WizardDialog.kt @@ -39,12 +39,12 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.T +import app.aaps.core.interfaces.utils.fabric.FabricPrivacy import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.main.extensions.valueToUnits import app.aaps.core.main.iob.round import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.utils.extensions.formatColor -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.main.wizard.BolusWizard import app.aaps.core.ui.toast.ToastUtils import app.aaps.core.utils.HtmlHelper