From d7d01a0b3e635779b2b0e6e2721270e1f0a1be6a Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Mon, 25 Sep 2023 11:58:24 +0200 Subject: [PATCH] :core:ui cleanup --- app/src/main/kotlin/app/aaps/MainActivity.kt | 28 +- app/src/main/kotlin/app/aaps/MainApp.kt | 6 +- .../aaps/activities/HistoryBrowseActivity.kt | 10 +- .../aaps/activities/MyPreferenceFragment.kt | 28 +- .../aaps/implementations/UiInteractionImpl.kt | 2 +- .../app/aaps/receivers/KeepAliveWorker.kt | 4 +- .../extensions/TemporaryTargetExtension.kt | 2 +- .../aaps/core/main/graph/BasalProfileGraph.kt | 4 +- .../aaps/core/main/graph/IcProfileGraph.kt | 2 +- .../aaps/core/main/graph/IsfProfileGraph.kt | 2 +- .../core/main/graph/TargetBgProfileGraph.kt | 2 +- .../core/main/graph/data/BolusDataPoint.kt | 6 +- .../core/main/graph/data/CarbsDataPoint.kt | 2 +- .../data/EffectiveProfileSwitchDataPoint.kt | 2 +- .../main/graph/data/ExtendedBolusDataPoint.kt | 2 +- .../main/graph/data/GlucoseValueDataPoint.kt | 14 +- .../main/graph/data/HeartRateDataPoint.kt | 2 +- .../data/InMemoryGlucoseValueDataPoint.kt | 6 +- .../main/graph/data/TherapyEventDataPoint.kt | 14 +- .../aaps/core/main/iob/CobInfoExtension.kt | 2 +- .../aaps/core/main/profile/ProfileSealed.kt | 34 +-- .../main/pump/PumpEnactResultExtension.kt | 34 +-- .../app/aaps/core/main/wizard/BolusWizard.kt | 70 ++--- .../interfaces/profile/ProfileSealedTest.kt | 6 +- core/ui/build.gradle | 2 +- .../app/aaps}/core/ui/ContextExtensions.kt | 2 +- .../app/aaps}/core/ui/UIRunnable.kt | 2 +- .../PluginNoSplashAppCompatActivity.kt | 4 +- .../TranslatedDaggerAppCompatActivity.kt | 4 +- .../core/ui/dialogs/AlertDialogHelper.kt | 4 +- .../app/aaps}/core/ui/dialogs/OKDialog.kt | 4 +- .../core/ui/dialogs/TwoMessagesAlertDialog.kt | 4 +- .../aaps}/core/ui/dialogs/WarningDialog.kt | 4 +- .../ui/dragHelpers/ItemTouchHelperAdapter.kt | 8 +- .../ui/dragHelpers/OnStartDragListener.kt | 2 +- .../SimpleItemTouchHelperCallback.kt | 2 +- .../ui/elements/BluetoothDevicePreference.kt | 6 +- .../ui/elements/DigitsKeyListenerWithComma.kt | 2 +- .../core/ui/elements/IntSeekBarPreference.kt | 4 +- .../core/ui/elements/MinutesNumberPicker.kt | 6 +- .../aaps}/core/ui/elements/NumberPicker.kt | 8 +- .../core/ui/elements/NumberPickerVertical.kt | 4 +- .../ui/elements/NumberPickerViewAdapter.kt | 24 +- .../core/ui/elements/SingleClickButton.kt | 2 +- .../aaps}/core/ui/elements/SpinnerHelper.kt | 2 +- .../core/ui/elements/VerticalTextView.kt | 2 +- .../app/aaps}/core/ui/elements/WeekDay.kt | 14 +- .../aaps}/core/ui/elements/WeekdayPicker.kt | 8 +- .../core/ui/extensions/RadioGroupExtension.kt | 2 +- .../app/aaps}/core/ui/locale/LocaleHelper.kt | 4 +- .../app/aaps}/core/ui/toast/ToastUtils.kt | 6 +- .../main/res/layout/number_picker_layout.xml | 2 +- .../layout/number_picker_layout_vertical.xml | 2 +- .../implementation/HardLimitsImpl.kt | 6 +- .../implementation/LocalAlertUtilsImpl.kt | 16 +- .../implementation/TranslatorImpl.kt | 286 +++++++++--------- .../implementation/TrendCalculatorImpl.kt | 36 +-- .../NotificationHolderImpl.kt | 2 +- .../overview/OverviewDataImpl.kt | 38 +-- .../profile/ProfileFunctionImpl.kt | 4 +- .../protection/BiometricCheck.kt | 4 +- .../protection/PasswordCheckImpl.kt | 46 +-- .../protection/ProtectionCheckImpl.kt | 14 +- .../implementation/pump/BlePreCheckImpl.kt | 8 +- .../pump/PumpSyncImplementation.kt | 2 +- .../implementation/pump/WarnColorsImpl.kt | 18 +- .../queue/CommandQueueImplementation.kt | 4 +- .../implementation/queue/QueueThread.kt | 2 +- .../queue/commands/CommandBolus.kt | 8 +- .../commands/CommandCancelExtendedBolus.kt | 4 +- .../queue/commands/CommandCancelTempBasal.kt | 4 +- .../queue/commands/CommandClearAlarms.kt | 4 +- .../queue/commands/CommandCustomCommand.kt | 2 +- .../queue/commands/CommandDeactivate.kt | 4 +- .../queue/commands/CommandExtendedBolus.kt | 4 +- .../CommandInsightSetTBROverNotification.kt | 4 +- .../queue/commands/CommandLoadEvents.kt | 4 +- .../queue/commands/CommandLoadHistory.kt | 4 +- .../queue/commands/CommandLoadTDDs.kt | 4 +- .../queue/commands/CommandReadStatus.kt | 4 +- .../queue/commands/CommandSMBBolus.kt | 6 +- .../queue/commands/CommandSetProfile.kt | 6 +- .../queue/commands/CommandSetUserSettings.kt | 4 +- .../queue/commands/CommandStartPump.kt | 4 +- .../queue/commands/CommandStopPump.kt | 4 +- .../commands/CommandTempBasalAbsolute.kt | 4 +- .../queue/commands/CommandTempBasalPercent.kt | 4 +- .../queue/commands/CommandUpdateTime.kt | 4 +- .../resources/IconsProviderImplementation.kt | 8 +- .../resources/ResourceHelperImpl.kt | 10 +- .../implementation/stats/DexcomTirImpl.kt | 10 +- .../implementation/stats/TddCalculatorImpl.kt | 4 +- .../implementation/stats/TirCalculatorImpl.kt | 6 +- .../implementation/stats/TirImpl.kt | 14 +- .../stats/TotalDailyDoseExtension.kt | 24 +- .../UserEntryPresentationHelperImpl.kt | 102 +++---- .../utils/DecimalFormatterImpl.kt | 2 +- .../queue/CommandQueueImplementationTest.kt | 6 +- .../implementation/queue/QueueThreadTest.kt | 2 +- .../interfaces/pump/PumpEnactResultTest.kt | 20 +- .../pump/insight/InsightAlertService.java | 4 +- .../pump/insight/LocalInsightFragment.java | 20 +- .../pump/insight/LocalInsightPlugin.java | 38 +-- .../plugins/pump/insight/utils/AlertUtils.kt | 2 +- .../insight/utils/ExceptionTranslator.java | 2 +- .../nightscout/plugins/aps/APSResultObject.kt | 2 +- .../nightscout/plugins/aps/loop/LoopPlugin.kt | 54 ++-- .../aps/openAPSAMA/OpenAPSAMAPlugin.kt | 34 +-- .../aps/openAPSSMB/OpenAPSSMBPlugin.kt | 36 +-- .../plugins/general/autotune/AutotuneFS.kt | 2 +- .../general/autotune/AutotuneFragment.kt | 64 ++-- .../general/autotune/AutotunePlugin.kt | 46 +-- .../general/autotune/data/ATProfile.kt | 2 +- .../src/main/res/layout/autotune_fragment.xml | 2 +- .../plugins/aps/loop/LoopPluginTest.kt | 2 +- .../automation/AutomationFragment.kt | 22 +- .../nightscout/automation/AutomationPlugin.kt | 14 +- .../automation/actions/ActionAlarm.kt | 4 +- .../actions/ActionCarePortalEvent.kt | 6 +- .../automation/actions/ActionLoopDisable.kt | 4 +- .../automation/actions/ActionLoopEnable.kt | 6 +- .../automation/actions/ActionLoopResume.kt | 6 +- .../automation/actions/ActionLoopSuspend.kt | 6 +- .../automation/actions/ActionNotification.kt | 4 +- .../automation/actions/ActionProfileSwitch.kt | 8 +- .../actions/ActionProfileSwitchPercent.kt | 12 +- .../automation/actions/ActionRunAutotune.kt | 20 +- .../automation/actions/ActionSendSMS.kt | 2 +- .../actions/ActionStartTempTarget.kt | 10 +- .../actions/ActionStopProcessing.kt | 2 +- .../actions/ActionStopTempTarget.kt | 6 +- .../automation/dialogs/BaseDialog.kt | 4 +- .../automation/dialogs/EditEventDialog.kt | 2 +- .../automation/elements/Comparator.kt | 2 +- .../automation/elements/ComparatorConnect.kt | 2 +- .../automation/elements/ComparatorExists.kt | 6 +- .../nightscout/automation/elements/InputBg.kt | 4 +- .../elements/InputCarePortalMenu.kt | 18 +- .../automation/elements/InputDateTime.kt | 4 +- .../automation/elements/InputDelta.kt | 4 +- .../automation/elements/InputDouble.kt | 4 +- .../automation/elements/InputDropdownMenu.kt | 2 +- .../automation/elements/InputDuration.kt | 10 +- .../automation/elements/InputInsulin.kt | 4 +- .../automation/elements/InputLocationMode.kt | 2 +- .../automation/elements/InputPercent.kt | 4 +- .../automation/elements/InputProfileName.kt | 4 +- .../automation/elements/InputTempTarget.kt | 4 +- .../automation/elements/InputTimeRange.kt | 2 +- .../automation/elements/InputWeekDay.kt | 2 +- .../automation/elements/LayoutBuilder.kt | 2 +- .../automation/elements/StaticLabel.kt | 2 +- .../automation/triggers/TriggerBTDevice.kt | 6 +- .../automation/triggers/TriggerBg.kt | 4 +- .../automation/triggers/TriggerConnector.kt | 6 +- .../automation/triggers/TriggerIob.kt | 4 +- .../automation/triggers/TriggerLocation.kt | 2 +- .../triggers/TriggerProfilePercent.kt | 2 +- .../triggers/TriggerRecurringTime.kt | 2 +- .../automation/triggers/TriggerTempTarget.kt | 4 +- .../triggers/TriggerTempTargetValue.kt | 4 +- .../automation/triggers/TriggerTime.kt | 4 +- .../automation/triggers/TriggerWifiSsid.kt | 6 +- .../nightscout/automation/ui/TimerUtil.kt | 2 +- .../automation/actions/ActionAlarmTest.kt | 6 +- .../actions/ActionCarePortalEventTest.kt | 4 +- .../actions/ActionLoopDisableTest.kt | 6 +- .../actions/ActionLoopEnableTest.kt | 4 +- .../actions/ActionLoopResumeTest.kt | 4 +- .../actions/ActionLoopSuspendTest.kt | 4 +- .../actions/ActionNotificationTest.kt | 6 +- .../actions/ActionProfileSwitchPercentTest.kt | 4 +- .../actions/ActionProfileSwitchTest.kt | 6 +- .../actions/ActionStopTempTargetTest.kt | 4 +- .../automation/actions/ActionsTestBase.kt | 4 +- .../automation/elements/StaticLabelTest.kt | 4 +- .../triggers/TriggerBTDeviceTest.kt | 2 +- .../triggers/TriggerProfilePercentTest.kt | 2 +- .../automation/triggers/TriggerTimeTest.kt | 2 +- .../triggers/TriggerWifiSsidTest.kt | 2 +- .../configuration/AndroidPermissionImpl.kt | 8 +- .../DaggerAppCompatActivityWithResult.kt | 4 +- .../activities/SingleFragmentActivity.kt | 2 +- .../configBuilder/ConfigBuilderFragment.kt | 4 +- .../configBuilder/ConfigBuilderPlugin.kt | 6 +- .../maintenance/ImportExportPrefsImpl.kt | 14 +- .../maintenance/MaintenanceFragment.kt | 10 +- .../maintenance/MaintenancePlugin.kt | 2 +- .../maintenance/PrefFileListProviderImpl.kt | 4 +- .../CustomWatchfaceImportListActivity.kt | 6 +- .../activities/LogSettingActivity.kt | 2 +- .../activities/PrefImportListActivity.kt | 6 +- .../dialogs/PrefImportSummaryDialog.kt | 16 +- .../configuration/setupwizard/SWDefinition.kt | 30 +- .../setupwizard/SetupWizardActivity.kt | 4 +- .../elements/SWEditEncryptedPassword.kt | 6 +- .../setupwizard/elements/SWEditIntNumber.kt | 2 +- .../setupwizard/elements/SWEditNumber.kt | 2 +- .../elements/SWEditNumberWithUnits.kt | 2 +- .../main/res/layout/maintenance_fragment.xml | 16 +- .../constraints/dstHelper/DstHelperPlugin.kt | 4 +- .../objectives/ObjectivesFragment.kt | 28 +- .../objectives/ObjectivesPlugin.kt | 4 +- .../activities/ObjectivesExamDialog.kt | 2 +- .../objectives/dialogs/NtpProgressDialog.kt | 8 +- .../objectives/objectives/Objective.kt | 6 +- .../objectives/objectives/Objective0.kt | 4 +- .../objectives/objectives/Objective2.kt | 6 +- .../constraints/safety/SafetyPlugin.kt | 26 +- .../constraints/ConstraintsCheckerImplTest.kt | 24 +- .../constraints/safety/SafetyPluginTest.kt | 14 +- .../nightscout/insulin/InsulinFragment.kt | 2 +- .../general/actions/ActionsFragment.kt | 32 +- .../plugins/general/food/FoodFragment.kt | 34 +-- .../general/overview/OverviewFragment.kt | 112 +++---- .../general/overview/OverviewMenusImpl.kt | 50 +-- .../general/overview/OverviewPlugin.kt | 4 +- .../general/overview/graphData/GraphData.kt | 6 +- .../notifications/NotificationStore.kt | 18 +- .../notifications/NotificationWithAction.kt | 4 +- .../general/overview/ui/StatusLightHandler.kt | 10 +- .../PersistentNotificationPlugin.kt | 12 +- .../smsCommunicator/SmsCommunicatorPlugin.kt | 44 +-- .../activities/SmsCommunicatorOtpActivity.kt | 6 +- .../smsCommunicator/otp/OneTimePassword.kt | 2 +- .../plugins/general/wear/WearFragment.kt | 2 +- .../plugins/general/wear/WearPlugin.kt | 4 +- .../wear/activities/CwfInfosActivity.kt | 4 +- .../wear/wearintegration/DataHandlerMobile.kt | 100 +++--- .../plugins/profile/ProfileFragment.kt | 26 +- .../plugins/profile/ProfilePlugin.kt | 6 +- .../plugins/profile/ui/TimeListEdit.kt | 6 +- .../src/main/res/layout/actions_fragment.xml | 32 +- .../res/layout/overview_buttons_layout.xml | 16 +- .../src/main/res/layout/profile_fragment.xml | 2 +- .../layout/smscommunicator_activity_otp.xml | 2 +- .../main/res/layout/timelistedit_element.xml | 4 +- .../layout/timelistedit_element_vertical.xml | 4 +- .../src/main/res/layout/wear_fragment.xml | 8 +- .../SmsCommunicatorPluginTest.kt | 26 +- .../sensitivity/SensitivityAAPSPlugin.kt | 2 +- .../sensitivity/SensitivityOref1Plugin.kt | 2 +- .../SensitivityWeightedAveragePlugin.kt | 2 +- .../smoothing/AvgSmoothingPlugin.kt | 2 +- .../smoothing/ExponentialSmoothingPlugin.kt | 2 +- .../nightscout/smoothing/NoSmoothingPlugin.kt | 2 +- .../nightscout/source/BGSourceFragment.kt | 8 +- .../info/nightscout/source/IntelligoPlugin.kt | 2 +- .../RequestDexcomPermissionActivity.kt | 2 +- .../plugins/sync/nsShared/NSClientFragment.kt | 10 +- .../plugins/sync/nsclient/NSClientPlugin.kt | 2 +- .../nsclient/data/NSSettingsStatusImpl.kt | 4 +- .../data/ProcessedDeviceStatusDataImpl.kt | 10 +- .../sync/nsclientV3/NSClientV3Plugin.kt | 8 +- .../sync/openhumans/ui/OHLoginActivity.kt | 2 +- .../plugins/sync/tidepool/TidepoolFragment.kt | 2 +- .../plugins/sync/tidepool/TidepoolPlugin.kt | 2 +- .../sync/tidepool/comm/TidepoolUploader.kt | 2 +- .../plugins/sync/xdrip/XdripFragment.kt | 4 +- .../plugins/sync/xdrip/XdripPlugin.kt | 6 +- .../ExtendedBolusExtensionKtTest.kt | 2 +- .../nightscout/pump/combo/ComboFragment.kt | 42 +-- .../nightscout/pump/combo/ComboPlugin.java | 34 +-- .../main/res/layout/combopump_fragment.xml | 2 +- .../nightscout/pump/combo/ComboPluginTest.kt | 2 +- .../pump/combov2/ComboV2Fragment.kt | 14 +- .../nightscout/pump/combov2/ComboV2Plugin.kt | 26 +- .../activities/ComboV2PairingActivity.kt | 6 +- .../src/main/res/layout/combov2_fragment.xml | 2 +- .../combov2/src/main/res/xml/pref_combov2.xml | 2 +- .../info/nightscout/pump/dana/DanaFragment.kt | 12 +- .../dana/activities/DanaHistoryActivity.kt | 12 +- .../activities/DanaUserOptionsActivity.kt | 4 +- .../src/main/res/layout/danar_fragment.xml | 8 +- .../layout/danar_user_options_activity.xml | 8 +- .../danaRKorean/DanaRKoreanPlugin.kt | 8 +- .../comm/MsgInitConnStatusTime_k.kt | 2 +- .../services/DanaRKoreanExecutionService.java | 2 +- .../androidaps/danaRv2/DanaRv2Plugin.java | 22 +- .../danaRv2/comm/MsgCheckValue_v2.kt | 4 +- .../services/DanaRv2ExecutionService.java | 4 +- .../androidaps/danar/AbstractDanaRPlugin.java | 38 +-- .../androidaps/danar/DanaRPlugin.java | 12 +- .../androidaps/danar/comm/MsgBolusProgress.kt | 2 +- .../danar/comm/MsgInitConnStatusTime.kt | 2 +- .../danar/comm/MsgSetBasalProfile.kt | 2 +- .../danar/comm/MsgSetSingleBasalProfile.kt | 2 +- .../AbstractDanaRExecutionService.java | 4 +- .../danar/services/DanaRExecutionService.java | 2 +- pump/danar/src/main/res/xml/pref_danar.xml | 2 +- .../src/main/res/xml/pref_danarkorean.xml | 2 +- pump/danar/src/main/res/xml/pref_danarv2.xml | 2 +- .../nightscout/pump/danaR/DanaRPluginTest.kt | 8 +- .../pump/danaR/comm/MsgBolusProgressTest.kt | 2 +- .../pump/danaRKorean/DanaRKoreanPluginTest.kt | 8 +- .../pump/danaRv2/DanaRv2PluginTest.kt | 8 +- .../nightscout/pump/danars/DanaRSPlugin.kt | 56 ++-- .../pump/danars/activities/BLEScanActivity.kt | 12 +- .../danars/activities/EnterPinActivity.kt | 6 +- .../activities/PairingHelperActivity.kt | 2 +- .../DanaRSPacketNotifyDeliveryComplete.kt | 2 +- .../DanaRSPacketNotifyDeliveryRateDisplay.kt | 2 +- .../pump/danars/services/BLEComm.kt | 10 +- .../pump/danars/services/DanaRSService.kt | 6 +- .../pump/danars/DanaRSPluginTest.kt | 4 +- .../pump/diaconn/DiaconnG8Fragment.kt | 10 +- .../pump/diaconn/DiaconnG8Plugin.kt | 42 +-- .../activities/DiaconnG8BLEScanActivity.kt | 8 +- .../activities/DiaconnG8HistoryActivity.kt | 12 +- .../DiaconnG8UserOptionsActivity.kt | 10 +- .../pump/diaconn/service/BLECommonService.kt | 10 +- .../pump/diaconn/service/DiaconnG8Service.kt | 2 +- .../diaconn_g8_user_options_activity.xml | 2 +- .../plugins/pump/eopatch/EopatchPumpPlugin.kt | 24 +- .../pump/eopatch/alarm/AlarmManager.kt | 4 +- .../pump/eopatch/ui/AlarmHelperActivity.kt | 4 +- .../pump/eopatch/ui/DialogHelperActivity.kt | 4 +- .../plugins/pump/eopatch/ui/EoBaseActivity.kt | 2 +- .../pump/eopatch/ui/EopatchActivity.kt | 10 +- .../eopatch/ui/EopatchConnectNewFragment.kt | 2 +- .../eopatch/ui/EopatchOverviewFragment.kt | 8 +- .../eopatch/ui/EopatchRotateKnobFragment.kt | 2 +- .../pump/eopatch/ui/dialogs/AlarmDialog.kt | 2 +- .../pump/eopatch/ui/dialogs/CommonDialog.kt | 2 +- .../res/layout/fragment_eopatch_overview.xml | 6 +- .../pump/medtronic/MedtronicFragment.kt | 18 +- .../pump/medtronic/MedtronicPumpPlugin.kt | 14 +- .../dialog/MedtronicHistoryActivity.kt | 2 +- .../nightscout/pump/medtrum/MedtrumPlugin.kt | 14 +- .../pump/medtrum/services/BLEComm.kt | 6 +- .../pump/medtrum/services/MedtrumService.kt | 10 +- .../ui/MedtrumActivateCompleteFragment.kt | 2 +- .../medtrum/ui/MedtrumActivateFragment.kt | 4 +- .../medtrum/ui/MedtrumAttachPatchFragment.kt | 4 +- .../pump/medtrum/ui/MedtrumBaseActivity.kt | 2 +- .../ui/MedtrumDeactivatePatchFragment.kt | 2 +- .../medtrum/ui/MedtrumOverviewFragment.kt | 6 +- .../ui/MedtrumPreparePatchConnectFragment.kt | 4 +- .../ui/MedtrumPrimeCompleteFragment.kt | 4 +- .../pump/medtrum/ui/MedtrumPrimeFragment.kt | 4 +- .../pump/medtrum/ui/MedtrumPrimingFragment.kt | 4 +- .../MedtrumRetryActivationConnectFragment.kt | 2 +- .../ui/MedtrumRetryActivationFragment.kt | 2 +- .../ui/MedtrumStartDeactivationFragment.kt | 2 +- .../ui/viewmodel/MedtrumOverviewViewModel.kt | 6 +- .../res/layout/fragment_medtrum_overview.xml | 6 +- .../fragment/info/AttachPodFragment.kt | 2 +- .../activity/OmnipodWizardActivityBase.kt | 4 +- .../common/fragment/WizardFragmentBase.kt | 2 +- .../fragment/action/DeactivatePodFragment.kt | 2 +- .../omnipod/dash/OmnipodDashPumpPlugin.kt | 30 +- .../omnipod/dash/ui/DashPodHistoryActivity.kt | 14 +- .../dash/ui/DashPodManagementActivity.kt | 6 +- .../dash/ui/OmnipodDashOverviewFragment.kt | 62 ++-- .../layout/omnipod_dash_pod_management.xml | 10 +- .../omnipod/eros/OmnipodErosPumpPlugin.java | 6 +- .../eros/manager/AapsOmnipodErosManager.java | 30 +- .../omnipod/eros/ui/ErosPodHistoryActivity.kt | 4 +- .../eros/ui/ErosPodManagementActivity.kt | 8 +- .../eros/ui/OmnipodErosOverviewFragment.kt | 66 ++-- .../layout/omnipod_eros_pod_management.xml | 16 +- .../pump/common/PumpPluginAbstract.kt | 2 +- .../pump/common/defs/PumpDriverState.kt | 4 +- .../pump/common/ui/PumpBLEConfigActivity.kt | 4 +- .../pump/common/ui/PumpHistoryActivity.kt | 4 +- .../dialog/RileyLinkBLEConfigActivity.kt | 4 +- .../dialog/RileyLinkStatusActivity.kt | 2 +- .../pump/virtual/VirtualPumpFragment.kt | 6 +- .../pump/virtual/VirtualPumpPlugin.kt | 22 +- .../extensions/PumpEnactResultExtension.kt | 32 +- .../activities/BolusProgressHelperActivity.kt | 2 +- .../ui/activities/ErrorHelperActivity.kt | 4 +- .../ui/activities/ProfileHelperActivity.kt | 24 +- .../ui/activities/QuickWizardListActivity.kt | 18 +- .../nightscout/ui/activities/StatsActivity.kt | 8 +- .../ui/activities/SurveyActivity.kt | 6 +- .../ui/activities/TDDStatsActivity.kt | 104 +++---- .../ui/activities/TreatmentsActivity.kt | 2 +- .../fragments/TreatmentsBolusCarbsFragment.kt | 30 +- .../fragments/TreatmentsCareportalFragment.kt | 18 +- .../TreatmentsExtendedBolusesFragment.kt | 24 +- .../TreatmentsProfileSwitchFragment.kt | 18 +- .../fragments/TreatmentsTempTargetFragment.kt | 16 +- .../TreatmentsTemporaryBasalsFragment.kt | 24 +- .../fragments/TreatmentsUserEntryFragment.kt | 6 +- .../ui/activityMonitor/ActivityMonitor.kt | 4 +- .../nightscout/ui/alertDialogs/ErrorDialog.kt | 6 +- .../ui/dialogs/BolusProgressDialog.kt | 8 +- .../ui/dialogs/CalibrationDialog.kt | 12 +- .../info/nightscout/ui/dialogs/CarbsDialog.kt | 48 +-- .../info/nightscout/ui/dialogs/CareDialog.kt | 34 +-- .../ui/dialogs/DialogFragmentWithDate.kt | 14 +- .../ui/dialogs/EditQuickWizardDialog.kt | 6 +- .../ui/dialogs/ExtendedBolusDialog.kt | 14 +- .../info/nightscout/ui/dialogs/FillDialog.kt | 24 +- .../nightscout/ui/dialogs/InsulinDialog.kt | 40 +-- .../info/nightscout/ui/dialogs/LoopDialog.kt | 30 +- .../ui/dialogs/ProfileSwitchDialog.kt | 26 +- .../ui/dialogs/ProfileViewerDialog.kt | 28 +- .../nightscout/ui/dialogs/TempBasalDialog.kt | 20 +- .../nightscout/ui/dialogs/TempTargetDialog.kt | 54 ++-- .../nightscout/ui/dialogs/TreatmentDialog.kt | 29 +- .../nightscout/ui/dialogs/WizardDialog.kt | 42 +-- .../nightscout/ui/dialogs/WizardInfoDialog.kt | 20 +- .../ui/services/AlarmSoundService.kt | 4 +- .../java/info/nightscout/ui/widget/Widget.kt | 44 +-- .../res/layout/activity_profilehelper.xml | 12 +- ui/src/main/res/layout/dialog_calibration.xml | 2 +- ui/src/main/res/layout/dialog_carbs.xml | 6 +- ui/src/main/res/layout/dialog_care.xml | 4 +- .../main/res/layout/dialog_extendedbolus.xml | 4 +- ui/src/main/res/layout/dialog_fill.xml | 2 +- ui/src/main/res/layout/dialog_insulin.xml | 4 +- ui/src/main/res/layout/dialog_loop.xml | 32 +- .../main/res/layout/dialog_profileswitch.xml | 8 +- ui/src/main/res/layout/dialog_tempbasal.xml | 6 +- ui/src/main/res/layout/dialog_temptarget.xml | 12 +- ui/src/main/res/layout/dialog_treatment.xml | 4 +- ui/src/main/res/layout/dialog_wizard.xml | 8 +- .../workflow/PrepareBasalDataWorker.kt | 8 +- .../PrepareIobAutosensGraphDataWorker.kt | 42 +-- .../PrepareTemporaryTargetDataWorker.kt | 2 +- .../workflow/PrepareTreatmentsDataWorker.kt | 2 +- 423 files changed, 2383 insertions(+), 2396 deletions(-) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/ContextExtensions.kt (90%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/UIRunnable.kt (90%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/activities/PluginNoSplashAppCompatActivity.kt (79%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/activities/TranslatedDaggerAppCompatActivity.kt (92%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/dialogs/AlertDialogHelper.kt (94%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/dialogs/OKDialog.kt (99%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/dialogs/TwoMessagesAlertDialog.kt (96%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/dialogs/WarningDialog.kt (96%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/dragHelpers/ItemTouchHelperAdapter.kt (66%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/dragHelpers/OnStartDragListener.kt (86%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt (97%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/BluetoothDevicePreference.kt (90%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/DigitsKeyListenerWithComma.kt (99%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/IntSeekBarPreference.kt (94%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/MinutesNumberPicker.kt (84%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/NumberPicker.kt (98%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/NumberPickerVertical.kt (79%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/NumberPickerViewAdapter.kt (61%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/SingleClickButton.kt (95%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/SpinnerHelper.kt (99%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/VerticalTextView.kt (97%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/WeekDay.kt (87%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/elements/WeekdayPicker.kt (90%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/extensions/RadioGroupExtension.kt (91%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/locale/LocaleHelper.kt (96%) rename core/ui/src/main/{java/info/nightscout => kotlin/app/aaps}/core/ui/toast/ToastUtils.kt (97%) diff --git a/app/src/main/kotlin/app/aaps/MainActivity.kt b/app/src/main/kotlin/app/aaps/MainActivity.kt index 98e6ea89de..ec9e821b54 100644 --- a/app/src/main/kotlin/app/aaps/MainActivity.kt +++ b/app/src/main/kotlin/app/aaps/MainActivity.kt @@ -63,10 +63,10 @@ import com.joanzapata.iconify.fonts.FontAwesomeModule import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.R import info.nightscout.androidaps.databinding.ActivityMainBinding -import info.nightscout.core.ui.UIRunnable -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.locale.LocaleHelper -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.UIRunnable +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.locale.LocaleHelper +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.isRunningRealPumpTest import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -212,16 +212,16 @@ class MainActivity : DaggerAppCompatActivityWithResult() { message += "${rh.gs(app.aaps.configuration.R.string.configbuilder_nightscoutversion_label)} ${activePlugin.activeNsClient?.detectedNsVersion() ?: rh.gs(info.nightscout.plugins.R.string.not_available_full)}" if (config.isEngineeringMode()) message += "\n${rh.gs(app.aaps.configuration.R.string.engineering_mode_enabled)}" if (config.isUnfinishedMode()) message += "\nUnfinished mode enabled" - if (!fabricPrivacy.fabricEnabled()) message += "\n${rh.gs(info.nightscout.core.ui.R.string.fabric_upload_disabled)}" - message += rh.gs(info.nightscout.core.ui.R.string.about_link_urls) + if (!fabricPrivacy.fabricEnabled()) message += "\n${rh.gs(app.aaps.core.ui.R.string.fabric_upload_disabled)}" + message += rh.gs(app.aaps.core.ui.R.string.about_link_urls) val messageSpanned = SpannableString(message) Linkify.addLinks(messageSpanned, Linkify.WEB_URLS) - MaterialAlertDialogBuilder(this@MainActivity, info.nightscout.core.ui.R.style.DialogTheme) + MaterialAlertDialogBuilder(this@MainActivity, app.aaps.core.ui.R.style.DialogTheme) .setTitle(rh.gs(R.string.app_name) + " " + BuildConfig.VERSION) .setIcon(iconsProvider.getIcon()) .setMessage(messageSpanned) - .setPositiveButton(rh.gs(info.nightscout.core.ui.R.string.ok), null) - .setNeutralButton(rh.gs(info.nightscout.core.ui.R.string.cta_dont_kill_my_app_info)) { _, _ -> + .setPositiveButton(rh.gs(app.aaps.core.ui.R.string.ok), null) + .setNeutralButton(rh.gs(app.aaps.core.ui.R.string.cta_dont_kill_my_app_info)) { _, _ -> startActivity( Intent( Intent.ACTION_VIEW, @@ -356,7 +356,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() { if (p.menuIcon != -1) { menuItem.setIcon(p.menuIcon) } else { - menuItem.setIcon(info.nightscout.core.ui.R.drawable.ic_settings) + menuItem.setIcon(app.aaps.core.ui.R.drawable.ic_settings) } menuItem.setOnMenuItemClickListener { startActivity( @@ -377,7 +377,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() { if (sp.getBoolean(info.nightscout.plugins.R.string.key_short_tabtitles, false)) { binding.tabsNormal.visibility = View.GONE binding.tabsCompact.visibility = View.VISIBLE - binding.toolbar.layoutParams = LinearLayout.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT, resources.getDimension(info.nightscout.core.ui.R.dimen.compact_height).toInt()) + binding.toolbar.layoutParams = LinearLayout.LayoutParams(Toolbar.LayoutParams.MATCH_PARENT, resources.getDimension(app.aaps.core.ui.R.dimen.compact_height).toInt()) TabLayoutMediator(binding.tabsCompact, binding.mainPager) { tab, position -> tab.text = (binding.mainPager.adapter as TabPageAdapter).getPluginAt(position).nameShort }.attach() @@ -416,7 +416,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() { private fun setDisabledMenuItemColorPluginPreferences() { if (pluginPreferencesMenuItem?.isEnabled == false) { val spanString = SpannableString(this.menu?.findItem(R.id.nav_plugin_preferences)?.title.toString()) - spanString.setSpan(ForegroundColorSpan(rh.gac(info.nightscout.core.ui.R.attr.disabledTextColor)), 0, spanString.length, 0) + spanString.setSpan(ForegroundColorSpan(rh.gac(app.aaps.core.ui.R.attr.disabledTextColor)), 0, spanString.length, 0) this.menu?.findItem(R.id.nav_plugin_preferences)?.title = spanString } } @@ -458,7 +458,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() { .replace(".org/", ":") .replace(".net/", ":") fabricPrivacy.firebaseAnalytics.setUserProperty("Mode", BuildConfig.APPLICATION_ID + "-" + closedLoopEnabled) - fabricPrivacy.firebaseAnalytics.setUserProperty("Language", sp.getString(info.nightscout.core.ui.R.string.key_language, Locale.getDefault().language)) + fabricPrivacy.firebaseAnalytics.setUserProperty("Language", sp.getString(app.aaps.core.ui.R.string.key_language, Locale.getDefault().language)) fabricPrivacy.firebaseAnalytics.setUserProperty("Version", BuildConfig.VERSION) fabricPrivacy.firebaseAnalytics.setUserProperty("HEAD", BuildConfig.HEAD) fabricPrivacy.firebaseAnalytics.setUserProperty("Remote", remote) @@ -492,7 +492,7 @@ class MainActivity : DaggerAppCompatActivityWithResult() { val sn = activePlugin.activePump.serialNumber() sp.putString(info.nightscout.core.utils.R.string.key_master_password, cryptoUtil.hashPassword(sn)) passwordReset.delete() - ToastUtils.okToast(context, context.getString(info.nightscout.core.ui.R.string.password_set)) + ToastUtils.okToast(context, context.getString(app.aaps.core.ui.R.string.password_set)) } } } \ No newline at end of file diff --git a/app/src/main/kotlin/app/aaps/MainApp.kt b/app/src/main/kotlin/app/aaps/MainApp.kt index 7775aa2555..5531e221e4 100644 --- a/app/src/main/kotlin/app/aaps/MainApp.kt +++ b/app/src/main/kotlin/app/aaps/MainApp.kt @@ -36,7 +36,7 @@ import dagger.android.AndroidInjector import dagger.android.DaggerApplication import info.nightscout.androidaps.BuildConfig import info.nightscout.androidaps.R -import info.nightscout.core.ui.locale.LocaleHelper +import app.aaps.core.ui.locale.LocaleHelper import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry import info.nightscout.database.impl.AppRepository @@ -138,7 +138,7 @@ class MainApp : DaggerApplication() { InsertIfNewByTimestampTherapyEventTransaction( timestamp = dateUtil.now(), type = TherapyEvent.Type.NOTE, - note = rh.get().gs(info.nightscout.core.ui.R.string.androidaps_start) + " - " + Build.MANUFACTURER + " " + Build.MODEL, + note = rh.get().gs(app.aaps.core.ui.R.string.androidaps_start) + " - " + Build.MANUFACTURER + " " + Build.MODEL, glucoseUnit = TherapyEvent.GlucoseUnit.MGDL ) ) @@ -201,7 +201,7 @@ class MainApp : DaggerApplication() { // set values for different builds if (!sp.contains(R.string.key_ns_alarms)) sp.putBoolean(R.string.key_ns_alarms, config.NSCLIENT) if (!sp.contains(R.string.key_ns_announcements)) sp.putBoolean(R.string.key_ns_announcements, config.NSCLIENT) - if (!sp.contains(info.nightscout.core.ui.R.string.key_language)) sp.putString(info.nightscout.core.ui.R.string.key_language, "default") + if (!sp.contains(app.aaps.core.ui.R.string.key_language)) sp.putString(app.aaps.core.ui.R.string.key_language, "default") // 3.1.0 if (sp.contains("ns_wifionly")) { if (sp.getBoolean("ns_wifionly", false)) { diff --git a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt index 28a27f4202..af6874d304 100644 --- a/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt +++ b/app/src/main/kotlin/app/aaps/activities/HistoryBrowseActivity.kt @@ -33,7 +33,7 @@ import com.google.android.material.datepicker.MaterialDatePicker import com.jjoe64.graphview.GraphView import dagger.android.HasAndroidInjector import info.nightscout.androidaps.databinding.ActivityHistorybrowseBinding -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.plugins.general.overview.graphData.GraphData import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign @@ -113,7 +113,7 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() { binding.date.setOnClickListener { MaterialDatePicker.Builder.datePicker() .setSelection(dateUtil.timeStampToUtcDateMillis(historyBrowserData.overviewData.fromTime)) - .setTheme(info.nightscout.core.ui.R.style.DatePicker) + .setTheme(app.aaps.core.ui.R.style.DatePicker) .build() .apply { addOnPositiveButtonClickListener { selection -> @@ -133,7 +133,7 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() { windowManager.defaultDisplay.getMetrics(dm) axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80 - binding.bgGraph.gridLabelRenderer?.gridColor = rh.gac(this, info.nightscout.core.ui.R.attr.graphGrid) + binding.bgGraph.gridLabelRenderer?.gridColor = rh.gac(this, app.aaps.core.ui.R.attr.graphGrid) binding.bgGraph.gridLabelRenderer?.reloadStyles() binding.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth @@ -214,12 +214,12 @@ class HistoryBrowseActivity : TranslatedDaggerAppCompatActivity() { val graph = GraphView(this) graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, rh.dpToPx(100)).also { it.setMargins(0, rh.dpToPx(15), 0, rh.dpToPx(10)) } - graph.gridLabelRenderer?.gridColor = rh.gac(info.nightscout.core.ui.R.attr.graphGrid) + graph.gridLabelRenderer?.gridColor = rh.gac(app.aaps.core.ui.R.attr.graphGrid) graph.gridLabelRenderer?.reloadStyles() graph.gridLabelRenderer?.isHorizontalLabelsVisible = false graph.gridLabelRenderer?.labelVerticalWidth = axisWidth graph.gridLabelRenderer?.numVerticalLabels = 3 - graph.viewport.backgroundColor = rh.gac(this, info.nightscout.core.ui.R.attr.viewPortBackgroundColor) + graph.viewport.backgroundColor = rh.gac(this, app.aaps.core.ui.R.attr.viewPortBackgroundColor) relativeLayout.addView(graph) val label = TextView(this) diff --git a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt index a0096fc3b9..e570fa2715 100644 --- a/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt +++ b/app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt @@ -40,7 +40,7 @@ import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin import info.nightscout.automation.AutomationPlugin -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.implementation.plugin.PluginStore import info.nightscout.insulin.InsulinOrefFreePeakPlugin import info.nightscout.plugins.aps.loop.LoopPlugin @@ -238,7 +238,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { key ?: return rxBus.send(EventPreferenceChange(key)) - if (key == rh.gs(info.nightscout.core.ui.R.string.key_language)) { + if (key == rh.gs(app.aaps.core.ui.R.string.key_language)) { rxBus.send(EventRebuildTabs(true)) //recreate() does not update language so better close settings activity?.finish() @@ -276,7 +276,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang sp.getInt(key, NONE.ordinal) == BIOMETRIC.ordinal ) { activity?.let { - val title = rh.gs(info.nightscout.core.ui.R.string.unsecure_fallback_biometric) + val title = rh.gs(app.aaps.core.ui.R.string.unsecure_fallback_biometric) val message = rh.gs(app.aaps.configuration.R.string.master_password_missing, rh.gs(app.aaps.configuration.R.string.configbuilder_general), rh.gs(app.aaps.configuration.R.string.protection)) OKDialog.show(it, title = title, message = message) @@ -289,8 +289,8 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang sp.getInt(info.nightscout.core.utils.R.string.key_bolus_protection, NONE.ordinal) == BIOMETRIC.ordinal if (rh.gs(info.nightscout.core.utils.R.string.key_master_password) == key && sp.getString(key, "") == "" && isBiometricActivated) { activity?.let { - val title = rh.gs(info.nightscout.core.ui.R.string.unsecure_fallback_biometric) - val message = rh.gs(info.nightscout.core.ui.R.string.unsecure_fallback_descriotion_biometric) + val title = rh.gs(app.aaps.core.ui.R.string.unsecure_fallback_biometric) + val message = rh.gs(app.aaps.core.ui.R.string.unsecure_fallback_descriotion_biometric) OKDialog.show(it, title = title, message = message) } } @@ -409,9 +409,9 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang pref.summary = "******" } else { if (pref.key.contains("pin")) { - pref.summary = rh.gs(info.nightscout.core.ui.R.string.pin_not_set) + pref.summary = rh.gs(app.aaps.core.ui.R.string.pin_not_set) } else { - pref.summary = rh.gs(info.nightscout.core.ui.R.string.password_not_set) + pref.summary = rh.gs(app.aaps.core.ui.R.string.password_not_set) } } } @@ -440,38 +440,38 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang when (preference.key) { rh.gs(info.nightscout.core.utils.R.string.key_master_password) -> { passwordCheck.queryPassword(context, app.aaps.configuration.R.string.current_master_password, info.nightscout.core.utils.R.string.key_master_password, { - passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password) + passwordCheck.setPassword(context, app.aaps.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password) }) true } rh.gs(info.nightscout.core.utils.R.string.key_settings_password) -> { - passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.settings_password, info.nightscout.core.utils.R.string.key_settings_password) + passwordCheck.setPassword(context, app.aaps.core.ui.R.string.settings_password, info.nightscout.core.utils.R.string.key_settings_password) true } rh.gs(info.nightscout.core.utils.R.string.key_bolus_password) -> { - passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.bolus_password, info.nightscout.core.utils.R.string.key_bolus_password) + passwordCheck.setPassword(context, app.aaps.core.ui.R.string.bolus_password, info.nightscout.core.utils.R.string.key_bolus_password) true } rh.gs(info.nightscout.core.utils.R.string.key_application_password) -> { - passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.application_password, info.nightscout.core.utils.R.string.key_application_password) + passwordCheck.setPassword(context, app.aaps.core.ui.R.string.application_password, info.nightscout.core.utils.R.string.key_application_password) true } rh.gs(info.nightscout.core.utils.R.string.key_settings_pin) -> { - passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.settings_pin, info.nightscout.core.utils.R.string.key_settings_pin, pinInput = true) + passwordCheck.setPassword(context, app.aaps.core.ui.R.string.settings_pin, info.nightscout.core.utils.R.string.key_settings_pin, pinInput = true) true } rh.gs(info.nightscout.core.utils.R.string.key_bolus_pin) -> { - passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.bolus_pin, info.nightscout.core.utils.R.string.key_bolus_pin, pinInput = true) + passwordCheck.setPassword(context, app.aaps.core.ui.R.string.bolus_pin, info.nightscout.core.utils.R.string.key_bolus_pin, pinInput = true) true } rh.gs(info.nightscout.core.utils.R.string.key_application_pin) -> { - passwordCheck.setPassword(context, info.nightscout.core.ui.R.string.application_pin, info.nightscout.core.utils.R.string.key_application_pin, pinInput = true) + passwordCheck.setPassword(context, app.aaps.core.ui.R.string.application_pin, info.nightscout.core.utils.R.string.key_application_pin, pinInput = true) true } // NSClient copy settings diff --git a/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt b/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt index 1186c9648c..575947b15c 100644 --- a/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt +++ b/app/src/main/kotlin/app/aaps/implementations/UiInteractionImpl.kt @@ -18,7 +18,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector import info.nightscout.androidaps.R -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.plugins.general.overview.notifications.NotificationWithAction import info.nightscout.ui.activities.BolusProgressHelperActivity import info.nightscout.ui.activities.ErrorHelperActivity diff --git a/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt b/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt index 059cb6ad25..4bef277f54 100644 --- a/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt +++ b/app/src/main/kotlin/app/aaps/receivers/KeepAliveWorker.kt @@ -187,10 +187,10 @@ class KeepAliveWorker( rxBus.send(EventProfileSwitchChanged()) } else if (isStatusOutdated && !pump.isBusy()) { lastReadStatus = now - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.keepalive_status_outdated), null) + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.keepalive_status_outdated), null) } else if (isBasalOutdated && !pump.isBusy()) { lastReadStatus = now - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.keepalive_basal_outdated), null) + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.keepalive_basal_outdated), null) } } } \ No newline at end of file diff --git a/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt index ddbedd64c8..445ee79914 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/extensions/TemporaryTargetExtension.kt @@ -22,4 +22,4 @@ fun TemporaryTarget.target(): Double = fun TemporaryTarget.friendlyDescription(units: GlucoseUnit, rh: ResourceHelper, profileUtil: ProfileUtil): String = profileUtil.toTargetRangeString(lowTarget, highTarget, GlucoseUnit.MGDL, units) + units.asText + - "@" + rh.gs(info.nightscout.core.ui.R.string.format_mins, TimeUnit.MILLISECONDS.toMinutes(duration)) + "(" + reason.text + ")" + "@" + rh.gs(app.aaps.core.ui.R.string.format_mins, TimeUnit.MILLISECONDS.toMinutes(duration)) + "(" + reason.text + ")" diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt index fc8c226e39..096f522b9f 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/BasalProfileGraph.kt @@ -76,8 +76,8 @@ class BasalProfileGraph : GraphView { addSeries(basalSeries2) basalSeries2.thickness = 8 basalSeries2.isDrawBackground = false - basalSeries2.color = context.getColor(info.nightscout.core.ui.R.color.examinedProfile) - basalSeries2.backgroundColor = context.getColor(info.nightscout.core.ui.R.color.examinedProfile) + basalSeries2.color = context.getColor(app.aaps.core.ui.R.color.examinedProfile) + basalSeries2.backgroundColor = context.getColor(app.aaps.core.ui.R.color.examinedProfile) viewport.isXAxisBoundsManual = true viewport.setMinX(0.0) diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt index 7e601903b7..69c2eebe3d 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/IcProfileGraph.kt @@ -78,7 +78,7 @@ class IcProfileGraph : GraphView { addSeries(icSeries2) icSeries2.thickness = 8 icSeries2.isDrawBackground = false - icSeries2.color = context.getColor(info.nightscout.core.ui.R.color.examinedProfile) + icSeries2.color = context.getColor(app.aaps.core.ui.R.color.examinedProfile) viewport.isXAxisBoundsManual = true viewport.setMinX(0.0) diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt index 674c8c428c..d162c56fa7 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/IsfProfileGraph.kt @@ -86,7 +86,7 @@ class IsfProfileGraph : GraphView { addSeries(isfSeries2) isfSeries2.thickness = 8 isfSeries2.isDrawBackground = false - isfSeries2.color = context.getColor(info.nightscout.core.ui.R.color.examinedProfile) + isfSeries2.color = context.getColor(app.aaps.core.ui.R.color.examinedProfile) viewport.isXAxisBoundsManual = true viewport.setMinX(0.0) diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt index 0e15d2a53c..551080fe83 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/TargetBgProfileGraph.kt @@ -87,7 +87,7 @@ class TargetBgProfileGraph : GraphView { val targetSeries2: AreaGraphSeries = AreaGraphSeries(targetDataPoints2) addSeries(targetSeries2) targetSeries2.isDrawBackground = false - targetSeries2.color = context.getColor(info.nightscout.core.ui.R.color.examinedProfile) + targetSeries2.color = context.getColor(app.aaps.core.ui.R.color.examinedProfile) viewport.isXAxisBoundsManual = true viewport.setMinX(0.0) diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt index e6463e4c53..50f7dd9879 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/BolusDataPoint.kt @@ -29,9 +29,9 @@ class BolusDataPoint( get() = if (data.type == Bolus.Type.SMB) PointsWithLabelGraphSeries.Shape.SMB else PointsWithLabelGraphSeries.Shape.BOLUS override fun color(context: Context?): Int = - if (data.type == Bolus.Type.SMB) rh.gac(context, info.nightscout.core.ui.R.attr.smbColor) - else if (data.isValid) rh.gac(context, info.nightscout.core.ui.R.attr.bolusDataPointColor) - else rh.gac(context, info.nightscout.core.ui.R.attr.alarmColor) + if (data.type == Bolus.Type.SMB) rh.gac(context, app.aaps.core.ui.R.attr.smbColor) + else if (data.isValid) rh.gac(context, app.aaps.core.ui.R.attr.bolusDataPointColor) + else rh.gac(context, app.aaps.core.ui.R.attr.alarmColor) override fun setY(y: Double) { yValue = y diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt index 8ab61223c5..46ec4e974c 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/CarbsDataPoint.kt @@ -22,7 +22,7 @@ class CarbsDataPoint( override val paintStyle: Paint.Style = Paint.Style.FILL // not used override fun color(context: Context?): Int { - return if (data.isValid) rh.gac(context, info.nightscout.core.ui.R.attr.cobColor) else rh.gac(context, info.nightscout.core.ui.R.attr.alarmColor) + return if (data.isValid) rh.gac(context, app.aaps.core.ui.R.attr.cobColor) else rh.gac(context, app.aaps.core.ui.R.attr.alarmColor) } override fun setY(y: Double) { diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt index 5c310020f2..12f895ab9d 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/EffectiveProfileSwitchDataPoint.kt @@ -25,6 +25,6 @@ class EffectiveProfileSwitchDataPoint( override val size = 2f override val paintStyle: Paint.Style = Paint.Style.FILL // not used override fun color(context: Context?): Int { - return rh.gac(context, info.nightscout.core.ui.R.attr.profileSwitchColor) + return rh.gac(context, app.aaps.core.ui.R.attr.profileSwitchColor) } } \ No newline at end of file diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt index eaae3e4a4b..4c3deb3ff7 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/ExtendedBolusDataPoint.kt @@ -22,7 +22,7 @@ class ExtendedBolusDataPoint( override val shape = PointsWithLabelGraphSeries.Shape.EXTENDEDBOLUS override val paintStyle: Paint.Style = Paint.Style.FILL // not used override fun color(context: Context?): Int { - return rh.gac(context, info.nightscout.core.ui.R.attr.extBolusColor) + return rh.gac(context, app.aaps.core.ui.R.attr.extBolusColor) } override fun setY(y: Double) { diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt index f516fa44f5..51c7491636 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/GlucoseValueDataPoint.kt @@ -30,18 +30,18 @@ class GlucoseValueDataPoint( override fun color(context: Context?): Int { return when { isPrediction -> predictionColor(context) - else -> rh.gac(context, info.nightscout.core.ui.R.attr.originalBgValueColor) + else -> rh.gac(context, app.aaps.core.ui.R.attr.originalBgValueColor) } } private fun predictionColor(context: Context?): Int { return when (data.sourceSensor) { - GlucoseValue.SourceSensor.IOB_PREDICTION -> rh.gac(context, info.nightscout.core.ui.R.attr.iobColor) - GlucoseValue.SourceSensor.COB_PREDICTION -> rh.gac(context, info.nightscout.core.ui.R.attr.cobColor) - GlucoseValue.SourceSensor.A_COB_PREDICTION -> -0x7f000001 and rh.gac(context, info.nightscout.core.ui.R.attr.cobColor) - GlucoseValue.SourceSensor.UAM_PREDICTION -> rh.gac(context, info.nightscout.core.ui.R.attr.uamColor) - GlucoseValue.SourceSensor.ZT_PREDICTION -> rh.gac(context, info.nightscout.core.ui.R.attr.ztColor) - else -> rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor) + GlucoseValue.SourceSensor.IOB_PREDICTION -> rh.gac(context, app.aaps.core.ui.R.attr.iobColor) + GlucoseValue.SourceSensor.COB_PREDICTION -> rh.gac(context, app.aaps.core.ui.R.attr.cobColor) + GlucoseValue.SourceSensor.A_COB_PREDICTION -> -0x7f000001 and rh.gac(context, app.aaps.core.ui.R.attr.cobColor) + GlucoseValue.SourceSensor.UAM_PREDICTION -> rh.gac(context, app.aaps.core.ui.R.attr.uamColor) + GlucoseValue.SourceSensor.ZT_PREDICTION -> rh.gac(context, app.aaps.core.ui.R.attr.ztColor) + else -> rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor) } } diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt index 6e8a555287..eec9f7a434 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/HeartRateDataPoint.kt @@ -20,5 +20,5 @@ class HeartRateDataPoint( override val size = 10f override val paintStyle: Paint.Style = Paint.Style.FILL - override fun color(context: Context?): Int = rh.gac(context, info.nightscout.core.ui.R.attr.heartRateColor) + override fun color(context: Context?): Int = rh.gac(context, app.aaps.core.ui.R.attr.heartRateColor) } diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt index 5261f96b9a..766934fae7 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/InMemoryGlucoseValueDataPoint.kt @@ -36,9 +36,9 @@ class InMemoryGlucoseValueDataPoint( val lowLine = defaultValueHelper.determineLowLine() val highLine = defaultValueHelper.determineHighLine() val color = when { - valueToUnits(units) < lowLine -> rh.gac(context, info.nightscout.core.ui.R.attr.bgLow) - valueToUnits(units) > highLine -> rh.gac(context, info.nightscout.core.ui.R.attr.highColor) - else -> rh.gac(context, info.nightscout.core.ui.R.attr.bgInRange) + valueToUnits(units) < lowLine -> rh.gac(context, app.aaps.core.ui.R.attr.bgLow) + valueToUnits(units) > highLine -> rh.gac(context, app.aaps.core.ui.R.attr.highColor) + else -> rh.gac(context, app.aaps.core.ui.R.attr.bgInRange) } return if (data.filledGap) ColorUtils.setAlphaComponent(color, 128) else color } diff --git a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt index b2ffc996db..1a62323e1e 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/graph/data/TherapyEventDataPoint.kt @@ -50,15 +50,15 @@ class TherapyEventDataPoint( } override val paintStyle: Paint.Style = Paint.Style.FILL // not used - override val size get() = if (rh.gb(info.nightscout.core.ui.R.bool.isTablet)) 12.0f else 10.0f + override val size get() = if (rh.gb(app.aaps.core.ui.R.bool.isTablet)) 12.0f else 10.0f override fun color(context: Context?): Int { return when (data.type) { - TherapyEvent.Type.ANNOUNCEMENT -> rh.gac(context, info.nightscout.core.ui.R.attr.notificationAnnouncement) - TherapyEvent.Type.NS_MBG -> rh.gac(context, info.nightscout.core.ui.R.attr.therapyEvent_NS_MBG) - TherapyEvent.Type.FINGER_STICK_BG_VALUE -> rh.gac(context, info.nightscout.core.ui.R.attr.therapyEvent_FINGER_STICK_BG_VALUE) - TherapyEvent.Type.EXERCISE -> rh.gac(context, info.nightscout.core.ui.R.attr.therapyEvent_EXERCISE) - TherapyEvent.Type.APS_OFFLINE -> rh.gac(context, info.nightscout.core.ui.R.attr.therapyEvent_APS_OFFLINE) and -0x7f000001 - else -> rh.gac(context, info.nightscout.core.ui.R.attr.therapyEvent_Default) + TherapyEvent.Type.ANNOUNCEMENT -> rh.gac(context, app.aaps.core.ui.R.attr.notificationAnnouncement) + TherapyEvent.Type.NS_MBG -> rh.gac(context, app.aaps.core.ui.R.attr.therapyEvent_NS_MBG) + TherapyEvent.Type.FINGER_STICK_BG_VALUE -> rh.gac(context, app.aaps.core.ui.R.attr.therapyEvent_FINGER_STICK_BG_VALUE) + TherapyEvent.Type.EXERCISE -> rh.gac(context, app.aaps.core.ui.R.attr.therapyEvent_EXERCISE) + TherapyEvent.Type.APS_OFFLINE -> rh.gac(context, app.aaps.core.ui.R.attr.therapyEvent_APS_OFFLINE) and -0x7f000001 + else -> rh.gac(context, app.aaps.core.ui.R.attr.therapyEvent_Default) } } } \ No newline at end of file diff --git a/core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt index 5b670eb61b..ed3c8cdca2 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/iob/CobInfoExtension.kt @@ -17,7 +17,7 @@ fun CobInfo.generateCOBString(decimalFormatter: DecimalFormatter): String { fun CobInfo.displayText(rh: ResourceHelper, decimalFormatter: DecimalFormatter): String? = displayCob?.let { displayCob -> - var cobText = rh.gs(info.nightscout.core.ui.R.string.format_carbs, displayCob.toInt()) + var cobText = rh.gs(app.aaps.core.ui.R.string.format_carbs, displayCob.toInt()) if (futureCarbs > 0) cobText += "(" + decimalFormatter.to0Decimal(futureCarbs) + ")" cobText } diff --git a/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt b/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt index 10f1fc6ee9..ba34669933 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/profile/ProfileSealed.kt @@ -112,21 +112,21 @@ sealed class ProfileSealed( if (sendNotifications && config.APS) { val notification = Notification( Notification.BASAL_PROFILE_NOT_ALIGNED_TO_HOURS, - rh.gs(info.nightscout.core.ui.R.string.basalprofilenotaligned, from), + rh.gs(app.aaps.core.ui.R.string.basalprofilenotaligned, from), Notification.NORMAL ) rxBus.send(EventNewNotification(notification)) } validityCheck.isValid = false validityCheck.reasons.add( - rh.gs(info.nightscout.core.ui.R.string.basalprofilenotaligned, from) + rh.gs(app.aaps.core.ui.R.string.basalprofilenotaligned, from) ) break } } if (!hardLimits.isInRange(basalAmount, 0.01, hardLimits.maxBasal())) { validityCheck.isValid = false - validityCheck.reasons.add(rh.gs(info.nightscout.core.ui.R.string.value_out_of_hard_limits, rh.gs(info.nightscout.core.ui.R.string.basal_value), basalAmount)) + validityCheck.reasons.add(rh.gs(app.aaps.core.ui.R.string.value_out_of_hard_limits, rh.gs(app.aaps.core.ui.R.string.basal_value), basalAmount)) break } // Check for minimal basal value @@ -134,28 +134,28 @@ sealed class ProfileSealed( basal.amount = description.basalMinimumRate if (sendNotifications) sendBelowMinimumNotification(from, rxBus, rh) validityCheck.isValid = false - validityCheck.reasons.add(rh.gs(info.nightscout.core.ui.R.string.minimalbasalvaluereplaced, from)) + validityCheck.reasons.add(rh.gs(app.aaps.core.ui.R.string.minimalbasalvaluereplaced, from)) break } else if (basalAmount > description.basalMaximumRate) { basal.amount = description.basalMaximumRate if (sendNotifications) sendAboveMaximumNotification(from, rxBus, rh) validityCheck.isValid = false - validityCheck.reasons.add(rh.gs(info.nightscout.core.ui.R.string.maximumbasalvaluereplaced, from)) + validityCheck.reasons.add(rh.gs(app.aaps.core.ui.R.string.maximumbasalvaluereplaced, from)) break } } if (!hardLimits.isInRange(dia, hardLimits.minDia(), hardLimits.maxDia())) { validityCheck.isValid = false - validityCheck.reasons.add(rh.gs(info.nightscout.core.ui.R.string.value_out_of_hard_limits, rh.gs(info.nightscout.core.ui.R.string.profile_dia), dia)) + validityCheck.reasons.add(rh.gs(app.aaps.core.ui.R.string.value_out_of_hard_limits, rh.gs(app.aaps.core.ui.R.string.profile_dia), dia)) } for (ic in icBlocks) if (!hardLimits.isInRange(ic.amount * 100.0 / percentage, hardLimits.minIC(), hardLimits.maxIC())) { validityCheck.isValid = false validityCheck.reasons.add( rh.gs( - info.nightscout.core.ui.R.string.value_out_of_hard_limits, - rh.gs(info.nightscout.core.ui.R.string.profile_carbs_ratio_value), + app.aaps.core.ui.R.string.value_out_of_hard_limits, + rh.gs(app.aaps.core.ui.R.string.profile_carbs_ratio_value), ic.amount * 100.0 / percentage ) ) @@ -166,8 +166,8 @@ sealed class ProfileSealed( validityCheck.isValid = false validityCheck.reasons.add( rh.gs( - info.nightscout.core.ui.R.string.value_out_of_hard_limits, - rh.gs(info.nightscout.core.ui.R.string.profile_sensitivity_value), + app.aaps.core.ui.R.string.value_out_of_hard_limits, + rh.gs(app.aaps.core.ui.R.string.profile_sensitivity_value), isf.amount * 100.0 / percentage ) ) @@ -181,7 +181,7 @@ sealed class ProfileSealed( ) ) { validityCheck.isValid = false - validityCheck.reasons.add(rh.gs(info.nightscout.core.ui.R.string.value_out_of_hard_limits, rh.gs(info.nightscout.core.ui.R.string.profile_low_target), target.lowTarget)) + validityCheck.reasons.add(rh.gs(app.aaps.core.ui.R.string.value_out_of_hard_limits, rh.gs(app.aaps.core.ui.R.string.profile_low_target), target.lowTarget)) break } if (!hardLimits.isInRange( @@ -191,7 +191,7 @@ sealed class ProfileSealed( ) ) { validityCheck.isValid = false - validityCheck.reasons.add(rh.gs(info.nightscout.core.ui.R.string.value_out_of_hard_limits, rh.gs(info.nightscout.core.ui.R.string.profile_high_target), target.highTarget)) + validityCheck.reasons.add(rh.gs(app.aaps.core.ui.R.string.value_out_of_hard_limits, rh.gs(app.aaps.core.ui.R.string.profile_high_target), target.highTarget)) break } } @@ -199,11 +199,11 @@ sealed class ProfileSealed( } protected open fun sendBelowMinimumNotification(from: String, rxBus: RxBus, rh: ResourceHelper) { - rxBus.send(EventNewNotification(Notification(Notification.MINIMAL_BASAL_VALUE_REPLACED, rh.gs(info.nightscout.core.ui.R.string.minimalbasalvaluereplaced, from), Notification.NORMAL))) + rxBus.send(EventNewNotification(Notification(Notification.MINIMAL_BASAL_VALUE_REPLACED, rh.gs(app.aaps.core.ui.R.string.minimalbasalvaluereplaced, from), Notification.NORMAL))) } protected open fun sendAboveMaximumNotification(from: String, rxBus: RxBus, rh: ResourceHelper) { - rxBus.send(EventNewNotification(Notification(Notification.MAXIMUM_BASAL_VALUE_REPLACED, rh.gs(info.nightscout.core.ui.R.string.maximumbasalvaluereplaced, from), Notification.NORMAL))) + rxBus.send(EventNewNotification(Notification(Notification.MAXIMUM_BASAL_VALUE_REPLACED, rh.gs(app.aaps.core.ui.R.string.maximumbasalvaluereplaced, from), Notification.NORMAL))) } override val units: GlucoseUnit @@ -255,13 +255,13 @@ sealed class ProfileSealed( override fun getTargetHighMgdlTimeFromMidnight(timeAsSeconds: Int): Double = toMgdl(targetBlocks.highTargetBlockValueBySeconds(timeAsSeconds, timeshift), units) override fun getIcList(rh: ResourceHelper, dateUtil: DateUtil): String = - getValuesList(icBlocks, 100.0 / percentage, DecimalFormat("0.0"), rh.gs(info.nightscout.core.ui.R.string.profile_carbs_per_unit), dateUtil) + getValuesList(icBlocks, 100.0 / percentage, DecimalFormat("0.0"), rh.gs(app.aaps.core.ui.R.string.profile_carbs_per_unit), dateUtil) override fun getIsfList(rh: ResourceHelper, dateUtil: DateUtil): String = - getValuesList(isfBlocks, 100.0 / percentage, DecimalFormat("0.0"), units.asText + rh.gs(info.nightscout.core.ui.R.string.profile_per_unit), dateUtil) + getValuesList(isfBlocks, 100.0 / percentage, DecimalFormat("0.0"), units.asText + rh.gs(app.aaps.core.ui.R.string.profile_per_unit), dateUtil) override fun getBasalList(rh: ResourceHelper, dateUtil: DateUtil): String = - getValuesList(basalBlocks, percentage / 100.0, DecimalFormat("0.00"), rh.gs(info.nightscout.core.ui.R.string.profile_ins_units_per_hour), dateUtil) + getValuesList(basalBlocks, percentage / 100.0, DecimalFormat("0.00"), rh.gs(app.aaps.core.ui.R.string.profile_ins_units_per_hour), dateUtil) override fun getTargetList(rh: ResourceHelper, dateUtil: DateUtil): String = getTargetValuesList(targetBlocks, DecimalFormat("0.0"), units.asText, dateUtil) diff --git a/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt b/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt index 45fd20a5be..1b9b0a79b0 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/pump/PumpEnactResultExtension.kt @@ -5,39 +5,39 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.utils.DecimalFormatter fun PumpEnactResult.toHtml(rh: ResourceHelper, decimalFormatter: DecimalFormatter): String { - var ret = "" + rh.gs(info.nightscout.core.ui.R.string.success) + ": " + success + var ret = "" + rh.gs(app.aaps.core.ui.R.string.success) + ": " + success if (queued) { - ret = rh.gs(info.nightscout.core.ui.R.string.waitingforpumpresult) + ret = rh.gs(app.aaps.core.ui.R.string.waitingforpumpresult) } else if (enacted) { when { bolusDelivered > 0 -> { - ret += "
" + rh.gs(info.nightscout.core.ui.R.string.enacted) + ": " + enacted - if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.ui.R.string.comment) + ": " + comment - ret += "
" + rh.gs(info.nightscout.core.ui.R.string.smb_shortname) + ": " + bolusDelivered + " " + rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + ret += "
" + rh.gs(app.aaps.core.ui.R.string.enacted) + ": " + enacted + if (comment.isNotEmpty()) ret += "
" + rh.gs(app.aaps.core.ui.R.string.comment) + ": " + comment + ret += "
" + rh.gs(app.aaps.core.ui.R.string.smb_shortname) + ": " + bolusDelivered + " " + rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) } isTempCancel -> { - ret += "
" + rh.gs(info.nightscout.core.ui.R.string.enacted) + ": " + enacted - ret += "
" + rh.gs(info.nightscout.core.ui.R.string.comment) + ": " + comment + - "
" + rh.gs(info.nightscout.core.ui.R.string.cancel_temp) + ret += "
" + rh.gs(app.aaps.core.ui.R.string.enacted) + ": " + enacted + ret += "
" + rh.gs(app.aaps.core.ui.R.string.comment) + ": " + comment + + "
" + rh.gs(app.aaps.core.ui.R.string.cancel_temp) } isPercent && percent != -1 -> { - ret += "
" + rh.gs(info.nightscout.core.ui.R.string.enacted) + ": " + enacted - if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.ui.R.string.comment) + ": " + comment - ret += "
" + rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + " min" - ret += "
" + rh.gs(info.nightscout.core.ui.R.string.percent) + ": " + percent + "%" + ret += "
" + rh.gs(app.aaps.core.ui.R.string.enacted) + ": " + enacted + if (comment.isNotEmpty()) ret += "
" + rh.gs(app.aaps.core.ui.R.string.comment) + ": " + comment + ret += "
" + rh.gs(app.aaps.core.ui.R.string.duration) + ": " + duration + " min" + ret += "
" + rh.gs(app.aaps.core.ui.R.string.percent) + ": " + percent + "%" } absolute != -1.0 -> { - ret += "
" + rh.gs(info.nightscout.core.ui.R.string.enacted) + ": " + enacted - if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.ui.R.string.comment) + ": " + comment - ret += "
" + rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + " min" - ret += "
" + rh.gs(info.nightscout.core.ui.R.string.absolute) + ": " + decimalFormatter.to2Decimal(absolute) + " U/h" + ret += "
" + rh.gs(app.aaps.core.ui.R.string.enacted) + ": " + enacted + if (comment.isNotEmpty()) ret += "
" + rh.gs(app.aaps.core.ui.R.string.comment) + ": " + comment + ret += "
" + rh.gs(app.aaps.core.ui.R.string.duration) + ": " + duration + " min" + ret += "
" + rh.gs(app.aaps.core.ui.R.string.absolute) + ": " + decimalFormatter.to2Decimal(absolute) + " U/h" } } } else { - if (comment.isNotEmpty()) ret += "
" + rh.gs(info.nightscout.core.ui.R.string.comment) + ": " + comment + if (comment.isNotEmpty()) ret += "
" + rh.gs(app.aaps.core.ui.R.string.comment) + ": " + comment } return ret } \ No newline at end of file diff --git a/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt b/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt index dec572aba3..7244b6305d 100644 --- a/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt +++ b/core/main/src/main/kotlin/app/aaps/core/main/wizard/BolusWizard.kt @@ -38,7 +38,7 @@ import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.T import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.BolusCalculatorResult import info.nightscout.database.entities.OfflineEvent @@ -320,47 +320,47 @@ class BolusWizard @Inject constructor( if (insulinAfterConstraints > 0) { val pct = if (percentageCorrection != 100) " ($percentageCorrection%)" else "" actions.add( - rh.gs(info.nightscout.core.ui.R.string.bolus) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, insulinAfterConstraints).formatColor - (context, rh, info.nightscout.core.ui.R.attr.bolusColor) + pct + rh.gs(app.aaps.core.ui.R.string.bolus) + ": " + rh.gs(app.aaps.core.ui.R.string.format_insulin_units, insulinAfterConstraints).formatColor + (context, rh, app.aaps.core.ui.R.attr.bolusColor) + pct ) } if (carbs > 0 && !advisor) { var timeShift = "" if (carbTime > 0) { - timeShift += " (+" + rh.gs(info.nightscout.core.ui.R.string.mins, carbTime) + ")" + timeShift += " (+" + rh.gs(app.aaps.core.ui.R.string.mins, carbTime) + ")" } else if (carbTime < 0) { - timeShift += " (" + rh.gs(info.nightscout.core.ui.R.string.mins, carbTime) + ")" + timeShift += " (" + rh.gs(app.aaps.core.ui.R.string.mins, carbTime) + ")" } actions.add( - rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_carbs, carbs) - .formatColor(context, rh, info.nightscout.core.ui.R.attr.carbsColor) + timeShift + rh.gs(app.aaps.core.ui.R.string.carbs) + ": " + rh.gs(app.aaps.core.ui.R.string.format_carbs, carbs) + .formatColor(context, rh, app.aaps.core.ui.R.attr.carbsColor) + timeShift ) } if (insulinFromCOB > 0) { actions.add( - rh.gs(info.nightscout.core.ui.R.string.cobvsiob) + ": " + rh.gs( - info.nightscout.core.ui.R.string.formatsignedinsulinunits, + rh.gs(app.aaps.core.ui.R.string.cobvsiob) + ": " + rh.gs( + app.aaps.core.ui.R.string.formatsignedinsulinunits, insulinFromBolusIOB + insulinFromBasalIOB + insulinFromCOB + insulinFromBG ).formatColor( - context, rh, info.nightscout.core.ui.R.attr + context, rh, app.aaps.core.ui.R.attr .cobAlertColor ) ) val absorptionRate = iobCobCalculator.ads.slowAbsorptionPercentage(60) if (absorptionRate > .25) - actions.add(rh.gs(info.nightscout.core.ui.R.string.slowabsorptiondetected, rh.gac(context, info.nightscout.core.ui.R.attr.cobAlertColor), (absorptionRate * 100).toInt())) + actions.add(rh.gs(app.aaps.core.ui.R.string.slowabsorptiondetected, rh.gac(context, app.aaps.core.ui.R.attr.cobAlertColor), (absorptionRate * 100).toInt())) } if (abs(insulinAfterConstraints - calculatedTotalInsulin) > activePlugin.activePump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) actions.add( - rh.gs(info.nightscout.core.ui.R.string.bolus_constraint_applied_warn, calculatedTotalInsulin, insulinAfterConstraints) - .formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor) + rh.gs(app.aaps.core.ui.R.string.bolus_constraint_applied_warn, calculatedTotalInsulin, insulinAfterConstraints) + .formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor) ) if (config.NSCLIENT && insulinAfterConstraints > 0) - actions.add(rh.gs(info.nightscout.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) + actions.add(rh.gs(app.aaps.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)) if (useAlarm && !advisor && carbs > 0 && carbTime > 0) - actions.add(rh.gs(info.nightscout.core.ui.R.string.alarminxmin, carbTime).formatColor(context, rh, info.nightscout.core.ui.R.attr.infoColor)) + actions.add(rh.gs(app.aaps.core.ui.R.string.alarminxmin, carbTime).formatColor(context, rh, app.aaps.core.ui.R.attr.infoColor)) if (advisor) - actions.add(rh.gs(info.nightscout.core.ui.R.string.advisoralarm).formatColor(context, rh, info.nightscout.core.ui.R.attr.infoColor)) + actions.add(rh.gs(app.aaps.core.ui.R.string.advisoralarm).formatColor(context, rh, app.aaps.core.ui.R.attr.infoColor)) return HtmlHelper.fromHtml(Joiner.on("
").join(actions)) } @@ -376,21 +376,21 @@ class BolusWizard @Inject constructor( automation.removeAutomationEventBolusReminder() if (carbs > 0.0) automation.removeAutomationEventEatReminder() - if (sp.getBoolean(info.nightscout.core.ui.R.string.key_usebolusadvisor, false) && profileUtil.convertToMgdl(bg, profile.units) > 180 && carbs > 0 && carbTime >= 0) - OKDialog.showYesNoCancel(ctx, rh.gs(info.nightscout.core.ui.R.string.bolus_advisor), rh.gs(info.nightscout.core.ui.R.string.bolus_advisor_message), + if (sp.getBoolean(app.aaps.core.ui.R.string.key_usebolusadvisor, false) && profileUtil.convertToMgdl(bg, profile.units) > 180 && carbs > 0 && carbTime >= 0) + OKDialog.showYesNoCancel(ctx, rh.gs(app.aaps.core.ui.R.string.bolus_advisor), rh.gs(app.aaps.core.ui.R.string.bolus_advisor_message), { bolusAdvisorProcessing(ctx) }, { commonProcessing(ctx) } ) else commonProcessing(ctx) } else { - OKDialog.show(ctx, rh.gs(info.nightscout.core.ui.R.string.boluswizard), rh.gs(info.nightscout.core.ui.R.string.no_action_selected)) + OKDialog.show(ctx, rh.gs(app.aaps.core.ui.R.string.boluswizard), rh.gs(app.aaps.core.ui.R.string.no_action_selected)) } } private fun bolusAdvisorProcessing(ctx: Context) { val confirmMessage = confirmMessageAfterConstraints(ctx, advisor = true) - OKDialog.showConfirmation(ctx, rh.gs(info.nightscout.core.ui.R.string.boluswizard), confirmMessage, { + OKDialog.showConfirmation(ctx, rh.gs(app.aaps.core.ui.R.string.boluswizard), confirmMessage, { DetailedBolusInfo().apply { eventType = DetailedBolusInfo.EventType.CORRECTION_BOLUS insulin = insulinAfterConstraints @@ -412,7 +412,7 @@ class BolusWizard @Inject constructor( commandQueue.bolus(this, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror), app.aaps.core.ui.R.raw.boluserror) } else automation.scheduleAutomationEventEatReminder() } @@ -423,24 +423,24 @@ class BolusWizard @Inject constructor( } fun explainShort(): String { - var message = rh.gs(info.nightscout.core.ui.R.string.wizard_explain_calc, ic, sens) - message += "\n" + rh.gs(info.nightscout.core.ui.R.string.wizard_explain_carbs, insulinFromCarbs) + var message = rh.gs(app.aaps.core.ui.R.string.wizard_explain_calc, ic, sens) + message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_carbs, insulinFromCarbs) if (useTT && tempTarget != null) { val tt = if (tempTarget?.lowTarget == tempTarget?.highTarget) tempTarget?.lowValueToUnitsToString(profile.units, decimalFormatter) else rh.gs( - info.nightscout.core.ui.R.string.wizard_explain_tt_to, + app.aaps.core.ui.R.string.wizard_explain_tt_to, tempTarget?.lowValueToUnitsToString(profile.units, decimalFormatter), tempTarget?.highValueToUnitsToString(profile.units, decimalFormatter) ) - message += "\n" + rh.gs(info.nightscout.core.ui.R.string.wizard_explain_tt, tt) + message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_tt, tt) } - if (useCob) message += "\n" + rh.gs(info.nightscout.core.ui.R.string.wizard_explain_cob, cob, insulinFromCOB) - if (useBg) message += "\n" + rh.gs(info.nightscout.core.ui.R.string.wizard_explain_bg, insulinFromBG) - if (includeBolusIOB) message += "\n" + rh.gs(info.nightscout.core.ui.R.string.wizard_explain_iob, insulinFromBolusIOB + insulinFromBasalIOB) - if (useTrend) message += "\n" + rh.gs(info.nightscout.core.ui.R.string.wizard_explain_trend, insulinFromTrend) - if (useSuperBolus) message += "\n" + rh.gs(info.nightscout.core.ui.R.string.wizard_explain_superbolus, insulinFromSuperBolus) + if (useCob) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_cob, cob, insulinFromCOB) + if (useBg) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_bg, insulinFromBG) + if (includeBolusIOB) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_iob, insulinFromBolusIOB + insulinFromBasalIOB) + if (useTrend) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_trend, insulinFromTrend) + if (useSuperBolus) message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_superbolus, insulinFromSuperBolus) if (percentageCorrection != 100) { - message += "\n" + rh.gs(info.nightscout.core.ui.R.string.wizard_explain_percent, totalBeforePercentageAdjustment, percentageCorrection, calculatedTotalInsulin) + message += "\n" + rh.gs(app.aaps.core.ui.R.string.wizard_explain_percent, totalBeforePercentageAdjustment, percentageCorrection, calculatedTotalInsulin) } return message } @@ -450,7 +450,7 @@ class BolusWizard @Inject constructor( val pump = activePlugin.activePump val confirmMessage = confirmMessageAfterConstraints(ctx, advisor = false) - OKDialog.showConfirmation(ctx, rh.gs(info.nightscout.core.ui.R.string.boluswizard), confirmMessage, { + OKDialog.showConfirmation(ctx, rh.gs(app.aaps.core.ui.R.string.boluswizard), confirmMessage, { if (insulinAfterConstraints > 0 || carbs > 0) { if (useSuperBolus) { uel.log(Action.SUPERBOLUS_TBR, Sources.WizardDialog) @@ -463,7 +463,7 @@ class BolusWizard @Inject constructor( commandQueue.tempBasalAbsolute(0.0, 120, true, profile, PumpSync.TemporaryBasalType.NORMAL, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error), app.aaps.core.ui.R.raw.boluserror) } } }) @@ -471,7 +471,7 @@ class BolusWizard @Inject constructor( commandQueue.tempBasalPercent(0, 120, true, profile, PumpSync.TemporaryBasalType.NORMAL, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error), app.aaps.core.ui.R.raw.boluserror) } } }) @@ -502,7 +502,7 @@ class BolusWizard @Inject constructor( commandQueue.bolus(this, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror), app.aaps.core.ui.R.raw.boluserror) } } }) diff --git a/core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt b/core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt index 1132488f6f..9b55480244 100644 --- a/core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt +++ b/core/main/src/test/kotlin/app/aaps/interfaces/profile/ProfileSealedTest.kt @@ -60,9 +60,9 @@ class ProfileSealedTest : TestBase() { dateUtil = DateUtilImpl(context) hardLimits = HardLimitsMock(sp, rh) `when`(activePluginProvider.activePump).thenReturn(testPumpPlugin) - `when`(rh.gs(info.nightscout.core.ui.R.string.profile_per_unit)).thenReturn("/U") - `when`(rh.gs(info.nightscout.core.ui.R.string.profile_carbs_per_unit)).thenReturn("g/U") - `when`(rh.gs(info.nightscout.core.ui.R.string.profile_ins_units_per_hour)).thenReturn("U/h") + `when`(rh.gs(app.aaps.core.ui.R.string.profile_per_unit)).thenReturn("/U") + `when`(rh.gs(app.aaps.core.ui.R.string.profile_carbs_per_unit)).thenReturn("g/U") + `when`(rh.gs(app.aaps.core.ui.R.string.profile_ins_units_per_hour)).thenReturn("U/h") `when`(rh.gs(anyInt(), anyString())).thenReturn("") } diff --git a/core/ui/build.gradle b/core/ui/build.gradle index 3ed9373b28..f8d0c810f6 100644 --- a/core/ui/build.gradle +++ b/core/ui/build.gradle @@ -8,7 +8,7 @@ apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" android { - namespace 'info.nightscout.core.ui' + namespace 'app.aaps.core.ui' buildFeatures { viewBinding true diff --git a/core/ui/src/main/java/info/nightscout/core/ui/ContextExtensions.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/ContextExtensions.kt similarity index 90% rename from core/ui/src/main/java/info/nightscout/core/ui/ContextExtensions.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/ContextExtensions.kt index 66c90c75d2..23fc702d5c 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/ContextExtensions.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/ContextExtensions.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui +package app.aaps.core.ui import android.content.Context import android.util.TypedValue diff --git a/core/ui/src/main/java/info/nightscout/core/ui/UIRunnable.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/UIRunnable.kt similarity index 90% rename from core/ui/src/main/java/info/nightscout/core/ui/UIRunnable.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/UIRunnable.kt index 2ec57ab925..2d6a687aa7 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/UIRunnable.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/UIRunnable.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui +package app.aaps.core.ui import android.os.Handler import android.os.Looper diff --git a/core/ui/src/main/java/info/nightscout/core/ui/activities/PluginNoSplashAppCompatActivity.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/activities/PluginNoSplashAppCompatActivity.kt similarity index 79% rename from core/ui/src/main/java/info/nightscout/core/ui/activities/PluginNoSplashAppCompatActivity.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/activities/PluginNoSplashAppCompatActivity.kt index 4aa503a08f..35cb2b56d5 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/activities/PluginNoSplashAppCompatActivity.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/activities/PluginNoSplashAppCompatActivity.kt @@ -1,8 +1,8 @@ -package info.nightscout.core.ui.activities +package app.aaps.core.ui.activities import android.os.Bundle import dagger.android.support.DaggerAppCompatActivity -import info.nightscout.core.ui.R +import app.aaps.core.ui.R open class PluginNoSplashAppCompatActivity : DaggerAppCompatActivity() { public override fun onCreate(savedInstanceState: Bundle?) { diff --git a/core/ui/src/main/java/info/nightscout/core/ui/activities/TranslatedDaggerAppCompatActivity.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/activities/TranslatedDaggerAppCompatActivity.kt similarity index 92% rename from core/ui/src/main/java/info/nightscout/core/ui/activities/TranslatedDaggerAppCompatActivity.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/activities/TranslatedDaggerAppCompatActivity.kt index 33442bba6c..09eed6e2f3 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/activities/TranslatedDaggerAppCompatActivity.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/activities/TranslatedDaggerAppCompatActivity.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.activities +package app.aaps.core.ui.activities import android.content.Context import android.os.Bundle @@ -6,8 +6,8 @@ import android.view.Menu import android.view.MenuInflater import android.view.MenuItem import androidx.core.view.MenuProvider +import app.aaps.core.ui.locale.LocaleHelper import dagger.android.support.DaggerAppCompatActivity -import info.nightscout.core.ui.locale.LocaleHelper open class TranslatedDaggerAppCompatActivity : DaggerAppCompatActivity() { override fun attachBaseContext(newBase: Context) { diff --git a/core/ui/src/main/java/info/nightscout/core/ui/dialogs/AlertDialogHelper.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/AlertDialogHelper.kt similarity index 94% rename from core/ui/src/main/java/info/nightscout/core/ui/dialogs/AlertDialogHelper.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/AlertDialogHelper.kt index 086956e9f4..b94ea8e741 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/dialogs/AlertDialogHelper.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/AlertDialogHelper.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.dialogs +package app.aaps.core.ui.dialogs import android.content.Context import android.view.LayoutInflater @@ -10,7 +10,7 @@ import androidx.annotation.LayoutRes import androidx.annotation.StyleRes import androidx.appcompat.view.ContextThemeWrapper import com.google.android.material.dialog.MaterialAlertDialogBuilder -import info.nightscout.core.ui.R +import app.aaps.core.ui.R object AlertDialogHelper { diff --git a/core/ui/src/main/java/info/nightscout/core/ui/dialogs/OKDialog.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/OKDialog.kt similarity index 99% rename from core/ui/src/main/java/info/nightscout/core/ui/dialogs/OKDialog.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/OKDialog.kt index 8776206258..fa5082bd0a 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/dialogs/OKDialog.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/OKDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.dialogs +package app.aaps.core.ui.dialogs import android.annotation.SuppressLint import android.content.Context @@ -9,7 +9,7 @@ import android.os.SystemClock import android.text.Spanned import androidx.fragment.app.FragmentActivity import com.google.android.material.dialog.MaterialAlertDialogBuilder -import info.nightscout.core.ui.R +import app.aaps.core.ui.R object OKDialog { diff --git a/core/ui/src/main/java/info/nightscout/core/ui/dialogs/TwoMessagesAlertDialog.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/TwoMessagesAlertDialog.kt similarity index 96% rename from core/ui/src/main/java/info/nightscout/core/ui/dialogs/TwoMessagesAlertDialog.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/TwoMessagesAlertDialog.kt index 797daaa926..b1adfba840 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/dialogs/TwoMessagesAlertDialog.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/TwoMessagesAlertDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.dialogs +package app.aaps.core.ui.dialogs import android.annotation.SuppressLint import android.content.Context @@ -11,7 +11,7 @@ import android.view.View import android.widget.TextView import androidx.annotation.DrawableRes import com.google.android.material.dialog.MaterialAlertDialogBuilder -import info.nightscout.core.ui.R +import app.aaps.core.ui.R object TwoMessagesAlertDialog { diff --git a/core/ui/src/main/java/info/nightscout/core/ui/dialogs/WarningDialog.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/WarningDialog.kt similarity index 96% rename from core/ui/src/main/java/info/nightscout/core/ui/dialogs/WarningDialog.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/WarningDialog.kt index 0f7447f75b..8fb22d1db6 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/dialogs/WarningDialog.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/dialogs/WarningDialog.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.dialogs +package app.aaps.core.ui.dialogs import android.annotation.SuppressLint import android.content.Context @@ -8,7 +8,7 @@ import android.os.Looper import android.os.SystemClock import androidx.annotation.StringRes import com.google.android.material.dialog.MaterialAlertDialogBuilder -import info.nightscout.core.ui.R +import app.aaps.core.ui.R // if you need error dialog - duplicate to ErrorDialog and make it and use: AppThemeErrorDialog & R.drawable.ic_header_error instead diff --git a/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/ItemTouchHelperAdapter.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/dragHelpers/ItemTouchHelperAdapter.kt similarity index 66% rename from core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/ItemTouchHelperAdapter.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/dragHelpers/ItemTouchHelperAdapter.kt index 458897a4a2..86300a6ebb 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/ItemTouchHelperAdapter.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/dragHelpers/ItemTouchHelperAdapter.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.dragHelpers +package app.aaps.core.ui.dragHelpers interface ItemTouchHelperAdapter { @@ -6,15 +6,15 @@ interface ItemTouchHelperAdapter { * Called when an item has been dragged far enough to trigger a move. This is called every time * an item is shifted, and **not** at the end of a "drop" event.

*

- * Implementations should call [RecyclerView.Adapter.notifyItemMoved] after + * Implementations should call [androidx.recyclerview.widget.RecyclerView.Adapter.notifyItemMoved] after * adjusting the underlying data to reflect this move. * * @param fromPosition The start position of the moved item. * @param toPosition Then resolved position of the moved item. * @return True if the item was moved to the new adapter position. * - * @see RecyclerView.getAdapterPositionFor - * @see RecyclerView.ViewHolder.getAdapterPosition + * @see androidx.recyclerview.widget.RecyclerView.getAdapterPositionFor + * @see androidx.recyclerview.widget.RecyclerView.ViewHolder.getAdapterPosition */ fun onItemMove(fromPosition: Int, toPosition: Int): Boolean diff --git a/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/OnStartDragListener.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/dragHelpers/OnStartDragListener.kt similarity index 86% rename from core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/OnStartDragListener.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/dragHelpers/OnStartDragListener.kt index aef86bc506..69d1ac3791 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/OnStartDragListener.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/dragHelpers/OnStartDragListener.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.dragHelpers +package app.aaps.core.ui.dragHelpers import androidx.recyclerview.widget.RecyclerView diff --git a/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt similarity index 97% rename from core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt index cbfde8d04d..777f8c06c6 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/dragHelpers/SimpleItemTouchHelperCallback.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.dragHelpers +package app.aaps.core.ui.dragHelpers import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper.ACTION_STATE_DRAG diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/BluetoothDevicePreference.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/BluetoothDevicePreference.kt similarity index 90% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/BluetoothDevicePreference.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/BluetoothDevicePreference.kt index aa21175169..6f83beda83 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/BluetoothDevicePreference.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/BluetoothDevicePreference.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.Manifest import android.bluetooth.BluetoothManager @@ -8,8 +8,8 @@ import android.os.Build import android.util.AttributeSet import androidx.core.app.ActivityCompat import androidx.preference.ListPreference -import info.nightscout.core.ui.R -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils +import app.aaps.core.ui.R import java.util.Vector class BluetoothDevicePreference @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ListPreference(context, attrs) { diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/DigitsKeyListenerWithComma.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/DigitsKeyListenerWithComma.kt similarity index 99% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/DigitsKeyListenerWithComma.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/DigitsKeyListenerWithComma.kt index 0086eeab07..fc7e1e2b5f 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/DigitsKeyListenerWithComma.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/DigitsKeyListenerWithComma.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.text.InputType import android.text.SpannableStringBuilder diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/IntSeekBarPreference.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/IntSeekBarPreference.kt similarity index 94% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/IntSeekBarPreference.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/IntSeekBarPreference.kt index 17324cb591..339422fdfc 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/IntSeekBarPreference.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/IntSeekBarPreference.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.content.Context import android.util.AttributeSet @@ -19,7 +19,7 @@ import androidx.preference.SeekBarPreference * value is re-read as a string and then converted to an int. * * To use this in fragment XMLs, replace "SeekBarPreference" in them - * with "info.nightscout.core.ui.elements.IntSeekBarPreference". + * with "app.aaps.core.ui.elements.IntSeekBarPreference". */ class IntSeekBarPreference @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : SeekBarPreference(context, attrs) { override fun onSetInitialValue(defaultValue: Any?) { diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/MinutesNumberPicker.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/MinutesNumberPicker.kt similarity index 84% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/MinutesNumberPicker.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/MinutesNumberPicker.kt index e1dac44d69..edc24d3642 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/MinutesNumberPicker.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/MinutesNumberPicker.kt @@ -1,12 +1,12 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.content.Context import android.util.AttributeSet import android.widget.Button -import info.nightscout.core.ui.R +import app.aaps.core.ui.R import java.text.DecimalFormat -class MinutesNumberPicker constructor(context: Context, attrs: AttributeSet? = null) : NumberPicker(context, attrs) { +class MinutesNumberPicker(context: Context, attrs: AttributeSet? = null) : NumberPicker(context, attrs) { fun setParams(initValue: Double, minValue: Double, maxValue: Double, step: Double, allowZero: Boolean, okButton: Button? = null) { super.setParams(initValue, minValue, maxValue, step, null, allowZero, okButton) diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/NumberPicker.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/NumberPicker.kt similarity index 98% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/NumberPicker.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/NumberPicker.kt index 873577b9ac..ca11b1607e 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/NumberPicker.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/NumberPicker.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.annotation.SuppressLint import android.app.Service @@ -21,9 +21,9 @@ import android.view.accessibility.AccessibilityManager import android.view.inputmethod.InputMethodManager import android.widget.Button import android.widget.LinearLayout -import info.nightscout.core.ui.R -import info.nightscout.core.ui.databinding.NumberPickerLayoutBinding -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils +import app.aaps.core.ui.R +import app.aaps.core.ui.databinding.NumberPickerLayoutBinding import java.text.NumberFormat import java.util.concurrent.Executors import java.util.concurrent.ScheduledExecutorService diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/NumberPickerVertical.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/NumberPickerVertical.kt similarity index 79% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/NumberPickerVertical.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/NumberPickerVertical.kt index 0d0d206524..1ae02e99a3 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/NumberPickerVertical.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/NumberPickerVertical.kt @@ -1,9 +1,9 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater -import info.nightscout.core.ui.databinding.NumberPickerLayoutVerticalBinding +import app.aaps.core.ui.databinding.NumberPickerLayoutVerticalBinding class NumberPickerVertical(context: Context, attrs: AttributeSet? = null) : NumberPicker(context, attrs) { diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/NumberPickerViewAdapter.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/NumberPickerViewAdapter.kt similarity index 61% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/NumberPickerViewAdapter.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/NumberPickerViewAdapter.kt index 12a2424915..bd308ba785 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/NumberPickerViewAdapter.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/NumberPickerViewAdapter.kt @@ -1,21 +1,16 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements -import info.nightscout.core.ui.databinding.NumberPickerLayoutBinding -import info.nightscout.core.ui.databinding.NumberPickerLayoutVerticalBinding +import app.aaps.core.ui.databinding.NumberPickerLayoutBinding +import app.aaps.core.ui.databinding.NumberPickerLayoutVerticalBinding /** * NumberPickerViewAdapter binds both NumberPickerLayoutBinding and NumberPickerLayoutVerticalBinding shared attributes to one common view adapter. * Requires at least one of the ViewBinding as a parameter. Recommended to use the factory object to create the binding. */ -class NumberPickerViewAdapter( - val nH: NumberPickerLayoutBinding?, - nV: NumberPickerLayoutVerticalBinding?, -) { +class NumberPickerViewAdapter(nH: NumberPickerLayoutBinding?, nV: NumberPickerLayoutVerticalBinding?) { init { - if (nH == null && nV == null) { - throw IllegalArgumentException("Require at least on Binding parameter") - } + require(nH != null || nV != null) { "Require at least on Binding parameter" } } val editText = nH?.display ?: nV?.display ?: throw IllegalArgumentException("Missing require View Binding parameter display") @@ -25,12 +20,7 @@ class NumberPickerViewAdapter( companion object { - fun getBinding(bindLayout: NumberPickerLayoutBinding): NumberPickerViewAdapter { - return NumberPickerViewAdapter(bindLayout, null) - } - - fun getBinding(bindLayout: NumberPickerLayoutVerticalBinding): NumberPickerViewAdapter { - return NumberPickerViewAdapter(null, bindLayout) - } + fun getBinding(bindLayout: NumberPickerLayoutBinding): NumberPickerViewAdapter = NumberPickerViewAdapter(bindLayout, null) + fun getBinding(bindLayout: NumberPickerLayoutVerticalBinding): NumberPickerViewAdapter = NumberPickerViewAdapter(null, bindLayout) } } diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/SingleClickButton.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/SingleClickButton.kt similarity index 95% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/SingleClickButton.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/SingleClickButton.kt index f10da62ac8..a3be1f5710 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/SingleClickButton.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/SingleClickButton.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.content.Context import android.util.AttributeSet diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/SpinnerHelper.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/SpinnerHelper.kt similarity index 99% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/SpinnerHelper.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/SpinnerHelper.kt index e0d1efbf6a..7183e7ce44 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/SpinnerHelper.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/SpinnerHelper.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.view.MotionEvent import android.view.View diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/VerticalTextView.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/VerticalTextView.kt similarity index 97% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/VerticalTextView.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/VerticalTextView.kt index 2e04fe4b76..42f529c7de 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/VerticalTextView.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/VerticalTextView.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.content.Context import android.graphics.Canvas diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/WeekDay.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/WeekDay.kt similarity index 87% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/WeekDay.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/WeekDay.kt index 5281ffd220..9e971828e8 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/WeekDay.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/WeekDay.kt @@ -1,8 +1,8 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.widget.LinearLayout import androidx.annotation.StringRes -import info.nightscout.core.ui.R +import app.aaps.core.ui.R import java.util.Calendar import java.util.Date @@ -41,21 +41,21 @@ open class WeekDay { fun fromCalendarInt(day: Int): DayOfWeek { for (i in calendarInts.indices) { - if (calendarInts[i] == day) return values()[i] + if (calendarInts[i] == day) return entries[i] } throw IllegalStateException("Invalid day") } } } - val weekdays = BooleanArray(DayOfWeek.values().size) + val weekdays = BooleanArray(DayOfWeek.entries.size) var view: WeekdayPicker? = null init { - for (day in DayOfWeek.values()) set(day, false) + for (day in DayOfWeek.entries) set(day, false) } fun setAll(value: Boolean) { - for (day in DayOfWeek.values()) set(day, value) + for (day in DayOfWeek.entries) set(day, value) } operator fun set(day: DayOfWeek, value: Boolean): WeekDay { @@ -73,7 +73,7 @@ open class WeekDay { fun getSelectedDays(): List { val selectedDays: MutableList = ArrayList() for (i in weekdays.indices) { - val day = DayOfWeek.values()[i] + val day = DayOfWeek.entries[i] val selected = weekdays[i] if (selected) selectedDays.add(day.toCalendarInt()) } diff --git a/core/ui/src/main/java/info/nightscout/core/ui/elements/WeekdayPicker.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/WeekdayPicker.kt similarity index 90% rename from core/ui/src/main/java/info/nightscout/core/ui/elements/WeekdayPicker.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/elements/WeekdayPicker.kt index f4b098c10b..93c320cd27 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/elements/WeekdayPicker.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/elements/WeekdayPicker.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.elements +package app.aaps.core.ui.elements import android.content.Context import android.util.AttributeSet @@ -7,12 +7,10 @@ import android.view.View import android.widget.Checkable import androidx.appcompat.widget.AppCompatCheckedTextView import androidx.constraintlayout.widget.ConstraintLayout -import info.nightscout.core.ui.databinding.WeekdayPickerBinding +import app.aaps.core.ui.databinding.WeekdayPickerBinding import java.util.Calendar -class WeekdayPicker constructor( - context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : ConstraintLayout(context, attrs, defStyleAttr) { +class WeekdayPicker(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) { private var changeListener: ((Int, Boolean) -> Unit)? = null diff --git a/core/ui/src/main/java/info/nightscout/core/ui/extensions/RadioGroupExtension.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/extensions/RadioGroupExtension.kt similarity index 91% rename from core/ui/src/main/java/info/nightscout/core/ui/extensions/RadioGroupExtension.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/extensions/RadioGroupExtension.kt index 54b61b97db..5697264db3 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/extensions/RadioGroupExtension.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/extensions/RadioGroupExtension.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.extensions +package app.aaps.core.ui.extensions import android.widget.RadioGroup import androidx.appcompat.widget.AppCompatRadioButton diff --git a/core/ui/src/main/java/info/nightscout/core/ui/locale/LocaleHelper.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/locale/LocaleHelper.kt similarity index 96% rename from core/ui/src/main/java/info/nightscout/core/ui/locale/LocaleHelper.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/locale/LocaleHelper.kt index a703d9d6d0..909d7ffa2a 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/locale/LocaleHelper.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/locale/LocaleHelper.kt @@ -1,11 +1,11 @@ -package info.nightscout.core.ui.locale +package app.aaps.core.ui.locale import android.content.Context import android.content.ContextWrapper import android.content.res.Configuration import android.os.LocaleList import androidx.preference.PreferenceManager -import info.nightscout.core.ui.R +import app.aaps.core.ui.R import java.util.Locale object LocaleHelper { diff --git a/core/ui/src/main/java/info/nightscout/core/ui/toast/ToastUtils.kt b/core/ui/src/main/kotlin/app/aaps/core/ui/toast/ToastUtils.kt similarity index 97% rename from core/ui/src/main/java/info/nightscout/core/ui/toast/ToastUtils.kt rename to core/ui/src/main/kotlin/app/aaps/core/ui/toast/ToastUtils.kt index cc9d457c2f..545d0ed362 100644 --- a/core/ui/src/main/java/info/nightscout/core/ui/toast/ToastUtils.kt +++ b/core/ui/src/main/kotlin/app/aaps/core/ui/toast/ToastUtils.kt @@ -1,4 +1,4 @@ -package info.nightscout.core.ui.toast +package app.aaps.core.ui.toast import android.annotation.SuppressLint import android.content.Context @@ -14,8 +14,8 @@ import android.widget.Toast import androidx.annotation.DrawableRes import androidx.annotation.StringRes import androidx.appcompat.view.ContextThemeWrapper -import info.nightscout.core.ui.R -import info.nightscout.core.ui.getThemeColor +import app.aaps.core.ui.getThemeColor +import app.aaps.core.ui.R object ToastUtils { diff --git a/core/ui/src/main/res/layout/number_picker_layout.xml b/core/ui/src/main/res/layout/number_picker_layout.xml index d3d7d32de3..5fc10dfc55 100644 --- a/core/ui/src/main/res/layout/number_picker_layout.xml +++ b/core/ui/src/main/res/layout/number_picker_layout.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="130dp" android:layout_height="40dp" - tools:context="info.nightscout.core.ui.elements.NumberPicker"> + tools:context="app.aaps.core.ui.elements.NumberPicker"> + tools:context="app.aaps.core.ui.elements.NumberPickerVertical"> highLimit) { newValue = max(newValue, lowLimit) newValue = min(newValue, highLimit) - var msg = rh.gs(info.nightscout.core.ui.R.string.valueoutofrange, rh.gs(valueName)) + var msg = rh.gs(app.aaps.core.ui.R.string.valueoutofrange, rh.gs(valueName)) msg += ".\n" - msg += rh.gs(info.nightscout.core.ui.R.string.valuelimitedto, value, newValue) + msg += rh.gs(app.aaps.core.ui.R.string.valuelimitedto, value, newValue) aapsLogger.error(msg) disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(msg)).subscribe() - uiInteraction.showToastAndNotification(context, msg, info.nightscout.core.ui.R.raw.error) + uiInteraction.showToastAndNotification(context, msg, app.aaps.core.ui.R.raw.error) } return newValue } diff --git a/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt index 6df0b542f8..6bbecb45a1 100644 --- a/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt @@ -65,16 +65,16 @@ class LocalAlertUtilsImpl @Inject constructor( if (sp.getBoolean(info.nightscout.core.utils.R.string.key_enable_pump_unreachable_alert, true)) { aapsLogger.debug(LTag.CORE, "Generating pump unreachable alarm. lastConnection: " + dateUtil.dateAndTimeString(lastConnection) + " isStatusOutdated: " + isStatusOutdated) sp.putLong("nextPumpDisconnectedAlarm", System.currentTimeMillis() + pumpUnreachableThreshold()) - rxBus.send(EventNewNotification(Notification(Notification.PUMP_UNREACHABLE, rh.gs(info.nightscout.core.ui.R.string.pump_unreachable), Notification.URGENT).also { + rxBus.send(EventNewNotification(Notification(Notification.PUMP_UNREACHABLE, rh.gs(app.aaps.core.ui.R.string.pump_unreachable), Notification.URGENT).also { it.soundId = - info.nightscout.core.ui.R.raw.alarm + app.aaps.core.ui.R.raw.alarm })) - uel.log(Action.CAREPORTAL, Sources.Aaps, rh.gs(info.nightscout.core.ui.R.string.pump_unreachable), ValueWithUnit.TherapyEventType(TherapyEvent.Type.ANNOUNCEMENT)) + uel.log(Action.CAREPORTAL, Sources.Aaps, rh.gs(app.aaps.core.ui.R.string.pump_unreachable), ValueWithUnit.TherapyEventType(TherapyEvent.Type.ANNOUNCEMENT)) if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_create_announcements_from_errors, true)) - disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(rh.gs(info.nightscout.core.ui.R.string.pump_unreachable))).subscribe() + disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(rh.gs(app.aaps.core.ui.R.string.pump_unreachable))).subscribe() } if (sp.getBoolean(info.nightscout.core.utils.R.string.key_smscommunicator_report_pump_unreachable, true)) - smsCommunicator.sendNotificationToAllNumbers(rh.gs(info.nightscout.core.ui.R.string.pump_unreachable)) + smsCommunicator.sendNotificationToAllNumbers(rh.gs(app.aaps.core.ui.R.string.pump_unreachable)) } if (!isStatusOutdated && !alarmTimeoutExpired) rxBus.send(EventDismissNotification(Notification.PUMP_UNREACHABLE)) } @@ -127,11 +127,11 @@ class LocalAlertUtilsImpl @Inject constructor( && bgReading.timestamp + missedReadingsThreshold() < System.currentTimeMillis() && sp.getLong("nextMissedReadingsAlarm", 0L) < System.currentTimeMillis() ) { - val n = Notification(Notification.BG_READINGS_MISSED, rh.gs(info.nightscout.core.ui.R.string.missed_bg_readings), Notification.URGENT) - n.soundId = info.nightscout.core.ui.R.raw.alarm + val n = Notification(Notification.BG_READINGS_MISSED, rh.gs(app.aaps.core.ui.R.string.missed_bg_readings), Notification.URGENT) + n.soundId = app.aaps.core.ui.R.raw.alarm sp.putLong("nextMissedReadingsAlarm", System.currentTimeMillis() + missedReadingsThreshold()) rxBus.send(EventNewNotification(n)) - uel.log(Action.CAREPORTAL, Sources.Aaps, rh.gs(info.nightscout.core.ui.R.string.missed_bg_readings), ValueWithUnit.TherapyEventType(TherapyEvent.Type.ANNOUNCEMENT)) + uel.log(Action.CAREPORTAL, Sources.Aaps, rh.gs(app.aaps.core.ui.R.string.missed_bg_readings), ValueWithUnit.TherapyEventType(TherapyEvent.Type.ANNOUNCEMENT)) if (sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_create_announcements_from_errors, true)) { disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(n.text)).subscribe() } diff --git a/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt index 84370b9e40..e968f7a350 100644 --- a/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/TranslatorImpl.kt @@ -17,140 +17,140 @@ class TranslatorImpl @Inject internal constructor( ) : Translator { override fun translate(action: Action): String = when (action) { - Action.BOLUS -> rh.gs(info.nightscout.core.ui.R.string.uel_bolus) - Action.BOLUS_CALCULATOR_RESULT -> rh.gs(info.nightscout.core.ui.R.string.uel_bolus_calculator) - Action.BOLUS_CALCULATOR_RESULT_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_bolus_calculator) - Action.SMB -> rh.gs(info.nightscout.core.ui.R.string.smb_shortname) - Action.BOLUS_ADVISOR -> rh.gs(info.nightscout.core.ui.R.string.uel_bolus_advisor) - Action.EXTENDED_BOLUS -> rh.gs(info.nightscout.core.ui.R.string.uel_extended_bolus) - Action.SUPERBOLUS_TBR -> rh.gs(info.nightscout.core.ui.R.string.uel_superbolus_tbr) - Action.CARBS -> rh.gs(info.nightscout.core.ui.R.string.uel_carbs) - Action.EXTENDED_CARBS -> rh.gs(info.nightscout.core.ui.R.string.uel_extended_carbs) - Action.TEMP_BASAL -> rh.gs(info.nightscout.core.ui.R.string.uel_temp_basal) - Action.TT -> rh.gs(info.nightscout.core.ui.R.string.uel_tt) - Action.NEW_PROFILE -> rh.gs(info.nightscout.core.ui.R.string.uel_new_profile) - Action.CLONE_PROFILE -> rh.gs(info.nightscout.core.ui.R.string.uel_clone_profile) - Action.STORE_PROFILE -> rh.gs(info.nightscout.core.ui.R.string.uel_store_profile) - Action.PROFILE_SWITCH -> rh.gs(info.nightscout.core.ui.R.string.uel_profile_switch) - Action.PROFILE_SWITCH_CLONED -> rh.gs(info.nightscout.core.ui.R.string.uel_profile_switch_cloned) - Action.CLOSED_LOOP_MODE -> rh.gs(info.nightscout.core.ui.R.string.uel_closed_loop_mode) - Action.LGS_LOOP_MODE -> rh.gs(info.nightscout.core.ui.R.string.uel_lgs_loop_mode) - Action.OPEN_LOOP_MODE -> rh.gs(info.nightscout.core.ui.R.string.uel_open_loop_mode) - Action.LOOP_DISABLED -> rh.gs(info.nightscout.core.ui.R.string.uel_loop_disabled) - Action.LOOP_ENABLED -> rh.gs(info.nightscout.core.ui.R.string.uel_loop_enabled) - Action.RECONNECT -> rh.gs(info.nightscout.core.ui.R.string.uel_reconnect) - Action.DISCONNECT -> rh.gs(info.nightscout.core.ui.R.string.uel_disconnect) - Action.RESUME -> rh.gs(info.nightscout.core.ui.R.string.uel_resume) - Action.SUSPEND -> rh.gs(info.nightscout.core.ui.R.string.uel_suspend) - Action.HW_PUMP_ALLOWED -> rh.gs(info.nightscout.core.ui.R.string.uel_hw_pump_allowed) - Action.CLEAR_PAIRING_KEYS -> rh.gs(info.nightscout.core.ui.R.string.uel_clear_pairing_keys) - Action.ACCEPTS_TEMP_BASAL -> rh.gs(info.nightscout.core.ui.R.string.uel_accepts_temp_basal) - Action.CANCEL_TEMP_BASAL -> rh.gs(info.nightscout.core.ui.R.string.uel_cancel_temp_basal) - Action.CANCEL_BOLUS -> rh.gs(info.nightscout.core.ui.R.string.uel_cancel_bolus) - Action.CANCEL_EXTENDED_BOLUS -> rh.gs(info.nightscout.core.ui.R.string.uel_cancel_extended_bolus) - Action.CANCEL_TT -> rh.gs(info.nightscout.core.ui.R.string.uel_cancel_tt) - Action.CAREPORTAL -> rh.gs(info.nightscout.core.ui.R.string.uel_careportal) - Action.SITE_CHANGE -> rh.gs(info.nightscout.core.ui.R.string.uel_site_change) - Action.RESERVOIR_CHANGE -> rh.gs(info.nightscout.core.ui.R.string.uel_reservoir_change) - Action.CALIBRATION -> rh.gs(info.nightscout.core.ui.R.string.uel_calibration) - Action.PRIME_BOLUS -> rh.gs(info.nightscout.core.ui.R.string.uel_prime_bolus) - Action.TREATMENT -> rh.gs(info.nightscout.core.ui.R.string.uel_treatment) - Action.CAREPORTAL_NS_REFRESH -> rh.gs(info.nightscout.core.ui.R.string.uel_careportal_ns_refresh) - Action.PROFILE_SWITCH_NS_REFRESH -> rh.gs(info.nightscout.core.ui.R.string.uel_profile_switch_ns_refresh) - Action.TREATMENTS_NS_REFRESH -> rh.gs(info.nightscout.core.ui.R.string.uel_treatments_ns_refresh) - Action.TT_NS_REFRESH -> rh.gs(info.nightscout.core.ui.R.string.uel_tt_ns_refresh) - Action.AUTOMATION_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_automation_removed) - Action.BG_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_bg_removed) - Action.CAREPORTAL_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_careportal_removed) - Action.BOLUS_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_bolus_removed) - Action.CARBS_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_carbs_removed) - Action.TEMP_BASAL_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_temp_basal_removed) - Action.EXTENDED_BOLUS_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_extended_bolus_removed) - Action.FOOD -> rh.gs(info.nightscout.core.ui.R.string.uel_food) - Action.FOOD_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_food_removed) - Action.PROFILE_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_profile_removed) - Action.PROFILE_SWITCH_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_profile_switch_removed) - Action.RESTART_EVENTS_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_restart_events_removed) - Action.TREATMENT_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_treatment_removed) - Action.TT_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_tt_removed) - Action.NS_PAUSED -> rh.gs(info.nightscout.core.ui.R.string.uel_ns_paused) - Action.NS_RESUME -> rh.gs(info.nightscout.core.ui.R.string.uel_ns_resume) - Action.NS_QUEUE_CLEARED -> rh.gs(info.nightscout.core.ui.R.string.uel_ns_queue_cleared) - Action.NS_SETTINGS_COPIED -> rh.gs(info.nightscout.core.ui.R.string.uel_ns_settings_copied) - Action.ERROR_DIALOG_OK -> rh.gs(info.nightscout.core.ui.R.string.uel_error_dialog_ok) - Action.ERROR_DIALOG_MUTE -> rh.gs(info.nightscout.core.ui.R.string.uel_error_dialog_mute) - Action.ERROR_DIALOG_MUTE_5MIN -> rh.gs(info.nightscout.core.ui.R.string.uel_error_dialog_mute_5min) - Action.OBJECTIVE_STARTED -> rh.gs(info.nightscout.core.ui.R.string.uel_objective_started) - Action.OBJECTIVE_UNSTARTED -> rh.gs(info.nightscout.core.ui.R.string.uel_objective_unstarted) - Action.OBJECTIVES_SKIPPED -> rh.gs(info.nightscout.core.ui.R.string.uel_objectives_skipped) - Action.STAT_RESET -> rh.gs(info.nightscout.core.ui.R.string.uel_stat_reset) - Action.DELETE_LOGS -> rh.gs(info.nightscout.core.ui.R.string.uel_delete_logs) - Action.DELETE_FUTURE_TREATMENTS -> rh.gs(info.nightscout.core.ui.R.string.uel_delete_future_treatments) - Action.EXPORT_SETTINGS -> rh.gs(info.nightscout.core.ui.R.string.uel_export_settings) - Action.IMPORT_SETTINGS -> rh.gs(info.nightscout.core.ui.R.string.uel_import_settings) - Action.RESET_DATABASES -> rh.gs(info.nightscout.core.ui.R.string.uel_reset_databases) - Action.CLEANUP_DATABASES -> rh.gs(info.nightscout.core.ui.R.string.uel_cleanup_databases) - Action.EXPORT_DATABASES -> rh.gs(info.nightscout.core.ui.R.string.uel_export_databases) - Action.IMPORT_DATABASES -> rh.gs(info.nightscout.core.ui.R.string.uel_import_databases) - Action.OTP_EXPORT -> rh.gs(info.nightscout.core.ui.R.string.uel_otp_export) - Action.OTP_RESET -> rh.gs(info.nightscout.core.ui.R.string.uel_otp_reset) - Action.EXPORT_CSV -> rh.gs(info.nightscout.core.ui.R.string.uel_export_csv) - Action.STOP_SMS -> rh.gs(info.nightscout.core.ui.R.string.uel_stop_sms) - Action.START_AAPS -> rh.gs(info.nightscout.core.ui.R.string.uel_start_aaps) - Action.EXIT_AAPS -> rh.gs(info.nightscout.core.ui.R.string.uel_exit_aaps) - Action.PLUGIN_ENABLED -> rh.gs(info.nightscout.core.ui.R.string.uel_plugin_enabled) - Action.PLUGIN_DISABLED -> rh.gs(info.nightscout.core.ui.R.string.uel_plugin_disabled) - Action.LOOP_CHANGE -> rh.gs(info.nightscout.core.ui.R.string.uel_loop_change) - Action.LOOP_REMOVED -> rh.gs(info.nightscout.core.ui.R.string.uel_loop_removed) - Action.UNKNOWN -> rh.gs(info.nightscout.core.ui.R.string.unknown) + Action.BOLUS -> rh.gs(app.aaps.core.ui.R.string.uel_bolus) + Action.BOLUS_CALCULATOR_RESULT -> rh.gs(app.aaps.core.ui.R.string.uel_bolus_calculator) + Action.BOLUS_CALCULATOR_RESULT_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_bolus_calculator) + Action.SMB -> rh.gs(app.aaps.core.ui.R.string.smb_shortname) + Action.BOLUS_ADVISOR -> rh.gs(app.aaps.core.ui.R.string.uel_bolus_advisor) + Action.EXTENDED_BOLUS -> rh.gs(app.aaps.core.ui.R.string.uel_extended_bolus) + Action.SUPERBOLUS_TBR -> rh.gs(app.aaps.core.ui.R.string.uel_superbolus_tbr) + Action.CARBS -> rh.gs(app.aaps.core.ui.R.string.uel_carbs) + Action.EXTENDED_CARBS -> rh.gs(app.aaps.core.ui.R.string.uel_extended_carbs) + Action.TEMP_BASAL -> rh.gs(app.aaps.core.ui.R.string.uel_temp_basal) + Action.TT -> rh.gs(app.aaps.core.ui.R.string.uel_tt) + Action.NEW_PROFILE -> rh.gs(app.aaps.core.ui.R.string.uel_new_profile) + Action.CLONE_PROFILE -> rh.gs(app.aaps.core.ui.R.string.uel_clone_profile) + Action.STORE_PROFILE -> rh.gs(app.aaps.core.ui.R.string.uel_store_profile) + Action.PROFILE_SWITCH -> rh.gs(app.aaps.core.ui.R.string.uel_profile_switch) + Action.PROFILE_SWITCH_CLONED -> rh.gs(app.aaps.core.ui.R.string.uel_profile_switch_cloned) + Action.CLOSED_LOOP_MODE -> rh.gs(app.aaps.core.ui.R.string.uel_closed_loop_mode) + Action.LGS_LOOP_MODE -> rh.gs(app.aaps.core.ui.R.string.uel_lgs_loop_mode) + Action.OPEN_LOOP_MODE -> rh.gs(app.aaps.core.ui.R.string.uel_open_loop_mode) + Action.LOOP_DISABLED -> rh.gs(app.aaps.core.ui.R.string.uel_loop_disabled) + Action.LOOP_ENABLED -> rh.gs(app.aaps.core.ui.R.string.uel_loop_enabled) + Action.RECONNECT -> rh.gs(app.aaps.core.ui.R.string.uel_reconnect) + Action.DISCONNECT -> rh.gs(app.aaps.core.ui.R.string.uel_disconnect) + Action.RESUME -> rh.gs(app.aaps.core.ui.R.string.uel_resume) + Action.SUSPEND -> rh.gs(app.aaps.core.ui.R.string.uel_suspend) + Action.HW_PUMP_ALLOWED -> rh.gs(app.aaps.core.ui.R.string.uel_hw_pump_allowed) + Action.CLEAR_PAIRING_KEYS -> rh.gs(app.aaps.core.ui.R.string.uel_clear_pairing_keys) + Action.ACCEPTS_TEMP_BASAL -> rh.gs(app.aaps.core.ui.R.string.uel_accepts_temp_basal) + Action.CANCEL_TEMP_BASAL -> rh.gs(app.aaps.core.ui.R.string.uel_cancel_temp_basal) + Action.CANCEL_BOLUS -> rh.gs(app.aaps.core.ui.R.string.uel_cancel_bolus) + Action.CANCEL_EXTENDED_BOLUS -> rh.gs(app.aaps.core.ui.R.string.uel_cancel_extended_bolus) + Action.CANCEL_TT -> rh.gs(app.aaps.core.ui.R.string.uel_cancel_tt) + Action.CAREPORTAL -> rh.gs(app.aaps.core.ui.R.string.uel_careportal) + Action.SITE_CHANGE -> rh.gs(app.aaps.core.ui.R.string.uel_site_change) + Action.RESERVOIR_CHANGE -> rh.gs(app.aaps.core.ui.R.string.uel_reservoir_change) + Action.CALIBRATION -> rh.gs(app.aaps.core.ui.R.string.uel_calibration) + Action.PRIME_BOLUS -> rh.gs(app.aaps.core.ui.R.string.uel_prime_bolus) + Action.TREATMENT -> rh.gs(app.aaps.core.ui.R.string.uel_treatment) + Action.CAREPORTAL_NS_REFRESH -> rh.gs(app.aaps.core.ui.R.string.uel_careportal_ns_refresh) + Action.PROFILE_SWITCH_NS_REFRESH -> rh.gs(app.aaps.core.ui.R.string.uel_profile_switch_ns_refresh) + Action.TREATMENTS_NS_REFRESH -> rh.gs(app.aaps.core.ui.R.string.uel_treatments_ns_refresh) + Action.TT_NS_REFRESH -> rh.gs(app.aaps.core.ui.R.string.uel_tt_ns_refresh) + Action.AUTOMATION_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_automation_removed) + Action.BG_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_bg_removed) + Action.CAREPORTAL_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_careportal_removed) + Action.BOLUS_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_bolus_removed) + Action.CARBS_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_carbs_removed) + Action.TEMP_BASAL_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_temp_basal_removed) + Action.EXTENDED_BOLUS_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_extended_bolus_removed) + Action.FOOD -> rh.gs(app.aaps.core.ui.R.string.uel_food) + Action.FOOD_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_food_removed) + Action.PROFILE_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_profile_removed) + Action.PROFILE_SWITCH_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_profile_switch_removed) + Action.RESTART_EVENTS_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_restart_events_removed) + Action.TREATMENT_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_treatment_removed) + Action.TT_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_tt_removed) + Action.NS_PAUSED -> rh.gs(app.aaps.core.ui.R.string.uel_ns_paused) + Action.NS_RESUME -> rh.gs(app.aaps.core.ui.R.string.uel_ns_resume) + Action.NS_QUEUE_CLEARED -> rh.gs(app.aaps.core.ui.R.string.uel_ns_queue_cleared) + Action.NS_SETTINGS_COPIED -> rh.gs(app.aaps.core.ui.R.string.uel_ns_settings_copied) + Action.ERROR_DIALOG_OK -> rh.gs(app.aaps.core.ui.R.string.uel_error_dialog_ok) + Action.ERROR_DIALOG_MUTE -> rh.gs(app.aaps.core.ui.R.string.uel_error_dialog_mute) + Action.ERROR_DIALOG_MUTE_5MIN -> rh.gs(app.aaps.core.ui.R.string.uel_error_dialog_mute_5min) + Action.OBJECTIVE_STARTED -> rh.gs(app.aaps.core.ui.R.string.uel_objective_started) + Action.OBJECTIVE_UNSTARTED -> rh.gs(app.aaps.core.ui.R.string.uel_objective_unstarted) + Action.OBJECTIVES_SKIPPED -> rh.gs(app.aaps.core.ui.R.string.uel_objectives_skipped) + Action.STAT_RESET -> rh.gs(app.aaps.core.ui.R.string.uel_stat_reset) + Action.DELETE_LOGS -> rh.gs(app.aaps.core.ui.R.string.uel_delete_logs) + Action.DELETE_FUTURE_TREATMENTS -> rh.gs(app.aaps.core.ui.R.string.uel_delete_future_treatments) + Action.EXPORT_SETTINGS -> rh.gs(app.aaps.core.ui.R.string.uel_export_settings) + Action.IMPORT_SETTINGS -> rh.gs(app.aaps.core.ui.R.string.uel_import_settings) + Action.RESET_DATABASES -> rh.gs(app.aaps.core.ui.R.string.uel_reset_databases) + Action.CLEANUP_DATABASES -> rh.gs(app.aaps.core.ui.R.string.uel_cleanup_databases) + Action.EXPORT_DATABASES -> rh.gs(app.aaps.core.ui.R.string.uel_export_databases) + Action.IMPORT_DATABASES -> rh.gs(app.aaps.core.ui.R.string.uel_import_databases) + Action.OTP_EXPORT -> rh.gs(app.aaps.core.ui.R.string.uel_otp_export) + Action.OTP_RESET -> rh.gs(app.aaps.core.ui.R.string.uel_otp_reset) + Action.EXPORT_CSV -> rh.gs(app.aaps.core.ui.R.string.uel_export_csv) + Action.STOP_SMS -> rh.gs(app.aaps.core.ui.R.string.uel_stop_sms) + Action.START_AAPS -> rh.gs(app.aaps.core.ui.R.string.uel_start_aaps) + Action.EXIT_AAPS -> rh.gs(app.aaps.core.ui.R.string.uel_exit_aaps) + Action.PLUGIN_ENABLED -> rh.gs(app.aaps.core.ui.R.string.uel_plugin_enabled) + Action.PLUGIN_DISABLED -> rh.gs(app.aaps.core.ui.R.string.uel_plugin_disabled) + Action.LOOP_CHANGE -> rh.gs(app.aaps.core.ui.R.string.uel_loop_change) + Action.LOOP_REMOVED -> rh.gs(app.aaps.core.ui.R.string.uel_loop_removed) + Action.UNKNOWN -> rh.gs(app.aaps.core.ui.R.string.unknown) } override fun translate(units: ValueWithUnit?): String = when (units) { - is ValueWithUnit.Gram -> rh.gs(info.nightscout.core.ui.R.string.shortgram) + is ValueWithUnit.Gram -> rh.gs(app.aaps.core.ui.R.string.shortgram) is ValueWithUnit.Hour -> rh.gs(app.aaps.core.interfaces.R.string.shorthour) - is ValueWithUnit.Insulin -> rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) - is ValueWithUnit.Mgdl -> rh.gs(info.nightscout.core.ui.R.string.mgdl) + is ValueWithUnit.Insulin -> rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) + is ValueWithUnit.Mgdl -> rh.gs(app.aaps.core.ui.R.string.mgdl) is ValueWithUnit.Minute -> rh.gs(app.aaps.core.interfaces.R.string.shortminute) - is ValueWithUnit.Mmoll -> rh.gs(info.nightscout.core.ui.R.string.mmol) - is ValueWithUnit.Percent -> rh.gs(info.nightscout.core.ui.R.string.shortpercent) - is ValueWithUnit.UnitPerHour -> rh.gs(info.nightscout.core.ui.R.string.profile_ins_units_per_hour) + is ValueWithUnit.Mmoll -> rh.gs(app.aaps.core.ui.R.string.mmol) + is ValueWithUnit.Percent -> rh.gs(app.aaps.core.ui.R.string.shortpercent) + is ValueWithUnit.UnitPerHour -> rh.gs(app.aaps.core.ui.R.string.profile_ins_units_per_hour) else -> "" } override fun translate(meterType: TherapyEvent.MeterType?): String = when (meterType) { - TherapyEvent.MeterType.FINGER -> rh.gs(info.nightscout.core.ui.R.string.glucosetype_finger) - TherapyEvent.MeterType.SENSOR -> rh.gs(info.nightscout.core.ui.R.string.glucosetype_sensor) - TherapyEvent.MeterType.MANUAL -> rh.gs(info.nightscout.core.ui.R.string.manual) + TherapyEvent.MeterType.FINGER -> rh.gs(app.aaps.core.ui.R.string.glucosetype_finger) + TherapyEvent.MeterType.SENSOR -> rh.gs(app.aaps.core.ui.R.string.glucosetype_sensor) + TherapyEvent.MeterType.MANUAL -> rh.gs(app.aaps.core.ui.R.string.manual) - else -> rh.gs(info.nightscout.core.ui.R.string.unknown) + else -> rh.gs(app.aaps.core.ui.R.string.unknown) } override fun translate(type: TherapyEvent.Type?): String = when (type) { - TherapyEvent.Type.FINGER_STICK_BG_VALUE -> rh.gs(info.nightscout.core.ui.R.string.careportal_bgcheck) - TherapyEvent.Type.SNACK_BOLUS -> rh.gs(info.nightscout.core.ui.R.string.careportal_snackbolus) - TherapyEvent.Type.MEAL_BOLUS -> rh.gs(info.nightscout.core.ui.R.string.careportal_mealbolus) - TherapyEvent.Type.CORRECTION_BOLUS -> rh.gs(info.nightscout.core.ui.R.string.careportal_correctionbolus) - TherapyEvent.Type.CARBS_CORRECTION -> rh.gs(info.nightscout.core.ui.R.string.careportal_carbscorrection) - TherapyEvent.Type.BOLUS_WIZARD -> rh.gs(info.nightscout.core.ui.R.string.boluswizard) - TherapyEvent.Type.COMBO_BOLUS -> rh.gs(info.nightscout.core.ui.R.string.careportal_combobolus) - TherapyEvent.Type.ANNOUNCEMENT -> rh.gs(info.nightscout.core.ui.R.string.careportal_announcement) - TherapyEvent.Type.NOTE -> rh.gs(info.nightscout.core.ui.R.string.careportal_note) - TherapyEvent.Type.QUESTION -> rh.gs(info.nightscout.core.ui.R.string.careportal_question) - TherapyEvent.Type.EXERCISE -> rh.gs(info.nightscout.core.ui.R.string.careportal_exercise) - TherapyEvent.Type.CANNULA_CHANGE -> rh.gs(info.nightscout.core.ui.R.string.careportal_pump_site_change) - TherapyEvent.Type.PUMP_BATTERY_CHANGE -> rh.gs(info.nightscout.core.ui.R.string.pump_battery_change) - TherapyEvent.Type.SENSOR_STARTED -> rh.gs(info.nightscout.core.ui.R.string.careportal_cgmsensorstart) - TherapyEvent.Type.SENSOR_STOPPED -> rh.gs(info.nightscout.core.ui.R.string.careportal_cgm_sensor_stop) - TherapyEvent.Type.SENSOR_CHANGE -> rh.gs(info.nightscout.core.ui.R.string.cgm_sensor_insert) - TherapyEvent.Type.INSULIN_CHANGE -> rh.gs(info.nightscout.core.ui.R.string.careportal_insulin_cartridge_change) - TherapyEvent.Type.DAD_ALERT -> rh.gs(info.nightscout.core.ui.R.string.careportal_dad_alert) - TherapyEvent.Type.TEMPORARY_BASAL_START -> rh.gs(info.nightscout.core.ui.R.string.careportal_tempbasalstart) - TherapyEvent.Type.TEMPORARY_BASAL_END -> rh.gs(info.nightscout.core.ui.R.string.careportal_tempbasalend) - TherapyEvent.Type.PROFILE_SWITCH -> rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch) - TherapyEvent.Type.TEMPORARY_TARGET -> rh.gs(info.nightscout.core.ui.R.string.temporary_target) - TherapyEvent.Type.TEMPORARY_TARGET_CANCEL -> rh.gs(info.nightscout.core.ui.R.string.careportal_temporarytargetcancel) - TherapyEvent.Type.APS_OFFLINE -> rh.gs(info.nightscout.core.ui.R.string.careportal_openapsoffline) - TherapyEvent.Type.NS_MBG -> rh.gs(info.nightscout.core.ui.R.string.careportal_mbg) + TherapyEvent.Type.FINGER_STICK_BG_VALUE -> rh.gs(app.aaps.core.ui.R.string.careportal_bgcheck) + TherapyEvent.Type.SNACK_BOLUS -> rh.gs(app.aaps.core.ui.R.string.careportal_snackbolus) + TherapyEvent.Type.MEAL_BOLUS -> rh.gs(app.aaps.core.ui.R.string.careportal_mealbolus) + TherapyEvent.Type.CORRECTION_BOLUS -> rh.gs(app.aaps.core.ui.R.string.careportal_correctionbolus) + TherapyEvent.Type.CARBS_CORRECTION -> rh.gs(app.aaps.core.ui.R.string.careportal_carbscorrection) + TherapyEvent.Type.BOLUS_WIZARD -> rh.gs(app.aaps.core.ui.R.string.boluswizard) + TherapyEvent.Type.COMBO_BOLUS -> rh.gs(app.aaps.core.ui.R.string.careportal_combobolus) + TherapyEvent.Type.ANNOUNCEMENT -> rh.gs(app.aaps.core.ui.R.string.careportal_announcement) + TherapyEvent.Type.NOTE -> rh.gs(app.aaps.core.ui.R.string.careportal_note) + TherapyEvent.Type.QUESTION -> rh.gs(app.aaps.core.ui.R.string.careportal_question) + TherapyEvent.Type.EXERCISE -> rh.gs(app.aaps.core.ui.R.string.careportal_exercise) + TherapyEvent.Type.CANNULA_CHANGE -> rh.gs(app.aaps.core.ui.R.string.careportal_pump_site_change) + TherapyEvent.Type.PUMP_BATTERY_CHANGE -> rh.gs(app.aaps.core.ui.R.string.pump_battery_change) + TherapyEvent.Type.SENSOR_STARTED -> rh.gs(app.aaps.core.ui.R.string.careportal_cgmsensorstart) + TherapyEvent.Type.SENSOR_STOPPED -> rh.gs(app.aaps.core.ui.R.string.careportal_cgm_sensor_stop) + TherapyEvent.Type.SENSOR_CHANGE -> rh.gs(app.aaps.core.ui.R.string.cgm_sensor_insert) + TherapyEvent.Type.INSULIN_CHANGE -> rh.gs(app.aaps.core.ui.R.string.careportal_insulin_cartridge_change) + TherapyEvent.Type.DAD_ALERT -> rh.gs(app.aaps.core.ui.R.string.careportal_dad_alert) + TherapyEvent.Type.TEMPORARY_BASAL_START -> rh.gs(app.aaps.core.ui.R.string.careportal_tempbasalstart) + TherapyEvent.Type.TEMPORARY_BASAL_END -> rh.gs(app.aaps.core.ui.R.string.careportal_tempbasalend) + TherapyEvent.Type.PROFILE_SWITCH -> rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch) + TherapyEvent.Type.TEMPORARY_TARGET -> rh.gs(app.aaps.core.ui.R.string.temporary_target) + TherapyEvent.Type.TEMPORARY_TARGET_CANCEL -> rh.gs(app.aaps.core.ui.R.string.careportal_temporarytargetcancel) + TherapyEvent.Type.APS_OFFLINE -> rh.gs(app.aaps.core.ui.R.string.careportal_openapsoffline) + TherapyEvent.Type.NS_MBG -> rh.gs(app.aaps.core.ui.R.string.careportal_mbg) /* TherapyEvent.Type.TEMPORARY_BASAL -> TODO() TherapyEvent.Type.TUBE_CHANGE -> TODO() @@ -171,29 +171,29 @@ class TranslatorImpl @Inject internal constructor( TherapyEvent.Type.FEELING_HIGH -> TODO() TherapyEvent.Type.LEAKING_INFUSION_SET -> TODO() */ - TherapyEvent.Type.NONE -> rh.gs(info.nightscout.core.ui.R.string.unknown) + TherapyEvent.Type.NONE -> rh.gs(app.aaps.core.ui.R.string.unknown) - else -> rh.gs(info.nightscout.core.ui.R.string.unknown) + else -> rh.gs(app.aaps.core.ui.R.string.unknown) } override fun translate(reason: TemporaryTarget.Reason?): String = when (reason) { - TemporaryTarget.Reason.CUSTOM -> rh.gs(info.nightscout.core.ui.R.string.custom) - TemporaryTarget.Reason.HYPOGLYCEMIA -> rh.gs(info.nightscout.core.ui.R.string.hypo) - TemporaryTarget.Reason.EATING_SOON -> rh.gs(info.nightscout.core.ui.R.string.eatingsoon) - TemporaryTarget.Reason.ACTIVITY -> rh.gs(info.nightscout.core.ui.R.string.activity) - TemporaryTarget.Reason.AUTOMATION -> rh.gs(info.nightscout.core.ui.R.string.automation) - TemporaryTarget.Reason.WEAR -> rh.gs(info.nightscout.core.ui.R.string.wear) + TemporaryTarget.Reason.CUSTOM -> rh.gs(app.aaps.core.ui.R.string.custom) + TemporaryTarget.Reason.HYPOGLYCEMIA -> rh.gs(app.aaps.core.ui.R.string.hypo) + TemporaryTarget.Reason.EATING_SOON -> rh.gs(app.aaps.core.ui.R.string.eatingsoon) + TemporaryTarget.Reason.ACTIVITY -> rh.gs(app.aaps.core.ui.R.string.activity) + TemporaryTarget.Reason.AUTOMATION -> rh.gs(app.aaps.core.ui.R.string.automation) + TemporaryTarget.Reason.WEAR -> rh.gs(app.aaps.core.ui.R.string.wear) - else -> rh.gs(info.nightscout.core.ui.R.string.unknown) + else -> rh.gs(app.aaps.core.ui.R.string.unknown) } override fun translate(reason: OfflineEvent.Reason?): String = when (reason) { - OfflineEvent.Reason.SUSPEND -> rh.gs(info.nightscout.core.ui.R.string.uel_suspend) - OfflineEvent.Reason.DISABLE_LOOP -> rh.gs(info.nightscout.core.ui.R.string.disableloop) - OfflineEvent.Reason.DISCONNECT_PUMP -> rh.gs(info.nightscout.core.ui.R.string.uel_disconnect) - OfflineEvent.Reason.OTHER -> rh.gs(info.nightscout.core.ui.R.string.uel_other) + OfflineEvent.Reason.SUSPEND -> rh.gs(app.aaps.core.ui.R.string.uel_suspend) + OfflineEvent.Reason.DISABLE_LOOP -> rh.gs(app.aaps.core.ui.R.string.disableloop) + OfflineEvent.Reason.DISCONNECT_PUMP -> rh.gs(app.aaps.core.ui.R.string.uel_disconnect) + OfflineEvent.Reason.OTHER -> rh.gs(app.aaps.core.ui.R.string.uel_other) - else -> rh.gs(info.nightscout.core.ui.R.string.unknown) + else -> rh.gs(app.aaps.core.ui.R.string.unknown) } override fun translate(source: Sources): String = when (source) { @@ -285,14 +285,14 @@ class TranslatorImpl @Inject internal constructor( Sources.Stats -> TODO() Sources.Aaps -> TODO() */ - Sources.Automation -> rh.gs(info.nightscout.core.ui.R.string.automation) - Sources.Autotune -> rh.gs(info.nightscout.core.ui.R.string.autotune) - Sources.Loop -> rh.gs(info.nightscout.core.ui.R.string.loop) - Sources.NSClient -> rh.gs(info.nightscout.core.ui.R.string.ns) - Sources.Pump -> rh.gs(info.nightscout.core.ui.R.string.pump) - Sources.SMS -> rh.gs(info.nightscout.core.ui.R.string.sms) - Sources.Wear -> rh.gs(info.nightscout.core.ui.R.string.wear) - Sources.Unknown -> rh.gs(info.nightscout.core.ui.R.string.unknown) + Sources.Automation -> rh.gs(app.aaps.core.ui.R.string.automation) + Sources.Autotune -> rh.gs(app.aaps.core.ui.R.string.autotune) + Sources.Loop -> rh.gs(app.aaps.core.ui.R.string.loop) + Sources.NSClient -> rh.gs(app.aaps.core.ui.R.string.ns) + Sources.Pump -> rh.gs(app.aaps.core.ui.R.string.pump) + Sources.SMS -> rh.gs(app.aaps.core.ui.R.string.sms) + Sources.Wear -> rh.gs(app.aaps.core.ui.R.string.wear) + Sources.Unknown -> rh.gs(app.aaps.core.ui.R.string.unknown) else -> source.name } diff --git a/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt index fafda6e795..7a7df0088a 100644 --- a/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/TrendCalculatorImpl.kt @@ -32,15 +32,15 @@ class TrendCalculatorImpl @Inject constructor( override fun getTrendDescription(glucoseValue: GlucoseValue?): String = when (getTrendArrow(glucoseValue)) { - GlucoseValue.TrendArrow.DOUBLE_DOWN -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_double_down) - GlucoseValue.TrendArrow.SINGLE_DOWN -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_single_down) - GlucoseValue.TrendArrow.FORTY_FIVE_DOWN -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_forty_five_down) - GlucoseValue.TrendArrow.FLAT -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_flat) - GlucoseValue.TrendArrow.FORTY_FIVE_UP -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_forty_five_up) - GlucoseValue.TrendArrow.SINGLE_UP -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_single_up) - GlucoseValue.TrendArrow.DOUBLE_UP -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_double_up) - GlucoseValue.TrendArrow.NONE -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_none) - else -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_unknown) + GlucoseValue.TrendArrow.DOUBLE_DOWN -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_double_down) + GlucoseValue.TrendArrow.SINGLE_DOWN -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_single_down) + GlucoseValue.TrendArrow.FORTY_FIVE_DOWN -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_forty_five_down) + GlucoseValue.TrendArrow.FLAT -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_flat) + GlucoseValue.TrendArrow.FORTY_FIVE_UP -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_forty_five_up) + GlucoseValue.TrendArrow.SINGLE_UP -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_single_up) + GlucoseValue.TrendArrow.DOUBLE_UP -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_double_up) + GlucoseValue.TrendArrow.NONE -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_none) + else -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_unknown) } private fun calculateDirection(glucoseValue: InMemoryGlucoseValue): GlucoseValue.TrendArrow { @@ -85,15 +85,15 @@ class TrendCalculatorImpl @Inject constructor( override fun getTrendDescription(autosensDataStore: AutosensDataStore): String { return when (getTrendArrow(autosensDataStore)) { - GlucoseValue.TrendArrow.DOUBLE_DOWN -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_double_down) - GlucoseValue.TrendArrow.SINGLE_DOWN -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_single_down) - GlucoseValue.TrendArrow.FORTY_FIVE_DOWN -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_forty_five_down) - GlucoseValue.TrendArrow.FLAT -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_flat) - GlucoseValue.TrendArrow.FORTY_FIVE_UP -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_forty_five_up) - GlucoseValue.TrendArrow.SINGLE_UP -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_single_up) - GlucoseValue.TrendArrow.DOUBLE_UP -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_double_up) - GlucoseValue.TrendArrow.NONE -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_none) - else -> rh.gs(info.nightscout.core.ui.R.string.a11y_arrow_unknown) + GlucoseValue.TrendArrow.DOUBLE_DOWN -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_double_down) + GlucoseValue.TrendArrow.SINGLE_DOWN -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_single_down) + GlucoseValue.TrendArrow.FORTY_FIVE_DOWN -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_forty_five_down) + GlucoseValue.TrendArrow.FLAT -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_flat) + GlucoseValue.TrendArrow.FORTY_FIVE_UP -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_forty_five_up) + GlucoseValue.TrendArrow.SINGLE_UP -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_single_up) + GlucoseValue.TrendArrow.DOUBLE_UP -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_double_up) + GlucoseValue.TrendArrow.NONE -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_none) + else -> rh.gs(app.aaps.core.ui.R.string.a11y_arrow_unknown) } } diff --git a/implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt b/implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt index 2d786175cb..6154319395 100644 --- a/implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/androidNotification/NotificationHolderImpl.kt @@ -48,7 +48,7 @@ class NotificationHolderImpl @Inject constructor( .setCategory(NotificationCompat.CATEGORY_STATUS) .setSmallIcon(iconsProvider.getNotificationIcon()) .setLargeIcon(rh.decodeResource(iconsProvider.getIcon())) - .setContentTitle(rh.gs(info.nightscout.core.ui.R.string.loading)) + .setContentTitle(rh.gs(app.aaps.core.ui.R.string.loading)) .setContentIntent(openAppIntent(context)) .build() .also { diff --git a/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt b/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt index 54be457680..6857b482bb 100644 --- a/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/overview/OverviewDataImpl.kt @@ -159,16 +159,16 @@ class OverviewDataImpl @Inject constructor( @ColorInt override fun lastBgColor(context: Context?, autosensDataStore: AutosensDataStore): Int = when { - isLow(autosensDataStore) -> rh.gac(context, info.nightscout.core.ui.R.attr.bgLow) - isHigh(autosensDataStore) -> rh.gac(context, info.nightscout.core.ui.R.attr.highColor) - else -> rh.gac(context, info.nightscout.core.ui.R.attr.bgInRange) + isLow(autosensDataStore) -> rh.gac(context, app.aaps.core.ui.R.attr.bgLow) + isHigh(autosensDataStore) -> rh.gac(context, app.aaps.core.ui.R.attr.highColor) + else -> rh.gac(context, app.aaps.core.ui.R.attr.bgInRange) } override fun lastBgDescription(autosensDataStore: AutosensDataStore): String = when { - isLow(autosensDataStore) -> rh.gs(info.nightscout.core.ui.R.string.a11y_low) - isHigh(autosensDataStore) -> rh.gs(info.nightscout.core.ui.R.string.a11y_high) - else -> rh.gs(info.nightscout.core.ui.R.string.a11y_inrange) + isLow(autosensDataStore) -> rh.gs(app.aaps.core.ui.R.string.a11y_low) + isHigh(autosensDataStore) -> rh.gs(app.aaps.core.ui.R.string.a11y_high) + else -> rh.gs(app.aaps.core.ui.R.string.a11y_inrange) } override fun isActualBg(autosensDataStore: AutosensDataStore): Boolean = @@ -185,17 +185,17 @@ class OverviewDataImpl @Inject constructor( var temporaryBasal = iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now()) if (temporaryBasal?.isInProgress == false) temporaryBasal = null temporaryBasal?.let { "T:" + it.toStringShort(decimalFormatter) } - ?: rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, profile.getBasal()) - } ?: rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short) + ?: rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, profile.getBasal()) + } ?: rh.gs(app.aaps.core.ui.R.string.value_unavailable_short) override fun temporaryBasalDialogText(iobCobCalculator: IobCobCalculator): String = profileFunction.getProfile()?.let { profile -> iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())?.let { temporaryBasal -> - "${rh.gs(info.nightscout.core.ui.R.string.base_basal_rate_label)}: ${rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, profile.getBasal())}" + - "\n" + rh.gs(info.nightscout.core.ui.R.string.tempbasal_label) + ": " + temporaryBasal.toStringFull(profile, dateUtil, decimalFormatter) + "${rh.gs(app.aaps.core.ui.R.string.base_basal_rate_label)}: ${rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, profile.getBasal())}" + + "\n" + rh.gs(app.aaps.core.ui.R.string.tempbasal_label) + ": " + temporaryBasal.toStringFull(profile, dateUtil, decimalFormatter) } - ?: "${rh.gs(info.nightscout.core.ui.R.string.base_basal_rate_label)}: ${rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, profile.getBasal())}" - } ?: rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short) + ?: "${rh.gs(app.aaps.core.ui.R.string.base_basal_rate_label)}: ${rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, profile.getBasal())}" + } ?: rh.gs(app.aaps.core.ui.R.string.value_unavailable_short) @DrawableRes override fun temporaryBasalIcon(iobCobCalculator: IobCobCalculator): Int = profileFunction.getProfile()?.let { profile -> @@ -211,11 +211,11 @@ class OverviewDataImpl @Inject constructor( @AttrRes override fun temporaryBasalColor(context: Context?, iobCobCalculator: IobCobCalculator): Int = iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())?.let { rh.gac( - context, info.nightscout.core.ui.R + context, app.aaps.core.ui.R .attr.basal ) } - ?: rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor) + ?: rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor) /* * EXTENDED BOLUS @@ -224,7 +224,7 @@ class OverviewDataImpl @Inject constructor( override fun extendedBolusText(iobCobCalculator: IobCobCalculator): String = iobCobCalculator.getExtendedBolus(dateUtil.now())?.let { extendedBolus -> if (!extendedBolus.isInProgress(dateUtil)) "" - else if (!activePlugin.activePump.isFakingTempsByExtendedBoluses) rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, extendedBolus.rate) + else if (!activePlugin.activePump.isFakingTempsByExtendedBoluses) rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, extendedBolus.rate) else "" } ?: "" @@ -245,12 +245,12 @@ class OverviewDataImpl @Inject constructor( } override fun iobText(iobCobCalculator: IobCobCalculator): String = - rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, bolusIob(iobCobCalculator).iob + basalIob(iobCobCalculator).basaliob) + rh.gs(app.aaps.core.ui.R.string.format_insulin_units, bolusIob(iobCobCalculator).iob + basalIob(iobCobCalculator).basaliob) override fun iobDialogText(iobCobCalculator: IobCobCalculator): String = - rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, bolusIob(iobCobCalculator).iob + basalIob(iobCobCalculator).basaliob) + "\n" + - rh.gs(info.nightscout.core.ui.R.string.bolus) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, bolusIob(iobCobCalculator).iob) + "\n" + - rh.gs(info.nightscout.core.ui.R.string.basal) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, basalIob(iobCobCalculator).basaliob) + rh.gs(app.aaps.core.ui.R.string.format_insulin_units, bolusIob(iobCobCalculator).iob + basalIob(iobCobCalculator).basaliob) + "\n" + + rh.gs(app.aaps.core.ui.R.string.bolus) + ": " + rh.gs(app.aaps.core.ui.R.string.format_insulin_units, bolusIob(iobCobCalculator).iob) + "\n" + + rh.gs(app.aaps.core.ui.R.string.basal) + ": " + rh.gs(app.aaps.core.ui.R.string.format_insulin_units, basalIob(iobCobCalculator).basaliob) /* * TEMP TARGET diff --git a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt index 7c13f5be91..8cfe7fddae 100644 --- a/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/profile/ProfileFunctionImpl.kt @@ -71,7 +71,7 @@ class ProfileFunctionImpl @Inject constructor( getProfileName(System.currentTimeMillis(), customized = true, showRemainingTime = true) private fun getProfileName(time: Long, customized: Boolean, showRemainingTime: Boolean): String { - var profileName = rh.gs(info.nightscout.core.ui.R.string.no_profile_set) + var profileName = rh.gs(app.aaps.core.ui.R.string.no_profile_set) val profileSwitch = repository.getEffectiveProfileSwitchActiveAt(time).blockingGet() if (profileSwitch is ValueWrapper.Existing) { @@ -181,7 +181,7 @@ class ProfileFunctionImpl @Inject constructor( val profileStore = activePlugin.activeProfileSource.profile ?: return false val ps = buildProfileSwitch(profileStore, profile.profileName, durationInMinutes, percentage, 0, dateUtil.now()) ?: return false val validity = ProfileSealed.PS(ps).isValid( - rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch), + rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch), activePlugin.activePump, config, rh, diff --git a/implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt b/implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt index d8c1a19eab..b1623269ec 100644 --- a/implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt +++ b/implementation/src/main/java/info/nightscout/implementation/protection/BiometricCheck.kt @@ -19,8 +19,8 @@ import androidx.biometric.BiometricPrompt.PromptInfo import androidx.fragment.app.FragmentActivity import app.aaps.core.interfaces.extensions.runOnUiThread import app.aaps.core.interfaces.protection.PasswordCheck -import info.nightscout.core.ui.R -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.R +import app.aaps.core.ui.toast.ToastUtils import java.util.concurrent.Executors object BiometricCheck { diff --git a/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt b/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt index 4678b890b7..f9a9524f21 100644 --- a/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/protection/PasswordCheckImpl.kt @@ -17,7 +17,7 @@ import app.aaps.core.interfaces.protection.PasswordCheck import app.aaps.core.interfaces.sharedPreferences.SP import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.Reusable -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import javax.inject.Inject @Reusable @@ -41,7 +41,7 @@ class PasswordCheckImpl @Inject constructor( return } val promptsView = LayoutInflater.from(context).inflate(R.layout.passwordprompt, null) - val alertDialogBuilder = MaterialAlertDialogBuilder(context, info.nightscout.core.ui.R.style.DialogTheme) + val alertDialogBuilder = MaterialAlertDialogBuilder(context, app.aaps.core.ui.R.style.DialogTheme) alertDialogBuilder.setView(promptsView) val userInput = promptsView.findViewById(R.id.password_prompt_pass) as EditText @@ -49,7 +49,7 @@ class PasswordCheckImpl @Inject constructor( userInput2.visibility = View.GONE if (pinInput) { - userInput.setHint(info.nightscout.core.ui.R.string.pin_hint) + userInput.setHint(app.aaps.core.ui.R.string.pin_hint) userInput.inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_VARIATION_PASSWORD } val autoFillHintPasswordKind = context.getString(preference) @@ -64,7 +64,7 @@ class PasswordCheckImpl @Inject constructor( ok?.invoke(enteredPassword) return true } - val msg = if (pinInput) info.nightscout.core.ui.R.string.wrongpin else info.nightscout.core.ui.R.string.wrongpassword + val msg = if (pinInput) app.aaps.core.ui.R.string.wrongpin else app.aaps.core.ui.R.string.wrongpassword ToastUtils.errorToast(context, context.getString(msg)) fail?.invoke() return false @@ -72,9 +72,9 @@ class PasswordCheckImpl @Inject constructor( alertDialogBuilder .setCancelable(false) - .setCustomTitle(info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key)) - .setPositiveButton(context.getString(info.nightscout.core.ui.R.string.ok)) { _, _ -> validatePassword() } - .setNegativeButton(context.getString(info.nightscout.core.ui.R.string.cancel)) { dialog, _ -> + .setCustomTitle(app.aaps.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key)) + .setPositiveButton(context.getString(app.aaps.core.ui.R.string.ok)) { _, _ -> validatePassword() } + .setNegativeButton(context.getString(app.aaps.core.ui.R.string.cancel)) { dialog, _ -> cancel?.invoke() dialog.cancel() } @@ -98,7 +98,7 @@ class PasswordCheckImpl @Inject constructor( @SuppressLint("InflateParams") override fun setPassword(context: Context, @StringRes labelId: Int, @StringRes preference: Int, ok: ((String) -> Unit)?, cancel: (() -> Unit)?, clear: (() -> Unit)?, pinInput: Boolean) { val promptsView = LayoutInflater.from(context).inflate(R.layout.passwordprompt, null) - val alertDialogBuilder = MaterialAlertDialogBuilder(context, info.nightscout.core.ui.R.style.DialogTheme) + val alertDialogBuilder = MaterialAlertDialogBuilder(context, app.aaps.core.ui.R.style.DialogTheme) alertDialogBuilder.setView(promptsView) val userInput = promptsView.findViewById(R.id.password_prompt_pass) as EditText @@ -106,8 +106,8 @@ class PasswordCheckImpl @Inject constructor( if (pinInput) { userInput.inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_VARIATION_PASSWORD userInput2.inputType = InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_VARIATION_PASSWORD - userInput.setHint(info.nightscout.core.ui.R.string.pin_hint) - userInput2.setHint(info.nightscout.core.ui.R.string.pin_hint) + userInput.setHint(app.aaps.core.ui.R.string.pin_hint) + userInput2.setHint(app.aaps.core.ui.R.string.pin_hint) } val autoFillHintPasswordKind = context.getString(preference) userInput.setAutofillHints(AUTOFILL_HINT_NEW_PASSWORD, "aaps_${autoFillHintPasswordKind}") @@ -115,26 +115,26 @@ class PasswordCheckImpl @Inject constructor( alertDialogBuilder .setCancelable(false) - .setCustomTitle(info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key)) - .setPositiveButton(context.getString(info.nightscout.core.ui.R.string.ok)) { _, _ -> + .setCustomTitle(app.aaps.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key)) + .setPositiveButton(context.getString(app.aaps.core.ui.R.string.ok)) { _, _ -> val enteredPassword = userInput.text.toString() val enteredPassword2 = userInput2.text.toString() if (enteredPassword != enteredPassword2) { - val msg = if (pinInput) info.nightscout.core.ui.R.string.pin_dont_match else info.nightscout.core.ui.R.string.passwords_dont_match + val msg = if (pinInput) app.aaps.core.ui.R.string.pin_dont_match else app.aaps.core.ui.R.string.passwords_dont_match ToastUtils.errorToast(context, context.getString(msg)) } else if (enteredPassword.isNotEmpty()) { sp.putString(preference, cryptoUtil.hashPassword(enteredPassword)) - val msg = if (pinInput) info.nightscout.core.ui.R.string.pin_set else info.nightscout.core.ui.R.string.password_set + val msg = if (pinInput) app.aaps.core.ui.R.string.pin_set else app.aaps.core.ui.R.string.password_set ToastUtils.okToast(context, context.getString(msg)) ok?.invoke(enteredPassword) } else { if (sp.contains(preference)) { sp.remove(preference) - val msg = if (pinInput) info.nightscout.core.ui.R.string.pin_cleared else info.nightscout.core.ui.R.string.password_cleared - ToastUtils.graphicalToast(context, context.getString(msg), info.nightscout.core.ui.R.drawable.ic_toast_delete_confirm) + val msg = if (pinInput) app.aaps.core.ui.R.string.pin_cleared else app.aaps.core.ui.R.string.password_cleared + ToastUtils.graphicalToast(context, context.getString(msg), app.aaps.core.ui.R.drawable.ic_toast_delete_confirm) clear?.invoke() } else { - val msg = if (pinInput) info.nightscout.core.ui.R.string.pin_not_changed else info.nightscout.core.ui.R.string.password_not_changed + val msg = if (pinInput) app.aaps.core.ui.R.string.pin_not_changed else app.aaps.core.ui.R.string.password_not_changed ToastUtils.warnToast(context, context.getString(msg)) cancel?.invoke() } @@ -142,9 +142,9 @@ class PasswordCheckImpl @Inject constructor( } .setNegativeButton( - context.getString(info.nightscout.core.ui.R.string.cancel) + context.getString(app.aaps.core.ui.R.string.cancel) ) { dialog, _ -> - val msg = if (pinInput) info.nightscout.core.ui.R.string.pin_not_changed else info.nightscout.core.ui.R.string.password_not_changed + val msg = if (pinInput) app.aaps.core.ui.R.string.pin_not_changed else app.aaps.core.ui.R.string.password_not_changed ToastUtils.infoToast(context, msg) cancel?.invoke() dialog.cancel() @@ -165,7 +165,7 @@ class PasswordCheckImpl @Inject constructor( ) { val promptsView = LayoutInflater.from(context).inflate(R.layout.passwordprompt, null) - val alertDialogBuilder = MaterialAlertDialogBuilder(context, info.nightscout.core.ui.R.style.DialogTheme) + val alertDialogBuilder = MaterialAlertDialogBuilder(context, app.aaps.core.ui.R.style.DialogTheme) alertDialogBuilder.setView(promptsView) passwordExplanation?.let { alertDialogBuilder.setMessage(it) } @@ -191,10 +191,10 @@ class PasswordCheckImpl @Inject constructor( alertDialogBuilder .setCancelable(false) - .setCustomTitle(info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key)) - .setPositiveButton(context.getString(info.nightscout.core.ui.R.string.ok)) { _, _ -> validatePassword() } + .setCustomTitle(app.aaps.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(labelId), R.drawable.ic_header_key)) + .setPositiveButton(context.getString(app.aaps.core.ui.R.string.ok)) { _, _ -> validatePassword() } .setNegativeButton( - context.getString(info.nightscout.core.ui.R.string.cancel) + context.getString(app.aaps.core.ui.R.string.cancel) ) { dialog, _ -> cancel?.invoke() dialog.cancel() diff --git a/implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt b/implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt index a22e55544c..e4627da8df 100644 --- a/implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/protection/ProtectionCheckImpl.kt @@ -37,15 +37,15 @@ class ProtectionCheckImpl @Inject constructor( ) private val titlePassResourceIDs = listOf( - info.nightscout.core.ui.R.string.settings_password, - info.nightscout.core.ui.R.string.application_password, - info.nightscout.core.ui.R.string.bolus_password + app.aaps.core.ui.R.string.settings_password, + app.aaps.core.ui.R.string.application_password, + app.aaps.core.ui.R.string.bolus_password ) private val titlePinResourceIDs = listOf( - info.nightscout.core.ui.R.string.settings_pin, - info.nightscout.core.ui.R.string.application_pin, - info.nightscout.core.ui.R.string.bolus_pin + app.aaps.core.ui.R.string.settings_pin, + app.aaps.core.ui.R.string.application_pin, + app.aaps.core.ui.R.string.bolus_pin ) override fun isLocked(protection: ProtectionCheck.Protection): Boolean { @@ -95,7 +95,7 @@ class ProtectionCheckImpl @Inject constructor( ProtectionCheck.ProtectionType.MASTER_PASSWORD -> passwordCheck.queryPassword( activity, - info.nightscout.core.ui.R.string.master_password, + app.aaps.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password, { onOk(protection); ok?.run() }, { cancel?.run() }, diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt index 07bd603dfd..7b2024a7f2 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/BlePreCheckImpl.kt @@ -13,7 +13,7 @@ import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import app.aaps.core.interfaces.pump.BlePreCheck import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.core.utils.extensions.safeEnable import javax.inject.Inject import javax.inject.Singleton @@ -32,7 +32,7 @@ class BlePreCheckImpl @Inject constructor( override fun prerequisitesCheck(activity: AppCompatActivity): Boolean { if (!activity.packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) { - OKDialog.show(activity, rh.gs(info.nightscout.core.ui.R.string.message), rh.gs(info.nightscout.core.ui.R.string.ble_not_supported)) + OKDialog.show(activity, rh.gs(app.aaps.core.ui.R.string.message), rh.gs(app.aaps.core.ui.R.string.ble_not_supported)) return false } else { // Use this check to determine whether BLE is supported on the device. Then @@ -56,7 +56,7 @@ class BlePreCheckImpl @Inject constructor( // displays a dialog requesting user permission to enable Bluetooth. bluetoothAdapter?.safeEnable(3000) if (bluetoothAdapter?.isEnabled != true) { - OKDialog.show(activity, rh.gs(info.nightscout.core.ui.R.string.message), rh.gs(info.nightscout.core.ui.R.string.ble_not_enabled)) + OKDialog.show(activity, rh.gs(app.aaps.core.ui.R.string.message), rh.gs(app.aaps.core.ui.R.string.ble_not_enabled)) return false } else { // Will request that GPS be enabled for devices running Marshmallow or newer. @@ -95,7 +95,7 @@ class BlePreCheckImpl @Inject constructor( } // Shamelessly borrowed from http://stackoverflow.com/a/10311877/868533 - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.location_not_found_title), rh.gs(info.nightscout.core.ui.R.string.location_not_found_message), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.location_not_found_title), rh.gs(app.aaps.core.ui.R.string.location_not_found_message), Runnable { activity.startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS)) }) } diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt index a1f5d6edb4..22e3fbbf09 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt @@ -115,7 +115,7 @@ class PumpSyncImplementation @Inject constructor( } if (showNotification && (type.description != storedType || serialNumber != storedSerial) && timestamp >= storedTimestamp) - rxBus.send(EventNewNotification(Notification(Notification.WRONG_PUMP_DATA, rh.gs(info.nightscout.core.ui.R.string.wrong_pump_data), Notification.URGENT))) + rxBus.send(EventNewNotification(Notification(Notification.WRONG_PUMP_DATA, rh.gs(app.aaps.core.ui.R.string.wrong_pump_data), Notification.URGENT))) aapsLogger.error( LTag.PUMP, "Ignoring pump history record Allowed: ${dateUtil.dateAndTimeAndSecondsString(storedTimestamp)} $storedType $storedSerial Received: $timestamp ${ diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt index 80e88fb114..2fd10ab928 100644 --- a/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/pump/WarnColorsImpl.kt @@ -17,9 +17,9 @@ import javax.inject.Singleton view?.setTextColor( rh.gac( view.context, when { - value >= urgentLevel -> info.nightscout.core.ui.R.attr.urgentColor - value >= warnLevel -> info.nightscout.core.ui.R.attr.warnColor - else -> info.nightscout.core.ui.R.attr.defaultTextColor + value >= urgentLevel -> app.aaps.core.ui.R.attr.urgentColor + value >= warnLevel -> app.aaps.core.ui.R.attr.warnColor + else -> app.aaps.core.ui.R.attr.defaultTextColor } ) ) @@ -29,9 +29,9 @@ import javax.inject.Singleton view?.setTextColor( rh.gac( view.context, when { - value <= urgentLevel -> info.nightscout.core.ui.R.attr.urgentColor - value <= warnLevel -> info.nightscout.core.ui.R.attr.warnColor - else -> info.nightscout.core.ui.R.attr.defaultTextColor + value <= urgentLevel -> app.aaps.core.ui.R.attr.urgentColor + value <= warnLevel -> app.aaps.core.ui.R.attr.warnColor + else -> app.aaps.core.ui.R.attr.defaultTextColor } ) ) @@ -41,9 +41,9 @@ import javax.inject.Singleton view?.setTextColor( rh.gac( view.context, when { - therapyEvent.isOlderThan(urgentThreshold, dateUtil) -> info.nightscout.core.ui.R.attr.lowColor - therapyEvent.isOlderThan(warnThreshold, dateUtil) -> info.nightscout.core.ui.R.attr.highColor - else -> info.nightscout.core.ui.R.attr.defaultTextColor + therapyEvent.isOlderThan(urgentThreshold, dateUtil) -> app.aaps.core.ui.R.attr.lowColor + therapyEvent.isOlderThan(warnThreshold, dateUtil) -> app.aaps.core.ui.R.attr.highColor + else -> app.aaps.core.ui.R.attr.defaultTextColor } ) ) diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt index 28c3a6af9e..744074f7b9 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt @@ -124,7 +124,7 @@ class CommandQueueImplementation @Inject constructor( setProfile(ProfileSealed.PS(it), it.interfaceIDs.nightscoutId != null, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile), app.aaps.core.ui.R.raw.boluserror) } else if (result.enacted || effective is ValueWrapper.Existing && effective.value.originalEnd < dateUtil.now() && effective.value.originalDuration != 0L) { val nonCustomized = ProfileSealed.PS(it).convertToNonCustomizedProfile(dateUtil) EffectiveProfileSwitch( @@ -326,7 +326,7 @@ class CommandQueueImplementation @Inject constructor( EventMobileToWear( EventData.BolusProgress( percent = 0, - status = rh.gs(info.nightscout.core.ui.R.string.goingtodeliver, detailedBolusInfo.insulin) + status = rh.gs(app.aaps.core.ui.R.string.goingtodeliver, detailedBolusInfo.insulin) ) ) ) diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt b/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt index 83a4afb526..1fb94e71b2 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/QueueThread.kt @@ -19,7 +19,7 @@ import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import app.aaps.core.interfaces.rx.events.EventQueueChanged import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.T -import info.nightscout.core.ui.R +import app.aaps.core.ui.R import info.nightscout.core.utils.extensions.safeDisable import info.nightscout.core.utils.extensions.safeEnable diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt index 5d9598a539..4e562518c7 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandBolus.kt @@ -33,17 +33,17 @@ class CommandBolus( } override fun status(): String { - return (if (detailedBolusInfo.insulin > 0) rh.gs(info.nightscout.core.ui.R.string.bolus_u_min, detailedBolusInfo.insulin) else "") + - if (detailedBolusInfo.carbs > 0) rh.gs(info.nightscout.core.ui.R.string.carbs_g, detailedBolusInfo.carbs.toInt()) else "" + return (if (detailedBolusInfo.insulin > 0) rh.gs(app.aaps.core.ui.R.string.bolus_u_min, detailedBolusInfo.insulin) else "") + + if (detailedBolusInfo.carbs > 0) rh.gs(app.aaps.core.ui.R.string.carbs_g, detailedBolusInfo.carbs.toInt()) else "" } override fun log(): String { - return (if (detailedBolusInfo.insulin > 0) "BOLUS " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, detailedBolusInfo.insulin) else "") + + return (if (detailedBolusInfo.insulin > 0) "BOLUS " + rh.gs(app.aaps.core.ui.R.string.format_insulin_units, detailedBolusInfo.insulin) else "") + if (detailedBolusInfo.carbs > 0) "CARBS " + rh.gs(app.aaps.core.main.R.string.format_carbs, detailedBolusInfo.carbs.toInt()) else "" } override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt index 6bcd0d2ce5..d640bee195 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelExtendedBolus.kt @@ -21,11 +21,11 @@ class CommandCancelExtendedBolus( callback?.result(r)?.run() } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.uel_cancel_extended_bolus) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.uel_cancel_extended_bolus) override fun log(): String = "CANCEL EXTENDEDBOLUS" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt index 7f0e8b57ef..8264d0473a 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCancelTempBasal.kt @@ -22,11 +22,11 @@ class CommandCancelTempBasal( callback?.result(r)?.run() } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.uel_accepts_temp_basal) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.uel_accepts_temp_basal) override fun log(): String = "CANCEL TEMPBASAL" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt index f63757792a..694f46f5a9 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandClearAlarms.kt @@ -27,11 +27,11 @@ class CommandClearAlarms( } } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.clear_alarms) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.clear_alarms) override fun log(): String = "CLEAR ALARMS" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt index 3791d9edbc..d652f6e639 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandCustomCommand.kt @@ -29,6 +29,6 @@ class CommandCustomCommand( override fun log(): String = customCommand.statusDescription override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt index 31d59cf4fc..da8c765ddc 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandDeactivate.kt @@ -27,11 +27,11 @@ class CommandDeactivate( } } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.deactivate) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.deactivate) override fun log(): String = "DEACTIVATE" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt index 5eaf5e549b..76514b8615 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandExtendedBolus.kt @@ -23,11 +23,11 @@ class CommandExtendedBolus( callback?.result(r)?.run() } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.extended_bolus_u_min, insulin, durationInMinutes) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.extended_bolus_u_min, insulin, durationInMinutes) override fun log(): String = "EXTENDEDBOLUS $insulin U $durationInMinutes min" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt index f2e3a5f19f..639e5b7ab4 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandInsightSetTBROverNotification.kt @@ -25,12 +25,12 @@ class CommandInsightSetTBROverNotification( } } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.insight_set_tbr_over_notification) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.insight_set_tbr_over_notification) @Suppress("SpellCheckingInspection") override fun log(): String = "INSIGHTSETTBROVERNOTIFICATION" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt index cc3dbda896..0bce6ebd2c 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadEvents.kt @@ -42,11 +42,11 @@ class CommandLoadEvents( } } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.load_events) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.load_events) override fun log(): String = "LOAD EVENTS" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt index 6781e27f50..7bae4164df 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadHistory.kt @@ -35,11 +35,11 @@ class CommandLoadHistory( } } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.load_history, type.toInt()) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.load_history, type.toInt()) override fun log(): String = "LOAD HISTORY $type" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt index 2183cdd52c..fd501c6e6c 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandLoadTDDs.kt @@ -22,11 +22,11 @@ class CommandLoadTDDs( callback?.result(r)?.run() } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.load_tdds) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.load_tdds) override fun log(): String = "LOAD TDDs" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt index 37b03bf8e7..1b66f215ed 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandReadStatus.kt @@ -30,11 +30,11 @@ class CommandReadStatus( callback?.result(result)?.run() } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.read_status, reason) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.read_status, reason) override fun log(): String = "READSTATUS $reason" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt index 1667d96a8b..8504c46074 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSMBBolus.kt @@ -39,11 +39,11 @@ class CommandSMBBolus( callback?.result(r)?.run() } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.smb_bolus_u, detailedBolusInfo.insulin) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.smb_bolus_u, detailedBolusInfo.insulin) - override fun log(): String = "SMB BOLUS ${rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, detailedBolusInfo.insulin)}" + override fun log(): String = "SMB BOLUS ${rh.gs(app.aaps.core.ui.R.string.format_insulin_units, detailedBolusInfo.insulin)}" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt index 043a44c0c4..22ed44b5fa 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetProfile.kt @@ -42,15 +42,15 @@ class CommandSetProfile( val profileSwitch = repository.getEffectiveProfileSwitchActiveAt(dateUtil.now()).blockingGet() if (profileSwitch is ValueWrapper.Existing && r.enacted && hasNsId && !config.NSCLIENT) { if (smsCommunicator.isEnabled()) - smsCommunicator.sendNotificationToAllNumbers(rh.gs(info.nightscout.core.ui.R.string.profile_set_ok)) + smsCommunicator.sendNotificationToAllNumbers(rh.gs(app.aaps.core.ui.R.string.profile_set_ok)) } } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.set_profile) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.set_profile) override fun log(): String = "SET PROFILE" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt index 955e95fe29..15fc652546 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandSetUserSettings.kt @@ -39,11 +39,11 @@ class CommandSetUserSettings( } } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.set_user_settings) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.set_user_settings) override fun log(): String = "SET USER SETTINGS" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt index fe672a7a8e..22308f899f 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStartPump.kt @@ -24,11 +24,11 @@ class CommandStartPump( } } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.start_pump) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.start_pump) override fun log(): String = "START PUMP" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt index f45e656e3a..7a012ccdbb 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandStopPump.kt @@ -24,11 +24,11 @@ class CommandStopPump( } } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.stop_pump) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.stop_pump) override fun log(): String = "STOP PUMP" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt index 930e0373f8..b0691eefc7 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalAbsolute.kt @@ -28,11 +28,11 @@ class CommandTempBasalAbsolute( callback?.result(r)?.run() } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.temp_basal_absolute, absoluteRate, durationInMinutes) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.temp_basal_absolute, absoluteRate, durationInMinutes) override fun log(): String = "TEMP BASAL $absoluteRate U/h $durationInMinutes min" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt index a9d7e14493..2541160fca 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandTempBasalPercent.kt @@ -32,11 +32,11 @@ class CommandTempBasalPercent( callback?.result(r)?.run() } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.temp_basal_percent, percent, durationInMinutes) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.temp_basal_percent, percent, durationInMinutes) override fun log(): String = "TEMP BASAL $percent% $durationInMinutes min" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } \ No newline at end of file diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt index a02790155a..d4b5af8726 100644 --- a/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt +++ b/implementation/src/main/java/info/nightscout/implementation/queue/commands/CommandUpdateTime.kt @@ -27,11 +27,11 @@ class CommandUpdateTime( } } - override fun status(): String = rh.gs(info.nightscout.core.ui.R.string.update_time) + override fun status(): String = rh.gs(app.aaps.core.ui.R.string.update_time) override fun log(): String = "UPDATE TIME" override fun cancel() { aapsLogger.debug(LTag.PUMPQUEUE, "Result cancel") - callback?.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.connectiontimedout))?.run() + callback?.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.connectiontimedout))?.run() } } diff --git a/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt index 68d8df1af4..35bf03d050 100644 --- a/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt +++ b/implementation/src/main/java/info/nightscout/implementation/resources/IconsProviderImplementation.kt @@ -11,10 +11,10 @@ class IconsProviderImplementation @Inject constructor(private val config: Config override fun getIcon(): Int = when { - config.NSCLIENT2 -> info.nightscout.core.ui.R.mipmap.ic_blueowl - config.NSCLIENT1 -> info.nightscout.core.ui.R.mipmap.ic_yellowowl - config.PUMPCONTROL -> info.nightscout.core.ui.R.mipmap.ic_pumpcontrol - else -> info.nightscout.core.ui.R.mipmap.ic_launcher + config.NSCLIENT2 -> app.aaps.core.ui.R.mipmap.ic_blueowl + config.NSCLIENT1 -> app.aaps.core.ui.R.mipmap.ic_yellowowl + config.PUMPCONTROL -> app.aaps.core.ui.R.mipmap.ic_pumpcontrol + else -> app.aaps.core.ui.R.mipmap.ic_launcher } override fun getNotificationIcon(): Int = diff --git a/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt index 84ec5356c7..ee20b6d45d 100644 --- a/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/resources/ResourceHelperImpl.kt @@ -20,8 +20,8 @@ import androidx.appcompat.view.ContextThemeWrapper import androidx.core.content.ContextCompat import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.getThemeColor -import info.nightscout.core.ui.locale.LocaleHelper +import app.aaps.core.ui.getThemeColor +import app.aaps.core.ui.locale.LocaleHelper import java.util.Locale import javax.inject.Inject @@ -93,13 +93,13 @@ class ResourceHelperImpl @Inject constructor(var context: Context, private val f return (dp * scale + 0.5f).toInt() } - override fun shortTextMode(): Boolean = !gb(info.nightscout.core.ui.R.bool.isTablet) + override fun shortTextMode(): Boolean = !gb(app.aaps.core.ui.R.bool.isTablet) override fun gac(context: Context?, attributeId: Int): Int = - (ContextThemeWrapper(context ?: this.context, info.nightscout.core.ui.R.style.AppTheme)).getThemeColor(attributeId) + (ContextThemeWrapper(context ?: this.context, app.aaps.core.ui.R.style.AppTheme)).getThemeColor(attributeId) override fun gac(attributeId: Int): Int = - ContextThemeWrapper(this.context, info.nightscout.core.ui.R.style.AppTheme).getThemeColor(attributeId) + ContextThemeWrapper(this.context, app.aaps.core.ui.R.style.AppTheme).getThemeColor(attributeId) override fun getThemedCtx(context: Context): Context { val res: Resources = context.resources diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt index 1fb30a707f..f1364d59b7 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/DexcomTirImpl.kt @@ -148,23 +148,23 @@ class DexcomTirImpl : DexcomTIR { row.gravity = Gravity.CENTER_HORIZONTAL row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = - context.getString(info.nightscout.core.ui.R.string.formatPercent, veryLowPct()) + context.getString(app.aaps.core.ui.R.string.formatPercent, veryLowPct()) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = - context.getString(info.nightscout.core.ui.R.string.formatPercent, lowPct()) + context.getString(app.aaps.core.ui.R.string.formatPercent, lowPct()) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2 }; text = - context.getString(info.nightscout.core.ui.R.string.formatPercent, inRangePct()) + context.getString(app.aaps.core.ui.R.string.formatPercent, inRangePct()) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = - context.getString(info.nightscout.core.ui.R.string.formatPercent, highPct()) + context.getString(app.aaps.core.ui.R.string.formatPercent, highPct()) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4 }; text = - context.getString(info.nightscout.core.ui.R.string.formatPercent, veryHighPct()) + context.getString(app.aaps.core.ui.R.string.formatPercent, veryHighPct()) }) } } diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt index 5dd495ce6f..0f5704d1df 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TddCalculatorImpl.kt @@ -145,7 +145,7 @@ class TddCalculatorImpl @Inject constructor( return TableLayout(context).also { layout -> layout.layoutParams = TableLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f) layout.addView(TextView(context).apply { - text = rh.gs(info.nightscout.core.ui.R.string.tdd) + text = rh.gs(app.aaps.core.ui.R.string.tdd) setTypeface(typeface, Typeface.BOLD) gravity = Gravity.CENTER_HORIZONTAL setTextAppearance(android.R.style.TextAppearance_Material_Medium) @@ -155,7 +155,7 @@ class TddCalculatorImpl @Inject constructor( averageTdd?.let { averageTdd -> layout.addView(TextView(context).apply { layoutParams = lp - text = rh.gs(info.nightscout.core.ui.R.string.average) + text = rh.gs(app.aaps.core.ui.R.string.average) setTypeface(typeface, Typeface.BOLD) gravity = Gravity.CENTER_HORIZONTAL setTextAppearance(android.R.style.TextAppearance_Material_Medium) diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt index 98023bb288..71a4bbae65 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TirCalculatorImpl.kt @@ -87,7 +87,7 @@ class TirCalculatorImpl @Inject constructor( layout.layoutParams = TableLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f) layout.addView( TextView(context).apply { - text = rh.gs(info.nightscout.core.ui.R.string.tir) + " (" + profileUtil.stringInCurrentUnitsDetect(lowTirMgdl) + "-" + profileUtil.stringInCurrentUnitsDetect(highTirMgdl) + ")" + text = rh.gs(app.aaps.core.ui.R.string.tir) + " (" + profileUtil.stringInCurrentUnitsDetect(lowTirMgdl) + "-" + profileUtil.stringInCurrentUnitsDetect(highTirMgdl) + ")" setTypeface(typeface, Typeface.BOLD) gravity = Gravity.CENTER_HORIZONTAL setTextAppearance(android.R.style.TextAppearance_Material_Medium) @@ -96,7 +96,7 @@ class TirCalculatorImpl @Inject constructor( for (i in 0 until tir7.size()) layout.addView(tir7.valueAt(i).toTableRow(context, rh, dateUtil)) layout.addView( TextView(context).apply { - text = rh.gs(info.nightscout.core.ui.R.string.average) + " (" + profileUtil.stringInCurrentUnitsDetect(lowTirMgdl) + "-" + profileUtil.stringInCurrentUnitsDetect(highTirMgdl) + ")" + text = rh.gs(app.aaps.core.ui.R.string.average) + " (" + profileUtil.stringInCurrentUnitsDetect(lowTirMgdl) + "-" + profileUtil.stringInCurrentUnitsDetect(highTirMgdl) + ")" setTypeface(typeface, Typeface.BOLD) gravity = Gravity.CENTER_HORIZONTAL setTextAppearance(android.R.style.TextAppearance_Material_Medium) @@ -105,7 +105,7 @@ class TirCalculatorImpl @Inject constructor( layout.addView(averageTir30.toTableRow(context, rh, tir30.size())) layout.addView( TextView(context).apply { - text = rh.gs(info.nightscout.core.ui.R.string.average) + " (" + profileUtil.stringInCurrentUnitsDetect(lowTitMgdl) + "-" + profileUtil.stringInCurrentUnitsDetect(highTitMgdl) + ")" + text = rh.gs(app.aaps.core.ui.R.string.average) + " (" + profileUtil.stringInCurrentUnitsDetect(lowTitMgdl) + "-" + profileUtil.stringInCurrentUnitsDetect(highTitMgdl) + ")" setTypeface(typeface, Typeface.BOLD) gravity = Gravity.CENTER_HORIZONTAL setTextAppearance(android.R.style.TextAppearance_Material_Medium) diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt index 80c4924167..78396e9c6e 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TirImpl.kt @@ -47,7 +47,7 @@ class TirImpl(override val date: Long, override val lowThreshold: Double, overri header.gravity = Gravity.CENTER_HORIZONTAL header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0; weight = 1f }; text = - rh.gs(info.nightscout.core.ui.R.string.date) + rh.gs(app.aaps.core.ui.R.string.date) }) header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1; weight = 1f }; text = rh.gs(R.string.below) }) header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2; weight = 1f }; text = rh.gs(R.string.in_range) }) @@ -63,15 +63,15 @@ class TirImpl(override val date: Long, override val lowThreshold: Double, overri row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = dateUtil.dateStringShort(date) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = - rh.gs(info.nightscout.core.ui.R.string.formatPercent, belowPct()) + rh.gs(app.aaps.core.ui.R.string.formatPercent, belowPct()) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2 }; text = - rh.gs(info.nightscout.core.ui.R.string.formatPercent, inRangePct()) + rh.gs(app.aaps.core.ui.R.string.formatPercent, inRangePct()) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = - rh.gs(info.nightscout.core.ui.R.string.formatPercent, abovePct()) + rh.gs(app.aaps.core.ui.R.string.formatPercent, abovePct()) }) } @@ -87,15 +87,15 @@ class TirImpl(override val date: Long, override val lowThreshold: Double, overri }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = - rh.gs(info.nightscout.core.ui.R.string.formatPercent, belowPct()) + rh.gs(app.aaps.core.ui.R.string.formatPercent, belowPct()) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2 }; text = - rh.gs(info.nightscout.core.ui.R.string.formatPercent, inRangePct()) + rh.gs(app.aaps.core.ui.R.string.formatPercent, inRangePct()) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = - rh.gs(info.nightscout.core.ui.R.string.formatPercent, abovePct()) + rh.gs(app.aaps.core.ui.R.string.formatPercent, abovePct()) }) } } diff --git a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt index 515ccdbb93..8a4ebdf164 100644 --- a/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt +++ b/implementation/src/main/java/info/nightscout/implementation/stats/TotalDailyDoseExtension.kt @@ -21,11 +21,11 @@ fun TotalDailyDose.Companion.toTableRowHeader(context: Context, rh: ResourceHelp val lp = TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT) header.layoutParams = TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT) header.gravity = Gravity.CENTER_HORIZONTAL - header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0; weight = 1f }; text = rh.gs(info.nightscout.core.ui.R.string.date) }) + header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0; weight = 1f }; text = rh.gs(app.aaps.core.ui.R.string.date) }) header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1; weight = 1f }; text = "∑" }) - header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2; weight = 1f }; text = rh.gs(info.nightscout.core.ui.R.string.bolus) }) - header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3; weight = 1f }; text = rh.gs(info.nightscout.core.ui.R.string.basal) }) - header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4; weight = 1f }; text = rh.gs(info.nightscout.core.ui.R.string.basalpct) }) + header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2; weight = 1f }; text = rh.gs(app.aaps.core.ui.R.string.bolus) }) + header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3; weight = 1f }; text = rh.gs(app.aaps.core.ui.R.string.basal) }) + header.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4; weight = 1f }; text = rh.gs(app.aaps.core.ui.R.string.basalpct) }) if (includeCarbs) header.addView(TextView(context).apply { layoutParams = lp.apply { column = 5; weight = 1f }; text = rh.gs(R.string.carbs_short) }) } @@ -39,17 +39,17 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, dateUtil: Da row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 0 }; text = dateUtil.dateStringShort(timestamp) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = - rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, total) + rh.gs(app.aaps.core.ui.R.string.format_insulin_units1, total) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2 }; text = - rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, bolusAmount) + rh.gs(app.aaps.core.ui.R.string.format_insulin_units1, bolusAmount) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = - rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, basalAmount) + rh.gs(app.aaps.core.ui.R.string.format_insulin_units1, basalAmount) }) - row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, basalPct) }) + row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4 }; text = rh.gs(app.aaps.core.ui.R.string.formatPercent, basalPct) }) if (includeCarbs) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs( @@ -73,17 +73,17 @@ fun TotalDailyDose.toTableRow(context: Context, rh: ResourceHelper, days: Int, i }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 1 }; text = - rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, total) + rh.gs(app.aaps.core.ui.R.string.format_insulin_units1, total) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 2 }; text = - rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, bolusAmount) + rh.gs(app.aaps.core.ui.R.string.format_insulin_units1, bolusAmount) }) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 3 }; text = - rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, basalAmount) + rh.gs(app.aaps.core.ui.R.string.format_insulin_units1, basalAmount) }) - row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4 }; text = rh.gs(info.nightscout.core.ui.R.string.formatPercent, basalPct) }) + row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 4 }; text = rh.gs(app.aaps.core.ui.R.string.formatPercent, basalPct) }) if (includeCarbs) row.addView(TextView(context).apply { gravity = Gravity.CENTER_HORIZONTAL; layoutParams = lp.apply { column = 5 }; text = rh.gs( diff --git a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt index dc45c1d9b5..54db25219a 100644 --- a/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/userEntry/UserEntryPresentationHelperImpl.kt @@ -29,16 +29,16 @@ class UserEntryPresentationHelperImpl @Inject constructor( ) : UserEntryPresentationHelper { override fun colorId(colorGroup: ColorGroup): Int = when (colorGroup) { - ColorGroup.InsulinTreatment -> info.nightscout.core.ui.R.color.iob - ColorGroup.BasalTreatment -> info.nightscout.core.ui.R.color.basal - ColorGroup.CarbTreatment -> info.nightscout.core.ui.R.color.carbs - ColorGroup.TT -> info.nightscout.core.ui.R.color.tempTargetConfirmation - ColorGroup.Profile -> info.nightscout.core.ui.R.color.white - ColorGroup.Loop -> info.nightscout.core.ui.R.color.loopClosed - ColorGroup.Careportal -> info.nightscout.core.ui.R.color.high - ColorGroup.Pump -> info.nightscout.core.ui.R.color.loopDisconnected - ColorGroup.Aaps -> info.nightscout.core.ui.R.color.defaultText - else -> info.nightscout.core.ui.R.color.defaultText + ColorGroup.InsulinTreatment -> app.aaps.core.ui.R.color.iob + ColorGroup.BasalTreatment -> app.aaps.core.ui.R.color.basal + ColorGroup.CarbTreatment -> app.aaps.core.ui.R.color.carbs + ColorGroup.TT -> app.aaps.core.ui.R.color.tempTargetConfirmation + ColorGroup.Profile -> app.aaps.core.ui.R.color.white + ColorGroup.Loop -> app.aaps.core.ui.R.color.loopClosed + ColorGroup.Careportal -> app.aaps.core.ui.R.color.high + ColorGroup.Pump -> app.aaps.core.ui.R.color.loopDisconnected + ColorGroup.Aaps -> app.aaps.core.ui.R.color.defaultText + else -> app.aaps.core.ui.R.color.defaultText } override fun iconId(source: Sources): Int = when (source) { @@ -49,7 +49,7 @@ class UserEntryPresentationHelperImpl @Inject constructor( Sources.QuickWizard -> R.drawable.ic_quick_wizard Sources.ExtendedBolusDialog -> R.drawable.ic_actions_start_extended_bolus Sources.TTDialog -> R.drawable.ic_temptarget_high - Sources.ProfileSwitchDialog -> info.nightscout.core.ui.R.drawable.ic_actions_profileswitch + Sources.ProfileSwitchDialog -> app.aaps.core.ui.R.drawable.ic_actions_profileswitch Sources.LoopDialog -> R.drawable.ic_loop_closed Sources.TempBasalDialog -> R.drawable.ic_actions_start_temp_basal Sources.CalibrationDialog -> R.drawable.ic_calibration @@ -74,30 +74,30 @@ class UserEntryPresentationHelperImpl @Inject constructor( Sources.PocTech -> R.drawable.ic_poctech Sources.Tomato -> R.drawable.ic_sensor Sources.Glunovo -> R.drawable.ic_glunovo - Sources.Intelligo -> info.nightscout.core.ui.R.drawable.ic_intelligo + Sources.Intelligo -> app.aaps.core.ui.R.drawable.ic_intelligo Sources.Xdrip -> R.drawable.ic_blooddrop_48 Sources.LocalProfile -> R.drawable.ic_local_profile Sources.Loop -> R.drawable.ic_loop_closed_white - Sources.Maintenance -> info.nightscout.core.ui.R.drawable.ic_maintenance - Sources.NSClient -> info.nightscout.core.ui.R.drawable.ic_nightscout_syncs + Sources.Maintenance -> app.aaps.core.ui.R.drawable.ic_maintenance + Sources.NSClient -> app.aaps.core.ui.R.drawable.ic_nightscout_syncs Sources.NSProfile -> R.drawable.ic_nightscout_profile - Sources.Objectives -> info.nightscout.core.ui.R.drawable.ic_graduation - Sources.Pump -> info.nightscout.core.ui.R.drawable.ic_generic_icon - Sources.Dana -> info.nightscout.core.ui.R.drawable.ic_danars_128 - Sources.DanaR -> info.nightscout.core.ui.R.drawable.ic_danars_128 - Sources.DanaRC -> info.nightscout.core.ui.R.drawable.ic_danars_128 - Sources.DanaRv2 -> info.nightscout.core.ui.R.drawable.ic_danars_128 - Sources.DanaRS -> info.nightscout.core.ui.R.drawable.ic_danars_128 - Sources.DanaI -> info.nightscout.core.ui.R.drawable.ic_danai_128 - Sources.DiaconnG8 -> info.nightscout.core.ui.R.drawable.ic_diaconn_g8 - Sources.Insight -> info.nightscout.core.ui.R.drawable.ic_insight_128 - Sources.Combo -> info.nightscout.core.ui.R.drawable.ic_combo_128 - Sources.Medtronic -> info.nightscout.core.ui.R.drawable.ic_veo_128 + Sources.Objectives -> app.aaps.core.ui.R.drawable.ic_graduation + Sources.Pump -> app.aaps.core.ui.R.drawable.ic_generic_icon + Sources.Dana -> app.aaps.core.ui.R.drawable.ic_danars_128 + Sources.DanaR -> app.aaps.core.ui.R.drawable.ic_danars_128 + Sources.DanaRC -> app.aaps.core.ui.R.drawable.ic_danars_128 + Sources.DanaRv2 -> app.aaps.core.ui.R.drawable.ic_danars_128 + Sources.DanaRS -> app.aaps.core.ui.R.drawable.ic_danars_128 + Sources.DanaI -> app.aaps.core.ui.R.drawable.ic_danai_128 + Sources.DiaconnG8 -> app.aaps.core.ui.R.drawable.ic_diaconn_g8 + Sources.Insight -> app.aaps.core.ui.R.drawable.ic_insight_128 + Sources.Combo -> app.aaps.core.ui.R.drawable.ic_combo_128 + Sources.Medtronic -> app.aaps.core.ui.R.drawable.ic_veo_128 Sources.Omnipod -> R.drawable.ic_patch_pump_outline Sources.OmnipodEros -> R.drawable.ic_patch_pump_outline Sources.OmnipodDash -> R.drawable.ic_patch_pump_outline - Sources.EOPatch2 -> info.nightscout.core.ui.R.drawable.ic_eopatch2_128 - Sources.Medtrum -> info.nightscout.core.ui.R.drawable.ic_medtrum_128 + Sources.EOPatch2 -> app.aaps.core.ui.R.drawable.ic_eopatch2_128 + Sources.Medtrum -> app.aaps.core.ui.R.drawable.ic_medtrum_128 Sources.MDI -> R.drawable.ic_ict Sources.VirtualPump -> R.drawable.ic_virtual_pump Sources.SMS -> R.drawable.ic_sms @@ -105,10 +105,10 @@ class UserEntryPresentationHelperImpl @Inject constructor( Sources.Wear -> R.drawable.ic_watch Sources.Food -> R.drawable.ic_food Sources.Stats -> R.drawable.ic_cp_stats - Sources.ConfigBuilder -> info.nightscout.core.ui.R.drawable.ic_cogs - Sources.Overview -> info.nightscout.core.ui.R.drawable.ic_home + Sources.ConfigBuilder -> app.aaps.core.ui.R.drawable.ic_cogs + Sources.Overview -> app.aaps.core.ui.R.drawable.ic_home Sources.Aaps -> R.drawable.ic_aaps - Sources.Unknown -> info.nightscout.core.ui.R.drawable.ic_generic_icon + Sources.Unknown -> app.aaps.core.ui.R.drawable.ic_generic_icon } override fun actionToColoredString(action: Action): Spanned = when (action) { @@ -137,13 +137,13 @@ class UserEntryPresentationHelperImpl @Inject constructor( is ValueWithUnit.Timestamp -> dateUtil.dateAndTimeAndSecondsString(valueWithUnit.value) is ValueWithUnit.Mgdl -> { - if (profileUtil.units == GlucoseUnit.MGDL) decimalFormatter.to0Decimal(valueWithUnit.value) + rh.gs(info.nightscout.core.ui.R.string.mgdl) - else decimalFormatter.to1Decimal(valueWithUnit.value * Constants.MGDL_TO_MMOLL) + rh.gs(info.nightscout.core.ui.R.string.mmol) + if (profileUtil.units == GlucoseUnit.MGDL) decimalFormatter.to0Decimal(valueWithUnit.value) + rh.gs(app.aaps.core.ui.R.string.mgdl) + else decimalFormatter.to1Decimal(valueWithUnit.value * Constants.MGDL_TO_MMOLL) + rh.gs(app.aaps.core.ui.R.string.mmol) } is ValueWithUnit.Mmoll -> { - if (profileUtil.units == GlucoseUnit.MMOL) decimalFormatter.to1Decimal(valueWithUnit.value) + rh.gs(info.nightscout.core.ui.R.string.mmol) - else decimalFormatter.to0Decimal(valueWithUnit.value * Constants.MMOLL_TO_MGDL) + rh.gs(info.nightscout.core.ui.R.string.mgdl) + if (profileUtil.units == GlucoseUnit.MMOL) decimalFormatter.to1Decimal(valueWithUnit.value) + rh.gs(app.aaps.core.ui.R.string.mmol) + else decimalFormatter.to0Decimal(valueWithUnit.value * Constants.MMOLL_TO_MGDL) + rh.gs(app.aaps.core.ui.R.string.mgdl) } ValueWithUnit.UNKNOWN -> "" @@ -155,24 +155,24 @@ class UserEntryPresentationHelperImpl @Inject constructor( } private fun getCsvHeader() = rh.gs( - info.nightscout.core.ui.R.string.ue_csv_header, - csvString(info.nightscout.core.ui.R.string.ue_timestamp), - csvString(info.nightscout.core.ui.R.string.date), - csvString(info.nightscout.core.ui.R.string.ue_utc_offset), - csvString(info.nightscout.core.ui.R.string.ue_action), - csvString(info.nightscout.core.ui.R.string.event_type), - csvString(info.nightscout.core.ui.R.string.ue_source), - csvString(info.nightscout.core.ui.R.string.careportal_note), - csvString(info.nightscout.core.ui.R.string.ue_string), - csvString(info.nightscout.core.ui.R.string.event_time_label), - csvString(if (profileUtil.units == GlucoseUnit.MGDL) info.nightscout.core.ui.R.string.mgdl else info.nightscout.core.ui.R.string.mmol), - csvString(info.nightscout.core.ui.R.string.shortgram), - csvString(info.nightscout.core.ui.R.string.insulin_unit_shortname), - csvString(info.nightscout.core.ui.R.string.profile_ins_units_per_hour), - csvString(info.nightscout.core.ui.R.string.shortpercent), + app.aaps.core.ui.R.string.ue_csv_header, + csvString(app.aaps.core.ui.R.string.ue_timestamp), + csvString(app.aaps.core.ui.R.string.date), + csvString(app.aaps.core.ui.R.string.ue_utc_offset), + csvString(app.aaps.core.ui.R.string.ue_action), + csvString(app.aaps.core.ui.R.string.event_type), + csvString(app.aaps.core.ui.R.string.ue_source), + csvString(app.aaps.core.ui.R.string.careportal_note), + csvString(app.aaps.core.ui.R.string.ue_string), + csvString(app.aaps.core.ui.R.string.event_time_label), + csvString(if (profileUtil.units == GlucoseUnit.MGDL) app.aaps.core.ui.R.string.mgdl else app.aaps.core.ui.R.string.mmol), + csvString(app.aaps.core.ui.R.string.shortgram), + csvString(app.aaps.core.ui.R.string.insulin_unit_shortname), + csvString(app.aaps.core.ui.R.string.profile_ins_units_per_hour), + csvString(app.aaps.core.ui.R.string.shortpercent), csvString(app.aaps.core.interfaces.R.string.shorthour), csvString(app.aaps.core.interfaces.R.string.shortminute), - csvString(info.nightscout.core.ui.R.string.ue_none) + csvString(app.aaps.core.ui.R.string.ue_none) ) + "\n" private fun getCsvEntry(entry: UserEntry): String { diff --git a/implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt b/implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt index cbb07fa33e..1767b505fc 100644 --- a/implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt +++ b/implementation/src/main/java/info/nightscout/implementation/utils/DecimalFormatterImpl.kt @@ -26,7 +26,7 @@ class DecimalFormatterImpl @Inject constructor( override fun to3Decimal(value: Double, unit: String): String = format3dec.format(value) + unit override fun toPumpSupportedBolus(value: Double, bolusStep: Double): String = if (bolusStep <= 0.051) to2Decimal(value) else to1Decimal(value) override fun toPumpSupportedBolusWithUnits(value: Double, bolusStep: Double): String = - if (bolusStep <= 0.051) rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, value) else rh.gs(info.nightscout.core.ui.R.string.format_insulin_units1, value) + if (bolusStep <= 0.051) rh.gs(app.aaps.core.ui.R.string.format_insulin_units, value) else rh.gs(app.aaps.core.ui.R.string.format_insulin_units1, value) override fun pumpSupportedBolusFormat(bolusStep: Double): DecimalFormat = if (bolusStep <= 0.051) DecimalFormat("0.00") else DecimalFormat("0.0") } \ No newline at end of file diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt index 7f8b4a6936..3ce1d1c710 100644 --- a/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/queue/CommandQueueImplementationTest.kt @@ -149,9 +149,9 @@ class CommandQueueImplementationTest : TestBaseWithProfile() { `when`(constraintChecker.applyBasalConstraints(anyObject(), anyObject())).thenReturn(rateConstraint) val percentageConstraint = ConstraintObject(0, aapsLogger) `when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject())).thenReturn(percentageConstraint) - `when`(rh.gs(info.nightscout.core.ui.R.string.connectiontimedout)).thenReturn("Connection timed out") - `when`(rh.gs(info.nightscout.core.ui.R.string.format_insulin_units)).thenReturn("%1\$.2f U") - `when`(rh.gs(info.nightscout.core.ui.R.string.goingtodeliver)).thenReturn("Going to deliver %1\$.2f U") + `when`(rh.gs(app.aaps.core.ui.R.string.connectiontimedout)).thenReturn("Connection timed out") + `when`(rh.gs(app.aaps.core.ui.R.string.format_insulin_units)).thenReturn("%1\$.2f U") + `when`(rh.gs(app.aaps.core.ui.R.string.goingtodeliver)).thenReturn("Going to deliver %1\$.2f U") } @Test diff --git a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt b/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt index 9dbedbfde7..f977e6236d 100644 --- a/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt +++ b/implementation/src/test/java/info/nightscout/implementation/queue/QueueThreadTest.kt @@ -74,7 +74,7 @@ class QueueThreadTest : TestBaseWithProfile() { val percentageConstraint = ConstraintObject(0, aapsLogger) Mockito.`when`(constraintChecker.applyBasalPercentConstraints(anyObject(), anyObject())) .thenReturn(percentageConstraint) - Mockito.`when`(rh.gs(ArgumentMatchers.eq(info.nightscout.core.ui.R.string.temp_basal_absolute), anyObject(), anyObject())).thenReturn("TEMP BASAL %1\$.2f U/h %2\$d min") + Mockito.`when`(rh.gs(ArgumentMatchers.eq(app.aaps.core.ui.R.string.temp_basal_absolute), anyObject(), anyObject())).thenReturn("TEMP BASAL %1\$.2f U/h %2\$d min") sut = QueueThread(commandQueue, context, aapsLogger, rxBus, activePlugin, rh, sp, androidPermission, config) } diff --git a/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt b/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt index 74cac443bf..99aa320dc3 100644 --- a/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt +++ b/implementation/src/test/java/info/nightscout/interfaces/pump/PumpEnactResultTest.kt @@ -26,16 +26,16 @@ class PumpEnactResultTest : TestBaseWithProfile() { @BeforeEach fun mock() { - `when`(rh.gs(info.nightscout.core.ui.R.string.success)).thenReturn("Success") - `when`(rh.gs(info.nightscout.core.ui.R.string.enacted)).thenReturn("Enacted") - `when`(rh.gs(info.nightscout.core.ui.R.string.comment)).thenReturn("Comment") - `when`(rh.gs(info.nightscout.core.ui.R.string.configbuilder_insulin)).thenReturn("Insulin") - `when`(rh.gs(info.nightscout.core.ui.R.string.smb_shortname)).thenReturn("SMB") - `when`(rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname)).thenReturn("U") - `when`(rh.gs(info.nightscout.core.ui.R.string.cancel_temp)).thenReturn("Cancel temp basal") - `when`(rh.gs(info.nightscout.core.ui.R.string.duration)).thenReturn("Duration") - `when`(rh.gs(info.nightscout.core.ui.R.string.percent)).thenReturn("Percent") - `when`(rh.gs(info.nightscout.core.ui.R.string.absolute)).thenReturn("Absolute") + `when`(rh.gs(app.aaps.core.ui.R.string.success)).thenReturn("Success") + `when`(rh.gs(app.aaps.core.ui.R.string.enacted)).thenReturn("Enacted") + `when`(rh.gs(app.aaps.core.ui.R.string.comment)).thenReturn("Comment") + `when`(rh.gs(app.aaps.core.ui.R.string.configbuilder_insulin)).thenReturn("Insulin") + `when`(rh.gs(app.aaps.core.ui.R.string.smb_shortname)).thenReturn("SMB") + `when`(rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname)).thenReturn("U") + `when`(rh.gs(app.aaps.core.ui.R.string.cancel_temp)).thenReturn("Cancel temp basal") + `when`(rh.gs(app.aaps.core.ui.R.string.duration)).thenReturn("Duration") + `when`(rh.gs(app.aaps.core.ui.R.string.percent)).thenReturn("Percent") + `when`(rh.gs(app.aaps.core.ui.R.string.absolute)).thenReturn("Absolute") } @Test fun successTest() { diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java index 2a5706aa56..600d11e2dc 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/InsightAlertService.java @@ -316,11 +316,11 @@ public class InsightAlertService extends DaggerService implements InsightConnect case ACTIVE: Intent muteIntent = new Intent(this, InsightAlertService.class).putExtra("command", "mute"); PendingIntent mutePendingIntent = PendingIntent.getService(this, 1, muteIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); - notificationBuilder.addAction(0, rh.gs(info.nightscout.core.ui.R.string.mute), mutePendingIntent); + notificationBuilder.addAction(0, rh.gs(app.aaps.core.ui.R.string.mute), mutePendingIntent); case SNOOZED: Intent confirmIntent = new Intent(this, InsightAlertService.class).putExtra("command", "confirm"); PendingIntent confirmPendingIntent = PendingIntent.getService(this, 2, confirmIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); - notificationBuilder.addAction(0, rh.gs(info.nightscout.core.ui.R.string.confirm), confirmPendingIntent); + notificationBuilder.addAction(0, rh.gs(app.aaps.core.ui.R.string.confirm), confirmPendingIntent); } Notification notification = notificationBuilder.build(); 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 e87c689082..683db8dee2 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 @@ -203,7 +203,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick string = R.string.not_paired; break; case DISCONNECTED: - string = info.nightscout.core.ui.R.string.disconnected; + string = app.aaps.core.ui.R.string.disconnected; break; case CONNECTING: case SATL_CONNECTION_REQUEST: @@ -218,7 +218,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick case APP_FIRMWARE_VERSIONS: case APP_SYSTEM_IDENTIFICATION: case AWAITING_CODE_CONFIRMATION: - string = info.nightscout.core.ui.R.string.connecting; + string = app.aaps.core.ui.R.string.connecting; break; case CONNECTED: string = app.aaps.core.interfaces.R.string.connected; @@ -273,7 +273,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick break; case PAUSED: operatingMode.setText(R.string.start_pump); - string = info.nightscout.core.ui.R.string.paused; + string = app.aaps.core.ui.R.string.paused; break; } statusItems.add(getStatusItem(rh.gs(R.string.operating_mode), rh.gs(string))); @@ -281,7 +281,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick private void getBatteryStatusItem(List statusItems) { if (localInsightPlugin.getBatteryStatus() == null) return; - statusItems.add(getStatusItem(rh.gs(info.nightscout.core.ui.R.string.battery_label), + statusItems.add(getStatusItem(rh.gs(app.aaps.core.ui.R.string.battery_label), localInsightPlugin.getBatteryStatus().getBatteryAmount() + "%")); } @@ -292,7 +292,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick if (cartridgeStatus.isInserted()) status = decimalFormatter.to2Decimal(cartridgeStatus.getRemainingAmount()) + "U"; else status = rh.gs(R.string.not_inserted); - statusItems.add(getStatusItem(rh.gs(info.nightscout.core.ui.R.string.reservoir_label), status)); + statusItems.add(getStatusItem(rh.gs(app.aaps.core.ui.R.string.reservoir_label), status)); } private void getTDDItems(List statusItems) { @@ -300,20 +300,20 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick TotalDailyDose tdd = localInsightPlugin.getTotalDailyDose(); statusItems.add(getStatusItem(rh.gs(R.string.tdd_bolus), decimalFormatter.to2Decimal(tdd.getBolus()))); statusItems.add(getStatusItem(rh.gs(R.string.tdd_basal), decimalFormatter.to2Decimal(tdd.getBasal()))); - statusItems.add(getStatusItem(rh.gs(info.nightscout.core.ui.R.string.tdd_total), decimalFormatter.to2Decimal(tdd.getBolusAndBasal()))); + statusItems.add(getStatusItem(rh.gs(app.aaps.core.ui.R.string.tdd_total), decimalFormatter.to2Decimal(tdd.getBolusAndBasal()))); } private void getBaseBasalRateItem(List statusItems) { if (localInsightPlugin.getActiveBasalRate() == null) return; ActiveBasalRate activeBasalRate = localInsightPlugin.getActiveBasalRate(); - statusItems.add(getStatusItem(rh.gs(info.nightscout.core.ui.R.string.base_basal_rate_label), + statusItems.add(getStatusItem(rh.gs(app.aaps.core.ui.R.string.base_basal_rate_label), decimalFormatter.to2Decimal(activeBasalRate.getActiveBasalRate()) + " U/h (" + activeBasalRate.getActiveBasalProfileName() + ")")); } private void getTBRItem(List statusItems) { if (localInsightPlugin.getActiveTBR() == null) return; ActiveTBR activeTBR = localInsightPlugin.getActiveTBR(); - statusItems.add(getStatusItem(rh.gs(info.nightscout.core.ui.R.string.tempbasal_label), + statusItems.add(getStatusItem(rh.gs(app.aaps.core.ui.R.string.tempbasal_label), rh.gs(R.string.tbr_formatter, activeTBR.getPercentage(), activeTBR.getInitialDuration() - activeTBR.getRemainingDuration(), activeTBR.getInitialDuration()))); } @@ -321,7 +321,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick if (localInsightPlugin.lastBolusAmount == 0 || localInsightPlugin.lastBolusTimestamp == 0) return; long agoMsc = System.currentTimeMillis() - localInsightPlugin.lastBolusTimestamp; double bolusMinAgo = agoMsc / 60d / 1000d; - String unit = rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname); + String unit = rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname); String ago; if (bolusMinAgo < 60) { ago = dateUtil.minAgo(rh, localInsightPlugin.lastBolusTimestamp); @@ -341,7 +341,7 @@ public class LocalInsightFragment extends DaggerFragment implements View.OnClick label = rh.gs(R.string.multiwave_bolus); break; case EXTENDED: - label = rh.gs(info.nightscout.core.ui.R.string.extended_bolus); + label = rh.gs(app.aaps.core.ui.R.string.extended_bolus); break; default: continue; diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java index 1121a88514..71be10e50c 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/LocalInsightPlugin.java @@ -209,7 +209,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, InsightDatabase insightDatabase ) { super(new PluginDescription() - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_insight_128) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_insight_128) .pluginName(R.string.insight_local) .shortName(R.string.insightpump_shortname) .mainType(PluginType.PUMP) @@ -388,7 +388,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, SetDateTimeMessage setDateTimeMessage = new SetDateTimeMessage(); setDateTimeMessage.setPumpTime(pumpTime); connectionService.requestMessage(setDateTimeMessage).await(); - Notification notification = new Notification(Notification.INSIGHT_DATE_TIME_UPDATED, rh.gs(info.nightscout.core.ui.R.string.pump_time_updated), Notification.INFO, 60); + Notification notification = new Notification(Notification.INSIGHT_DATE_TIME_UPDATED, rh.gs(app.aaps.core.ui.R.string.pump_time_updated), Notification.INFO, 60); rxBus.send(new EventNewNotification(notification)); } } @@ -495,11 +495,11 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, profileBlock.setProfileBlocks(profileBlocks); ParameterBlockUtil.writeConfigurationBlock(connectionService, profileBlock); rxBus.send(new EventDismissNotification(Notification.FAILED_UPDATE_PROFILE)); - Notification notification = new Notification(Notification.PROFILE_SET_OK, rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60); + Notification notification = new Notification(Notification.PROFILE_SET_OK, rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60); rxBus.send(new EventNewNotification(notification)); result.success(true) .enacted(true) - .comment(info.nightscout.core.ui.R.string.virtualpump_resultok); + .comment(app.aaps.core.ui.R.string.virtualpump_resultok); this.profileBlocks = profileBlocks; try { fetchStatus(); @@ -507,17 +507,17 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, } } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while setting profile: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); - Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile), Notification.URGENT); + Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile), Notification.URGENT); rxBus.send(new EventNewNotification(notification)); result.comment(ExceptionTranslator.getString(context, e)); } catch (InsightException e) { aapsLogger.info(LTag.PUMP, "Exception while setting profile: " + e.getClass().getCanonicalName()); - Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile), Notification.URGENT); + Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile), Notification.URGENT); rxBus.send(new EventNewNotification(notification)); result.comment(ExceptionTranslator.getString(context, e)); } catch (Exception e) { aapsLogger.error("Exception while setting profile", e); - Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile), Notification.URGENT); + Notification notification = new Notification(Notification.FAILED_UPDATE_PROFILE, rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile), Notification.URGENT); rxBus.send(new EventNewNotification(notification)); result.comment(ExceptionTranslator.getString(context, e)); } @@ -709,7 +709,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, .isPercent(false) .absolute(absoluteRate) .duration(durationInMinutes) - .comment(info.nightscout.core.ui.R.string.virtualpump_resultok); + .comment(app.aaps.core.ui.R.string.virtualpump_resultok); } else { result.comment(ebResult.getComment()); } @@ -761,7 +761,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, .duration(durationInMinutes) .success(true) .enacted(true) - .comment(info.nightscout.core.ui.R.string.virtualpump_resultok); + .comment(app.aaps.core.ui.R.string.virtualpump_resultok); readHistory(); fetchStatus(); } catch (AppLayerErrorException e) { @@ -812,7 +812,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, null, null )); - result.success(true).enacted(true).comment(info.nightscout.core.ui.R.string.virtualpump_resultok); + result.success(true).enacted(true).comment(app.aaps.core.ui.R.string.virtualpump_resultok); } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while delivering extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); result.comment(ExceptionTranslator.getString(context, e)); @@ -858,10 +858,10 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, .isTempCancel(true); confirmAlert(AlertType.WARNING_36); alertService.ignore(null); - result.comment(info.nightscout.core.ui.R.string.virtualpump_resultok); + result.comment(app.aaps.core.ui.R.string.virtualpump_resultok); } catch (NoActiveTBRToCanceLException e) { result.success(true); - result.comment(info.nightscout.core.ui.R.string.virtualpump_resultok); + result.comment(app.aaps.core.ui.R.string.virtualpump_resultok); } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while canceling TBR: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); result.comment(ExceptionTranslator.getString(context, e)); @@ -908,7 +908,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, } } } - result.success(true).comment(info.nightscout.core.ui.R.string.virtualpump_resultok); + result.success(true).comment(app.aaps.core.ui.R.string.virtualpump_resultok); } catch (AppLayerErrorException e) { aapsLogger.info(LTag.PUMP, "Exception while canceling extended bolus: " + e.getClass().getCanonicalName() + " (" + e.getErrorCode() + ")"); result.comment(ExceptionTranslator.getString(context, e)); @@ -1334,7 +1334,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, case PAUSED: pumpID.setEventType(EventType.PumpPaused); if (sp.getBoolean("insight_log_operating_mode_changes", false)) - logNote(timestamp, rh.gs(info.nightscout.core.ui.R.string.pump_paused)); + logNote(timestamp, rh.gs(app.aaps.core.ui.R.string.pump_paused)); break; } insightDbHelper.createOrUpdate(pumpID); @@ -1586,22 +1586,22 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, @NonNull @Override public Constraint applyBasalPercentConstraints(Constraint percentRate, @NonNull Profile profile) { - percentRate.setIfGreater(0, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this); - percentRate.setIfSmaller(getPumpDescription().getMaxTempPercent(), rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, getPumpDescription().getMaxTempPercent(), rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this); + percentRate.setIfGreater(0, rh.gs(app.aaps.core.ui.R.string.limitingpercentrate, 0, rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)), this); + percentRate.setIfSmaller(getPumpDescription().getMaxTempPercent(), rh.gs(app.aaps.core.ui.R.string.limitingpercentrate, getPumpDescription().getMaxTempPercent(), rh.gs(app.aaps.core.ui.R.string.pumplimit)), this); return percentRate; } @NonNull @Override public Constraint applyBolusConstraints(@NonNull Constraint insulin) { if (!limitsFetched) return insulin; - insulin.setIfSmaller(maximumBolusAmount, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, maximumBolusAmount, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this); + insulin.setIfSmaller(maximumBolusAmount, rh.gs(app.aaps.core.ui.R.string.limitingbolus, maximumBolusAmount, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this); if (insulin.value() < minimumBolusAmount) { //TODO: Add function to Constraints or use different approach // This only works if the interface of the InsightPlugin is called last. // If not, another constraint could theoretically set the value between 0 and minimumBolusAmount - insulin.set(0d, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, minimumBolusAmount, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this); + insulin.set(0d, rh.gs(app.aaps.core.ui.R.string.limitingbolus, minimumBolusAmount, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this); } return insulin; } @@ -1635,7 +1635,7 @@ public class LocalInsightPlugin extends PumpPluginBase implements Pump, Insight, @Override public void onPumpPaired() { - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.pump_paired), null); + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.pump_paired), null); } @Override diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt index d540f5c686..c4f9e22a12 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/AlertUtils.kt @@ -110,7 +110,7 @@ class AlertUtils @Inject constructor(private val rh: ResourceHelper) { fun getAlertIcon(alertCategory: AlertCategory) = when (alertCategory) { AlertCategory.ERROR -> R.drawable.ic_error - AlertCategory.MAINTENANCE -> info.nightscout.core.ui.R.drawable.ic_maintenance + AlertCategory.MAINTENANCE -> app.aaps.core.ui.R.drawable.ic_maintenance AlertCategory.WARNING -> R.drawable.ic_warning AlertCategory.REMINDER -> R.drawable.ic_reminder } diff --git a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java index 05c8df0e86..5a4af1b681 100644 --- a/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java +++ b/insight/src/main/java/info/nightscout/androidaps/plugins/pump/insight/utils/ExceptionTranslator.java @@ -30,7 +30,7 @@ public class ExceptionTranslator { static { TABLE.put(ConnectionFailedException.class, R.string.connection_failed); TABLE.put(ConnectionLostException.class, R.string.connection_lost); - TABLE.put(DisconnectedException.class, info.nightscout.core.ui.R.string.disconnected); + TABLE.put(DisconnectedException.class, app.aaps.core.ui.R.string.disconnected); TABLE.put(SatlPairingRejectedException.class, R.string.pairing_rejected); TABLE.put(SocketCreationFailedException.class, R.string.socket_creation_failed); TABLE.put(TimeoutException.class, R.string.timeout); diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt index b841a41c6e..02515bc6b3 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt @@ -18,7 +18,7 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.R +import app.aaps.core.ui.R import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.GlucoseValue import org.json.JSONException diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt index e4547ac345..ca2969cade 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt @@ -112,7 +112,7 @@ class LoopPlugin @Inject constructor( .mainType(PluginType.LOOP) .fragmentClass(LoopFragment::class.java.name) .pluginIcon(app.aaps.core.main.R.drawable.ic_loop_closed_white) - .pluginName(info.nightscout.core.ui.R.string.loop) + .pluginName(app.aaps.core.ui.R.string.loop) .shortName(R.string.loop_shortname) .preferencesId(R.xml.pref_loop) .enableByDefault(config.APS) @@ -230,7 +230,7 @@ class LoopPlugin @Inject constructor( val loopEnabled = constraintChecker.isLoopInvocationAllowed() if (!loopEnabled.value()) { val message = """ - ${rh.gs(info.nightscout.core.ui.R.string.loop_disabled)} + ${rh.gs(app.aaps.core.ui.R.string.loop_disabled)} ${loopEnabled.getReasons()} """.trimIndent() aapsLogger.debug(LTag.APS, message) @@ -242,14 +242,14 @@ class LoopPlugin @Inject constructor( if (!isEnabled(PluginType.LOOP)) return val profile = profileFunction.getProfile() if (profile == null || !profileFunction.isProfileValid("Loop")) { - aapsLogger.debug(LTag.APS, rh.gs(info.nightscout.core.ui.R.string.no_profile_set)) - rxBus.send(EventLoopSetLastRunGui(rh.gs(info.nightscout.core.ui.R.string.no_profile_set))) + aapsLogger.debug(LTag.APS, rh.gs(app.aaps.core.ui.R.string.no_profile_set)) + rxBus.send(EventLoopSetLastRunGui(rh.gs(app.aaps.core.ui.R.string.no_profile_set))) return } if (!isEmptyQueue()) { - aapsLogger.debug(LTag.APS, rh.gs(info.nightscout.core.ui.R.string.pump_busy)) - rxBus.send(EventLoopSetLastRunGui(rh.gs(info.nightscout.core.ui.R.string.pump_busy))) + aapsLogger.debug(LTag.APS, rh.gs(app.aaps.core.ui.R.string.pump_busy)) + rxBus.send(EventLoopSetLastRunGui(rh.gs(app.aaps.core.ui.R.string.pump_busy))) return } @@ -303,13 +303,13 @@ class LoopPlugin @Inject constructor( buildAndStoreDeviceStatus() if (isSuspended) { - aapsLogger.debug(LTag.APS, rh.gs(info.nightscout.core.ui.R.string.loopsuspended)) - rxBus.send(EventLoopSetLastRunGui(rh.gs(info.nightscout.core.ui.R.string.loopsuspended))) + aapsLogger.debug(LTag.APS, rh.gs(app.aaps.core.ui.R.string.loopsuspended)) + rxBus.send(EventLoopSetLastRunGui(rh.gs(app.aaps.core.ui.R.string.loopsuspended))) return } if (pump.isSuspended()) { - aapsLogger.debug(LTag.APS, rh.gs(info.nightscout.core.ui.R.string.pumpsuspended)) - rxBus.send(EventLoopSetLastRunGui(rh.gs(info.nightscout.core.ui.R.string.pumpsuspended))) + aapsLogger.debug(LTag.APS, rh.gs(app.aaps.core.ui.R.string.pumpsuspended)) + rxBus.send(EventLoopSetLastRunGui(rh.gs(app.aaps.core.ui.R.string.pumpsuspended))) return } closedLoopEnabled = constraintChecker.isClosedLoopAllowed() @@ -324,7 +324,7 @@ class LoopPlugin @Inject constructor( if (sp.getBoolean( info.nightscout.core.utils.R.string.key_enable_carbs_required_alert_local, true - ) && !sp.getBoolean(info.nightscout.core.ui.R.string.key_raise_notifications_as_android_notifications, true) + ) && !sp.getBoolean(app.aaps.core.ui.R.string.key_raise_notifications_as_android_notifications, true) ) { val carbReqLocal = Notification(Notification.CARBS_REQUIRED, resultAfterConstraints.carbsRequiredText, Notification.NORMAL) rxBus.send(EventNewNotification(carbReqLocal)) @@ -335,7 +335,7 @@ class LoopPlugin @Inject constructor( if (sp.getBoolean( info.nightscout.core.utils.R.string.key_enable_carbs_required_alert_local, true - ) && sp.getBoolean(info.nightscout.core.ui.R.string.key_raise_notifications_as_android_notifications, true) + ) && sp.getBoolean(app.aaps.core.ui.R.string.key_raise_notifications_as_android_notifications, true) ) { val intentAction5m = Intent(context, CarbSuggestionReceiver::class.java) intentAction5m.putExtra("ignoreDuration", 5) @@ -350,7 +350,7 @@ class LoopPlugin @Inject constructor( val pendingIntent30m = PendingIntent.getBroadcast(context, 1, intentAction30m, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT) val actionIgnore30m = NotificationCompat.Action(app.aaps.core.main.R.drawable.ic_notif_aaps, rh.gs(R.string.ignore30m, "Ignore 30m"), pendingIntent30m) val builder = NotificationCompat.Builder(context, CHANNEL_ID) - builder.setSmallIcon(info.nightscout.core.ui.R.drawable.notif_icon) + builder.setSmallIcon(app.aaps.core.ui.R.drawable.notif_icon) .setContentTitle(rh.gs(R.string.carbs_suggestion)) .setContentText(resultAfterConstraints.carbsRequiredText) .setAutoCancel(true) @@ -366,14 +366,14 @@ class LoopPlugin @Inject constructor( // mId allows you to update the notification later on. mNotificationManager.notify(Constants.notificationID, builder.build()) uel.log( - Action.CAREPORTAL, Sources.Loop, rh.gs(info.nightscout.core.ui.R.string.carbsreq, resultAfterConstraints.carbsReq, resultAfterConstraints.carbsReqWithin), + Action.CAREPORTAL, Sources.Loop, rh.gs(app.aaps.core.ui.R.string.carbsreq, resultAfterConstraints.carbsReq, resultAfterConstraints.carbsReqWithin), ValueWithUnit.Gram(resultAfterConstraints.carbsReq), ValueWithUnit.Minute(resultAfterConstraints.carbsReqWithin) ) rxBus.send(EventNewOpenLoopNotification()) //only send to wear if Native notifications are turned off - if (!sp.getBoolean(info.nightscout.core.ui.R.string.key_raise_notifications_as_android_notifications, true)) { + if (!sp.getBoolean(app.aaps.core.ui.R.string.key_raise_notifications_as_android_notifications, true)) { // Send to Wear sendToWear() } @@ -435,7 +435,7 @@ class LoopPlugin @Inject constructor( } else { if (resultAfterConstraints.isChangeRequested && allowNotification) { val builder = NotificationCompat.Builder(context, CHANNEL_ID) - builder.setSmallIcon(info.nightscout.core.ui.R.drawable.notif_icon) + builder.setSmallIcon(app.aaps.core.ui.R.drawable.notif_icon) .setContentTitle(rh.gs(R.string.open_loop_new_suggestion)) .setContentText(resultAfterConstraints.toString()) .setAutoCancel(true) @@ -535,7 +535,7 @@ class LoopPlugin @Inject constructor( */ private fun applyTBRRequest(request: APSResult, profile: Profile, callback: Callback?) { if (!request.isTempBasalRequested) { - callback?.result(PumpEnactResult(injector).enacted(false).success(true).comment(info.nightscout.core.ui.R.string.nochangerequested))?.run() + callback?.result(PumpEnactResult(injector).enacted(false).success(true).comment(app.aaps.core.ui.R.string.nochangerequested))?.run() return } val pump = activePlugin.activePump @@ -545,8 +545,8 @@ class LoopPlugin @Inject constructor( return } if (pump.isSuspended()) { - aapsLogger.debug(LTag.APS, "applyAPSRequest: " + rh.gs(info.nightscout.core.ui.R.string.pumpsuspended)) - callback?.result(PumpEnactResult(injector).comment(info.nightscout.core.ui.R.string.pumpsuspended).enacted(false).success(false))?.run() + aapsLogger.debug(LTag.APS, "applyAPSRequest: " + rh.gs(app.aaps.core.ui.R.string.pumpsuspended)) + callback?.result(PumpEnactResult(injector).comment(app.aaps.core.ui.R.string.pumpsuspended).enacted(false).success(false))?.run() return } aapsLogger.debug(LTag.APS, "applyAPSRequest: $request") @@ -586,7 +586,7 @@ class LoopPlugin @Inject constructor( callback?.result( PumpEnactResult(injector).percent(request.percent) .enacted(false).success(true).duration(activeTemp.plannedRemainingMinutes) - .comment(info.nightscout.core.ui.R.string.let_temp_basal_run) + .comment(app.aaps.core.ui.R.string.let_temp_basal_run) )?.run() } else { aapsLogger.debug(LTag.APS, "applyAPSRequest: tempBasalPercent()") @@ -609,7 +609,7 @@ class LoopPlugin @Inject constructor( callback?.result( PumpEnactResult(injector).absolute(activeTemp.convertedToAbsolute(now, profile)) .enacted(false).success(true).duration(activeTemp.plannedRemainingMinutes) - .comment(info.nightscout.core.ui.R.string.let_temp_basal_run) + .comment(app.aaps.core.ui.R.string.let_temp_basal_run) )?.run() } else { aapsLogger.debug(LTag.APS, "applyAPSRequest: setTempBasalAbsolute()") @@ -645,8 +645,8 @@ class LoopPlugin @Inject constructor( return } if (pump.isSuspended()) { - aapsLogger.debug(LTag.APS, "applySMBRequest: " + rh.gs(info.nightscout.core.ui.R.string.pumpsuspended)) - callback?.result(PumpEnactResult(injector).comment(info.nightscout.core.ui.R.string.pumpsuspended).enacted(false).success(false))?.run() + aapsLogger.debug(LTag.APS, "applySMBRequest: " + rh.gs(app.aaps.core.ui.R.string.pumpsuspended)) + callback?.result(PumpEnactResult(injector).comment(app.aaps.core.ui.R.string.pumpsuspended).enacted(false).success(false))?.run() return } aapsLogger.debug(LTag.APS, "applySMBRequest: $request") @@ -681,7 +681,7 @@ class LoopPlugin @Inject constructor( commandQueue.tempBasalAbsolute(0.0, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error), app.aaps.core.ui.R.raw.boluserror) } } }) @@ -689,7 +689,7 @@ class LoopPlugin @Inject constructor( commandQueue.tempBasalPercent(0, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error), app.aaps.core.ui.R.raw.boluserror) } } }) @@ -698,7 +698,7 @@ class LoopPlugin @Inject constructor( commandQueue.cancelExtended(object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.extendedbolusdeliveryerror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.extendedbolusdeliveryerror), app.aaps.core.ui.R.raw.boluserror) } } }) @@ -716,7 +716,7 @@ class LoopPlugin @Inject constructor( commandQueue.cancelTempBasal(true, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error), app.aaps.core.ui.R.raw.boluserror) } } }) diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt index 01d760e969..cbb6ac602e 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt @@ -65,7 +65,7 @@ class OpenAPSAMAPlugin @Inject constructor( PluginDescription() .mainType(PluginType.APS) .fragmentClass(OpenAPSFragment::class.java.name) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_generic_icon) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_generic_icon) .pluginName(R.string.openapsama) .shortName(R.string.oaps_shortname) .preferencesId(R.xml.pref_openapsama) @@ -102,8 +102,8 @@ class OpenAPSAMAPlugin @Inject constructor( val profile = profileFunction.getProfile() val pump = activePlugin.activePump if (profile == null) { - rxBus.send(EventResetOpenAPSGui(rh.gs(info.nightscout.core.ui.R.string.no_profile_set))) - aapsLogger.debug(LTag.APS, rh.gs(info.nightscout.core.ui.R.string.no_profile_set)) + rxBus.send(EventResetOpenAPSGui(rh.gs(app.aaps.core.ui.R.string.no_profile_set))) + aapsLogger.debug(LTag.APS, rh.gs(app.aaps.core.ui.R.string.no_profile_set)) return } if (!isEnabled()) { @@ -133,19 +133,19 @@ class OpenAPSAMAPlugin @Inject constructor( var minBg = hardLimits.verifyHardLimits( Round.roundTo(profile.getTargetLowMgdl(), 0.1), - info.nightscout.core.ui.R.string.profile_low_target, + app.aaps.core.ui.R.string.profile_low_target, HardLimits.VERY_HARD_LIMIT_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_MIN_BG[1] ) var maxBg = hardLimits.verifyHardLimits( Round.roundTo(profile.getTargetHighMgdl(), 0.1), - info.nightscout.core.ui.R.string.profile_high_target, + app.aaps.core.ui.R.string.profile_high_target, HardLimits.VERY_HARD_LIMIT_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_MAX_BG[1] ) var targetBg = - hardLimits.verifyHardLimits(profile.getTargetMgdl(), info.nightscout.core.ui.R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TARGET_BG[1]) + hardLimits.verifyHardLimits(profile.getTargetMgdl(), app.aaps.core.ui.R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TARGET_BG[1]) var isTempTarget = false val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet() if (tempTarget is ValueWrapper.Existing) { @@ -153,36 +153,36 @@ class OpenAPSAMAPlugin @Inject constructor( minBg = hardLimits.verifyHardLimits( tempTarget.value.lowTarget, - info.nightscout.core.ui.R.string.temp_target_low_target, + app.aaps.core.ui.R.string.temp_target_low_target, HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[1].toDouble() ) maxBg = hardLimits.verifyHardLimits( tempTarget.value.highTarget, - info.nightscout.core.ui.R.string.temp_target_high_target, + app.aaps.core.ui.R.string.temp_target_high_target, HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[1].toDouble() ) targetBg = hardLimits.verifyHardLimits( tempTarget.value.target(), - info.nightscout.core.ui.R.string.temp_target_value, + app.aaps.core.ui.R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[1].toDouble() ) } - if (!hardLimits.checkHardLimits(profile.dia, info.nightscout.core.ui.R.string.profile_dia, hardLimits.minDia(), hardLimits.maxDia())) return + if (!hardLimits.checkHardLimits(profile.dia, app.aaps.core.ui.R.string.profile_dia, hardLimits.minDia(), hardLimits.maxDia())) return if (!hardLimits.checkHardLimits( profile.getIcTimeFromMidnight(MidnightUtils.secondsFromMidnight()), - info.nightscout.core.ui.R.string.profile_carbs_ratio_value, + app.aaps.core.ui.R.string.profile_carbs_ratio_value, hardLimits.minIC(), hardLimits.maxIC() ) ) return - if (!hardLimits.checkHardLimits(profile.getIsfMgdl(), info.nightscout.core.ui.R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return - if (!hardLimits.checkHardLimits(profile.getMaxDailyBasal(), info.nightscout.core.ui.R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return - if (!hardLimits.checkHardLimits(pump.baseBasalRate, info.nightscout.core.ui.R.string.current_basal_value, 0.01, hardLimits.maxBasal())) return + if (!hardLimits.checkHardLimits(profile.getIsfMgdl(), app.aaps.core.ui.R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return + if (!hardLimits.checkHardLimits(profile.getMaxDailyBasal(), app.aaps.core.ui.R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return + if (!hardLimits.checkHardLimits(pump.baseBasalRate, app.aaps.core.ui.R.string.current_basal_value, 0.01, hardLimits.maxBasal())) return startPart = System.currentTimeMillis() if (constraintChecker.isAutosensModeEnabled().value()) { val autosensData = iobCobCalculator.getLastAutosensDataWithWaitForCalculationFinish("OpenAPSPlugin") @@ -252,19 +252,19 @@ class OpenAPSAMAPlugin @Inject constructor( maxBasal = profile.getMaxDailyBasal() absoluteRate.addReason(rh.gs(R.string.increasing_max_basal), this) } - absoluteRate.setIfSmaller(maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxBasal, rh.gs(R.string.maxvalueinpreferences)), this) + absoluteRate.setIfSmaller(maxBasal, rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, maxBasal, rh.gs(R.string.maxvalueinpreferences)), this) // Check percentRate but absolute rate too, because we know real current basal in pump val maxBasalMultiplier = sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0) val maxFromBasalMultiplier = floor(maxBasalMultiplier * profile.getBasal() * 100) / 100 absoluteRate.setIfSmaller( maxFromBasalMultiplier, - rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxFromBasalMultiplier, rh.gs(R.string.max_basal_multiplier)), + rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, maxFromBasalMultiplier, rh.gs(R.string.max_basal_multiplier)), this ) val maxBasalFromDaily = sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3.0) val maxFromDaily = floor(profile.getMaxDailyBasal() * maxBasalFromDaily * 100) / 100 - absoluteRate.setIfSmaller(maxFromDaily, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxFromDaily, rh.gs(R.string.max_daily_basal_multiplier)), this) + absoluteRate.setIfSmaller(maxFromDaily, rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, maxFromDaily, rh.gs(R.string.max_daily_basal_multiplier)), this) } return absoluteRate } diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt index e10de5c236..d1757342ab 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt @@ -65,9 +65,9 @@ open class OpenAPSSMBPlugin @Inject constructor( PluginDescription() .mainType(PluginType.APS) .fragmentClass(info.nightscout.plugins.aps.OpenAPSFragment::class.java.name) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_generic_icon) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_generic_icon) .pluginName(R.string.openapssmb) - .shortName(info.nightscout.core.ui.R.string.smb_shortname) + .shortName(app.aaps.core.ui.R.string.smb_shortname) .preferencesId(R.xml.pref_openapssmb) .description(R.string.description_smb) .setDefault(), @@ -117,8 +117,8 @@ open class OpenAPSSMBPlugin @Inject constructor( val profile = profileFunction.getProfile() val pump = activePlugin.activePump if (profile == null) { - rxBus.send(EventResetOpenAPSGui(rh.gs(info.nightscout.core.ui.R.string.no_profile_set))) - aapsLogger.debug(LTag.APS, rh.gs(info.nightscout.core.ui.R.string.no_profile_set)) + rxBus.send(EventResetOpenAPSGui(rh.gs(app.aaps.core.ui.R.string.no_profile_set))) + aapsLogger.debug(LTag.APS, rh.gs(app.aaps.core.ui.R.string.no_profile_set)) return } if (!isEnabled()) { @@ -146,19 +146,19 @@ open class OpenAPSSMBPlugin @Inject constructor( var minBg = hardLimits.verifyHardLimits( Round.roundTo(profile.getTargetLowMgdl(), 0.1), - info.nightscout.core.ui.R.string.profile_low_target, + app.aaps.core.ui.R.string.profile_low_target, HardLimits.VERY_HARD_LIMIT_MIN_BG[0], HardLimits.VERY_HARD_LIMIT_MIN_BG[1] ) var maxBg = hardLimits.verifyHardLimits( Round.roundTo(profile.getTargetHighMgdl(), 0.1), - info.nightscout.core.ui.R.string.profile_high_target, + app.aaps.core.ui.R.string.profile_high_target, HardLimits.VERY_HARD_LIMIT_MAX_BG[0], HardLimits.VERY_HARD_LIMIT_MAX_BG[1] ) var targetBg = - hardLimits.verifyHardLimits(profile.getTargetMgdl(), info.nightscout.core.ui.R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TARGET_BG[1]) + hardLimits.verifyHardLimits(profile.getTargetMgdl(), app.aaps.core.ui.R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0], HardLimits.VERY_HARD_LIMIT_TARGET_BG[1]) var isTempTarget = false val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet() if (tempTarget is ValueWrapper.Existing) { @@ -166,36 +166,36 @@ open class OpenAPSSMBPlugin @Inject constructor( minBg = hardLimits.verifyHardLimits( tempTarget.value.lowTarget, - info.nightscout.core.ui.R.string.temp_target_low_target, + app.aaps.core.ui.R.string.temp_target_low_target, HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_MIN_BG[1].toDouble() ) maxBg = hardLimits.verifyHardLimits( tempTarget.value.highTarget, - info.nightscout.core.ui.R.string.temp_target_high_target, + app.aaps.core.ui.R.string.temp_target_high_target, HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_MAX_BG[1].toDouble() ) targetBg = hardLimits.verifyHardLimits( tempTarget.value.target(), - info.nightscout.core.ui.R.string.temp_target_value, + app.aaps.core.ui.R.string.temp_target_value, HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TEMP_TARGET_BG[1].toDouble() ) } - if (!hardLimits.checkHardLimits(profile.dia, info.nightscout.core.ui.R.string.profile_dia, hardLimits.minDia(), hardLimits.maxDia())) return + if (!hardLimits.checkHardLimits(profile.dia, app.aaps.core.ui.R.string.profile_dia, hardLimits.minDia(), hardLimits.maxDia())) return if (!hardLimits.checkHardLimits( profile.getIcTimeFromMidnight(MidnightUtils.secondsFromMidnight()), - info.nightscout.core.ui.R.string.profile_carbs_ratio_value, + app.aaps.core.ui.R.string.profile_carbs_ratio_value, hardLimits.minIC(), hardLimits.maxIC() ) ) return - if (!hardLimits.checkHardLimits(profile.getIsfMgdl(), info.nightscout.core.ui.R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return - if (!hardLimits.checkHardLimits(profile.getMaxDailyBasal(), info.nightscout.core.ui.R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return - if (!hardLimits.checkHardLimits(pump.baseBasalRate, info.nightscout.core.ui.R.string.current_basal_value, 0.01, hardLimits.maxBasal())) return + if (!hardLimits.checkHardLimits(profile.getIsfMgdl(), app.aaps.core.ui.R.string.profile_sensitivity_value, HardLimits.MIN_ISF, HardLimits.MAX_ISF)) return + if (!hardLimits.checkHardLimits(profile.getMaxDailyBasal(), app.aaps.core.ui.R.string.profile_max_daily_basal_value, 0.02, hardLimits.maxBasal())) return + if (!hardLimits.checkHardLimits(pump.baseBasalRate, app.aaps.core.ui.R.string.current_basal_value, 0.01, hardLimits.maxBasal())) return startPart = System.currentTimeMillis() if (constraintChecker.isAutosensModeEnabled().value()) { val autosensData = iobCobCalculator.getLastAutosensDataWithWaitForCalculationFinish("OpenAPSPlugin") @@ -316,19 +316,19 @@ open class OpenAPSSMBPlugin @Inject constructor( maxBasal = profile.getMaxDailyBasal() absoluteRate.addReason(rh.gs(R.string.increasing_max_basal), this) } - absoluteRate.setIfSmaller(maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxBasal, rh.gs(R.string.maxvalueinpreferences)), this) + absoluteRate.setIfSmaller(maxBasal, rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, maxBasal, rh.gs(R.string.maxvalueinpreferences)), this) // Check percentRate but absolute rate too, because we know real current basal in pump val maxBasalMultiplier = sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4.0) val maxFromBasalMultiplier = floor(maxBasalMultiplier * profile.getBasal() * 100) / 100 absoluteRate.setIfSmaller( maxFromBasalMultiplier, - rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxFromBasalMultiplier, rh.gs(R.string.max_basal_multiplier)), + rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, maxFromBasalMultiplier, rh.gs(R.string.max_basal_multiplier)), this ) val maxBasalFromDaily = sp.getDouble(R.string.key_openapsama_max_daily_safety_multiplier, 3.0) val maxFromDaily = floor(profile.getMaxDailyBasal() * maxBasalFromDaily * 100) / 100 - absoluteRate.setIfSmaller(maxFromDaily, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, maxFromDaily, rh.gs(R.string.max_daily_basal_multiplier)), this) + absoluteRate.setIfSmaller(maxFromDaily, rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, maxFromDaily, rh.gs(R.string.max_daily_basal_multiplier)), this) } return absoluteRate } diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt index fb243ec876..603c608c89 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt @@ -96,7 +96,7 @@ class AutotuneFS @Inject constructor( fun exportTunedProfile(tunedProfile: ATProfile) { createAutotunefile(TUNEDPROFILE + formatDate(tunedProfile.from) + ".json", tunedProfile.profileToOrefJSON()) try { - createAutotunefile(rh.gs(info.nightscout.core.ui.R.string.autotune_tunedprofile_name) + ".json", tunedProfile.profileToOrefJSON(), true) + createAutotunefile(rh.gs(app.aaps.core.ui.R.string.autotune_tunedprofile_name) + ".json", tunedProfile.profileToOrefJSON(), true) } catch (e: JSONException) { } } diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt index 976ad77d13..177c0932c7 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt @@ -41,8 +41,8 @@ import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.elements.WeekDay +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.elements.WeekDay import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit import info.nightscout.plugins.aps.R @@ -103,7 +103,7 @@ class AutotuneFragment : DaggerFragment() { autotunePlugin.lastNbDays = sp.getInt(info.nightscout.core.utils.R.string.key_autotune_default_tune_days, 5).toString() val defaultValue = sp.getInt(info.nightscout.core.utils.R.string.key_autotune_default_tune_days, 5).toDouble() profileStore = activePlugin.activeProfileSource.profile ?: instantiator.provideProfileStore(JSONObject()) - profileName = if (binding.profileList.text.toString() == rh.gs(info.nightscout.core.ui.R.string.active)) "" else binding.profileList.text.toString() + profileName = if (binding.profileList.text.toString() == rh.gs(app.aaps.core.ui.R.string.active)) "" else binding.profileList.text.toString() profileFunction.getProfile()?.let { currentProfile -> profile = ATProfile(profileStore.getSpecificProfile(profileName)?.let { ProfileSealed.Pure(it) } ?: currentProfile, LocalInsulin(""), injector) } @@ -137,7 +137,7 @@ class AutotuneFragment : DaggerFragment() { binding.profileList.onItemClickListener = AdapterView.OnItemClickListener { _, _, _, _ -> if (!autotunePlugin.calculationRunning) { - profileName = if (binding.profileList.text.toString() == rh.gs(info.nightscout.core.ui.R.string.active)) "" else binding.profileList.text.toString() + profileName = if (binding.profileList.text.toString() == rh.gs(app.aaps.core.ui.R.string.active)) "" else binding.profileList.text.toString() profileFunction.getProfile()?.let { currentProfile -> profile = ATProfile(profileStore.getSpecificProfile(profileName)?.let { ProfileSealed.Pure(it) } ?: currentProfile, LocalInsulin(""), injector) } @@ -149,12 +149,12 @@ class AutotuneFragment : DaggerFragment() { } binding.autotuneCopyLocal.setOnClickListener { - val localName = rh.gs(info.nightscout.core.ui.R.string.autotune_tunedprofile_name) + " " + dateUtil.dateAndTimeString(autotunePlugin.lastRun) + val localName = rh.gs(app.aaps.core.ui.R.string.autotune_tunedprofile_name) + " " + dateUtil.dateAndTimeString(autotunePlugin.lastRun) val circadian = sp.getBoolean(info.nightscout.core.utils.R.string.key_autotune_circadian_ic_isf, false) autotunePlugin.tunedProfile?.let { tunedProfile -> OKDialog.showConfirmation(requireContext(), - rh.gs(info.nightscout.core.ui.R.string.autotune_copy_localprofile_button), - rh.gs(info.nightscout.core.ui.R.string.autotune_copy_local_profile_message) + "\n" + localName, + rh.gs(app.aaps.core.ui.R.string.autotune_copy_localprofile_button), + rh.gs(app.aaps.core.ui.R.string.autotune_copy_local_profile_message) + "\n" + localName, Runnable { val profilePlugin = activePlugin.activeProfileSource profilePlugin.addProfile(profilePlugin.copyFrom(tunedProfile.getProfile(circadian), localName)) @@ -172,8 +172,8 @@ class AutotuneFragment : DaggerFragment() { binding.autotuneUpdateProfile.setOnClickListener { val localName = autotunePlugin.pumpProfile.profileName OKDialog.showConfirmation(requireContext(), - rh.gs(info.nightscout.core.ui.R.string.autotune_update_input_profile_button), - rh.gs(info.nightscout.core.ui.R.string.autotune_update_local_profile_message, localName), + rh.gs(app.aaps.core.ui.R.string.autotune_update_input_profile_button), + rh.gs(app.aaps.core.ui.R.string.autotune_update_local_profile_message, localName), Runnable { autotunePlugin.tunedProfile?.profileName = localName autotunePlugin.updateProfile(autotunePlugin.tunedProfile) @@ -192,8 +192,8 @@ class AutotuneFragment : DaggerFragment() { binding.autotuneRevertProfile.setOnClickListener { val localName = autotunePlugin.pumpProfile.profileName OKDialog.showConfirmation(requireContext(), - rh.gs(info.nightscout.core.ui.R.string.autotune_revert_input_profile_button), - rh.gs(info.nightscout.core.ui.R.string.autotune_revert_local_profile_message, localName), + rh.gs(app.aaps.core.ui.R.string.autotune_revert_input_profile_button), + rh.gs(app.aaps.core.ui.R.string.autotune_revert_local_profile_message, localName), Runnable { autotunePlugin.tunedProfile?.profileName = "" autotunePlugin.updateProfile(autotunePlugin.pumpProfile) @@ -240,7 +240,7 @@ class AutotuneFragment : DaggerFragment() { time = dateUtil.now(), mode = UiInteraction.Mode.PROFILE_COMPARE, customProfile = pumpProfile.profile.toPureNsJson(dateUtil).toString(), - customProfileName = pumpProfile.profileName + "\n" + rh.gs(info.nightscout.core.ui.R.string.autotune_tunedprofile_name), + customProfileName = pumpProfile.profileName + "\n" + rh.gs(app.aaps.core.ui.R.string.autotune_tunedprofile_name), customProfile2 = tunedProfile?.toPureNsJson(dateUtil).toString() ) } @@ -252,7 +252,7 @@ class AutotuneFragment : DaggerFragment() { tunedProfile?.let { tunedP -> tunedP.profileStore(circadian)?.let { OKDialog.showConfirmation(requireContext(), - rh.gs(info.nightscout.core.ui.R.string.activate_profile) + ": " + tunedP.profileName + " ?", + rh.gs(app.aaps.core.ui.R.string.activate_profile) + ": " + tunedP.profileName + " ?", { uel.log( UserEntry.Action.STORE_PROFILE, @@ -318,14 +318,14 @@ class AutotuneFragment : DaggerFragment() { private fun updateGui() { _binding ?: return profileStore = activePlugin.activeProfileSource.profile ?: instantiator.provideProfileStore(JSONObject()) - profileName = if (binding.profileList.text.toString() == rh.gs(info.nightscout.core.ui.R.string.active)) "" else binding.profileList.text.toString() + profileName = if (binding.profileList.text.toString() == rh.gs(app.aaps.core.ui.R.string.active)) "" else binding.profileList.text.toString() profileFunction.getProfile()?.let { currentProfile -> profile = ATProfile(profileStore.getSpecificProfile(profileName)?.let { ProfileSealed.Pure(it) } ?: currentProfile, LocalInsulin(""), injector) } val profileList: ArrayList = profileStore.getProfileList() - profileList.add(0, rh.gs(info.nightscout.core.ui.R.string.active)) + profileList.add(0, rh.gs(app.aaps.core.ui.R.string.active)) context?.let { context -> - binding.profileList.setAdapter(ArrayAdapter(context, info.nightscout.core.ui.R.layout.spinner_centered, profileList)) + binding.profileList.setAdapter(ArrayAdapter(context, app.aaps.core.ui.R.layout.spinner_centered, profileList)) } ?: return // set selected to actual profile if (autotunePlugin.selectedProfile.isNotEmpty()) @@ -343,7 +343,7 @@ class AutotuneFragment : DaggerFragment() { binding.autotuneCompare.visibility = View.GONE when { autotunePlugin.calculationRunning -> { - binding.tuneWarning.text = rh.gs(info.nightscout.core.ui.R.string.autotune_warning_during_run) + binding.tuneWarning.text = rh.gs(app.aaps.core.ui.R.string.autotune_warning_during_run) } autotunePlugin.lastRunSuccess -> { @@ -351,7 +351,7 @@ class AutotuneFragment : DaggerFragment() { binding.autotuneUpdateProfile.visibility = autotunePlugin.updateButtonVisibility binding.autotuneRevertProfile.visibility = if (autotunePlugin.updateButtonVisibility == View.VISIBLE) View.GONE else View.VISIBLE binding.autotuneProfileswitch.visibility = View.VISIBLE - binding.tuneWarning.text = rh.gs(info.nightscout.core.ui.R.string.autotune_warning_after_run) + binding.tuneWarning.text = rh.gs(app.aaps.core.ui.R.string.autotune_warning_after_run) binding.autotuneCompare.visibility = View.VISIBLE } @@ -370,7 +370,7 @@ class AutotuneFragment : DaggerFragment() { private fun checkNewDay() { val runToday = autotunePlugin.lastRun > MidnightTime.calc(dateUtil.now() - autotunePlugin.autotuneStartHour * 3600 * 1000L) + autotunePlugin.autotuneStartHour * 3600 * 1000L if (runToday && autotunePlugin.result != "") { - binding.tuneWarning.text = rh.gs(info.nightscout.core.ui.R.string.autotune_warning_after_run) + binding.tuneWarning.text = rh.gs(app.aaps.core.ui.R.string.autotune_warning_after_run) } else if (!runToday || autotunePlugin.result.isEmpty()) //if new day re-init result, default days, warning and button's visibility resetParam(!runToday) } @@ -379,18 +379,18 @@ class AutotuneFragment : DaggerFragment() { var warning = "" var nl = "" if (profileFunction.getProfile() == null) { - warning = rh.gs(info.nightscout.core.ui.R.string.profileswitch_ismissing) + warning = rh.gs(app.aaps.core.ui.R.string.profileswitch_ismissing) return warning } profileFunction.getProfile()?.let { currentProfile -> profile = ATProfile(profileStore.getSpecificProfile(profileName)?.let { ProfileSealed.Pure(it) } ?: currentProfile, LocalInsulin(""), injector).also { profile -> - if (!profile.isValid) return rh.gs(info.nightscout.core.ui.R.string.autotune_profile_invalid) + if (!profile.isValid) return rh.gs(app.aaps.core.ui.R.string.autotune_profile_invalid) if (profile.icSize > 1) { - warning += nl + rh.gs(info.nightscout.core.ui.R.string.autotune_ic_warning, profile.icSize, profile.ic) + warning += nl + rh.gs(app.aaps.core.ui.R.string.autotune_ic_warning, profile.icSize, profile.ic) nl = "\n" } if (profile.isfSize > 1) { - warning += nl + rh.gs(info.nightscout.core.ui.R.string.autotune_isf_warning, profile.isfSize, profileUtil.fromMgdlToUnits(profile.isf), profileFunction.getUnits().asText) + warning += nl + rh.gs(app.aaps.core.ui.R.string.autotune_isf_warning, profile.isfSize, profileUtil.fromMgdlToUnits(profile.isf), profileFunction.getUnits().asText) } } } @@ -466,7 +466,7 @@ class AutotuneFragment : DaggerFragment() { layout.addView( toTableRowValue( context, - rh.gs(info.nightscout.core.ui.R.string.dia), + rh.gs(app.aaps.core.ui.R.string.dia), Round.roundTo(autotunePlugin.pumpProfile.localInsulin.dia, 0.1), Round.roundTo(tuned.localInsulin.dia, 0.1), "%.1f" @@ -476,7 +476,7 @@ class AutotuneFragment : DaggerFragment() { layout.addView( toTableRowValue( context, - rh.gs(info.nightscout.core.ui.R.string.isf_short), + rh.gs(app.aaps.core.ui.R.string.isf_short), Round.roundTo(autotunePlugin.pumpProfile.isf / toMgDl, 0.001), Round.roundTo(tuned.isf / toMgDl, 0.001), isfFormat @@ -485,7 +485,7 @@ class AutotuneFragment : DaggerFragment() { layout.addView( toTableRowValue( context, - rh.gs(info.nightscout.core.ui.R.string.ic_short), + rh.gs(app.aaps.core.ui.R.string.ic_short), Round.roundTo(autotunePlugin.pumpProfile.ic, 0.001), Round.roundTo(tuned.ic, 0.001), "%.2f" @@ -493,7 +493,7 @@ class AutotuneFragment : DaggerFragment() { ) layout.addView( TextView(context).apply { - text = rh.gs(info.nightscout.core.ui.R.string.basal) + text = rh.gs(app.aaps.core.ui.R.string.basal) setTypeface(typeface, Typeface.BOLD) gravity = Gravity.CENTER_HORIZONTAL setTextAppearance(android.R.style.TextAppearance_Material_Medium) @@ -527,27 +527,27 @@ class AutotuneFragment : DaggerFragment() { header.addView(TextView(context).apply { layoutParams = lp.apply { column = 0 } textAlignment = TextView.TEXT_ALIGNMENT_CENTER - text = if (basal) rh.gs(info.nightscout.core.ui.R.string.time) else rh.gs(info.nightscout.core.ui.R.string.autotune_param) + text = if (basal) rh.gs(app.aaps.core.ui.R.string.time) else rh.gs(app.aaps.core.ui.R.string.autotune_param) }) header.addView(TextView(context).apply { layoutParams = lp.apply { column = 1 } textAlignment = TextView.TEXT_ALIGNMENT_CENTER - text = rh.gs(info.nightscout.core.ui.R.string.profile) + text = rh.gs(app.aaps.core.ui.R.string.profile) }) header.addView(TextView(context).apply { layoutParams = lp.apply { column = 2 } textAlignment = TextView.TEXT_ALIGNMENT_CENTER - text = rh.gs(info.nightscout.core.ui.R.string.autotune_tunedprofile_name) + text = rh.gs(app.aaps.core.ui.R.string.autotune_tunedprofile_name) }) header.addView(TextView(context).apply { layoutParams = lp.apply { column = 3 } textAlignment = TextView.TEXT_ALIGNMENT_CENTER - text = rh.gs(info.nightscout.core.ui.R.string.autotune_percent) + text = rh.gs(app.aaps.core.ui.R.string.autotune_percent) }) header.addView(TextView(context).apply { layoutParams = lp.apply { column = 4 } textAlignment = TextView.TEXT_ALIGNMENT_CENTER - text = if (basal) rh.gs(info.nightscout.core.ui.R.string.autotune_missing) else " " + text = if (basal) rh.gs(app.aaps.core.ui.R.string.autotune_missing) else " " }) } diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt index c34e262613..df88bb120c 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt @@ -26,7 +26,7 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.MidnightTime import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.elements.WeekDay +import app.aaps.core.ui.elements.WeekDay import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -69,11 +69,11 @@ class AutotunePlugin @Inject constructor( .mainType(PluginType.GENERAL) .fragmentClass(AutotuneFragment::class.qualifiedName) .pluginIcon(app.aaps.core.main.R.drawable.ic_autotune) - .pluginName(info.nightscout.core.ui.R.string.autotune) - .shortName(info.nightscout.core.ui.R.string.autotune_shortname) + .pluginName(app.aaps.core.ui.R.string.autotune) + .shortName(app.aaps.core.ui.R.string.autotune_shortname) .preferencesId(R.xml.pref_autotune) .showInList(config.isEngineeringMode() && config.isDev()) - .description(info.nightscout.core.ui.R.string.autotune_description), + .description(app.aaps.core.ui.R.string.autotune_description), aapsLogger, resourceHelper, injector ), Autotune { @@ -115,7 +115,7 @@ class AutotunePlugin @Inject constructor( var logResult = "" result = "" if (profileFunction.getProfile() == null) { - result = rh.gs(info.nightscout.core.ui.R.string.profileswitch_ismissing) + result = rh.gs(app.aaps.core.ui.R.string.profileswitch_ismissing) rxBus.send(EventAutotuneUpdateGui()) calculationRunning = false return @@ -126,7 +126,7 @@ class AutotunePlugin @Inject constructor( lastRun = dateUtil.now() val profileStore = activePlugin.activeProfileSource.profile if (profileStore == null) { - result = rh.gs(info.nightscout.core.ui.R.string.profileswitch_ismissing) + result = rh.gs(app.aaps.core.ui.R.string.profileswitch_ismissing) rxBus.send(EventAutotuneUpdateGui()) calculationRunning = false return @@ -146,7 +146,7 @@ class AutotunePlugin @Inject constructor( val startTime = endTime - daysBack * 24 * 60 * 60 * 1000L autotuneFS.exportSettings(settings(lastRun, daysBack, startTime, endTime)) tunedProfile = ATProfile(profile, localInsulin, injector).also { - it.profileName = rh.gs(info.nightscout.core.ui.R.string.autotune_tunedprofile_name) + it.profileName = rh.gs(app.aaps.core.ui.R.string.autotune_tunedprofile_name) } pumpProfile = ATProfile(profile, localInsulin, injector).also { it.profileName = selectedProfile @@ -154,7 +154,7 @@ class AutotunePlugin @Inject constructor( autotuneFS.exportPumpProfile(pumpProfile) if (calcDays == 0) { - result = rh.gs(info.nightscout.core.ui.R.string.autotune_error_more_days) + result = rh.gs(app.aaps.core.ui.R.string.autotune_error_more_days) log(result) calculationRunning = false tunedProfile = null @@ -174,7 +174,7 @@ class AutotunePlugin @Inject constructor( tunedProfile?.let { autotuneIob.initializeData(from, to, it) //autotuneIob contains BG and Treatments data from history (<=> query for ns-treatments and ns-entries) if (autotuneIob.boluses.size == 0) { - result = rh.gs(info.nightscout.core.ui.R.string.autotune_error) + result = rh.gs(app.aaps.core.ui.R.string.autotune_error) log("No basal data on day ${i + 1}") autotuneFS.exportResult(result) autotuneFS.exportLogAndZip(lastRun) @@ -191,7 +191,7 @@ class AutotunePlugin @Inject constructor( autotuneFS.exportTunedProfile(tunedProfile) //<=> newprofile.yyyymmdd.json files exported for results compare with oref0 autotune on virtual machine if (currentCalcDay < calcDays) { log("Partial result for day ${i + 1}".trimIndent()) - result = rh.gs(info.nightscout.core.ui.R.string.autotune_partial_result, currentCalcDay, calcDays) + result = rh.gs(app.aaps.core.ui.R.string.autotune_partial_result, currentCalcDay, calcDays) rxBus.send(EventAutotuneUpdateGui()) } logResult = showResults(tunedProfile, pumpProfile) @@ -205,7 +205,7 @@ class AutotunePlugin @Inject constructor( } } if (tunedProfile == null) { - result = rh.gs(info.nightscout.core.ui.R.string.autotune_error) + result = rh.gs(app.aaps.core.ui.R.string.autotune_error) log("TunedProfile is null on day ${i + 1}") autotuneFS.exportResult(result) autotuneFS.exportLogAndZip(lastRun) @@ -215,7 +215,7 @@ class AutotunePlugin @Inject constructor( } } } - result = rh.gs(info.nightscout.core.ui.R.string.autotune_result, dateUtil.dateAndTimeString(lastRun)) + result = rh.gs(app.aaps.core.ui.R.string.autotune_result, dateUtil.dateAndTimeString(lastRun)) if (!detailedLog) autotuneFS.exportLog(lastRun) autotuneFS.exportResult(logResult) @@ -230,7 +230,7 @@ class AutotunePlugin @Inject constructor( uel.log( UserEntry.Action.STORE_PROFILE, UserEntry.Sources.Automation, - rh.gs(info.nightscout.core.ui.R.string.autotune), + rh.gs(app.aaps.core.ui.R.string.autotune), ValueWithUnit.SimpleString(tunedP.profileName) ) updateButtonVisibility = View.GONE @@ -248,7 +248,7 @@ class AutotunePlugin @Inject constructor( uel.log( UserEntry.Action.PROFILE_SWITCH, UserEntry.Sources.Automation, - rh.gs(info.nightscout.core.ui.R.string.autotune), + rh.gs(app.aaps.core.ui.R.string.autotune), ValueWithUnit.SimpleString(tunedP.profileName) ) } @@ -264,7 +264,7 @@ class AutotunePlugin @Inject constructor( calculationRunning = false return } - result = rh.gs(info.nightscout.core.ui.R.string.autotune_error) + result = rh.gs(app.aaps.core.ui.R.string.autotune_error) rxBus.send(EventAutotuneUpdateGui()) calculationRunning = false return @@ -273,18 +273,18 @@ class AutotunePlugin @Inject constructor( private fun showResults(tunedProfile: ATProfile?, pumpProfile: ATProfile): String { if (tunedProfile == null) return "No Result" // should never occurs - val line = rh.gs(info.nightscout.core.ui.R.string.autotune_log_separator) + val line = rh.gs(app.aaps.core.ui.R.string.autotune_log_separator) var strResult = line - strResult += rh.gs(info.nightscout.core.ui.R.string.autotune_log_title) + strResult += rh.gs(app.aaps.core.ui.R.string.autotune_log_title) strResult += line val tuneInsulin = sp.getBoolean(info.nightscout.core.utils.R.string.key_autotune_tune_insulin_curve, false) if (tuneInsulin) { - strResult += rh.gs(info.nightscout.core.ui.R.string.autotune_log_peak, rh.gs(R.string.insulin_peak), pumpProfile.localInsulin.peak, tunedProfile.localInsulin.peak) - strResult += rh.gs(info.nightscout.core.ui.R.string.autotune_log_dia, rh.gs(info.nightscout.core.ui.R.string.ic_short), pumpProfile.localInsulin.dia, tunedProfile.localInsulin.dia) + strResult += rh.gs(app.aaps.core.ui.R.string.autotune_log_peak, rh.gs(R.string.insulin_peak), pumpProfile.localInsulin.peak, tunedProfile.localInsulin.peak) + strResult += rh.gs(app.aaps.core.ui.R.string.autotune_log_dia, rh.gs(app.aaps.core.ui.R.string.ic_short), pumpProfile.localInsulin.dia, tunedProfile.localInsulin.dia) } // show ISF and CR - strResult += rh.gs(info.nightscout.core.ui.R.string.autotune_log_ic_isf, rh.gs(info.nightscout.core.ui.R.string.isf_short), pumpProfile.isf, tunedProfile.isf) - strResult += rh.gs(info.nightscout.core.ui.R.string.autotune_log_ic_isf, rh.gs(info.nightscout.core.ui.R.string.ic_short), pumpProfile.ic, tunedProfile.ic) + strResult += rh.gs(app.aaps.core.ui.R.string.autotune_log_ic_isf, rh.gs(app.aaps.core.ui.R.string.isf_short), pumpProfile.isf, tunedProfile.isf) + strResult += rh.gs(app.aaps.core.ui.R.string.autotune_log_ic_isf, rh.gs(app.aaps.core.ui.R.string.ic_short), pumpProfile.ic, tunedProfile.ic) strResult += line var totalBasal = 0.0 var totalTuned = 0.0 @@ -292,10 +292,10 @@ class AutotunePlugin @Inject constructor( totalBasal += pumpProfile.basal[i] totalTuned += tunedProfile.basal[i] val percentageChangeValue = tunedProfile.basal[i] / pumpProfile.basal[i] * 100 - 100 - strResult += rh.gs(info.nightscout.core.ui.R.string.autotune_log_basal, i.toDouble(), pumpProfile.basal[i], tunedProfile.basal[i], tunedProfile.basalUnTuned[i], percentageChangeValue) + strResult += rh.gs(app.aaps.core.ui.R.string.autotune_log_basal, i.toDouble(), pumpProfile.basal[i], tunedProfile.basal[i], tunedProfile.basalUnTuned[i], percentageChangeValue) } strResult += line - strResult += rh.gs(info.nightscout.core.ui.R.string.autotune_log_sum_basal, totalBasal, totalTuned) + strResult += rh.gs(app.aaps.core.ui.R.string.autotune_log_sum_basal, totalBasal, totalTuned) strResult += line log(strResult) return strResult diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt index 7c4de8c8ab..aa027333c7 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt +++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt @@ -178,7 +178,7 @@ class ATProfile(profile: Profile, var localInsulin: LocalInsulin, val injector: val store = JSONObject() val tunedProfile = if (circadian) circadianProfile else profile if (profileName.isEmpty()) - profileName = rh.gs(info.nightscout.core.ui.R.string.autotune_tunedprofile_name) + profileName = rh.gs(app.aaps.core.ui.R.string.autotune_tunedprofile_name) try { store.put(profileName, tunedProfile.toPureNsJson(dateUtil)) json.put("defaultProfile", profileName) diff --git a/plugins/aps/src/main/res/layout/autotune_fragment.xml b/plugins/aps/src/main/res/layout/autotune_fragment.xml index ae6d6e7b6f..b97d84a846 100644 --- a/plugins/aps/src/main/res/layout/autotune_fragment.xml +++ b/plugins/aps/src/main/res/layout/autotune_fragment.xml @@ -86,7 +86,7 @@ android:layout_weight="1" android:orientation="horizontal"> - info.nightscout.core.ui.R.attr.userAction - automation.areActionsValid() -> info.nightscout.core.ui.R.attr.validActions - else -> info.nightscout.core.ui.R.attr.actionsError + automation.userAction -> app.aaps.core.ui.R.attr.userAction + automation.areActionsValid() -> app.aaps.core.ui.R.attr.validActions + else -> app.aaps.core.ui.R.attr.actionsError } ) ) @@ -206,7 +206,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener, MenuProvider { holder.binding.iconLayout.removeAllViews() // trigger icons val triggerIcons = HashSet() - if (automation.userAction) triggerIcons.add(info.nightscout.core.ui.R.drawable.ic_user_options) + if (automation.userAction) triggerIcons.add(app.aaps.core.ui.R.drawable.ic_user_options) fillIconSet(automation.trigger, triggerIcons) for (res in triggerIcons) { addImage(res, holder.context, holder.binding.iconLayout) @@ -283,14 +283,14 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener, MenuProvider { private fun getConfirmationText(selectedItems: SparseArray): String { if (selectedItems.size() == 1) { val event = selectedItems.valueAt(0) - return rh.gs(info.nightscout.core.ui.R.string.removerecord) + " " + event.title + return rh.gs(app.aaps.core.ui.R.string.removerecord) + " " + event.title } - return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) + return rh.gs(app.aaps.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) } private fun removeSelected(selectedItems: SparseArray) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { selectedItems.forEach { _, event -> uel.log(Action.AUTOMATION_REMOVED, Sources.Automation, event.title) automationPlugin.removeAt(event.position) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt b/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt index 4fbeb1665c..bbc636b699 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt @@ -226,19 +226,19 @@ class AutomationPlugin @Inject constructor( var commonEventsEnabled = true if (loop.isSuspended || !(loop as PluginBase).isEnabled()) { aapsLogger.debug(LTag.AUTOMATION, "Loop deactivated") - executionLog.add(rh.gs(info.nightscout.core.ui.R.string.loopisdisabled)) + executionLog.add(rh.gs(app.aaps.core.ui.R.string.loopisdisabled)) rxBus.send(EventAutomationUpdateGui()) commonEventsEnabled = false } if (loop.isDisconnected || !(loop as PluginBase).isEnabled()) { aapsLogger.debug(LTag.AUTOMATION, "Loop disconnected") - executionLog.add(rh.gs(info.nightscout.core.ui.R.string.disconnected)) + executionLog.add(rh.gs(app.aaps.core.ui.R.string.disconnected)) rxBus.send(EventAutomationUpdateGui()) commonEventsEnabled = false } if (activePlugin.activePump.isSuspended()) { aapsLogger.debug(LTag.AUTOMATION, "Pump suspended") - executionLog.add(rh.gs(info.nightscout.core.ui.R.string.waitingforpump)) + executionLog.add(rh.gs(app.aaps.core.ui.R.string.waitingforpump)) rxBus.send(EventAutomationUpdateGui()) commonEventsEnabled = false } @@ -425,7 +425,7 @@ class AutomationPlugin @Inject constructor( */ override fun scheduleAutomationEventEatReminder() { val event = AutomationEventObject(injector).apply { - title = rh.gs(info.nightscout.core.ui.R.string.bolus_advisor) + title = rh.gs(app.aaps.core.ui.R.string.bolus_advisor) readOnly = true systemAction = true autoRemove = true @@ -482,14 +482,14 @@ class AutomationPlugin @Inject constructor( */ override fun removeAutomationEventEatReminder() { val event = AutomationEventObject(injector).apply { - title = rh.gs(info.nightscout.core.ui.R.string.bolus_advisor) + title = rh.gs(app.aaps.core.ui.R.string.bolus_advisor) } removeIfExists(event) } override fun scheduleAutomationEventBolusReminder() { val event = AutomationEventObject(injector).apply { - title = rh.gs(info.nightscout.core.ui.R.string.bolus_reminder) + title = rh.gs(app.aaps.core.ui.R.string.bolus_reminder) readOnly = true systemAction = true autoRemove = true @@ -512,7 +512,7 @@ class AutomationPlugin @Inject constructor( override fun removeAutomationEventBolusReminder() { val event = AutomationEventObject(injector).apply { - title = rh.gs(info.nightscout.core.ui.R.string.bolus_reminder) + title = rh.gs(app.aaps.core.ui.R.string.bolus_reminder) } removeIfExists(event) } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt index c0fac1b95c..53b2d8d1c0 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt @@ -32,7 +32,7 @@ class ActionAlarm(injector: HasAndroidInjector) : Action(injector) { this.text = InputString(text) } - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.alarm + override fun friendlyName(): Int = app.aaps.core.ui.R.string.alarm override fun shortDescription(): String = rh.gs(R.string.alarm_message, text.value) @DrawableRes override fun icon(): Int = app.aaps.core.main.R.drawable.ic_access_alarm_24dp @@ -41,7 +41,7 @@ class ActionAlarm(injector: HasAndroidInjector) : Action(injector) { override fun doAction(callback: Callback) { timerUtil.scheduleReminder(10, text.value.takeIf { it.isNotBlank() } ?: rh.gs(config.appName)) - callback.result(PumpEnactResult(injector).success(true).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(true).comment(app.aaps.core.ui.R.string.ok)).run() } override fun toJSON(): String { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt index 54ea2cfa39..ce4a6072b9 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt @@ -48,7 +48,7 @@ class ActionCarePortalEvent(injector: HasAndroidInjector) : Action(injector) { cpEvent = InputCarePortalMenu(rh, actionCPEvent.cpEvent.value) } - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.careportal + override fun friendlyName(): Int = app.aaps.core.ui.R.string.careportal override fun shortDescription(): String = rh.gs(cpEvent.value.stringResWithValue, note.value) @DrawableRes override fun icon(): Int = cpEvent.value.drawableRes @@ -110,8 +110,8 @@ class ActionCarePortalEvent(injector: HasAndroidInjector) : Action(injector) { override fun generateDialog(root: LinearLayout) { LayoutBuilder() .add(cpEvent) - .add(LabelWithElement(rh, rh.gs(info.nightscout.core.ui.R.string.duration_min_label), "", duration)) - .add(LabelWithElement(rh, rh.gs(info.nightscout.core.ui.R.string.notes_label), "", note)) + .add(LabelWithElement(rh, rh.gs(app.aaps.core.ui.R.string.duration_min_label), "", duration)) + .add(LabelWithElement(rh, rh.gs(app.aaps.core.ui.R.string.notes_label), "", note)) .build(root) } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt index f8abdf483b..bc4c7f6736 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt @@ -25,8 +25,8 @@ class ActionLoopDisable(injector: HasAndroidInjector) : Action(injector) { @Inject lateinit var rxBus: RxBus @Inject lateinit var uel: UserEntryLogger - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.disableloop - override fun shortDescription(): String = rh.gs(info.nightscout.core.ui.R.string.disableloop) + override fun friendlyName(): Int = app.aaps.core.ui.R.string.disableloop + override fun shortDescription(): String = rh.gs(app.aaps.core.ui.R.string.disableloop) @DrawableRes override fun icon(): Int = R.drawable.ic_stop_24dp override fun doAction(callback: Callback) { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt index fae2b6d07a..b312859874 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt @@ -23,8 +23,8 @@ class ActionLoopEnable(injector: HasAndroidInjector) : Action(injector) { @Inject lateinit var rxBus: RxBus @Inject lateinit var uel: UserEntryLogger - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.enableloop - override fun shortDescription(): String = rh.gs(info.nightscout.core.ui.R.string.enableloop) + override fun friendlyName(): Int = app.aaps.core.ui.R.string.enableloop + override fun shortDescription(): String = rh.gs(app.aaps.core.ui.R.string.enableloop) @DrawableRes override fun icon(): Int = R.drawable.ic_play_circle_outline_24dp override fun doAction(callback: Callback) { @@ -33,7 +33,7 @@ class ActionLoopEnable(injector: HasAndroidInjector) : Action(injector) { configBuilder.storeSettings("ActionLoopEnable") rxBus.send(EventRefreshOverview("ActionLoopEnable")) uel.log(UserEntry.Action.LOOP_ENABLED, Sources.Automation, title) - callback.result(PumpEnactResult(injector).success(true).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(true).comment(app.aaps.core.ui.R.string.ok)).run() } else { callback.result(PumpEnactResult(injector).success(true).comment(R.string.alreadyenabled)).run() } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt index babc99433d..a769d7960a 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt @@ -29,8 +29,8 @@ class ActionLoopResume(injector: HasAndroidInjector) : Action(injector) { @Inject lateinit var repository: AppRepository @Inject lateinit var dateUtil: DateUtil - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.resumeloop - override fun shortDescription(): String = rh.gs(info.nightscout.core.ui.R.string.resumeloop) + override fun friendlyName(): Int = app.aaps.core.ui.R.string.resumeloop + override fun shortDescription(): String = rh.gs(app.aaps.core.ui.R.string.resumeloop) @DrawableRes override fun icon(): Int = R.drawable.ic_replay_24dp val disposable = CompositeDisposable() @@ -45,7 +45,7 @@ class ActionLoopResume(injector: HasAndroidInjector) : Action(injector) { }) rxBus.send(EventRefreshOverview("ActionLoopResume")) uel.log(UserEntry.Action.RESUME, Sources.Automation, title) - callback.result(PumpEnactResult(injector).success(true).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(true).comment(app.aaps.core.ui.R.string.ok)).run() } else { callback.result(PumpEnactResult(injector).success(true).comment(R.string.notsuspended)).run() } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt index d6dd1eadca..4f2d292d4a 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt @@ -28,7 +28,7 @@ class ActionLoopSuspend(injector: HasAndroidInjector) : Action(injector) { var minutes = InputDuration(30, InputDuration.TimeUnit.MINUTES) - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.suspendloop + override fun friendlyName(): Int = app.aaps.core.ui.R.string.suspendloop override fun shortDescription(): String = rh.gs(R.string.suspendloopforXmin, minutes.getMinutes()) @DrawableRes override fun icon(): Int = R.drawable.ic_pause_circle_outline_24dp @@ -40,7 +40,7 @@ class ActionLoopSuspend(injector: HasAndroidInjector) : Action(injector) { UserEntry.Action.SUSPEND, Sources.Automation, title + ": " + rh.gs(R.string.suspendloopforXmin, minutes.getMinutes()), ValueWithUnit.Minute(minutes.getMinutes()) ) - callback.result(PumpEnactResult(injector).success(true).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(true).comment(app.aaps.core.ui.R.string.ok)).run() } else { callback.result(PumpEnactResult(injector).success(true).comment(R.string.alreadysuspended)).run() } @@ -64,7 +64,7 @@ class ActionLoopSuspend(injector: HasAndroidInjector) : Action(injector) { override fun generateDialog(root: LinearLayout) { LayoutBuilder() - .add(LabelWithElement(rh, rh.gs(info.nightscout.core.ui.R.string.duration_min_label), "", minutes)) + .add(LabelWithElement(rh, rh.gs(app.aaps.core.ui.R.string.duration_min_label), "", minutes)) .build(root) } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt index 4ffca6d268..ca8e61f619 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt @@ -30,7 +30,7 @@ class ActionNotification(injector: HasAndroidInjector) : Action(injector) { var text = InputString() - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.notification + override fun friendlyName(): Int = app.aaps.core.ui.R.string.notification override fun shortDescription(): String = rh.gs(R.string.notification_message, text.value) @DrawableRes override fun icon(): Int = R.drawable.ic_notifications @@ -39,7 +39,7 @@ class ActionNotification(injector: HasAndroidInjector) : Action(injector) { rxBus.send(EventNewNotification(notification)) disposable += repository.runTransaction(InsertTherapyEventAnnouncementTransaction(text.value)).subscribe() rxBus.send(EventRefreshOverview("ActionNotification")) - callback.result(PumpEnactResult(injector).success(true).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(true).comment(app.aaps.core.ui.R.string.ok)).run() } override fun toJSON(): String { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt index e1067cac6f..017df8c0da 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt @@ -32,7 +32,7 @@ class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) { override fun friendlyName(): Int = R.string.profilename override fun shortDescription(): String = rh.gs(R.string.changengetoprofilename, inputProfileName.value) - @DrawableRes override fun icon(): Int = info.nightscout.core.ui.R.drawable.ic_actions_profileswitch + @DrawableRes override fun icon(): Int = app.aaps.core.ui.R.drawable.ic_actions_profileswitch override fun doAction(callback: Callback) { val activeProfileName = profileFunction.getProfileName() @@ -44,7 +44,7 @@ class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) { } if (profileFunction.getProfile() == null) { aapsLogger.error(LTag.AUTOMATION, "ProfileFunctions not initialized") - callback.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.noprofile)).run() + callback.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.noprofile)).run() return } if (inputProfileName.value == activeProfileName) { @@ -55,7 +55,7 @@ class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) { val profileStore = activePlugin.activeProfileSource.profile ?: return if (profileStore.getSpecificProfile(inputProfileName.value) == null) { aapsLogger.error(LTag.AUTOMATION, "Selected profile does not exist! - ${inputProfileName.value}") - callback.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.notexists)).run() + callback.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.notexists)).run() return } uel.log( @@ -64,7 +64,7 @@ class ActionProfileSwitch(injector: HasAndroidInjector) : Action(injector) { ValueWithUnit.Percent(100) ) val result = profileFunction.createProfileSwitch(profileStore, inputProfileName.value, 0, 100, 0, dateUtil.now()) - callback.result(PumpEnactResult(injector).success(result).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(result).comment(app.aaps.core.ui.R.string.ok)).run() } override fun generateDialog(root: LinearLayout) { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt index 8c7c3dcd87..5c007f3bef 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt @@ -33,9 +33,9 @@ class ActionProfileSwitchPercent(injector: HasAndroidInjector) : Action(injector override fun friendlyName(): Int = R.string.profilepercentage override fun shortDescription(): String = if (duration.value == 0) rh.gs(R.string.startprofileforever, pct.value.toInt()) - else rh.gs(info.nightscout.core.ui.R.string.startprofile, pct.value.toInt(), duration.value) + else rh.gs(app.aaps.core.ui.R.string.startprofile, pct.value.toInt(), duration.value) - @DrawableRes override fun icon(): Int = info.nightscout.core.ui.R.drawable.ic_actions_profileswitch + @DrawableRes override fun icon(): Int = app.aaps.core.ui.R.drawable.ic_actions_profileswitch init { precondition = TriggerProfilePercent(injector, 100.0, Comparator.Compare.IS_EQUAL) @@ -46,21 +46,21 @@ class ActionProfileSwitchPercent(injector: HasAndroidInjector) : Action(injector uel.log( UserEntry.Action.PROFILE_SWITCH, Sources.Automation, - title + ": " + rh.gs(info.nightscout.core.ui.R.string.startprofile, pct.value.toInt(), duration.value), + title + ": " + rh.gs(app.aaps.core.ui.R.string.startprofile, pct.value.toInt(), duration.value), ValueWithUnit.Percent(pct.value.toInt()), ValueWithUnit.Minute(duration.value) ) - callback.result(PumpEnactResult(injector).success(true).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(true).comment(app.aaps.core.ui.R.string.ok)).run() } else { aapsLogger.error(LTag.AUTOMATION, "Final profile not valid") - callback.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.ok)).run() } } override fun generateDialog(root: LinearLayout) { LayoutBuilder() .add(LabelWithElement(rh, rh.gs(R.string.percent_u), "", pct)) - .add(LabelWithElement(rh, rh.gs(info.nightscout.core.ui.R.string.duration_min_label), "", duration)) + .add(LabelWithElement(rh, rh.gs(app.aaps.core.ui.R.string.duration_min_label), "", duration)) .build(root) } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt index 70a4a1cb28..2744b72f21 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt @@ -16,7 +16,7 @@ import info.nightscout.automation.elements.InputProfileName import info.nightscout.automation.elements.InputWeekDay import info.nightscout.automation.elements.LabelWithElement import info.nightscout.automation.elements.LayoutBuilder -import info.nightscout.core.ui.elements.WeekDay +import app.aaps.core.ui.elements.WeekDay import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import javax.inject.Inject @@ -34,25 +34,25 @@ class ActionRunAutotune(injector: HasAndroidInjector) : Action(injector) { private var daysBack = InputDuration(0, InputDuration.TimeUnit.DAYS) private val days = InputWeekDay().also { it.setAll(true) } - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.autotune_run - override fun shortDescription(): String = resourceHelper.gs(info.nightscout.core.ui.R.string.autotune_profile_name, inputProfileName.value) - @DrawableRes override fun icon(): Int = info.nightscout.core.ui.R.drawable.ic_actions_profileswitch + override fun friendlyName(): Int = app.aaps.core.ui.R.string.autotune_run + override fun shortDescription(): String = resourceHelper.gs(app.aaps.core.ui.R.string.autotune_profile_name, inputProfileName.value) + @DrawableRes override fun icon(): Int = app.aaps.core.ui.R.drawable.ic_actions_profileswitch override fun doAction(callback: Callback) { val autoSwitch = sp.getBoolean(info.nightscout.core.utils.R.string.key_autotune_auto, false) - val profileName = if (inputProfileName.value == rh.gs(info.nightscout.core.ui.R.string.active)) "" else inputProfileName.value - var message = if (autoSwitch) info.nightscout.core.ui.R.string.autotune_run_with_autoswitch else info.nightscout.core.ui.R.string.autotune_run_without_autoswitch + val profileName = if (inputProfileName.value == rh.gs(app.aaps.core.ui.R.string.active)) "" else inputProfileName.value + var message = if (autoSwitch) app.aaps.core.ui.R.string.autotune_run_with_autoswitch else app.aaps.core.ui.R.string.autotune_run_without_autoswitch Thread { if (!autotunePlugin.calculationRunning) { autotunePlugin.atLog("[Automation] Run Autotune $profileName, ${daysBack.value} days, Autoswitch $autoSwitch") autotunePlugin.aapsAutotune(daysBack.value, autoSwitch, profileName, days.weekdays) if (!autotunePlugin.lastRunSuccess) { - message = info.nightscout.core.ui.R.string.autotune_run_with_error + message = app.aaps.core.ui.R.string.autotune_run_with_error aapsLogger.error(LTag.AUTOMATION, "Error during Autotune Run") } callback.result(PumpEnactResult(injector).success(autotunePlugin.lastRunSuccess).comment(message)).run() } else { - message = info.nightscout.core.ui.R.string.autotune_run_cancelled + message = app.aaps.core.ui.R.string.autotune_run_cancelled aapsLogger.debug(LTag.AUTOMATION, "Autotune run detected, Autotune Run Cancelled") callback.result(PumpEnactResult(injector).success(false).comment(message)).run() } @@ -65,8 +65,8 @@ class ActionRunAutotune(injector: HasAndroidInjector) : Action(injector) { defaultValue = sp.getInt(info.nightscout.core.utils.R.string.key_autotune_default_tune_days, 5) daysBack.value = defaultValue LayoutBuilder() - .add(LabelWithElement(rh, rh.gs(info.nightscout.core.ui.R.string.autotune_select_profile), "", inputProfileName)) - .add(LabelWithElement(rh, rh.gs(info.nightscout.core.ui.R.string.autotune_tune_days), "", daysBack)) + .add(LabelWithElement(rh, rh.gs(app.aaps.core.ui.R.string.autotune_select_profile), "", inputProfileName)) + .add(LabelWithElement(rh, rh.gs(app.aaps.core.ui.R.string.autotune_tune_days), "", daysBack)) .add(days) .build(root) } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt index 83b923dc98..119344132a 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt @@ -25,7 +25,7 @@ class ActionSendSMS(injector: HasAndroidInjector) : Action(injector) { override fun doAction(callback: Callback) { val result = smsCommunicator.sendNotificationToAllNumbers(text.value) - callback.result(PumpEnactResult(injector).success(result).comment(if (result) info.nightscout.core.ui.R.string.ok else info.nightscout.core.ui.R.string.error)).run() + callback.result(PumpEnactResult(injector).success(result).comment(if (result) app.aaps.core.ui.R.string.ok else app.aaps.core.ui.R.string.error)).run() } override fun isValid(): Boolean = text.value.isNotEmpty() diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt index bbcbfdf7f7..ead5ec8f66 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt @@ -69,18 +69,18 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) { ValueWithUnit.Mgdl(tt().highTarget).takeIf { tt().lowTarget != tt().highTarget }, ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(tt().duration).toInt()) ) - callback.result(PumpEnactResult(injector).success(true).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(true).comment(app.aaps.core.ui.R.string.ok)).run() }, { aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it) - callback.result(PumpEnactResult(injector).success(false).comment(info.nightscout.core.ui.R.string.error)).run() + callback.result(PumpEnactResult(injector).success(false).comment(app.aaps.core.ui.R.string.error)).run() }) } override fun generateDialog(root: LinearLayout) { - val unitResId = if (value.units == GlucoseUnit.MGDL) info.nightscout.core.ui.R.string.mgdl else info.nightscout.core.ui.R.string.mmol + val unitResId = if (value.units == GlucoseUnit.MGDL) app.aaps.core.ui.R.string.mgdl else app.aaps.core.ui.R.string.mmol LayoutBuilder() - .add(LabelWithElement(rh, rh.gs(info.nightscout.core.ui.R.string.temporary_target) + "\n[" + rh.gs(unitResId) + "]", "", value)) - .add(LabelWithElement(rh, rh.gs(info.nightscout.core.ui.R.string.duration_min_label), "", duration)) + .add(LabelWithElement(rh, rh.gs(app.aaps.core.ui.R.string.temporary_target) + "\n[" + rh.gs(unitResId) + "]", "", value)) + .add(LabelWithElement(rh, rh.gs(app.aaps.core.ui.R.string.duration_min_label), "", duration)) .build(root) } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopProcessing.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopProcessing.kt index 1db71373e5..72fe468a9e 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopProcessing.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopProcessing.kt @@ -17,7 +17,7 @@ class ActionStopProcessing(injector: HasAndroidInjector) : Action(injector) { override fun isValid(): Boolean = true override fun doAction(callback: Callback) { - callback.result(PumpEnactResult(injector).success(true).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(true).comment(app.aaps.core.ui.R.string.ok)).run() } override fun toJSON(): String { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopTempTarget.kt index 3626813fee..485efcc5e4 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopTempTarget.kt @@ -23,8 +23,8 @@ class ActionStopTempTarget(injector: HasAndroidInjector) : Action(injector) { private val disposable = CompositeDisposable() - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.stoptemptarget - override fun shortDescription(): String = rh.gs(info.nightscout.core.ui.R.string.stoptemptarget) + override fun friendlyName(): Int = app.aaps.core.ui.R.string.stoptemptarget + override fun shortDescription(): String = rh.gs(app.aaps.core.ui.R.string.stoptemptarget) override fun icon(): Int = R.drawable.ic_stop_24dp override fun doAction(callback: Callback) { @@ -35,7 +35,7 @@ class ActionStopTempTarget(injector: HasAndroidInjector) : Action(injector) { }, { aapsLogger.error(LTag.DATABASE, "Error while saving temporary target", it) }) - callback.result(PumpEnactResult(injector).success(true).comment(info.nightscout.core.ui.R.string.ok)).run() + callback.result(PumpEnactResult(injector).success(true).comment(app.aaps.core.ui.R.string.ok)).run() } override fun isValid(): Boolean = true diff --git a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/BaseDialog.kt b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/BaseDialog.kt index f8f19da8ee..d6a607f632 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/BaseDialog.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/BaseDialog.kt @@ -37,7 +37,7 @@ abstract class BaseDialog : DaggerDialogFragment() { } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - (view.findViewById(info.nightscout.core.ui.R.id.ok) as Button?)?.setOnClickListener { + (view.findViewById(app.aaps.core.ui.R.id.ok) as Button?)?.setOnClickListener { synchronized(okClicked) { if (okClicked.get()) { aapsLogger.warn(LTag.UI, "guarding: ok already clicked for dialog: ${this.javaClass.simpleName}") @@ -53,7 +53,7 @@ abstract class BaseDialog : DaggerDialogFragment() { } } } - (view.findViewById(info.nightscout.core.ui.R.id.cancel) as Button?)?.setOnClickListener { + (view.findViewById(app.aaps.core.ui.R.id.cancel) as Button?)?.setOnClickListener { aapsLogger.debug(LTag.UI, "Cancel pressed for dialog: ${this.javaClass.simpleName}") dismiss() } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt index d19ed178fd..a3113e6be2 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt @@ -24,7 +24,7 @@ import info.nightscout.automation.events.EventAutomationDataChanged import info.nightscout.automation.events.EventAutomationUpdateAction import info.nightscout.automation.events.EventAutomationUpdateGui import info.nightscout.automation.events.EventAutomationUpdateTrigger -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/Comparator.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/Comparator.kt index ff6ae3c8c0..a52da26a30 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/Comparator.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/Comparator.kt @@ -63,7 +63,7 @@ class Comparator(private val rh: ResourceHelper) : Element { override fun addToLayout(root: LinearLayout) { root.addView( Spinner(root.context).apply { - adapter = ArrayAdapter(root.context, info.nightscout.core.ui.R.layout.spinner_centered, Compare.labels(rh)).apply { + adapter = ArrayAdapter(root.context, app.aaps.core.ui.R.layout.spinner_centered, Compare.labels(rh)).apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) } layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorConnect.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorConnect.kt index 458496f647..4d682c8a4b 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorConnect.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorConnect.kt @@ -40,7 +40,7 @@ class ComparatorConnect(private val rh: ResourceHelper) : Element { override fun addToLayout(root: LinearLayout) { root.addView( Spinner(root.context).apply { - adapter = ArrayAdapter(root.context, info.nightscout.core.ui.R.layout.spinner_centered, Compare.labels(rh)).apply { + adapter = ArrayAdapter(root.context, app.aaps.core.ui.R.layout.spinner_centered, Compare.labels(rh)).apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorExists.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorExists.kt index b0831ae7fb..c73cf489df 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorExists.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorExists.kt @@ -16,8 +16,8 @@ class ComparatorExists(private val rh: ResourceHelper, var value: Compare = Comp @get:StringRes val stringRes: Int get() = when (this) { - EXISTS -> info.nightscout.core.ui.R.string.exists - NOT_EXISTS -> info.nightscout.core.ui.R.string.notexists + EXISTS -> app.aaps.core.ui.R.string.exists + NOT_EXISTS -> app.aaps.core.ui.R.string.notexists } companion object { @@ -33,7 +33,7 @@ class ComparatorExists(private val rh: ResourceHelper, var value: Compare = Comp override fun addToLayout(root: LinearLayout) { root.addView( Spinner(root.context).apply { - adapter = ArrayAdapter(root.context, info.nightscout.core.ui.R.layout.spinner_centered, Compare.labels(rh)).apply { + adapter = ArrayAdapter(root.context, app.aaps.core.ui.R.layout.spinner_centered, Compare.labels(rh)).apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) } layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputBg.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputBg.kt index d41802575f..0696da4be7 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputBg.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputBg.kt @@ -4,7 +4,7 @@ import android.view.Gravity import android.widget.LinearLayout import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.profile.ProfileFunction -import info.nightscout.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.NumberPicker import java.text.DecimalFormat class InputBg(profileFunction: ProfileFunction) : Element { @@ -28,7 +28,7 @@ class InputBg(profileFunction: ProfileFunction) : Element { override fun addToLayout(root: LinearLayout) { root.addView( NumberPicker(root.context, null).also { - it.setParams(value, minValue, maxValue, step, decimalFormat, false, root.findViewById(info.nightscout.core.ui.R.id.ok)) + it.setParams(value, minValue, maxValue, step, decimalFormat, false, root.findViewById(app.aaps.core.ui.R.id.ok)) it.setOnValueChangedListener { v: Double -> value = v } it.gravity = Gravity.CENTER_HORIZONTAL }) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt index 7a2790d991..3ccff61d94 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt @@ -21,18 +21,18 @@ class InputCarePortalMenu(private val rh: ResourceHelper) : Element { @get:StringRes val stringResWithValue: Int get() = when (this) { - NOTE -> info.nightscout.core.ui.R.string.careportal_note_message - EXERCISE -> info.nightscout.core.ui.R.string.careportal_exercise_message - QUESTION -> info.nightscout.core.ui.R.string.careportal_question_message - ANNOUNCEMENT -> info.nightscout.core.ui.R.string.careportal_announcement_message + NOTE -> app.aaps.core.ui.R.string.careportal_note_message + EXERCISE -> app.aaps.core.ui.R.string.careportal_exercise_message + QUESTION -> app.aaps.core.ui.R.string.careportal_question_message + ANNOUNCEMENT -> app.aaps.core.ui.R.string.careportal_announcement_message } @get:StringRes val stringRes: Int get() = when (this) { - NOTE -> info.nightscout.core.ui.R.string.careportal_note - EXERCISE -> info.nightscout.core.ui.R.string.careportal_exercise - QUESTION -> info.nightscout.core.ui.R.string.careportal_question - ANNOUNCEMENT -> info.nightscout.core.ui.R.string.careportal_announcement + NOTE -> app.aaps.core.ui.R.string.careportal_note + EXERCISE -> app.aaps.core.ui.R.string.careportal_exercise + QUESTION -> app.aaps.core.ui.R.string.careportal_question + ANNOUNCEMENT -> app.aaps.core.ui.R.string.careportal_announcement } @get:DrawableRes val drawableRes: Int get() = when (this) { @@ -63,7 +63,7 @@ class InputCarePortalMenu(private val rh: ResourceHelper) : Element { override fun addToLayout(root: LinearLayout) { root.addView( Spinner(root.context).apply { - adapter = ArrayAdapter(root.context, info.nightscout.core.ui.R.layout.spinner_centered, EventType.labels(rh)).apply { + adapter = ArrayAdapter(root.context, app.aaps.core.ui.R.layout.spinner_centered, EventType.labels(rh)).apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) } layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDateTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDateTime.kt index a86c192fa4..57eaaa3f1f 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDateTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDateTime.kt @@ -39,7 +39,7 @@ class InputDateTime(private val rh: ResourceHelper, private val dateUtil: DateUt setOnClickListener { getFragmentManager(root.context)?.let { fm -> MaterialDatePicker.Builder.datePicker() - .setTheme(info.nightscout.core.ui.R.style.DatePicker) + .setTheme(app.aaps.core.ui.R.style.DatePicker) .setSelection(dateUtil.timeStampToUtcDateMillis(value)) .build() .apply { @@ -61,7 +61,7 @@ class InputDateTime(private val rh: ResourceHelper, private val dateUtil: DateUt val cal = Calendar.getInstance().apply { timeInMillis = value } val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H val timePicker = MaterialTimePicker.Builder() - .setTheme(info.nightscout.core.ui.R.style.TimePicker) + .setTheme(app.aaps.core.ui.R.style.TimePicker) .setTimeFormat(clockFormat) .setHour(cal.get(Calendar.HOUR_OF_DAY)) .setMinute(cal.get(Calendar.MINUTE)) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDelta.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDelta.kt index 2183fb4455..fc65440421 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDelta.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDelta.kt @@ -9,7 +9,7 @@ import android.widget.Spinner import androidx.annotation.StringRes import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.automation.R -import info.nightscout.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.NumberPicker import java.text.DecimalFormat class InputDelta(private val rh: ResourceHelper) : Element { @@ -64,7 +64,7 @@ class InputDelta(private val rh: ResourceHelper) : Element { override fun addToLayout(root: LinearLayout) { root.addView( Spinner(root.context).apply { - adapter = ArrayAdapter(root.context, info.nightscout.core.ui.R.layout.spinner_centered, DeltaType.labels(rh)).apply { + adapter = ArrayAdapter(root.context, app.aaps.core.ui.R.layout.spinner_centered, DeltaType.labels(rh)).apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) } layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDouble.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDouble.kt index 2d24edc5c7..1a5a1fcf42 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDouble.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDouble.kt @@ -2,7 +2,7 @@ package info.nightscout.automation.elements import android.view.Gravity import android.widget.LinearLayout -import info.nightscout.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.NumberPicker import java.text.DecimalFormat class InputDouble() : Element { @@ -32,7 +32,7 @@ class InputDouble() : Element { override fun addToLayout(root: LinearLayout) { numberPicker = NumberPicker(root.context, null).also { - it.setParams(value, minValue, maxValue, step, decimalFormat, true, root.findViewById(info.nightscout.core.ui.R.id.ok)) + it.setParams(value, minValue, maxValue, step, decimalFormat, true, root.findViewById(app.aaps.core.ui.R.id.ok)) it.setOnValueChangedListener { v: Double -> value = v } it.gravity = Gravity.CENTER_HORIZONTAL } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDropdownMenu.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDropdownMenu.kt index ddb3754dac..43471066a3 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDropdownMenu.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDropdownMenu.kt @@ -25,7 +25,7 @@ class InputDropdownMenu(private val rh: ResourceHelper) : Element { override fun addToLayout(root: LinearLayout) { root.addView( Spinner(root.context).apply { - adapter = ArrayAdapter(root.context, info.nightscout.core.ui.R.layout.spinner_centered, itemList).apply { + adapter = ArrayAdapter(root.context, app.aaps.core.ui.R.layout.spinner_centered, itemList).apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) } layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).also { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDuration.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDuration.kt index 686f72a34b..0ecc278ec5 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDuration.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputDuration.kt @@ -2,8 +2,8 @@ package info.nightscout.automation.elements import android.view.Gravity import android.widget.LinearLayout -import info.nightscout.core.ui.elements.MinutesNumberPicker -import info.nightscout.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.MinutesNumberPicker +import app.aaps.core.ui.elements.NumberPicker import java.text.DecimalFormat class InputDuration( @@ -19,13 +19,13 @@ class InputDuration( val numberPicker: NumberPicker if (unit == TimeUnit.MINUTES) { numberPicker = MinutesNumberPicker(root.context, null) - numberPicker.setParams(value.toDouble(), 5.0, 24 * 60.0, 10.0, DecimalFormat("0"), false, root.findViewById(info.nightscout.core.ui.R.id.ok)) + numberPicker.setParams(value.toDouble(), 5.0, 24 * 60.0, 10.0, DecimalFormat("0"), false, root.findViewById(app.aaps.core.ui.R.id.ok)) } else if (unit == TimeUnit.DAYS) { numberPicker = MinutesNumberPicker(root.context, null) - numberPicker.setParams(value.toDouble(), 1.0, 30.0, 1.0, DecimalFormat("0"), false, root.findViewById(info.nightscout.core.ui.R.id.ok)) + numberPicker.setParams(value.toDouble(), 1.0, 30.0, 1.0, DecimalFormat("0"), false, root.findViewById(app.aaps.core.ui.R.id.ok)) } else { numberPicker = NumberPicker(root.context, null) - numberPicker.setParams(value.toDouble(), 1.0, 24.0, 1.0, DecimalFormat("0"), false, root.findViewById(info.nightscout.core.ui.R.id.ok)) + numberPicker.setParams(value.toDouble(), 1.0, 24.0, 1.0, DecimalFormat("0"), false, root.findViewById(app.aaps.core.ui.R.id.ok)) } numberPicker.setOnValueChangedListener { value: Double -> this.value = value.toInt() } numberPicker.gravity = Gravity.CENTER_HORIZONTAL diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputInsulin.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputInsulin.kt index aa64712d91..3c1c9c0c7f 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputInsulin.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputInsulin.kt @@ -2,7 +2,7 @@ package info.nightscout.automation.elements import android.view.Gravity import android.widget.LinearLayout -import info.nightscout.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.NumberPicker import java.text.DecimalFormat class InputInsulin() : Element { @@ -16,7 +16,7 @@ class InputInsulin() : Element { override fun addToLayout(root: LinearLayout) { root.addView( NumberPicker(root.context, null).also { - it.setParams(value, -20.0, 20.0, 0.1, DecimalFormat("0.0"), true, root.findViewById(info.nightscout.core.ui.R.id.ok)) + it.setParams(value, -20.0, 20.0, 0.1, DecimalFormat("0.0"), true, root.findViewById(app.aaps.core.ui.R.id.ok)) it.setOnValueChangedListener { v: Double -> value = v } it.gravity = Gravity.CENTER_HORIZONTAL }) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputLocationMode.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputLocationMode.kt index c6efc46d25..262654bf0b 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputLocationMode.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputLocationMode.kt @@ -51,7 +51,7 @@ class InputLocationMode(private val rh: ResourceHelper) : Element { override fun addToLayout(root: LinearLayout) { root.addView( Spinner(root.context).apply { - adapter = ArrayAdapter(root.context, info.nightscout.core.ui.R.layout.spinner_centered, Mode.labels(rh)).apply { + adapter = ArrayAdapter(root.context, app.aaps.core.ui.R.layout.spinner_centered, Mode.labels(rh)).apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) } val spinnerParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputPercent.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputPercent.kt index 86c5083054..4f192cf0ab 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputPercent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputPercent.kt @@ -2,7 +2,7 @@ package info.nightscout.automation.elements import android.view.Gravity import android.widget.LinearLayout -import info.nightscout.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.NumberPicker import java.text.DecimalFormat class InputPercent() : Element { @@ -16,7 +16,7 @@ class InputPercent() : Element { override fun addToLayout(root: LinearLayout) { root.addView( NumberPicker(root.context, null).also { - it.setParams(value, MIN, MAX, 5.0, DecimalFormat("0"), true, root.findViewById(info.nightscout.core.ui.R.id.ok)) + it.setParams(value, MIN, MAX, 5.0, DecimalFormat("0"), true, root.findViewById(app.aaps.core.ui.R.id.ok)) it.setOnValueChangedListener { v: Double -> value = v } it.gravity = Gravity.CENTER_HORIZONTAL }) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputProfileName.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputProfileName.kt index c7b74a78ec..9465a98fcf 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputProfileName.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputProfileName.kt @@ -17,10 +17,10 @@ class InputProfileName(private val rh: ResourceHelper, private val activePlugin: val profileStore = activePlugin.activeProfileSource.profile ?: return val profileList = profileStore.getProfileList() if (addActive) - profileList.add(0, rh.gs(info.nightscout.core.ui.R.string.active)) + profileList.add(0, rh.gs(app.aaps.core.ui.R.string.active)) root.addView( Spinner(root.context).apply { - adapter = ArrayAdapter(root.context, info.nightscout.core.ui.R.layout.spinner_centered, profileList).apply { + adapter = ArrayAdapter(root.context, app.aaps.core.ui.R.layout.spinner_centered, profileList).apply { setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) } layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT).apply { diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTempTarget.kt index a29af844ea..e6cb518bb7 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTempTarget.kt @@ -5,7 +5,7 @@ import android.widget.LinearLayout import app.aaps.core.interfaces.configuration.Constants import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.profile.ProfileFunction -import info.nightscout.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.NumberPicker import java.text.DecimalFormat class InputTempTarget(profileFunction: ProfileFunction) : Element { @@ -41,7 +41,7 @@ class InputTempTarget(profileFunction: ProfileFunction) : Element { } root.addView( NumberPicker(root.context, null).also { - it.setParams(value, minValue, maxValue, step, decimalFormat, true, root.findViewById(info.nightscout.core.ui.R.id.ok)) + it.setParams(value, minValue, maxValue, step, decimalFormat, true, root.findViewById(app.aaps.core.ui.R.id.ok)) it.setOnValueChangedListener { v: Double -> value = v } it.gravity = Gravity.CENTER_HORIZONTAL diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt index 5a0b7a5586..72e8938cd5 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt @@ -61,7 +61,7 @@ class InputTimeRange(private val rh: ResourceHelper, private val dateUtil: DateU }) addView(TextView(root.context).apply { @Suppress("SetTextI18n") - text = rh.gs(info.nightscout.core.ui.R.string.and) + " " + dateUtil.timeString(toMills(end)) + text = rh.gs(app.aaps.core.ui.R.string.and) + " " + dateUtil.timeString(toMills(end)) setPadding(px, px, px, px) setOnClickListener { getFragmentManager(root.context)?.let { fm -> diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputWeekDay.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputWeekDay.kt index a8269d8f93..a46e45aa60 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/InputWeekDay.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/InputWeekDay.kt @@ -1,5 +1,5 @@ package info.nightscout.automation.elements -import info.nightscout.core.ui.elements.WeekDay +import app.aaps.core.ui.elements.WeekDay class InputWeekDay : WeekDay(), Element diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/LayoutBuilder.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/LayoutBuilder.kt index add0e97030..187a4b62c0 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/LayoutBuilder.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/LayoutBuilder.kt @@ -23,7 +23,7 @@ class LayoutBuilder { layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { setMargins(0, 0, dpToPx(layout.context, 2), dpToPx(layout.context, 2)) } - setBackgroundColor(layout.context.getColor(info.nightscout.core.ui.R.color.mdtp_line_dark)) + setBackgroundColor(layout.context.getColor(app.aaps.core.ui.R.color.mdtp_line_dark)) } for (e in mElements) { e.addToLayout(elementLayout) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/elements/StaticLabel.kt b/plugins/automation/src/main/java/info/nightscout/automation/elements/StaticLabel.kt index 7e0a74d3f2..54fb4f614f 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/elements/StaticLabel.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/elements/StaticLabel.kt @@ -28,7 +28,7 @@ class StaticLabel(private val rh: ResourceHelper) : Element { LinearLayout(root.context).apply { orientation = LinearLayout.HORIZONTAL layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) - setBackgroundColor(rh.gac(context, info.nightscout.core.ui.R.attr.automationBackgroundColor)) + setBackgroundColor(rh.gac(context, app.aaps.core.ui.R.attr.automationBackgroundColor)) addView( TextView(root.context).apply { text = label diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt index 711fff7e44..4835e22c62 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt @@ -17,7 +17,7 @@ import info.nightscout.automation.elements.ComparatorConnect import info.nightscout.automation.elements.InputDropdownMenu import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.JsonHelper import org.json.JSONObject import javax.inject.Inject @@ -61,7 +61,7 @@ class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) { override fun friendlyDescription(): String = rh.gs(R.string.btdevicecompared, btDevice.value, rh.gs(comparator.value.stringRes)) - override fun icon(): Optional = Optional.of(info.nightscout.core.ui.R.drawable.ic_bluetooth_white_48dp) + override fun icon(): Optional = Optional.of(app.aaps.core.ui.R.drawable.ic_bluetooth_white_48dp) override fun duplicate(): Trigger = TriggerBTDevice(injector, this) @@ -81,7 +81,7 @@ class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S || ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED) { (context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager?)?.adapter?.bondedDevices?.forEach { s.add(it.name) } } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) } return s } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt index a9b2765b35..18d8595ae4 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt @@ -76,7 +76,7 @@ class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) { return this } - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.glucose + override fun friendlyName(): Int = app.aaps.core.ui.R.string.glucose override fun friendlyDescription(): String { return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) @@ -91,7 +91,7 @@ class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) { override fun generateDialog(root: LinearLayout) { LayoutBuilder() - .add(StaticLabel(rh, info.nightscout.core.ui.R.string.glucose, this)) + .add(StaticLabel(rh, app.aaps.core.ui.R.string.glucose, this)) .add(comparator) .add(LabelWithElement(rh, rh.gs(R.string.glucose_u, bg.units), "", bg)) .build(root) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt index 748306ea4c..36083466ad 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt @@ -13,7 +13,7 @@ import com.google.common.base.Optional import dagger.android.HasAndroidInjector import info.nightscout.automation.R import info.nightscout.automation.dialogs.ChooseOperationDialog -import info.nightscout.core.ui.elements.VerticalTextView +import app.aaps.core.ui.elements.VerticalTextView import info.nightscout.core.utils.JsonHelper.safeGetString import org.json.JSONArray import org.json.JSONObject @@ -37,7 +37,7 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) { get() = when (this) { OR -> R.string.or XOR -> R.string.xor - AND -> info.nightscout.core.ui.R.string.and + AND -> app.aaps.core.ui.R.string.and } companion object { @@ -164,7 +164,7 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) { text = rh.gs(connectorType.stringRes) gravity = gravity or Gravity.CENTER_VERTICAL setTypeface(typeface, Typeface.BOLD) - setBackgroundColor(rh.gac(context, info.nightscout.core.ui.R.attr.automationOverlayColor)) + setBackgroundColor(rh.gac(context, app.aaps.core.ui.R.attr.automationOverlayColor)) layoutParams = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT).also { ll -> ll.setMargins(rh.dpToPx(3), rh.dpToPx(3), rh.dpToPx(3), rh.dpToPx(3)) } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt index 6787d9598e..bd2ec8809a 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt @@ -56,7 +56,7 @@ class TriggerIob(injector: HasAndroidInjector) : Trigger(injector) { return this } - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.iob + override fun friendlyName(): Int = app.aaps.core.ui.R.string.iob override fun friendlyDescription(): String = rh.gs(R.string.iobcompared, rh.gs(comparator.value.stringRes), insulin.value) @@ -67,7 +67,7 @@ class TriggerIob(injector: HasAndroidInjector) : Trigger(injector) { override fun generateDialog(root: LinearLayout) { LayoutBuilder() - .add(StaticLabel(rh, info.nightscout.core.ui.R.string.iob, this)) + .add(StaticLabel(rh, app.aaps.core.ui.R.string.iob, this)) .add(comparator) .add(LabelWithElement(rh, rh.gs(R.string.iob_u), "", insulin)) .build(root) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt index a8660c83eb..76985acddd 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt @@ -95,7 +95,7 @@ class TriggerLocation(injector: HasAndroidInjector) : Trigger(injector) { override fun generateDialog(root: LinearLayout) { LayoutBuilder() .add(StaticLabel(rh, R.string.location, this)) - .add(LabelWithElement(rh, rh.gs(info.nightscout.core.ui.R.string.name_short), "", name)) + .add(LabelWithElement(rh, rh.gs(app.aaps.core.ui.R.string.name_short), "", name)) .add(LabelWithElement(rh, rh.gs(R.string.latitude_short), "", latitude)) .add(LabelWithElement(rh, rh.gs(R.string.longitude_short), "", longitude)) .add(LabelWithElement(rh, rh.gs(R.string.distance_short), "", distance)) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt index 8c356d9df0..6ad9676e3b 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt @@ -86,7 +86,7 @@ class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) { override fun friendlyDescription(): String = rh.gs(R.string.percentagecompared, rh.gs(comparator.value.stringRes), pct.value.toInt()) - override fun icon(): Optional = Optional.of(info.nightscout.core.ui.R.drawable.ic_actions_profileswitch) + override fun icon(): Optional = Optional.of(app.aaps.core.ui.R.drawable.ic_actions_profileswitch) override fun duplicate(): Trigger = TriggerProfilePercent(injector, this) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt index 11abd18652..9a55a50caa 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt @@ -10,7 +10,7 @@ import info.nightscout.automation.elements.InputTime import info.nightscout.automation.elements.InputWeekDay import info.nightscout.automation.elements.LayoutBuilder import info.nightscout.automation.elements.StaticLabel -import info.nightscout.core.ui.elements.WeekDay +import app.aaps.core.ui.elements.WeekDay import info.nightscout.core.utils.JsonHelper import info.nightscout.core.utils.MidnightUtils import org.json.JSONObject diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt index 0323c8e8b6..da0158a593 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt @@ -53,7 +53,7 @@ class TriggerTempTarget(injector: HasAndroidInjector) : Trigger(injector) { return this } - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.temporary_target + override fun friendlyName(): Int = app.aaps.core.ui.R.string.temporary_target override fun friendlyDescription(): String = rh.gs(R.string.temptargetcompared, rh.gs(comparator.value.stringRes)) @@ -64,7 +64,7 @@ class TriggerTempTarget(injector: HasAndroidInjector) : Trigger(injector) { override fun generateDialog(root: LinearLayout) { LayoutBuilder() - .add(StaticLabel(rh, info.nightscout.core.ui.R.string.temporary_target, this)) + .add(StaticLabel(rh, app.aaps.core.ui.R.string.temporary_target, this)) .add(comparator) .build(root) } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt index 346399a150..11fa0f3b84 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt @@ -73,7 +73,7 @@ class TriggerTempTargetValue(injector: HasAndroidInjector) : Trigger(injector) { return this } - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.careportal_temporarytargetvalue + override fun friendlyName(): Int = app.aaps.core.ui.R.string.careportal_temporarytargetvalue override fun friendlyDescription(): String { return if (comparator.value == Comparator.Compare.IS_NOT_AVAILABLE) @@ -88,7 +88,7 @@ class TriggerTempTargetValue(injector: HasAndroidInjector) : Trigger(injector) { override fun generateDialog(root: LinearLayout) { LayoutBuilder() - .add(StaticLabel(rh, info.nightscout.core.ui.R.string.careportal_temporarytargetvalue, this)) + .add(StaticLabel(rh, app.aaps.core.ui.R.string.careportal_temporarytargetvalue, this)) .add(comparator) .add(LabelWithElement(rh, rh.gs(R.string.target_u, ttValue.units), "", ttValue)) .build(root) diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt index 55e16f3524..0f27408e09 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt @@ -50,7 +50,7 @@ class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) { return this } - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.time + override fun friendlyName(): Int = app.aaps.core.ui.R.string.time override fun friendlyDescription(): String = rh.gs(R.string.atspecifiedtime, dateUtil.dateAndTimeString(time.value)) @@ -61,7 +61,7 @@ class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) { override fun generateDialog(root: LinearLayout) { LayoutBuilder() - .add(StaticLabel(rh, info.nightscout.core.ui.R.string.time, this)) + .add(StaticLabel(rh, app.aaps.core.ui.R.string.time, this)) .add(time) .build(root) } diff --git a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt index 65bf80623d..a5a9bc23e2 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt @@ -69,7 +69,7 @@ class TriggerWifiSsid(injector: HasAndroidInjector) : Trigger(injector) { return this } - override fun friendlyName(): Int = info.nightscout.core.ui.R.string.ns_wifi_ssids + override fun friendlyName(): Int = app.aaps.core.ui.R.string.ns_wifi_ssids override fun friendlyDescription(): String = rh.gs(R.string.wifissidcompared, rh.gs(comparator.value.stringRes), ssid.value) @@ -80,9 +80,9 @@ class TriggerWifiSsid(injector: HasAndroidInjector) : Trigger(injector) { override fun generateDialog(root: LinearLayout) { LayoutBuilder() - .add(StaticLabel(rh, info.nightscout.core.ui.R.string.ns_wifi_ssids, this)) + .add(StaticLabel(rh, app.aaps.core.ui.R.string.ns_wifi_ssids, this)) .add(comparator) - .add(LabelWithElement(rh, rh.gs(info.nightscout.core.ui.R.string.ns_wifi_ssids) + ": ", "", ssid)) + .add(LabelWithElement(rh, rh.gs(app.aaps.core.ui.R.string.ns_wifi_ssids) + ": ", "", ssid)) .build(root) } } \ No newline at end of file diff --git a/plugins/automation/src/main/java/info/nightscout/automation/ui/TimerUtil.kt b/plugins/automation/src/main/java/info/nightscout/automation/ui/TimerUtil.kt index 4bfedf0de3..5887b55a2f 100644 --- a/plugins/automation/src/main/java/info/nightscout/automation/ui/TimerUtil.kt +++ b/plugins/automation/src/main/java/info/nightscout/automation/ui/TimerUtil.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.provider.AlarmClock import app.aaps.annotations.OpenForTesting import info.nightscout.automation.R -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt index 61a4c74edb..94cc91a942 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt @@ -46,15 +46,15 @@ class ActionAlarmTest : TestBase() { @BeforeEach fun setup() { - `when`(context.getString(info.nightscout.core.ui.R.string.ok)).thenReturn("OK") - `when`(context.getString(info.nightscout.core.ui.R.string.alarm)).thenReturn("Alarm") + `when`(context.getString(app.aaps.core.ui.R.string.ok)).thenReturn("OK") + `when`(context.getString(app.aaps.core.ui.R.string.alarm)).thenReturn("Alarm") `when`(rh.gs(ArgumentMatchers.eq(R.string.alarm_message), ArgumentMatchers.anyString())).thenReturn("Alarm: %s") timerUtil = TimerUtil(context) sut = ActionAlarm(injector) } @Test fun friendlyNameTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.string.alarm, sut.friendlyName()) + Assertions.assertEquals(app.aaps.core.ui.R.string.alarm, sut.friendlyName()) } @Test fun shortDescriptionTest() { diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt index 3058449c76..f0a03cd3f8 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionCarePortalEventTest.kt @@ -21,7 +21,7 @@ class ActionCarePortalEventTest : ActionsTestBase() { @BeforeEach fun setup() { `when`(sp.getString(ArgumentMatchers.anyString(), ArgumentMatchers.anyString())).thenReturn("AAPS") - `when`(rh.gs(info.nightscout.core.ui.R.string.careportal_note_message)).thenReturn("Note : %s") + `when`(rh.gs(app.aaps.core.ui.R.string.careportal_note_message)).thenReturn("Note : %s") `when`(dateUtil.now()).thenReturn(0) `when`(profileFunction.getUnits()).thenReturn(GlucoseUnit.MGDL) `when`(repository.runTransactionForResult(anyObject>())) @@ -35,7 +35,7 @@ class ActionCarePortalEventTest : ActionsTestBase() { } @Test fun friendlyNameTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.string.careportal, sut.friendlyName()) + Assertions.assertEquals(app.aaps.core.ui.R.string.careportal, sut.friendlyName()) } @Test fun shortDescriptionTest() { diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt index 53b8b46f2d..4cc968d531 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopDisableTest.kt @@ -18,8 +18,8 @@ class ActionLoopDisableTest : ActionsTestBase() { fun setup() { testPumpPlugin.pumpDescription.isTempBasalCapable = true - `when`(context.getString(info.nightscout.core.ui.R.string.disableloop)).thenReturn("Disable loop") - `when`(rh.gs(info.nightscout.core.ui.R.string.disableloop)).thenReturn("Disable loop") + `when`(context.getString(app.aaps.core.ui.R.string.disableloop)).thenReturn("Disable loop") + `when`(rh.gs(app.aaps.core.ui.R.string.disableloop)).thenReturn("Disable loop") `when`(context.getString(R.string.alreadydisabled)).thenReturn("Already disabled") sut = ActionLoopDisable(injector) @@ -27,7 +27,7 @@ class ActionLoopDisableTest : ActionsTestBase() { @Test fun friendlyNameTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.string.disableloop, sut.friendlyName()) + Assertions.assertEquals(app.aaps.core.ui.R.string.disableloop, sut.friendlyName()) } @Test diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt index c43560c206..f80dd41e25 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopEnableTest.kt @@ -17,14 +17,14 @@ class ActionLoopEnableTest : ActionsTestBase() { fun setup() { testPumpPlugin.pumpDescription.isTempBasalCapable = true - `when`(rh.gs(info.nightscout.core.ui.R.string.enableloop)).thenReturn("Enable loop") + `when`(rh.gs(app.aaps.core.ui.R.string.enableloop)).thenReturn("Enable loop") `when`(context.getString(R.string.alreadyenabled)).thenReturn("Already enabled") sut = ActionLoopEnable(injector) } @Test fun friendlyNameTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.string.enableloop, sut.friendlyName()) + Assertions.assertEquals(app.aaps.core.ui.R.string.enableloop, sut.friendlyName()) } @Test fun shortDescriptionTest() { diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt index 08bdeca126..c1066931b2 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopResumeTest.kt @@ -18,14 +18,14 @@ class ActionLoopResumeTest : ActionsTestBase() { @BeforeEach fun setup() { - `when`(rh.gs(info.nightscout.core.ui.R.string.resumeloop)).thenReturn("Resume loop") + `when`(rh.gs(app.aaps.core.ui.R.string.resumeloop)).thenReturn("Resume loop") `when`(context.getString(R.string.notsuspended)).thenReturn("Not suspended") sut = ActionLoopResume(injector) } @Test fun friendlyNameTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.string.resumeloop, sut.friendlyName()) + Assertions.assertEquals(app.aaps.core.ui.R.string.resumeloop, sut.friendlyName()) } @Test fun shortDescriptionTest() { diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt index 52c37a45b1..4b63c8467d 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionLoopSuspendTest.kt @@ -16,7 +16,7 @@ class ActionLoopSuspendTest : ActionsTestBase() { @BeforeEach fun setup() { - `when`(context.getString(info.nightscout.core.ui.R.string.suspendloop)).thenReturn("Suspend loop") + `when`(context.getString(app.aaps.core.ui.R.string.suspendloop)).thenReturn("Suspend loop") `when`(rh.gs(R.string.suspendloopforXmin)).thenReturn("Suspend loop for %d min") `when`(context.getString(R.string.alreadysuspended)).thenReturn("Already suspended") @@ -24,7 +24,7 @@ class ActionLoopSuspendTest : ActionsTestBase() { } @Test fun friendlyNameTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.string.suspendloop, sut.friendlyName()) + Assertions.assertEquals(app.aaps.core.ui.R.string.suspendloop, sut.friendlyName()) } @Test fun shortDescriptionTest() { diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt index 9e0f6bbd85..15de7c6d45 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionNotificationTest.kt @@ -45,8 +45,8 @@ class ActionNotificationTest : TestBase() { @BeforeEach fun setup() { - `when`(context.getString(info.nightscout.core.ui.R.string.ok)).thenReturn("OK") - `when`(rh.gs(info.nightscout.core.ui.R.string.notification)).thenReturn("Notification") + `when`(context.getString(app.aaps.core.ui.R.string.ok)).thenReturn("OK") + `when`(rh.gs(app.aaps.core.ui.R.string.notification)).thenReturn("Notification") `when`( rh.gs( ArgumentMatchers.eq(R.string.notification_message), @@ -60,7 +60,7 @@ class ActionNotificationTest : TestBase() { } @Test fun friendlyNameTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.string.notification, sut.friendlyName()) + Assertions.assertEquals(app.aaps.core.ui.R.string.notification, sut.friendlyName()) } @Test fun shortDescriptionTest() { diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt index 3e367751df..7d2a4615a9 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchPercentTest.kt @@ -18,7 +18,7 @@ class ActionProfileSwitchPercentTest : ActionsTestBase() { fun setup() { `when`(rh.gs(R.string.startprofileforever)).thenReturn("Start profile %d%%") - `when`(rh.gs(info.nightscout.core.ui.R.string.startprofile)).thenReturn("Start profile %d%% for %d min") + `when`(rh.gs(app.aaps.core.ui.R.string.startprofile)).thenReturn("Start profile %d%% for %d min") sut = ActionProfileSwitchPercent(injector) } @@ -34,7 +34,7 @@ class ActionProfileSwitchPercentTest : ActionsTestBase() { } @Test fun iconTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.drawable.ic_actions_profileswitch, sut.icon()) + Assertions.assertEquals(app.aaps.core.ui.R.drawable.ic_actions_profileswitch, sut.icon()) } @Test fun doActionTest() { diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt index 4ab3fdec2f..d19b9e12b8 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionProfileSwitchTest.kt @@ -22,9 +22,9 @@ class ActionProfileSwitchTest : ActionsTestBase() { `when`(rh.gs(R.string.profilename)).thenReturn("Change profile to") `when`(rh.gs(R.string.changengetoprofilename)).thenReturn("Change profile to %s") `when`(context.getString(R.string.alreadyset)).thenReturn("Already set") - `when`(context.getString(info.nightscout.core.ui.R.string.notexists)).thenReturn("not exists") + `when`(context.getString(app.aaps.core.ui.R.string.notexists)).thenReturn("not exists") `when`(context.getString(info.nightscout.core.validators.R.string.error_field_must_not_be_empty)).thenReturn("The field must not be empty") - `when`(context.getString(info.nightscout.core.ui.R.string.noprofile)).thenReturn("No profile loaded from NS yet") + `when`(context.getString(app.aaps.core.ui.R.string.noprofile)).thenReturn("No profile loaded from NS yet") sut = ActionProfileSwitch(injector) } @@ -106,6 +106,6 @@ class ActionProfileSwitchTest : ActionsTestBase() { } @Test fun iconTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.drawable.ic_actions_profileswitch, sut.icon()) + Assertions.assertEquals(app.aaps.core.ui.R.drawable.ic_actions_profileswitch, sut.icon()) } } \ No newline at end of file diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopTempTargetTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopTempTargetTest.kt index 3070a0c30f..15b92cdca6 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopTempTargetTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionStopTempTargetTest.kt @@ -18,13 +18,13 @@ class ActionStopTempTargetTest : ActionsTestBase() { @BeforeEach fun setup() { - `when`(rh.gs(info.nightscout.core.ui.R.string.stoptemptarget)).thenReturn("Stop temp target") + `when`(rh.gs(app.aaps.core.ui.R.string.stoptemptarget)).thenReturn("Stop temp target") sut = ActionStopTempTarget(injector) } @Test fun friendlyNameTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.string.stoptemptarget, sut.friendlyName()) + Assertions.assertEquals(app.aaps.core.ui.R.string.stoptemptarget, sut.friendlyName()) } @Test fun shortDescriptionTest() { diff --git a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt index b3246dc588..eeee78aa85 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt @@ -178,7 +178,7 @@ ActionsTestBase : TestBaseWithProfile() { `when`(activePlugin.activeProfileSource).thenReturn(profilePlugin) `when`(profilePlugin.profile).thenReturn(getValidProfileStore()) - `when`(context.getString(info.nightscout.core.ui.R.string.ok)).thenReturn("OK") - `when`(context.getString(info.nightscout.core.ui.R.string.error)).thenReturn("Error") + `when`(context.getString(app.aaps.core.ui.R.string.ok)).thenReturn("OK") + `when`(context.getString(app.aaps.core.ui.R.string.error)).thenReturn("Error") } } \ No newline at end of file diff --git a/plugins/automation/src/test/java/info/nightscout/automation/elements/StaticLabelTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/elements/StaticLabelTest.kt index 6ef094c093..aac738f3d6 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/elements/StaticLabelTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/elements/StaticLabelTest.kt @@ -11,8 +11,8 @@ class StaticLabelTest : TriggerTestBase() { @Test fun constructor() { var sl = StaticLabel(rh, "any", TriggerDummy(injector)) Assertions.assertEquals("any", sl.label) - `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit") - sl = StaticLabel(rh, info.nightscout.core.ui.R.string.pumplimit, TriggerDummy(injector)) + `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") + sl = StaticLabel(rh, app.aaps.core.ui.R.string.pumplimit, TriggerDummy(injector)) Assertions.assertEquals("pump limit", sl.label) } } \ No newline at end of file diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBTDeviceTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBTDeviceTest.kt index 6fb0a2ccf0..812e536181 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBTDeviceTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerBTDeviceTest.kt @@ -31,7 +31,7 @@ class TriggerBTDeviceTest : TriggerTestBase() { @Test fun icon() { - Assertions.assertEquals(Optional.of(info.nightscout.core.ui.R.drawable.ic_bluetooth_white_48dp), TriggerBTDevice(injector).icon()) + Assertions.assertEquals(Optional.of(app.aaps.core.ui.R.drawable.ic_bluetooth_white_48dp), TriggerBTDevice(injector).icon()) } @Test fun duplicate() { diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerProfilePercentTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerProfilePercentTest.kt index 9ce7d35a73..4826e4bbd7 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerProfilePercentTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerProfilePercentTest.kt @@ -57,7 +57,7 @@ class TriggerProfilePercentTest : TriggerTestBase() { } @Test fun iconTest() { - Assertions.assertEquals(Optional.of(info.nightscout.core.ui.R.drawable.ic_actions_profileswitch), TriggerProfilePercent(injector).icon()) + Assertions.assertEquals(Optional.of(app.aaps.core.ui.R.drawable.ic_actions_profileswitch), TriggerProfilePercent(injector).icon()) } @Test fun friendlyNameTest() { diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt index 909bd50f9f..2dc21e3845 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerTimeTest.kt @@ -51,7 +51,7 @@ class TriggerTimeTest : TriggerTestBase() { @Test fun friendlyNameTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.string.time, TriggerTime(injector).friendlyName()) + Assertions.assertEquals(app.aaps.core.ui.R.string.time, TriggerTime(injector).friendlyName()) } @Test diff --git a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt index 8c7b55e4b3..749a2fad0a 100644 --- a/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt +++ b/plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerWifiSsidTest.kt @@ -58,7 +58,7 @@ class TriggerWifiSsidTest : TriggerTestBase() { } @Test fun friendlyNameTest() { - Assertions.assertEquals(info.nightscout.core.ui.R.string.ns_wifi_ssids, TriggerWifiSsid(injector).friendlyName()) + Assertions.assertEquals(app.aaps.core.ui.R.string.ns_wifi_ssids, TriggerWifiSsid(injector).friendlyName()) } @Test fun friendlyDescriptionTest() { diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/AndroidPermissionImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/AndroidPermissionImpl.kt index e1f6801112..d5c9193894 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/AndroidPermissionImpl.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/AndroidPermissionImpl.kt @@ -20,8 +20,8 @@ import app.aaps.core.interfaces.notifications.Notification import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import javax.inject.Inject import javax.inject.Singleton @@ -89,7 +89,7 @@ class AndroidPermissionImpl @Inject constructor( if (permissionNotGranted(activity, Manifest.permission.RECEIVE_SMS)) activePlugin.activeOverview.addNotification( id = Notification.PERMISSION_SMS, - text = rh.gs(info.nightscout.core.ui.R.string.smscommunicator_missingsmspermission), + text = rh.gs(app.aaps.core.ui.R.string.smscommunicator_missingsmspermission), level = Notification.URGENT, actionButtonId = R.string.request ) { @@ -110,7 +110,7 @@ class AndroidPermissionImpl @Inject constructor( if (permissionNotGranted(activity, Manifest.permission.BLUETOOTH_CONNECT) || permissionNotGranted(activity, Manifest.permission.BLUETOOTH_SCAN)) activePlugin.activeOverview.addNotification( id = Notification.PERMISSION_BT, - text = rh.gs(info.nightscout.core.ui.R.string.need_connect_permission), + text = rh.gs(app.aaps.core.ui.R.string.need_connect_permission), level = Notification.URGENT, actionButtonId = R.string.request ) { askForPermission(activity, arrayOf(Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT)) } diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/DaggerAppCompatActivityWithResult.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/DaggerAppCompatActivityWithResult.kt index e337148acf..465feb5901 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/DaggerAppCompatActivityWithResult.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/DaggerAppCompatActivityWithResult.kt @@ -16,8 +16,8 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventThemeSwitch import dagger.android.support.DaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.locale.LocaleHelper +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.locale.LocaleHelper import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/SingleFragmentActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/SingleFragmentActivity.kt index 59ab69811e..40a174d79f 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/SingleFragmentActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/activities/SingleFragmentActivity.kt @@ -23,7 +23,7 @@ class SingleFragmentActivity : DaggerAppCompatActivityWithResult() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setTheme(info.nightscout.core.ui.R.style.AppTheme) + setTheme(app.aaps.core.ui.R.style.AppTheme) setContentView(R.layout.activity_single_fragment) plugin = activePlugin.getPluginsList()[intent.getIntExtra("plugin", -1)] title = plugin?.name diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt index 019bc1d961..b98df264a3 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderFragment.kt @@ -95,7 +95,7 @@ class ConfigBuilderFragment : DaggerFragment() { ) if (config.APS || config.PUMPCONTROL || config.isEngineeringMode()) configBuilder.createViewsForPlugins( - title = info.nightscout.core.ui.R.string.configbuilder_insulin, + title = app.aaps.core.ui.R.string.configbuilder_insulin, description = R.string.configbuilder_insulin_description, pluginType = PluginType.INSULIN, plugins = activePlugin.getSpecificPluginsVisibleInList(PluginType.INSULIN), @@ -162,7 +162,7 @@ class ConfigBuilderFragment : DaggerFragment() { parent = binding.categories ) configBuilder.createViewsForPlugins( - title = info.nightscout.core.ui.R.string.constraints, + title = app.aaps.core.ui.R.string.constraints, description = R.string.configbuilder_constraints_description, pluginType = PluginType.CONSTRAINTS, plugins = activePlugin.getSpecificPluginsVisibleInList(PluginType.CONSTRAINTS), diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderPlugin.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderPlugin.kt index 86fcf322d1..9d1280e732 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderPlugin.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/configBuilder/ConfigBuilderPlugin.kt @@ -42,7 +42,7 @@ import app.aaps.core.interfaces.source.BgSource import app.aaps.core.interfaces.sync.NsClient import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit @@ -69,7 +69,7 @@ class ConfigBuilderPlugin @Inject constructor( .showInList(true) .alwaysEnabled(true) .alwaysVisible(false) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_cogs) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_cogs) .pluginName(R.string.config_builder) .shortName(R.string.config_builder_shortname) .description(R.string.description_config_builder), @@ -154,7 +154,7 @@ class ConfigBuilderPlugin @Inject constructor( // Ask when switching to physical pump plugin fun switchAllowed(changedPlugin: PluginBase, newState: Boolean, activity: FragmentActivity?, type: PluginType) { - if (changedPlugin.getType() == PluginType.PUMP && changedPlugin.name != rh.gs(info.nightscout.core.ui.R.string.virtual_pump)) + if (changedPlugin.getType() == PluginType.PUMP && changedPlugin.name != rh.gs(app.aaps.core.ui.R.string.virtual_pump)) confirmPumpPluginActivation(changedPlugin, newState, activity, type) else if (changedPlugin.getType() == PluginType.PUMP) { performPluginSwitch(changedPlugin, newState, type) diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt index 78555d693c..d634257d93 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/ImportExportPrefsImpl.kt @@ -55,10 +55,10 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.MidnightTime import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.dialogs.TwoMessagesAlertDialog -import info.nightscout.core.ui.dialogs.WarningDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.TwoMessagesAlertDialog +import app.aaps.core.ui.dialogs.WarningDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -142,7 +142,7 @@ class ImportExportPrefsImpl @Inject constructor( // name provided (hopefully) by user val patientName = sp.getString(info.nightscout.core.utils.R.string.key_patient_name, "") - val defaultPatientName = rh.gs(info.nightscout.core.ui.R.string.patient_name_default) + val defaultPatientName = rh.gs(app.aaps.core.ui.R.string.patient_name_default) // name we detect from OS val systemName = n1 ?: n2 ?: n3 ?: n4 ?: n5 ?: n6 ?: defaultPatientName @@ -150,7 +150,7 @@ class ImportExportPrefsImpl @Inject constructor( } private fun askForMasterPass(activity: FragmentActivity, @StringRes canceledMsg: Int, then: ((password: String) -> Unit)) { - passwordCheck.queryPassword(activity, info.nightscout.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password, { password -> + passwordCheck.queryPassword(activity, app.aaps.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password, { password -> then(password) }, { ToastUtils.warnToast(activity, rh.gs(canceledMsg)) @@ -207,7 +207,7 @@ class ImportExportPrefsImpl @Inject constructor( TwoMessagesAlertDialog.showAlert( activity, rh.gs(R.string.import_setting), rh.gs(R.string.import_from) + " " + fileToImport.name + " ?", - rh.gs(info.nightscout.core.ui.R.string.password_preferences_decrypt_prompt), { + rh.gs(app.aaps.core.ui.R.string.password_preferences_decrypt_prompt), { askForMasterPass(activity, R.string.preferences_import_canceled, then) }, null, R.drawable.ic_header_import ) diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt index 843c6b0f44..1eea59411d 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenanceFragment.kt @@ -31,7 +31,7 @@ import app.aaps.core.interfaces.rx.events.EventPreferenceChange import app.aaps.core.interfaces.sync.DataSyncSelectorXdrip import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -116,7 +116,7 @@ class MaintenanceFragment : DaggerFragment() { binding.cleanupDb.setOnClickListener { activity?.let { activity -> var result = "" - OKDialog.showConfirmation(activity, rh.gs(R.string.maintenance), rh.gs(info.nightscout.core.ui.R.string.cleanup_db_confirm), Runnable { + OKDialog.showConfirmation(activity, rh.gs(R.string.maintenance), rh.gs(app.aaps.core.ui.R.string.cleanup_db_confirm), Runnable { disposable += Completable.fromAction { result = persistenceLayer.cleanupDatabase(93, deleteTrackedChanges = true) } .subscribeOn(aapsSchedulers.io) .observeOn(aapsSchedulers.main) @@ -126,8 +126,8 @@ class MaintenanceFragment : DaggerFragment() { if (result.isNotEmpty()) OKDialog.show( activity, - rh.gs(info.nightscout.core.ui.R.string.result), - HtmlHelper.fromHtml("" + rh.gs(info.nightscout.core.ui.R.string.cleared_entries) + "
" + result) + rh.gs(app.aaps.core.ui.R.string.result), + HtmlHelper.fromHtml("" + rh.gs(app.aaps.core.ui.R.string.cleared_entries) + "
" + result) .toSpanned() ) aapsLogger.info(LTag.CORE, "Cleaned up databases with result: $result") @@ -154,7 +154,7 @@ class MaintenanceFragment : DaggerFragment() { binding.navLogsettings.setOnClickListener { startActivity(Intent(activity, LogSettingActivity::class.java)) } binding.exportCsv.setOnClickListener { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.ue_export_to_csv) + "?") { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.ue_export_to_csv) + "?") { uel.log(Action.EXPORT_CSV, Sources.Maintenance) importExportPrefs.exportUserEntriesCsv(activity) } diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenancePlugin.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenancePlugin.kt index c3f18bfe40..6e2a406429 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenancePlugin.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/MaintenancePlugin.kt @@ -45,7 +45,7 @@ class MaintenancePlugin @Inject constructor( .fragmentClass(MaintenanceFragment::class.java.name) .alwaysVisible(false) .alwaysEnabled(true) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_maintenance) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_maintenance) .pluginName(R.string.maintenance) .shortName(R.string.maintenance_shortname) .preferencesId(R.xml.pref_maintenance) diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt index db8e344688..4945d7b8c3 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt @@ -235,9 +235,9 @@ class PrefFileListProviderImpl @Inject constructor( return if (hours == 0) { rh.gs(R.string.exported_less_than_hour_ago) } else if ((hours < 24) && (hours > 0)) { - rh.gs(R.string.exported_ago, rh.gq(info.nightscout.core.ui.R.plurals.hours, hours, hours)) + rh.gs(R.string.exported_ago, rh.gq(app.aaps.core.ui.R.plurals.hours, hours, hours)) } else if ((days < IMPORT_AGE_NOT_YET_OLD_DAYS) && (days > 0)) { - rh.gs(R.string.exported_ago, rh.gq(info.nightscout.core.ui.R.plurals.days, days, days)) + rh.gs(R.string.exported_ago, rh.gq(app.aaps.core.ui.R.plurals.days, days, days)) } else { rh.gs(R.string.exported_at, utcTime.substring(0, 10)) } diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt index 7fb7e8c334..5e3a2fb277 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/CustomWatchfaceImportListActivity.kt @@ -30,7 +30,7 @@ import app.aaps.core.interfaces.rx.weardata.ResFileMap import app.aaps.core.interfaces.rx.weardata.ZipWatchfaceFormat import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.versionChecker.VersionCheckerUtils -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import javax.inject.Inject class CustomWatchfaceImportListActivity : TranslatedDaggerAppCompatActivity() { @@ -104,11 +104,11 @@ class CustomWatchfaceImportListActivity : TranslatedDaggerAppCompatActivity() { author.text = rh.gs(CWF_AUTHOR.label, metadata[CWF_AUTHOR] ?: "") createdAt.text = rh.gs(CWF_CREATED_AT.label, metadata[CWF_CREATED_AT] ?: "") cwfVersion.text = rh.gs(CWF_VERSION.label, metadata[CWF_VERSION] ?: "") - val colorAttr = if (checkCustomVersion(metadata)) info.nightscout.core.ui.R.attr.metadataTextOkColor else info.nightscout.core.ui.R.attr.metadataTextWarningColor + val colorAttr = if (checkCustomVersion(metadata)) app.aaps.core.ui.R.attr.metadataTextOkColor else app.aaps.core.ui.R.attr.metadataTextWarningColor cwfVersion.setTextColor(rh.gac(cwfVersion.context, colorAttr)) val prefExisting = metadata.keys.any { it.isPref } val prefSetting = sp.getBoolean(info.nightscout.core.utils.R.string.key_wear_custom_watchface_autorization, false) - val prefColor = if (prefSetting) info.nightscout.core.ui.R.attr.metadataTextWarningColor else info.nightscout.core.ui.R.attr.importListFileNameColor + val prefColor = if (prefSetting) app.aaps.core.ui.R.attr.metadataTextWarningColor else app.aaps.core.ui.R.attr.importListFileNameColor prefWarning.visibility = (prefExisting && prefSetting).toVisibility() prefInfo.visibility = (prefExisting && !prefSetting).toVisibility() cwfPrefNumber.text = "${metadata.count { it.key.isPref }}" diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/LogSettingActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/LogSettingActivity.kt index a751296691..e4a6199445 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/LogSettingActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/LogSettingActivity.kt @@ -10,7 +10,7 @@ import app.aaps.configuration.databinding.ActivityLogsettingBinding import app.aaps.core.interfaces.logging.L import app.aaps.core.interfaces.logging.LogElement import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import javax.inject.Inject class LogSettingActivity : TranslatedDaggerAppCompatActivity() { diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/PrefImportListActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/PrefImportListActivity.kt index 49524f2944..312ddcb4b2 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/PrefImportListActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/activities/PrefImportListActivity.kt @@ -17,7 +17,7 @@ import app.aaps.configuration.maintenance.data.PrefsStatusImpl import app.aaps.core.interfaces.maintenance.PrefFileListProvider import app.aaps.core.interfaces.maintenance.PrefsFile import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import javax.inject.Inject class PrefImportListActivity : TranslatedDaggerAppCompatActivity() { @@ -84,7 +84,7 @@ class PrefImportListActivity : TranslatedDaggerAppCompatActivity() { prefFile.metadata[PrefsMetadataKeyImpl.AAPS_FLAVOUR]?.let { metaVariantFormat.text = it.value - val colorAttr = if (it.status == PrefsStatusImpl.OK) info.nightscout.core.ui.R.attr.metadataTextOkColor else info.nightscout.core.ui.R.attr.metadataTextWarningColor + val colorAttr = if (it.status == PrefsStatusImpl.OK) app.aaps.core.ui.R.attr.metadataTextOkColor else app.aaps.core.ui.R.attr.metadataTextWarningColor metaVariantFormat.setTextColor(rh.gac(metaVariantFormat.context, colorAttr)) } @@ -94,7 +94,7 @@ class PrefImportListActivity : TranslatedDaggerAppCompatActivity() { prefFile.metadata[PrefsMetadataKeyImpl.AAPS_VERSION]?.let { metaAppVersion.text = it.value - val colorAttr = if (it.status == PrefsStatusImpl.OK) info.nightscout.core.ui.R.attr.metadataTextOkColor else info.nightscout.core.ui.R.attr.metadataTextWarningColor + val colorAttr = if (it.status == PrefsStatusImpl.OK) app.aaps.core.ui.R.attr.metadataTextOkColor else app.aaps.core.ui.R.attr.metadataTextWarningColor metaAppVersion.setTextColor(rh.gac(metaVariantFormat.context, colorAttr)) } diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/dialogs/PrefImportSummaryDialog.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/dialogs/PrefImportSummaryDialog.kt index 57d00a57fd..cbdf7e0b6e 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/dialogs/PrefImportSummaryDialog.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/dialogs/PrefImportSummaryDialog.kt @@ -21,7 +21,7 @@ import app.aaps.configuration.maintenance.data.Prefs import app.aaps.configuration.maintenance.data.PrefsStatusImpl import app.aaps.core.interfaces.extensions.runOnUiThread import com.google.android.material.dialog.MaterialAlertDialogBuilder -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import java.util.LinkedList object PrefImportSummaryDialog { @@ -29,8 +29,8 @@ object PrefImportSummaryDialog { @SuppressLint("InflateParams") fun showSummary(context: Context, importOk: Boolean, importPossible: Boolean, prefs: Prefs, ok: (() -> Unit)?, cancel: (() -> Unit)? = null) { - @StyleRes val theme: Int = if (importOk) info.nightscout.core.ui.R.style.DialogTheme else { - if (importPossible) info.nightscout.core.ui.R.style.AppThemeWarningDialog else info.nightscout.core.ui.R.style.AppThemeErrorDialog + @StyleRes val theme: Int = if (importOk) app.aaps.core.ui.R.style.DialogTheme else { + if (importPossible) app.aaps.core.ui.R.style.AppThemeWarningDialog else app.aaps.core.ui.R.style.AppThemeErrorDialog } @StringRes val messageRes: Int = if (importOk) R.string.check_preferences_before_import else { @@ -38,7 +38,7 @@ object PrefImportSummaryDialog { } @DrawableRes val headerIcon: Int = if (importOk) R.drawable.ic_header_import else { - if (importPossible) info.nightscout.core.ui.R.drawable.ic_header_warning else R.drawable.ic_header_error + if (importPossible) app.aaps.core.ui.R.drawable.ic_header_warning else R.drawable.ic_header_error } val themedCtx = ContextThemeWrapper(context, theme) @@ -92,13 +92,13 @@ object PrefImportSummaryDialog { webView.setBackgroundColor(Color.TRANSPARENT) webView.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null) - MaterialAlertDialogBuilder(context, info.nightscout.core.ui.R.style.DialogTheme) + MaterialAlertDialogBuilder(context, app.aaps.core.ui.R.style.DialogTheme) .setCustomTitle( - info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle( + app.aaps.core.ui.dialogs.AlertDialogHelper.buildCustomTitle( context, context.getString(R.string.check_preferences_details_title), R.drawable.ic_header_log, - info.nightscout.core.ui.R.style.AppTheme + app.aaps.core.ui.R.style.AppTheme ) ) .setView(detailsLayout) @@ -111,7 +111,7 @@ object PrefImportSummaryDialog { val builder = MaterialAlertDialogBuilder(context, theme) .setMessage(context.getString(messageRes)) - .setCustomTitle(info.nightscout.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(R.string.import_setting), headerIcon, theme)) + .setCustomTitle(app.aaps.core.ui.dialogs.AlertDialogHelper.buildCustomTitle(context, context.getString(R.string.import_setting), headerIcon, theme)) .setView(innerLayout) .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface, _: Int -> dialog.dismiss() diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt index 23e6379e27..4274566236 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SWDefinition.kt @@ -216,38 +216,38 @@ class SWDefinition @Inject constructor( .add(SWPreference(injector, this).option(R.xml.pref_datachoices)) private val screenMasterPassword - get() = SWScreen(injector, info.nightscout.core.ui.R.string.master_password) + get() = SWScreen(injector, app.aaps.core.ui.R.string.master_password) .skippable(false) - .add(SWInfoText(injector).label(info.nightscout.core.ui.R.string.master_password)) + .add(SWInfoText(injector).label(app.aaps.core.ui.R.string.master_password)) .add(SWEditEncryptedPassword(injector, cryptoUtil).preferenceId(info.nightscout.core.utils.R.string.key_master_password)) .add(SWBreak(injector)) .add(SWInfoText(injector).label(R.string.master_password_summary)) .validator { !cryptoUtil.checkPassword("", sp.getString(info.nightscout.core.utils.R.string.key_master_password, "")) } private val screenAge - get() = SWScreen(injector, info.nightscout.core.ui.R.string.patient_type) + get() = SWScreen(injector, app.aaps.core.ui.R.string.patient_type) .skippable(false) .add(SWBreak(injector)) .add( SWRadioButton(injector) - .option(info.nightscout.core.ui.R.array.ageArray, info.nightscout.core.utils.R.array.ageValues) + .option(app.aaps.core.ui.R.array.ageArray, info.nightscout.core.utils.R.array.ageValues) .preferenceId(info.nightscout.core.utils.R.string.key_age) - .label(info.nightscout.core.ui.R.string.patient_type) - .comment(info.nightscout.core.ui.R.string.patient_age_summary) + .label(app.aaps.core.ui.R.string.patient_type) + .comment(app.aaps.core.ui.R.string.patient_age_summary) ) .add(SWBreak(injector)) .add( SWEditNumber(injector, 3.0, 0.1, 25.0) .preferenceId(info.nightscout.core.utils.R.string.key_treatmentssafety_maxbolus) .updateDelay(5) - .label(info.nightscout.core.ui.R.string.max_bolus_title) + .label(app.aaps.core.ui.R.string.max_bolus_title) .comment(R.string.common_values) ) .add( SWEditIntNumber(injector, 48, 1, 100) .preferenceId(info.nightscout.core.utils.R.string.key_treatmentssafety_maxcarbs) .updateDelay(5) - .label(info.nightscout.core.ui.R.string.max_carbs_title) + .label(app.aaps.core.ui.R.string.max_carbs_title) .comment(R.string.common_values) ) .validator { @@ -257,7 +257,7 @@ class SWDefinition @Inject constructor( } private val screenInsulin - get() = SWScreen(injector, info.nightscout.core.ui.R.string.configbuilder_insulin) + get() = SWScreen(injector, app.aaps.core.ui.R.string.configbuilder_insulin) .skippable(false) .add(SWPlugin(injector, this).option(PluginType.INSULIN, R.string.configbuilder_insulin_description)) .add(SWBreak(injector)) @@ -290,9 +290,9 @@ class SWDefinition @Inject constructor( .visibility { (activePlugin.activeProfileSource as PluginBase).isEnabled() } private val screenProfileSwitch - get() = SWScreen(injector, info.nightscout.core.ui.R.string.careportal_profileswitch) + get() = SWScreen(injector, app.aaps.core.ui.R.string.careportal_profileswitch) .skippable(false) - .add(SWInfoText(injector).label(info.nightscout.core.ui.R.string.profileswitch_ismissing)) + .add(SWInfoText(injector).label(app.aaps.core.ui.R.string.profileswitch_ismissing)) .add(SWButton(injector) .text(R.string.doprofileswitch) .action { uiInteraction.runProfileSwitchDialog(activity.supportFragmentManager) }) @@ -316,7 +316,7 @@ class SWDefinition @Inject constructor( .visibility { activePlugin.activePump is OmnipodEros }) .add(SWButton(injector) .text(R.string.readstatus) - .action { commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.clicked_connect_to_pump), null) } + .action { commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.clicked_connect_to_pump), null) } .visibility { // Hide for Omnipod and Medtrum, because as we don't require a Pod/Patch to be paired in the setup wizard, // Getting the status might not be possible @@ -353,7 +353,7 @@ class SWDefinition @Inject constructor( .skippable(false) .add( SWRadioButton(injector) - .option(info.nightscout.core.ui.R.array.aps_modeArray, info.nightscout.core.ui.R.array.aps_modeValues) + .option(app.aaps.core.ui.R.array.aps_modeArray, app.aaps.core.ui.R.array.aps_modeValues) .preferenceId(info.nightscout.core.utils.R.string.key_aps_mode).label(R.string.apsmode_title) .comment(R.string.setupwizard_preferred_aps_mode) ) @@ -365,7 +365,7 @@ class SWDefinition @Inject constructor( .add(SWInfoText(injector).label(R.string.setupwizard_loop_description)) .add(SWBreak(injector)) .add(SWButton(injector) - .text(info.nightscout.core.ui.R.string.enableloop) + .text(app.aaps.core.ui.R.string.enableloop) .action { configBuilder.performPluginSwitch(loop as PluginBase, true, PluginType.LOOP) rxBus.send(EventSWUpdate(true)) @@ -383,7 +383,7 @@ class SWDefinition @Inject constructor( .add(SWPlugin(injector, this).option(PluginType.SENSITIVITY, R.string.configbuilder_sensitivity_description)) private val getScreenObjectives - get() = SWScreen(injector, info.nightscout.core.ui.R.string.objectives) + get() = SWScreen(injector, app.aaps.core.ui.R.string.objectives) .skippable(false) .add(SWInfoText(injector).label(R.string.startobjective)) .add(SWBreak(injector)) diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt index dc8ffe7357..a1097b756e 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/SetupWizardActivity.kt @@ -24,8 +24,8 @@ import app.aaps.core.interfaces.rx.events.EventSWUpdate import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.locale.LocaleHelper.update +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.locale.LocaleHelper.update import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt index ce7cfc7c66..f6833f7487 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditEncryptedPassword.kt @@ -29,10 +29,10 @@ class SWEditEncryptedPassword(injector: HasAndroidInjector, private val cryptoUt val isPasswordSet = sp.contains(info.nightscout.core.utils.R.string.key_master_password) && sp.getString(info.nightscout.core.utils.R.string.key_master_password, "") != "" button = Button(context) - button?.setText(info.nightscout.core.ui.R.string.unlock_settings) + button?.setText(app.aaps.core.ui.R.string.unlock_settings) button?.setOnClickListener { scanForActivity(context)?.let { activity -> - passwordCheck.queryPassword(activity, info.nightscout.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password, { + passwordCheck.queryPassword(activity, app.aaps.core.ui.R.string.master_password, info.nightscout.core.utils.R.string.key_master_password, { button?.visibility = View.GONE editText?.visibility = View.VISIBLE editText2?.visibility = View.VISIBLE @@ -72,7 +72,7 @@ class SWEditEncryptedPassword(injector: HasAndroidInjector, private val cryptoUt c2 = TextView(context) c2?.id = View.generateViewId() - c2?.setText(info.nightscout.core.ui.R.string.confirm) + c2?.setText(app.aaps.core.ui.R.string.confirm) c2?.visibility = isPasswordSet.not().toVisibility() layout.addView(c2) diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditIntNumber.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditIntNumber.kt index e7a95a5713..35efaa0638 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditIntNumber.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditIntNumber.kt @@ -8,7 +8,7 @@ import android.widget.LinearLayout import android.widget.TextView import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.NumberPicker import java.text.DecimalFormat class SWEditIntNumber(injector: HasAndroidInjector, private val init: Int, private val min: Int, private val max: Int) : SWItem(injector, Type.NUMBER) { diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumber.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumber.kt index bfa8b305c5..85b7d58a37 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumber.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumber.kt @@ -8,7 +8,7 @@ import android.widget.LinearLayout import android.widget.TextView import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.NumberPicker import java.text.DecimalFormat class SWEditNumber(injector: HasAndroidInjector, private val init: Double, private val min: Double, private val max: Double) : SWItem(injector, Type.DECIMAL_NUMBER) { diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumberWithUnits.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumberWithUnits.kt index 8fe5b31216..4a1a832e00 100644 --- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumberWithUnits.kt +++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/setupwizard/elements/SWEditNumberWithUnits.kt @@ -11,7 +11,7 @@ import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.utils.SafeParse import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.NumberPicker import java.text.DecimalFormat import javax.inject.Inject diff --git a/plugins/configuration/src/main/res/layout/maintenance_fragment.xml b/plugins/configuration/src/main/res/layout/maintenance_fragment.xml index f4104bb3f7..cf024f9a7c 100644 --- a/plugins/configuration/src/main/res/layout/maintenance_fragment.xml +++ b/plugins/configuration/src/main/res/layout/maintenance_fragment.xml @@ -54,7 +54,7 @@ android:padding="10dip" app:columnCount="2"> - - - - - - - - snoozedTo) { - activePlugin.activeOverview.addNotification(Notification.DST_IN_24H, rh.gs(R.string.dst_in_24h_warning), Notification.LOW, info.nightscout.core.ui.R.string.snooze) { + activePlugin.activeOverview.addNotification(Notification.DST_IN_24H, rh.gs(R.string.dst_in_24h_warning), Notification.LOW, app.aaps.core.ui.R.string.snooze) { sp.putLong(R.string.key_snooze_dst_in24h, System.currentTimeMillis() + T.hours(24).msecs()) } } @@ -67,7 +67,7 @@ class DstHelperPlugin @Inject constructor( if (!loop.isSuspended) { val snoozedTo: Long = sp.getLong(R.string.key_snooze_loop_disabled, 0L) if (snoozedTo == 0L || System.currentTimeMillis() > snoozedTo) { - activePlugin.activeOverview.addNotification(Notification.DST_LOOP_DISABLED, rh.gs(R.string.dst_loop_disabled_warning), Notification.LOW, info.nightscout.core.ui.R.string.snooze) { + activePlugin.activeOverview.addNotification(Notification.DST_LOOP_DISABLED, rh.gs(R.string.dst_loop_disabled_warning), Notification.LOW, app.aaps.core.ui.R.string.snooze) { sp.putLong(R.string.key_snooze_loop_disabled, System.currentTimeMillis() + T.hours(24).msecs()) } } diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt index e755909a74..6935bfbb07 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt @@ -28,7 +28,7 @@ import app.aaps.core.interfaces.rx.events.EventSWUpdate import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -168,7 +168,7 @@ class ObjectivesFragment : DaggerFragment() { } else holder.binding.gate.visibility = View.GONE if (!objective.isStarted) { - holder.binding.gate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + holder.binding.gate.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) holder.binding.verify.visibility = View.GONE holder.binding.progress.visibility = View.GONE holder.binding.accomplished.visibility = View.GONE @@ -181,7 +181,7 @@ class ObjectivesFragment : DaggerFragment() { else holder.binding.start.visibility = View.GONE } else if (objective.isAccomplished) { - holder.binding.gate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.isAccomplishedColor)) + holder.binding.gate.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.isAccomplishedColor)) holder.binding.verify.visibility = View.GONE holder.binding.progress.visibility = View.GONE holder.binding.start.visibility = View.GONE @@ -197,7 +197,7 @@ class ObjectivesFragment : DaggerFragment() { } } } else if (objective.isStarted) { - holder.binding.gate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + holder.binding.gate.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) holder.binding.verify.visibility = View.VISIBLE holder.binding.verify.isEnabled = objective.isCompleted || binding.fake.isChecked holder.binding.start.visibility = View.GONE @@ -213,7 +213,7 @@ class ObjectivesFragment : DaggerFragment() { // name val name = TextView(holder.binding.progress.context) name.text = "${rh.gs(task.task)}:" - name.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + name.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) holder.binding.progress.addView(name, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT) // hint task.hints.forEach { h -> @@ -222,12 +222,12 @@ class ObjectivesFragment : DaggerFragment() { } // state val state = TextView(holder.binding.progress.context) - state.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + state.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) val basicHTML = "%2\$s" val formattedHTML = String.format( basicHTML, - if (task.isCompleted()) rh.gac(context, info.nightscout.core.ui.R.attr.isCompletedColor) else rh.gac(context, info.nightscout.core.ui.R.attr.isNotCompletedColor), + if (task.isCompleted()) rh.gac(context, app.aaps.core.ui.R.attr.isCompletedColor) else rh.gac(context, app.aaps.core.ui.R.attr.isNotCompletedColor), task.progress ) state.text = HtmlHelper.fromHtml(formattedHTML) @@ -256,12 +256,12 @@ class ObjectivesFragment : DaggerFragment() { } // horizontal line val separator = View(holder.binding.progress.context) - separator.setBackgroundColor(rh.gac(context, info.nightscout.core.ui.R.attr.separatorColor)) + separator.setBackgroundColor(rh.gac(context, app.aaps.core.ui.R.attr.separatorColor)) holder.binding.progress.addView(separator, LinearLayout.LayoutParams.MATCH_PARENT, 2) } } holder.binding.accomplished.text = rh.gs(R.string.accomplished, dateUtil.dateAndTimeString(objective.accomplishedOn)) - holder.binding.accomplished.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + holder.binding.accomplished.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) holder.binding.verify.setOnClickListener { receiverStatusStore.updateNetworkStatus() if (binding.fake.isChecked) { @@ -274,7 +274,7 @@ class ObjectivesFragment : DaggerFragment() { // move out of UI thread handler.post { NtpProgressDialog().show((context as AppCompatActivity).supportFragmentManager, "NtpCheck") - rxBus.send(EventNtpStatus(rh.gs(info.nightscout.core.ui.R.string.timedetection), 0)) + rxBus.send(EventNtpStatus(rh.gs(app.aaps.core.ui.R.string.timedetection), 0)) sntpClient.ntpTime(object : SntpClient.Callback() { override fun run() { aapsLogger.debug("NTP time: $time System time: ${dateUtil.now()}") @@ -284,7 +284,7 @@ class ObjectivesFragment : DaggerFragment() { } else if (success) { if (objective.isCompleted(time)) { objective.accomplishedOn = time - rxBus.send(EventNtpStatus(rh.gs(info.nightscout.core.ui.R.string.success), 100)) + rxBus.send(EventNtpStatus(rh.gs(app.aaps.core.ui.R.string.success), 100)) SystemClock.sleep(1000) rxBus.send(EventObjectivesUpdateGui()) rxBus.send(EventSWUpdate(false)) @@ -313,7 +313,7 @@ class ObjectivesFragment : DaggerFragment() { // move out of UI thread handler.post { NtpProgressDialog().show((context as AppCompatActivity).supportFragmentManager, "NtpCheck") - rxBus.send(EventNtpStatus(rh.gs(info.nightscout.core.ui.R.string.timedetection), 0)) + rxBus.send(EventNtpStatus(rh.gs(app.aaps.core.ui.R.string.timedetection), 0)) sntpClient.ntpTime(object : SntpClient.Callback() { override fun run() { aapsLogger.debug("NTP time: $time System time: ${dateUtil.now()}") @@ -322,7 +322,7 @@ class ObjectivesFragment : DaggerFragment() { rxBus.send(EventNtpStatus(rh.gs(R.string.notconnected), 99)) } else if (success) { objective.startedOn = time - rxBus.send(EventNtpStatus(rh.gs(info.nightscout.core.ui.R.string.success), 100)) + rxBus.send(EventNtpStatus(rh.gs(app.aaps.core.ui.R.string.success), 100)) SystemClock.sleep(1000) rxBus.send(EventObjectivesUpdateGui()) rxBus.send(EventSWUpdate(false)) @@ -337,7 +337,7 @@ class ObjectivesFragment : DaggerFragment() { } holder.binding.unstart.setOnClickListener { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.objectives), rh.gs(R.string.doyouwantresetstart), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.objectives), rh.gs(R.string.doyouwantresetstart), Runnable { uel.log( Action.OBJECTIVE_UNSTARTED, Sources.Objectives, ValueWithUnit.SimpleInt(position + 1) diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt index aa1ad37018..3e058cb88c 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesPlugin.kt @@ -49,8 +49,8 @@ class ObjectivesPlugin @Inject constructor( .fragmentClass(ObjectivesFragment::class.qualifiedName) .alwaysEnabled(config.APS) .showInList(config.APS) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_graduation) - .pluginName(info.nightscout.core.ui.R.string.objectives) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_graduation) + .pluginName(app.aaps.core.ui.R.string.objectives) .shortName(R.string.objectives_shortname) .description(R.string.description_objectives), aapsLogger, rh, injector diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt index 06566cbd0e..8e7c451e01 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/activities/ObjectivesExamDialog.kt @@ -9,7 +9,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerDialogFragment -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.plugins.constraints.R import info.nightscout.plugins.constraints.databinding.ObjectivesExamFragmentBinding import info.nightscout.plugins.constraints.objectives.events.EventObjectivesUpdateGui diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt index 3879eee0a8..c86be2321a 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/dialogs/NtpProgressDialog.kt @@ -52,14 +52,14 @@ class NtpProgressDialog : DaggerDialogFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - val defaultMessage = rh.gs(info.nightscout.core.ui.R.string.timedetection) - dialog?.setTitle(rh.gs(info.nightscout.core.ui.R.string.objectives)) + val defaultMessage = rh.gs(app.aaps.core.ui.R.string.timedetection) + dialog?.setTitle(rh.gs(app.aaps.core.ui.R.string.objectives)) binding.stop.setOnClickListener { dismiss() } binding.status.text = state ?: defaultMessage binding.progressbar.max = 100 binding.progressbar.progress = percent - binding.stop.text = rh.gs(info.nightscout.core.ui.R.string.close) - binding.title.text = rh.gs(info.nightscout.core.ui.R.string.please_wait) + binding.stop.text = rh.gs(app.aaps.core.ui.R.string.close) + binding.title.text = rh.gs(app.aaps.core.ui.R.string.please_wait) } override fun onResume() { diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt index 2ec258e2c8..600d0f975a 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective.kt @@ -121,9 +121,9 @@ abstract class Objective(injector: HasAndroidInjector, spName: String, @StringRe val hours = floor(duration.toDouble() / T.hours(1).msecs()).toInt() val minutes = floor(duration.toDouble() / T.mins(1).msecs()).toInt() return when { - days > 0 -> rh.gq(info.nightscout.core.ui.R.plurals.days, days, days) - hours > 0 -> rh.gq(info.nightscout.core.ui.R.plurals.hours, hours, hours) - else -> rh.gq(info.nightscout.core.ui.R.plurals.minutes, minutes, minutes) + days > 0 -> rh.gq(app.aaps.core.ui.R.plurals.days, days, days) + hours > 0 -> rh.gq(app.aaps.core.ui.R.plurals.hours, hours, hours) + else -> rh.gq(app.aaps.core.ui.R.plurals.minutes, minutes, minutes) } } } diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt index fe2c9164c1..c8bb09cafb 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective0.kt @@ -32,7 +32,7 @@ class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R return activePlugin.firstActiveSync?.hasWritePermission == true || tidepoolPlugin?.hasWritePermission == true } }) - tasks.add(object : Task(this, info.nightscout.core.ui.R.string.virtualpump_uploadstatus_title) { + tasks.add(object : Task(this, app.aaps.core.ui.R.string.virtualpump_uploadstatus_title) { override fun isCompleted(): Boolean { return sp.getBoolean(info.nightscout.core.utils.R.string.key_virtual_pump_upload_status, false) || tidepoolPlugin?.hasWritePermission == true } @@ -64,7 +64,7 @@ class Objective0(injector: HasAndroidInjector) : Objective(injector, "config", R return (usedAPS as PluginBase).isEnabled() } }) - tasks.add(object : Task(this, info.nightscout.core.ui.R.string.activate_profile) { + tasks.add(object : Task(this, app.aaps.core.ui.R.string.activate_profile) { override fun isCompleted(): Boolean { return persistenceLayer.getEffectiveProfileSwitchActiveAt(dateUtil.now()).blockingGet() is ValueWrapper.Existing } diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt index 9033d03704..634f5761f4 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/objectives/objectives/Objective2.kt @@ -215,7 +215,7 @@ class Objective2(injector: HasAndroidInjector) : Objective(injector, "exam", R.s .option(Option(R.string.wrongcarbs_donothing, false)) ) tasks.add( - ExamTask(this, info.nightscout.core.ui.R.string.iob_label, R.string.blank, "iob") + ExamTask(this, app.aaps.core.ui.R.string.iob_label, R.string.blank, "iob") .option(Option(R.string.iob_value, true)) .option(Option(R.string.iob_hightemp, false)) .option(Option(R.string.iob_negiob, true)) @@ -270,8 +270,8 @@ class Objective2(injector: HasAndroidInjector) : Objective(injector, "exam", R.s ) tasks.add( ExamTask(this, R.string.other_medication_label, R.string.other_medication_text, "otherMedicationWarning") - .option(Option(info.nightscout.core.ui.R.string.yes, true)) - .option(Option(info.nightscout.core.ui.R.string.no, false)) + .option(Option(app.aaps.core.ui.R.string.yes, true)) + .option(Option(app.aaps.core.ui.R.string.no, false)) ) for (task in tasks) (task as ExamTask).options.shuffle() diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt index 71160a7185..aa2c3df943 100644 --- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt +++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/safety/SafetyPlugin.kt @@ -97,13 +97,13 @@ class SafetyPlugin @Inject constructor( } override fun applyBasalConstraints(absoluteRate: Constraint, profile: Profile): Constraint { - absoluteRate.setIfGreater(0.0, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, 0.0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this) - absoluteRate.setIfSmaller(hardLimits.maxBasal(), rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, hardLimits.maxBasal(), rh.gs(R.string.hardlimit)), this) + absoluteRate.setIfGreater(0.0, rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, 0.0, rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)), this) + absoluteRate.setIfSmaller(hardLimits.maxBasal(), rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, hardLimits.maxBasal(), rh.gs(R.string.hardlimit)), this) val pump = activePlugin.activePump // check for pump max if (pump.pumpDescription.tempBasalStyle == PumpDescription.ABSOLUTE) { val pumpLimit = pump.pumpDescription.pumpType.tbrSettings?.maxDose ?: 0.0 - absoluteRate.setIfSmaller(pumpLimit, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, pumpLimit, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this) + absoluteRate.setIfSmaller(pumpLimit, rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, pumpLimit, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this) } // do rounding @@ -129,38 +129,38 @@ class SafetyPlugin @Inject constructor( percentRateAfterConst = if (percentRateAfterConst < 100) Round.ceilTo(percentRateAfterConst.toDouble(), pump.pumpDescription.tempPercentStep.toDouble()) .toInt() else Round.floorTo(percentRateAfterConst.toDouble(), pump.pumpDescription.tempPercentStep.toDouble()).toInt() - percentRate.set(percentRateAfterConst, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, percentRateAfterConst, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this) + percentRate.set(percentRateAfterConst, rh.gs(app.aaps.core.ui.R.string.limitingpercentrate, percentRateAfterConst, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this) if (pump.pumpDescription.tempBasalStyle == PumpDescription.PERCENT) { val pumpLimit = pump.pumpDescription.pumpType.tbrSettings?.maxDose ?: 0.0 - percentRate.setIfSmaller(pumpLimit.toInt(), rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, pumpLimit, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this) + percentRate.setIfSmaller(pumpLimit.toInt(), rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, pumpLimit, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this) } return percentRate } override fun applyBolusConstraints(insulin: Constraint): Constraint { - insulin.setIfGreater(0.0, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, 0.0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this) + insulin.setIfGreater(0.0, rh.gs(app.aaps.core.ui.R.string.limitingbolus, 0.0, rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)), this) val maxBolus = sp.getDouble(info.nightscout.core.utils.R.string.key_treatmentssafety_maxbolus, 3.0) - insulin.setIfSmaller(maxBolus, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, maxBolus, rh.gs(R.string.maxvalueinpreferences)), this) - insulin.setIfSmaller(hardLimits.maxBolus(), rh.gs(info.nightscout.core.ui.R.string.limitingbolus, hardLimits.maxBolus(), rh.gs(R.string.hardlimit)), this) + insulin.setIfSmaller(maxBolus, rh.gs(app.aaps.core.ui.R.string.limitingbolus, maxBolus, rh.gs(R.string.maxvalueinpreferences)), this) + insulin.setIfSmaller(hardLimits.maxBolus(), rh.gs(app.aaps.core.ui.R.string.limitingbolus, hardLimits.maxBolus(), rh.gs(R.string.hardlimit)), this) val pump = activePlugin.activePump val rounded = pump.pumpDescription.pumpType.determineCorrectBolusSize(insulin.value()) - insulin.setIfDifferent(rounded, rh.gs(info.nightscout.core.ui.R.string.pumplimit), this) + insulin.setIfDifferent(rounded, rh.gs(app.aaps.core.ui.R.string.pumplimit), this) return insulin } override fun applyExtendedBolusConstraints(insulin: Constraint): Constraint { - insulin.setIfGreater(0.0, rh.gs(R.string.limitingextendedbolus, 0.0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this) + insulin.setIfGreater(0.0, rh.gs(R.string.limitingextendedbolus, 0.0, rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)), this) val maxBolus = sp.getDouble(info.nightscout.core.utils.R.string.key_treatmentssafety_maxbolus, 3.0) insulin.setIfSmaller(maxBolus, rh.gs(R.string.limitingextendedbolus, maxBolus, rh.gs(R.string.maxvalueinpreferences)), this) insulin.setIfSmaller(hardLimits.maxBolus(), rh.gs(R.string.limitingextendedbolus, hardLimits.maxBolus(), rh.gs(R.string.hardlimit)), this) val pump = activePlugin.activePump val rounded = pump.pumpDescription.pumpType.determineCorrectExtendedBolusSize(insulin.value()) - insulin.setIfDifferent(rounded, rh.gs(info.nightscout.core.ui.R.string.pumplimit), this) + insulin.setIfDifferent(rounded, rh.gs(app.aaps.core.ui.R.string.pumplimit), this) return insulin } override fun applyCarbsConstraints(carbs: Constraint): Constraint { - carbs.setIfGreater(0, rh.gs(R.string.limitingcarbs, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this) + carbs.setIfGreater(0, rh.gs(R.string.limitingcarbs, 0, rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)), this) val maxCarbs = sp.getInt(info.nightscout.core.utils.R.string.key_treatmentssafety_maxcarbs, 48) carbs.setIfSmaller(maxCarbs, rh.gs(R.string.limitingcarbs, maxCarbs, rh.gs(R.string.maxvalueinpreferences)), this) return carbs @@ -170,7 +170,7 @@ class SafetyPlugin @Inject constructor( val apsMode = ApsMode.fromString(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name)) if (apsMode == ApsMode.LGS) maxIob.setIfSmaller( HardLimits.MAX_IOB_LGS, - rh.gs(info.nightscout.core.ui.R.string.limiting_iob, HardLimits.MAX_IOB_LGS, rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend)), + rh.gs(app.aaps.core.ui.R.string.limiting_iob, HardLimits.MAX_IOB_LGS, rh.gs(app.aaps.core.ui.R.string.lowglucosesuspend)), this ) return maxIob diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt index f109e238b5..81ff45315f 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt @@ -98,29 +98,29 @@ class ConstraintsCheckerImplTest : TestBaseWithProfile() { fun prepare() { `when`(rh.gs(info.nightscout.plugins.constraints.R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences") - `when`(rh.gs(info.nightscout.core.ui.R.string.no_valid_basal_rate)).thenReturn("No valid basal rate read from pump") + `when`(rh.gs(app.aaps.core.ui.R.string.no_valid_basal_rate)).thenReturn("No valid basal rate read from pump") `when`(rh.gs(info.nightscout.plugins.aps.R.string.autosens_disabled_in_preferences)).thenReturn("Autosens disabled in preferences") `when`(rh.gs(info.nightscout.plugins.aps.R.string.smb_disabled_in_preferences)).thenReturn("SMB disabled in preferences") - `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit") - `when`(rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") + `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") + `when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.maxvalueinpreferences)).thenReturn("max value in preferences") `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_basal_multiplier)).thenReturn("max basal multiplier") `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_daily_basal_multiplier)).thenReturn("max daily basal multiplier") - `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %.1f U because of %s") + `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %.1f U because of %s") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.hardlimit)).thenReturn("hard limit") `when`(rh.gs(info.nightscout.core.utils.R.string.key_child)).thenReturn("child") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.limitingcarbs)).thenReturn("Limiting carbs to %d g because of %s") `when`(rh.gs(info.nightscout.plugins.aps.R.string.limiting_iob)).thenReturn("Limiting IOB to %.1f U because of %s") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") - `when`(rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode") - `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit") + `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") `when`(context.getString(info.nightscout.pump.combo.R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.objectivenotstarted)).thenReturn("Objective %1\$d not started") diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt index 251a34e610..e2eaa9c7f9 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt @@ -51,16 +51,16 @@ class SafetyPluginTest : TestBaseWithProfile() { @BeforeEach fun prepare() { `when`(rh.gs(info.nightscout.plugins.constraints.R.string.hardlimit)).thenReturn("hard limit") - `when`(rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") - `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit") + `when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") + `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.maxvalueinpreferences)).thenReturn("max value in preferences") `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_daily_basal_multiplier)).thenReturn("max daily basal multiplier") `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_basal_multiplier)).thenReturn("max basal multiplier") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") - `when`(rh.gs(info.nightscout.core.ui.R.string.limiting_iob)).thenReturn("Limiting IOB to %1\$.1f U because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limiting_iob)).thenReturn("Limiting IOB to %1\$.1f U because of %2\$s") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.limitingcarbs)).thenReturn("Limiting carbs to %1\$d g because of %2\$s") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.pumpisnottempbasalcapable)).thenReturn("Pump is not temp basal capable") `when`(rh.gs(info.nightscout.plugins.aps.R.string.increasing_max_basal)).thenReturn("Increasing max basal value because setting is lower than your max basal in profile") `when`(rh.gs(info.nightscout.plugins.aps.R.string.smb_disabled_in_preferences)).thenReturn("SMB disabled in preferences") @@ -69,7 +69,7 @@ class SafetyPluginTest : TestBaseWithProfile() { `when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbnotallowedinopenloopmode)).thenReturn("SMB not allowed in open loop mode") `when`(rh.gs(info.nightscout.core.utils.R.string.key_child)).thenReturn("child") - `when`(rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend)).thenReturn("Low Glucose Suspend") + `when`(rh.gs(app.aaps.core.ui.R.string.lowglucosesuspend)).thenReturn("Low Glucose Suspend") `when`(activePlugin.activePump).thenReturn(virtualPumpPlugin) `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription) diff --git a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinFragment.kt b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinFragment.kt index 6093fad6f4..e4c649181f 100644 --- a/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinFragment.kt +++ b/plugins/insulin/src/main/java/info/nightscout/insulin/InsulinFragment.kt @@ -33,7 +33,7 @@ class InsulinFragment : DaggerFragment() { super.onResume() binding.name.text = activePlugin.activeInsulin.friendlyName binding.comment.text = activePlugin.activeInsulin.comment - binding.dia.text = rh.gs(info.nightscout.core.ui.R.string.dia) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_hours, activePlugin.activeInsulin.dia) + binding.dia.text = rh.gs(app.aaps.core.ui.R.string.dia) + ": " + rh.gs(app.aaps.core.ui.R.string.format_hours, activePlugin.activeInsulin.dia) binding.graph.show(activePlugin.activeInsulin) } diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt index c5612f4a9a..1990619dbf 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt @@ -35,9 +35,9 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.UIRunnable -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.elements.SingleClickButton +import app.aaps.core.ui.UIRunnable +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.elements.SingleClickButton import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -114,7 +114,7 @@ class ActionsFragment : DaggerFragment() { activity?.let { activity -> protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { OKDialog.showConfirmation( - activity, rh.gs(info.nightscout.core.ui.R.string.extended_bolus), rh.gs(R.string.ebstopsloop), + activity, rh.gs(app.aaps.core.ui.R.string.extended_bolus), rh.gs(R.string.ebstopsloop), Runnable { uiInteraction.runExtendedBolusDialog(childFragmentManager) }, null @@ -128,7 +128,7 @@ class ActionsFragment : DaggerFragment() { commandQueue.cancelExtended(object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.extendedbolusdeliveryerror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.extendedbolusdeliveryerror), app.aaps.core.ui.R.raw.boluserror) } } }) @@ -148,7 +148,7 @@ class ActionsFragment : DaggerFragment() { commandQueue.cancelTempBasal(true, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error), app.aaps.core.ui.R.raw.boluserror) } } }) @@ -162,25 +162,25 @@ class ActionsFragment : DaggerFragment() { binding.historyBrowser.setOnClickListener { startActivity(Intent(context, uiInteraction.historyBrowseActivity)) } binding.tddStats.setOnClickListener { startActivity(Intent(context, uiInteraction.tddStatsActivity)) } binding.bgCheck.setOnClickListener { - uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.BGCHECK, info.nightscout.core.ui.R.string.careportal_bgcheck) + uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.BGCHECK, app.aaps.core.ui.R.string.careportal_bgcheck) } binding.cgmSensorInsert.setOnClickListener { - uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.SENSOR_INSERT, info.nightscout.core.ui.R.string.cgm_sensor_insert) + uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.SENSOR_INSERT, app.aaps.core.ui.R.string.cgm_sensor_insert) } binding.pumpBatteryChange.setOnClickListener { - uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.BATTERY_CHANGE, info.nightscout.core.ui.R.string.pump_battery_change) + uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.BATTERY_CHANGE, app.aaps.core.ui.R.string.pump_battery_change) } binding.note.setOnClickListener { - uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.NOTE, info.nightscout.core.ui.R.string.careportal_note) + uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.NOTE, app.aaps.core.ui.R.string.careportal_note) } binding.exercise.setOnClickListener { - uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.EXERCISE, info.nightscout.core.ui.R.string.careportal_exercise) + uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.EXERCISE, app.aaps.core.ui.R.string.careportal_exercise) } binding.question.setOnClickListener { - uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.QUESTION, info.nightscout.core.ui.R.string.careportal_question) + uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.QUESTION, app.aaps.core.ui.R.string.careportal_question) } binding.announcement.setOnClickListener { - uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.ANNOUNCEMENT, info.nightscout.core.ui.R.string.careportal_announcement) + uiInteraction.runCareDialog(childFragmentManager, UiInteraction.EventType.ANNOUNCEMENT, app.aaps.core.ui.R.string.careportal_announcement) } sp.putBoolean(info.nightscout.core.utils.R.string.key_objectiveuseactions, true) @@ -245,7 +245,7 @@ class ActionsFragment : DaggerFragment() { binding.extendedBolus.visibility = View.GONE binding.extendedBolusCancel.visibility = View.VISIBLE @Suppress("SetTextI18n") - binding.extendedBolusCancel.text = rh.gs(info.nightscout.core.ui.R.string.cancel) + " " + activeExtendedBolus.value.toStringMedium(dateUtil, decimalFormatter) + binding.extendedBolusCancel.text = rh.gs(app.aaps.core.ui.R.string.cancel) + " " + activeExtendedBolus.value.toStringMedium(dateUtil, decimalFormatter) } else { binding.extendedBolus.visibility = View.VISIBLE binding.extendedBolusCancel.visibility = View.GONE @@ -261,7 +261,7 @@ class ActionsFragment : DaggerFragment() { binding.setTempBasal.visibility = View.GONE binding.cancelTempBasal.visibility = View.VISIBLE @Suppress("SetTextI18n") - binding.cancelTempBasal.text = rh.gs(info.nightscout.core.ui.R.string.cancel) + " " + activeTemp.toStringShort(decimalFormatter) + binding.cancelTempBasal.text = rh.gs(app.aaps.core.ui.R.string.cancel) + " " + activeTemp.toStringShort(decimalFormatter) } else { binding.setTempBasal.visibility = View.VISIBLE binding.cancelTempBasal.visibility = View.GONE @@ -309,7 +309,7 @@ class ActionsFragment : DaggerFragment() { for (customAction in customActions) { if (!customAction.isEnabled) continue - val btn = SingleClickButton(currentContext, null, info.nightscout.core.ui.R.attr.customBtnStyle) + val btn = SingleClickButton(currentContext, null, app.aaps.core.ui.R.attr.customBtnStyle) btn.text = rh.gs(customAction.name) val layoutParams = LinearLayout.LayoutParams( diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt index 3aac79dd07..b88d16144a 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt @@ -23,8 +23,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventFoodDatabaseChanged import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.UIRunnable -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.UIRunnable +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.database.entities.Food import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -72,8 +72,8 @@ class FoodFragment : DaggerFragment() { binding.filterInputLayout.setEndIconOnClickListener { binding.filter.setText("") - binding.categoryList.setText(rh.gs(info.nightscout.core.ui.R.string.none), false) - binding.subcategoryList.setText(rh.gs(info.nightscout.core.ui.R.string.none), false) + binding.categoryList.setText(rh.gs(app.aaps.core.ui.R.string.none), false) + binding.subcategoryList.setText(rh.gs(app.aaps.core.ui.R.string.none), false) filterData() } binding.categoryList.onItemClickListener = AdapterView.OnItemClickListener { _, _, _, _ -> fillSubcategories(); filterData() } @@ -132,17 +132,17 @@ class FoodFragment : DaggerFragment() { } // make it unique val categories = ArrayList(catSet) - categories.add(0, rh.gs(info.nightscout.core.ui.R.string.none)) + categories.add(0, rh.gs(app.aaps.core.ui.R.string.none)) context?.let { context -> - binding.categoryList.setAdapter(ArrayAdapter(context, info.nightscout.core.ui.R.layout.spinner_centered, categories)) - binding.categoryList.setText(rh.gs(info.nightscout.core.ui.R.string.none), false) + binding.categoryList.setAdapter(ArrayAdapter(context, app.aaps.core.ui.R.layout.spinner_centered, categories)) + binding.categoryList.setText(rh.gs(app.aaps.core.ui.R.string.none), false) } } private fun fillSubcategories() { val categoryFilter = binding.categoryList.text.toString() val subCatSet: MutableSet = HashSet() - if (categoryFilter != rh.gs(info.nightscout.core.ui.R.string.none)) { + if (categoryFilter != rh.gs(app.aaps.core.ui.R.string.none)) { for (f in unfiltered) { if (f.category != null && f.category == categoryFilter) { val subCategory = f.subCategory @@ -152,10 +152,10 @@ class FoodFragment : DaggerFragment() { } // make it unique val subcategories = ArrayList(subCatSet) - subcategories.add(0, rh.gs(info.nightscout.core.ui.R.string.none)) + subcategories.add(0, rh.gs(app.aaps.core.ui.R.string.none)) context?.let { context -> - binding.subcategoryList.setAdapter(ArrayAdapter(context, info.nightscout.core.ui.R.layout.spinner_centered, subcategories)) - binding.subcategoryList.setText(rh.gs(info.nightscout.core.ui.R.string.none), false) + binding.subcategoryList.setAdapter(ArrayAdapter(context, app.aaps.core.ui.R.layout.spinner_centered, subcategories)) + binding.subcategoryList.setText(rh.gs(app.aaps.core.ui.R.string.none), false) } } @@ -166,8 +166,8 @@ class FoodFragment : DaggerFragment() { val newFiltered = ArrayList() for (f in unfiltered) { if (f.category == null || f.subCategory == null) continue - if (subcategoryFilter != rh.gs(info.nightscout.core.ui.R.string.none) && f.subCategory != subcategoryFilter) continue - if (categoryFilter != rh.gs(info.nightscout.core.ui.R.string.none) && f.category != categoryFilter) continue + if (subcategoryFilter != rh.gs(app.aaps.core.ui.R.string.none) && f.subCategory != subcategoryFilter) continue + if (categoryFilter != rh.gs(app.aaps.core.ui.R.string.none) && f.category != categoryFilter) continue if (textFilter != "" && !f.name.lowercase(Locale.getDefault()).contains(textFilter.lowercase(Locale.getDefault()))) continue newFiltered.add(f) } @@ -189,10 +189,10 @@ class FoodFragment : DaggerFragment() { val food = foodList[position] holder.binding.name.text = food.name holder.binding.portion.text = food.portion.toString() + food.unit - holder.binding.carbs.text = food.carbs.toString() + rh.gs(info.nightscout.core.ui.R.string.shortgramm) - holder.binding.fat.text = rh.gs(R.string.short_fat) + ": " + food.fat + rh.gs(info.nightscout.core.ui.R.string.shortgramm) + holder.binding.carbs.text = food.carbs.toString() + rh.gs(app.aaps.core.ui.R.string.shortgramm) + holder.binding.fat.text = rh.gs(R.string.short_fat) + ": " + food.fat + rh.gs(app.aaps.core.ui.R.string.shortgramm) holder.binding.fat.visibility = food.fat.isNotZero().toVisibility() - holder.binding.protein.text = rh.gs(R.string.short_protein) + ": " + food.protein + rh.gs(info.nightscout.core.ui.R.string.shortgramm) + holder.binding.protein.text = rh.gs(R.string.short_protein) + ": " + food.protein + rh.gs(app.aaps.core.ui.R.string.shortgramm) holder.binding.protein.visibility = food.protein.isNotZero().toVisibility() holder.binding.energy.text = rh.gs(R.string.short_energy) + ": " + food.energy + rh.gs(R.string.short_kilo_joul) holder.binding.energy.visibility = food.energy.isNotZero().toVisibility() @@ -210,7 +210,7 @@ class FoodFragment : DaggerFragment() { binding.icRemove.setOnClickListener { v: View -> val food = v.tag as Food activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.removerecord) + "\n" + food.name, { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.removerecord) + "\n" + food.name, { uel.log(Action.FOOD_REMOVED, Sources.Food, food.name) disposable += repository.runTransactionForResult(InvalidateFoodTransaction(food.id)) .subscribe( diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt index 3b82059259..349a7055ce 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewFragment.kt @@ -86,10 +86,10 @@ import app.aaps.core.interfaces.utils.TrendCalculator import com.jjoe64.graphview.GraphView import dagger.android.HasAndroidInjector import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.UIRunnable -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.elements.SingleClickButton -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.UIRunnable +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.elements.SingleClickButton +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -190,13 +190,13 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList smallHeight = screenHeight <= Constants.SMALL_HEIGHT val landscape = screenHeight < screenWidth - skinProvider.activeSkin().preProcessLandscapeOverviewLayout(binding, landscape, rh.gb(info.nightscout.core.ui.R.bool.isTablet), smallHeight) + skinProvider.activeSkin().preProcessLandscapeOverviewLayout(binding, landscape, rh.gb(app.aaps.core.ui.R.bool.isTablet), smallHeight) binding.nsclientCard.visibility = config.NSCLIENT.toVisibility() binding.notifications.setHasFixedSize(false) binding.notifications.layoutManager = LinearLayoutManager(view.context) axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80 - binding.graphsLayout.bgGraph.gridLabelRenderer?.gridColor = rh.gac(context, info.nightscout.core.ui.R.attr.graphGrid) + binding.graphsLayout.bgGraph.gridLabelRenderer?.gridColor = rh.gac(context, app.aaps.core.ui.R.attr.graphGrid) binding.graphsLayout.bgGraph.gridLabelRenderer?.reloadStyles() binding.graphsLayout.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth binding.graphsLayout.bgGraph.layoutParams?.height = rh.dpToPx(skinProvider.activeSkin().mainGraphHeight) @@ -440,7 +440,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList if (lastRun?.lastAPSRun != null && lastRun.constraintsProcessed?.isChangeRequested == true) { protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable { if (isAdded) - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned() + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.tempbasal_label), lastRun.constraintsProcessed?.toSpanned() ?: "".toSpanned(), { uel.log(Action.ACCEPTS_TEMP_BASAL, Sources.Overview) (context?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager?)?.cancel(Constants.notificationID) @@ -519,7 +519,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(quickWizardEntry.carbs(), aapsLogger)).value() activity?.let { if (abs(wizard.insulinAfterConstraints - wizard.calculatedTotalInsulin) >= pump.pumpDescription.pumpType.determineCorrectBolusStepSize(wizard.insulinAfterConstraints) || carbsAfterConstraints != quickWizardEntry.carbs()) { - OKDialog.show(it, rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror), rh.gs(R.string.constraints_violation) + "\n" + rh.gs(R.string.change_your_input)) + OKDialog.show(it, rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror), rh.gs(R.string.constraints_violation) + "\n" + rh.gs(R.string.change_your_input)) return } wizard.confirmAndExecute(it) @@ -544,7 +544,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList binding.buttonsLayout.quickWizardButton.visibility = View.VISIBLE val wizard = quickWizardEntry.doCalc(profile, profileName, lastBG) binding.buttonsLayout.quickWizardButton.text = quickWizardEntry.buttonText() + "\n" + rh.gs(app.aaps.core.main.R.string.format_carbs, quickWizardEntry.carbs()) + - " " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.calculatedTotalInsulin) + " " + rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.calculatedTotalInsulin) if (wizard.calculatedTotalInsulin <= 0) binding.buttonsLayout.quickWizardButton.visibility = View.GONE } else binding.buttonsLayout.quickWizardButton.visibility = View.GONE } @@ -586,16 +586,16 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_byoda), null, null) for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) { drawable?.mutate() - drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, info.nightscout.core.ui.R.attr.cgmDexColor), PorterDuff.Mode.SRC_IN) + drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, app.aaps.core.ui.R.attr.cgmDexColor), PorterDuff.Mode.SRC_IN) } - binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.cgmDexColor)) + binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.cgmDexColor)) } else if (xDripIsBgSource) { binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(app.aaps.core.main.R.drawable.ic_xdrip), null, null) for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) { drawable?.mutate() - drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, info.nightscout.core.ui.R.attr.cgmXdripColor), PorterDuff.Mode.SRC_IN) + drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, app.aaps.core.ui.R.attr.cgmXdripColor), PorterDuff.Mode.SRC_IN) } - binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.cgmXdripColor)) + binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.cgmXdripColor)) } binding.buttonsLayout.cgmButton.visibility = (sp.getBoolean(R.string.key_show_cgm_button, false) && (xDripIsBgSource || dexcomIsSource)).toVisibility() @@ -606,13 +606,13 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList for (event in events) if (event.isEnabled && event.canRun()) context?.let { context -> - SingleClickButton(context, null, info.nightscout.core.ui.R.attr.customBtnStyle).also { - it.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.treatmentButton)) + SingleClickButton(context, null, app.aaps.core.ui.R.attr.customBtnStyle).also { + it.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.treatmentButton)) it.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10f) it.layoutParams = LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.MATCH_PARENT, 0.5f).also { l -> l.setMargins(0, 0, rh.dpToPx(-4), 0) } - it.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(info.nightscout.core.ui.R.drawable.ic_user_options), null, null) + it.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(app.aaps.core.ui.R.drawable.ic_user_options), null, null) it.text = event.title it.setOnClickListener { @@ -635,7 +635,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { binding.infoLayout.apsMode.stateDescription = rh.gs(stringRes) } else { - binding.infoLayout.apsMode.contentDescription = rh.gs(info.nightscout.core.ui.R.string.aps_mode_title) + " " + rh.gs(stringRes) + binding.infoLayout.apsMode.contentDescription = rh.gs(app.aaps.core.ui.R.string.aps_mode_title) + " " + rh.gs(stringRes) } } @@ -647,21 +647,21 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList when { (loop as PluginBase).isEnabled() && loop.isSuperBolus -> { binding.infoLayout.apsMode.setImageResource(R.drawable.ic_loop_superbolus) - apsModeSetA11yLabel(info.nightscout.core.ui.R.string.superbolus) + apsModeSetA11yLabel(app.aaps.core.ui.R.string.superbolus) binding.infoLayout.apsModeText.text = dateUtil.age(loop.minutesToEndOfSuspend() * 60000L, true, rh) binding.infoLayout.apsModeText.visibility = View.VISIBLE } loop.isDisconnected -> { - binding.infoLayout.apsMode.setImageResource(info.nightscout.core.ui.R.drawable.ic_loop_disconnected) - apsModeSetA11yLabel(info.nightscout.core.ui.R.string.disconnected) + binding.infoLayout.apsMode.setImageResource(app.aaps.core.ui.R.drawable.ic_loop_disconnected) + apsModeSetA11yLabel(app.aaps.core.ui.R.string.disconnected) binding.infoLayout.apsModeText.text = dateUtil.age(loop.minutesToEndOfSuspend() * 60000L, true, rh) binding.infoLayout.apsModeText.visibility = View.VISIBLE } (loop as PluginBase).isEnabled() && loop.isSuspended -> { - binding.infoLayout.apsMode.setImageResource(info.nightscout.core.ui.R.drawable.ic_loop_paused) - apsModeSetA11yLabel(info.nightscout.core.ui.R.string.suspendloop_label) + binding.infoLayout.apsMode.setImageResource(app.aaps.core.ui.R.drawable.ic_loop_paused) + apsModeSetA11yLabel(app.aaps.core.ui.R.string.suspendloop_label) binding.infoLayout.apsModeText.text = dateUtil.age(loop.minutesToEndOfSuspend() * 60000L, true, rh) binding.infoLayout.apsModeText.visibility = View.VISIBLE } @@ -671,36 +671,36 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList if (pump.model() == PumpType.OMNIPOD_EROS || pump.model() == PumpType.OMNIPOD_DASH) { // For Omnipod, indicate the pump as disconnected when it's suspended. // The only way to 'reconnect' it, is through the Omnipod tab - apsModeSetA11yLabel(info.nightscout.core.ui.R.string.disconnected) - info.nightscout.core.ui.R.drawable.ic_loop_disconnected + apsModeSetA11yLabel(app.aaps.core.ui.R.string.disconnected) + app.aaps.core.ui.R.drawable.ic_loop_disconnected } else { - apsModeSetA11yLabel(info.nightscout.core.ui.R.string.pump_paused) - info.nightscout.core.ui.R.drawable.ic_loop_paused + apsModeSetA11yLabel(app.aaps.core.ui.R.string.pump_paused) + app.aaps.core.ui.R.drawable.ic_loop_paused } ) binding.infoLayout.apsModeText.visibility = View.GONE } (loop as PluginBase).isEnabled() && closedLoopEnabled.value() && loop.isLGS -> { - binding.infoLayout.apsMode.setImageResource(info.nightscout.core.ui.R.drawable.ic_loop_lgs) - apsModeSetA11yLabel(info.nightscout.core.ui.R.string.uel_lgs_loop_mode) + binding.infoLayout.apsMode.setImageResource(app.aaps.core.ui.R.drawable.ic_loop_lgs) + apsModeSetA11yLabel(app.aaps.core.ui.R.string.uel_lgs_loop_mode) binding.infoLayout.apsModeText.visibility = View.GONE } (loop as PluginBase).isEnabled() && closedLoopEnabled.value() -> { binding.infoLayout.apsMode.setImageResource(app.aaps.core.main.R.drawable.ic_loop_closed) - apsModeSetA11yLabel(info.nightscout.core.ui.R.string.closedloop) + apsModeSetA11yLabel(app.aaps.core.ui.R.string.closedloop) binding.infoLayout.apsModeText.visibility = View.GONE } (loop as PluginBase).isEnabled() && !closedLoopEnabled.value() -> { - binding.infoLayout.apsMode.setImageResource(info.nightscout.core.ui.R.drawable.ic_loop_open) - apsModeSetA11yLabel(info.nightscout.core.ui.R.string.openloop) + binding.infoLayout.apsMode.setImageResource(app.aaps.core.ui.R.drawable.ic_loop_open) + apsModeSetA11yLabel(app.aaps.core.ui.R.string.openloop) binding.infoLayout.apsModeText.visibility = View.GONE } else -> { - binding.infoLayout.apsMode.setImageResource(info.nightscout.core.ui.R.drawable.ic_loop_disabled) + binding.infoLayout.apsMode.setImageResource(app.aaps.core.ui.R.drawable.ic_loop_disabled) apsModeSetA11yLabel(R.string.disabled_loop) binding.infoLayout.apsModeText.visibility = View.GONE } @@ -714,7 +714,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList // pump status from ns binding.pump.text = processedDeviceStatusData.pumpStatus(nsSettingsStatus) - binding.pump.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(info.nightscout.core.ui.R.string.pump), processedDeviceStatusData.extendedPumpStatus) } } + binding.pump.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(app.aaps.core.ui.R.string.pump), processedDeviceStatusData.extendedPumpStatus) } } // OpenAPS status from ns binding.openaps.text = processedDeviceStatusData.openApsStatus @@ -740,12 +740,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList val graph = GraphView(context) graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, rh.dpToPx(skinProvider.activeSkin().secondaryGraphHeight)).also { it.setMargins(0, rh.dpToPx(15), 0, rh.dpToPx(10)) } - graph.gridLabelRenderer?.gridColor = rh.gac(context, info.nightscout.core.ui.R.attr.graphGrid) + graph.gridLabelRenderer?.gridColor = rh.gac(context, app.aaps.core.ui.R.attr.graphGrid) graph.gridLabelRenderer?.reloadStyles() graph.gridLabelRenderer?.isHorizontalLabelsVisible = false graph.gridLabelRenderer?.labelVerticalWidth = axisWidth graph.gridLabelRenderer?.numVerticalLabels = 3 - graph.viewport.backgroundColor = rh.gac(context, info.nightscout.core.ui.R.attr.viewPortBackgroundColor) + graph.viewport.backgroundColor = rh.gac(context, app.aaps.core.ui.R.attr.viewPortBackgroundColor) relativeLayout.addView(graph) val label = TextView(context) @@ -793,7 +793,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList trendArrow?.let { binding.infoLayout.arrow.setImageResource(it.directionToIcon()) } binding.infoLayout.arrow.visibility = (trendArrow != null).toVisibilityKeepSpace() binding.infoLayout.arrow.setColorFilter(lastBgColor) - binding.infoLayout.arrow.contentDescription = lastBgDescription + " " + rh.gs(info.nightscout.core.ui.R.string.and) + " " + trendDescription + binding.infoLayout.arrow.contentDescription = lastBgDescription + " " + rh.gs(app.aaps.core.ui.R.string.and) + " " + trendDescription if (glucoseStatus != null) { binding.infoLayout.deltaLarge.text = profileUtil.fromMgdlToSignedStringInUnits(glucoseStatus.delta) @@ -803,7 +803,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList binding.infoLayout.longAvgDelta.text = profileUtil.fromMgdlToSignedStringInUnits(glucoseStatus.longAvgDelta) } else { binding.infoLayout.deltaLarge.text = "" - binding.infoLayout.delta.text = "Δ " + rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short) + binding.infoLayout.delta.text = "Δ " + rh.gs(app.aaps.core.ui.R.string.value_unavailable_short) binding.infoLayout.avgDelta.text = "" binding.infoLayout.longAvgDelta.text = "" } @@ -841,18 +841,18 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList val profileBackgroundColor = profile?.let { if (it is ProfileSealed.EPS) { if (it.value.originalPercentage != 100 || it.value.originalTimeshift != 0L || it.value.originalDuration != 0L) - info.nightscout.core.ui.R.attr.ribbonWarningColor - else info.nightscout.core.ui.R.attr.ribbonDefaultColor - } else info.nightscout.core.ui.R.attr.ribbonDefaultColor - } ?: info.nightscout.core.ui.R.attr.ribbonCriticalColor + app.aaps.core.ui.R.attr.ribbonWarningColor + else app.aaps.core.ui.R.attr.ribbonDefaultColor + } else app.aaps.core.ui.R.attr.ribbonDefaultColor + } ?: app.aaps.core.ui.R.attr.ribbonCriticalColor val profileTextColor = profile?.let { if (it is ProfileSealed.EPS) { if (it.value.originalPercentage != 100 || it.value.originalTimeshift != 0L || it.value.originalDuration != 0L) - info.nightscout.core.ui.R.attr.ribbonTextWarningColor - else info.nightscout.core.ui.R.attr.ribbonTextDefaultColor - } else info.nightscout.core.ui.R.attr.ribbonTextDefaultColor - } ?: info.nightscout.core.ui.R.attr.ribbonTextDefaultColor + app.aaps.core.ui.R.attr.ribbonTextWarningColor + else app.aaps.core.ui.R.attr.ribbonTextDefaultColor + } else app.aaps.core.ui.R.attr.ribbonTextDefaultColor + } ?: app.aaps.core.ui.R.attr.ribbonTextDefaultColor setRibbon(binding.activeProfile, profileTextColor, profileBackgroundColor, profileFunction.getProfileNameWithRemainingTime()) } } @@ -867,7 +867,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList binding.infoLayout.baseBasal.text = temporaryBasalText binding.infoLayout.baseBasal.setTextColor(temporaryBasalColor) binding.infoLayout.baseBasalIcon.setImageResource(temporaryBasalIcon) - binding.infoLayout.basalLayout.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(info.nightscout.core.ui.R.string.basal), temporaryBasalDialogText) } } + binding.infoLayout.basalLayout.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(app.aaps.core.ui.R.string.basal), temporaryBasalDialogText) } } } } @@ -879,7 +879,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList runOnUiThread { _binding ?: return@runOnUiThread binding.infoLayout.extendedBolus.text = extendedBolusText - binding.infoLayout.extendedLayout.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(info.nightscout.core.ui.R.string.extended_bolus), extendedBolusDialogText) } } + binding.infoLayout.extendedLayout.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(app.aaps.core.ui.R.string.extended_bolus), extendedBolusDialogText) } } binding.infoLayout.extendedLayout.visibility = (extendedBolus != null && !pump.isFakingTempsByExtendedBoluses).toVisibility() } } @@ -921,9 +921,9 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList runOnUiThread { _binding ?: return@runOnUiThread binding.infoLayout.iob.text = iobText - binding.infoLayout.iobLayout.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(info.nightscout.core.ui.R.string.iob), iobDialogText) } } + binding.infoLayout.iobLayout.setOnClickListener { activity?.let { OKDialog.show(it, rh.gs(app.aaps.core.ui.R.string.iob), iobDialogText) } } // cob - var cobText = displayText ?: rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short) + var cobText = displayText ?: rh.gs(app.aaps.core.ui.R.string.value_unavailable_short) val constraintsProcessed = loop.lastRun?.constraintsProcessed val lastRun = loop.lastRun @@ -931,7 +931,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList if (constraintsProcessed.carbsReq > 0) { //only display carbsreq when carbs have not been entered recently if (lastCarbsTime < lastRun.lastAPSRun) { - cobText += "\n" + constraintsProcessed.carbsReq + " " + rh.gs(info.nightscout.core.ui.R.string.required) + cobText += "\n" + constraintsProcessed.carbsReq + " " + rh.gs(app.aaps.core.ui.R.string.required) } if (carbAnimation?.isRunning == false) carbAnimation?.start() @@ -953,8 +953,8 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList if (tempTarget != null) { setRibbon( binding.tempTarget, - info.nightscout.core.ui.R.attr.ribbonTextWarningColor, - info.nightscout.core.ui.R.attr.ribbonWarningColor, + app.aaps.core.ui.R.attr.ribbonTextWarningColor, + app.aaps.core.ui.R.attr.ribbonWarningColor, profileUtil.toTargetRangeString(tempTarget.lowTarget, tempTarget.highTarget, GlucoseUnit.MGDL, units) + " " + dateUtil.untilString(tempTarget.end, rh) ) } else { @@ -966,15 +966,15 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList aapsLogger.debug("Adjusted target. Profile: ${profile.getTargetMgdl()} APS: $targetUsed") setRibbon( binding.tempTarget, - info.nightscout.core.ui.R.attr.ribbonTextWarningColor, - info.nightscout.core.ui.R.attr.tempTargetBackgroundColor, + app.aaps.core.ui.R.attr.ribbonTextWarningColor, + app.aaps.core.ui.R.attr.tempTargetBackgroundColor, profileUtil.toTargetRangeString(targetUsed, targetUsed, GlucoseUnit.MGDL, units) ) } else { setRibbon( binding.tempTarget, - info.nightscout.core.ui.R.attr.ribbonTextDefaultColor, - info.nightscout.core.ui.R.attr.ribbonDefaultColor, + app.aaps.core.ui.R.attr.ribbonTextDefaultColor, + app.aaps.core.ui.R.attr.ribbonDefaultColor, profileUtil.toTargetRangeString(profile.getTargetLowMgdl(), profile.getTargetHighMgdl(), GlucoseUnit.MGDL, units) ) } diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt index 4a50de2714..6c2d68363a 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewMenusImpl.kt @@ -48,8 +48,8 @@ class OverviewMenusImpl @Inject constructor( PRE( R.string.overview_show_predictions, - info.nightscout.core.ui.R.attr.predictionColor, - info.nightscout.core.ui.R.attr.menuTextColor, + app.aaps.core.ui.R.attr.predictionColor, + app.aaps.core.ui.R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.prediction_shortname, @@ -57,8 +57,8 @@ class OverviewMenusImpl @Inject constructor( ), TREAT( R.string.overview_show_treatments, - info.nightscout.core.ui.R.attr.cobColor, - info.nightscout.core.ui.R.attr.menuTextColor, + app.aaps.core.ui.R.attr.cobColor, + app.aaps.core.ui.R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.treatments_shortname, @@ -66,8 +66,8 @@ class OverviewMenusImpl @Inject constructor( ), BAS( R.string.overview_show_basals, - info.nightscout.core.ui.R.attr.basal, - info.nightscout.core.ui.R.attr.menuTextColor, + app.aaps.core.ui.R.attr.basal, + app.aaps.core.ui.R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.basal_shortname, @@ -75,65 +75,65 @@ class OverviewMenusImpl @Inject constructor( ), ABS( R.string.overview_show_abs_insulin, - info.nightscout.core.ui.R.attr.iobColor, - info.nightscout.core.ui.R.attr.menuTextColor, + app.aaps.core.ui.R.attr.iobColor, + app.aaps.core.ui.R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.abs_insulin_shortname ), IOB( R.string.overview_show_iob, - info.nightscout.core.ui.R.attr.iobColor, - info.nightscout.core.ui.R.attr.menuTextColor, + app.aaps.core.ui.R.attr.iobColor, + app.aaps.core.ui.R.attr.menuTextColor, primary = false, secondary = true, - shortnameId = info.nightscout.core.ui.R.string.iob + shortnameId = app.aaps.core.ui.R.string.iob ), COB( R.string.overview_show_cob, - info.nightscout.core.ui.R.attr.cobColor, - info.nightscout.core.ui.R.attr.menuTextColor, + app.aaps.core.ui.R.attr.cobColor, + app.aaps.core.ui.R.attr.menuTextColor, primary = false, secondary = true, - shortnameId = info.nightscout.core.ui.R.string.cob + shortnameId = app.aaps.core.ui.R.string.cob ), DEV( R.string.overview_show_deviations, - info.nightscout.core.ui.R.attr.bgiColor, - info.nightscout.core.ui.R.attr.menuTextColor, + app.aaps.core.ui.R.attr.bgiColor, + app.aaps.core.ui.R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.deviation_shortname ), - BGI(R.string.overview_show_bgi, info.nightscout.core.ui.R.attr.bgiColor, info.nightscout.core.ui.R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.bgi_shortname), + BGI(R.string.overview_show_bgi, app.aaps.core.ui.R.attr.bgiColor, app.aaps.core.ui.R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.bgi_shortname), SEN( R.string.overview_show_sensitivity, - info.nightscout.core.ui.R.attr.ratioColor, - info.nightscout.core.ui.R.attr.menuTextColorInverse, + app.aaps.core.ui.R.attr.ratioColor, + app.aaps.core.ui.R.attr.menuTextColorInverse, primary = false, secondary = true, shortnameId = R.string.sensitivity_shortname ), ACT( R.string.overview_show_activity, - info.nightscout.core.ui.R.attr.activityColor, - info.nightscout.core.ui.R.attr.menuTextColor, + app.aaps.core.ui.R.attr.activityColor, + app.aaps.core.ui.R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.activity_shortname ), DEVSLOPE( R.string.overview_show_deviation_slope, - info.nightscout.core.ui.R.attr.devSlopePosColor, - info.nightscout.core.ui.R.attr.menuTextColor, + app.aaps.core.ui.R.attr.devSlopePosColor, + app.aaps.core.ui.R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.devslope_shortname ), HR( R.string.overview_show_heartRate, - info.nightscout.core.ui.R.attr.heartRateColor, - info.nightscout.core.ui.R.attr.menuTextColor, + app.aaps.core.ui.R.attr.heartRateColor, + app.aaps.core.ui.R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.heartRate_shortname diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt index e65daa34ee..6f45db1a00 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/OverviewPlugin.kt @@ -33,7 +33,7 @@ import app.aaps.core.interfaces.rx.events.EventUpdateOverviewCalcProgress import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.shared.impl.rx.bus.RxBusImpl import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.core.validators.ValidatingEditTextPreference import info.nightscout.plugins.R import info.nightscout.plugins.general.overview.notifications.NotificationStore @@ -66,7 +66,7 @@ class OverviewPlugin @Inject constructor( .fragmentClass(OverviewFragment::class.qualifiedName) .alwaysVisible(true) .alwaysEnabled(true) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_home) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_home) .pluginName(R.string.overview) .shortName(R.string.overview_shortname) .preferencesId(R.xml.pref_overview) diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt index 6f65b9b9e0..bff6c37fc0 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/graphData/GraphData.kt @@ -19,7 +19,7 @@ import com.jjoe64.graphview.series.DataPoint import com.jjoe64.graphview.series.LineGraphSeries import com.jjoe64.graphview.series.Series import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import javax.inject.Inject import kotlin.math.abs import kotlin.math.max @@ -69,7 +69,7 @@ class GraphData( addSeries(app.aaps.core.main.graph.data.AreaGraphSeries(inRangeAreaDataPoints).also { it.color = 0 it.isDrawBackground = true - it.backgroundColor = rh.gac(graph.context, info.nightscout.core.ui.R.attr.inRangeBackground) + it.backgroundColor = rh.gac(graph.context, app.aaps.core.ui.R.attr.inRangeBackground) }) } @@ -219,7 +219,7 @@ class GraphData( paint.style = Paint.Style.STROKE paint.strokeWidth = 2f paint.pathEffect = DashPathEffect(floatArrayOf(10f, 20f), 0f) - paint.color = rh.gac(graph.context, info.nightscout.core.ui.R.attr.dotLineColor) + paint.color = rh.gac(graph.context, app.aaps.core.ui.R.attr.dotLineColor) }) }) } diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt index c39d02f162..b07812263b 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationStore.kt @@ -67,7 +67,7 @@ class NotificationStore @Inject constructor( } } store.add(n) - if (sp.getBoolean(info.nightscout.core.ui.R.string.key_raise_notifications_as_android_notifications, true) && n !is NotificationWithAction) + if (sp.getBoolean(app.aaps.core.ui.R.string.key_raise_notifications_as_android_notifications, true) && n !is NotificationWithAction) raiseSystemNotification(n) if (n.soundId != null && n.soundId != 0) uiInteraction.startAlarm(n.soundId!!, n.text) Collections.sort(store, NotificationComparator()) @@ -117,11 +117,11 @@ class NotificationStore @Inject constructor( .setContentIntent(notificationHolder.openAppIntent(context)) if (n.level == Notification.URGENT) { notificationBuilder.setVibrate(longArrayOf(1000, 1000, 1000, 1000)) - .setContentTitle(rh.gs(info.nightscout.core.ui.R.string.urgent_alarm)) + .setContentTitle(rh.gs(app.aaps.core.ui.R.string.urgent_alarm)) .setSound(sound, AudioManager.STREAM_ALARM) } else { notificationBuilder.setVibrate(longArrayOf(0, 100, 50, 100, 50)) - .setContentTitle(rh.gs(info.nightscout.core.ui.R.string.info)) + .setContentTitle(rh.gs(app.aaps.core.ui.R.string.info)) } mgr.notify(n.id, notificationBuilder.build()) } @@ -161,15 +161,15 @@ class NotificationStore @Inject constructor( val notification = notificationsList[position] holder.binding.dismiss.tag = notification if (notification.buttonText != 0) holder.binding.dismiss.setText(notification.buttonText) - else holder.binding.dismiss.setText(info.nightscout.core.ui.R.string.snooze) + else holder.binding.dismiss.setText(app.aaps.core.ui.R.string.snooze) @Suppress("SetTextI18n") holder.binding.text.text = dateUtil.timeString(notification.date) + " " + notification.text when (notification.level) { - Notification.URGENT -> holder.binding.cv.setBackgroundColor(rh.gac(info.nightscout.core.ui.R.attr.notificationUrgent)) - Notification.NORMAL -> holder.binding.cv.setBackgroundColor(rh.gac(info.nightscout.core.ui.R.attr.notificationNormal)) - Notification.LOW -> holder.binding.cv.setBackgroundColor(rh.gac(info.nightscout.core.ui.R.attr.notificationLow)) - Notification.INFO -> holder.binding.cv.setBackgroundColor(rh.gac(info.nightscout.core.ui.R.attr.notificationInfo)) - Notification.ANNOUNCEMENT -> holder.binding.cv.setBackgroundColor(rh.gac(info.nightscout.core.ui.R.attr.notificationAnnouncement)) + Notification.URGENT -> holder.binding.cv.setBackgroundColor(rh.gac(app.aaps.core.ui.R.attr.notificationUrgent)) + Notification.NORMAL -> holder.binding.cv.setBackgroundColor(rh.gac(app.aaps.core.ui.R.attr.notificationNormal)) + Notification.LOW -> holder.binding.cv.setBackgroundColor(rh.gac(app.aaps.core.ui.R.attr.notificationLow)) + Notification.INFO -> holder.binding.cv.setBackgroundColor(rh.gac(app.aaps.core.ui.R.attr.notificationInfo)) + Notification.ANNOUNCEMENT -> holder.binding.cv.setBackgroundColor(rh.gac(app.aaps.core.ui.R.attr.notificationAnnouncement)) } } diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt index 2811fb4ba1..7596fe4646 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/notifications/NotificationWithAction.kt @@ -47,7 +47,7 @@ class NotificationWithAction( id = NS_ALARM level = NORMAL text = nsAlarm.title() - soundId = info.nightscout.core.ui.R.raw.alarm + soundId = app.aaps.core.ui.R.raw.alarm } 2 -> { @@ -57,7 +57,7 @@ class NotificationWithAction( soundId = R.raw.urgentalarm } } - buttonText = info.nightscout.core.ui.R.string.snooze + buttonText = app.aaps.core.ui.R.string.snooze action = Runnable { activePlugin.activeNsClient?.handleClearAlarm(nsAlarm, 60 * 60 * 1000L) // Adding current time to snooze if we got staleData diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt index 622cb3a8dc..f51ce907f9 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/overview/ui/StatusLightHandler.kt @@ -88,7 +88,7 @@ class StatusLightHandler @Inject constructor( ) } - val insulinUnit = rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + val insulinUnit = rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) if (pump.pumpDescription.isPatchPump) { handlePatchReservoirLevel( reservoirLevel, @@ -120,8 +120,8 @@ class StatusLightHandler @Inject constructor( if (pump.model().supportBatteryLevel || erosBatteryLinkAvailable) { handleLevel(batteryLevel, R.string.key_statuslights_bat_critical, 26.0, R.string.key_statuslights_bat_warning, 51.0, pump.batteryLevel.toDouble(), "%") } else { - batteryLevel?.text = rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short) - batteryLevel?.setTextColor(rh.gac(batteryLevel.context, info.nightscout.core.ui.R.attr.defaultTextColor)) + batteryLevel?.text = rh.gs(app.aaps.core.ui.R.string.value_unavailable_short) + batteryLevel?.setTextColor(rh.gac(batteryLevel.context, app.aaps.core.ui.R.attr.defaultTextColor)) } } } @@ -134,7 +134,7 @@ class StatusLightHandler @Inject constructor( warnColors.setColorByAge(view, therapyEvent.value, warn, urgent) view?.text = therapyEvent.value.age(rh.shortTextMode(), rh, dateUtil) } else { - view?.text = if (rh.shortTextMode()) "-" else rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short) + view?.text = if (rh.shortTextMode()) "-" else rh.gs(app.aaps.core.ui.R.string.value_unavailable_short) } } @@ -155,7 +155,7 @@ class StatusLightHandler @Inject constructor( ) { if (level >= maxReading) { view?.text = decimalFormatter.to0Decimal(maxReading, units) - view?.setTextColor(rh.gac(view.context, info.nightscout.core.ui.R.attr.defaultTextColor)) + view?.setTextColor(rh.gac(view.context, app.aaps.core.ui.R.attr.defaultTextColor)) } else { handleLevel(view, criticalSetting, criticalDefaultValue, warnSetting, warnDefaultValue, level, units) } diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt index 903f99c94d..9cc1160a76 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/persistentNotification/PersistentNotificationPlugin.kt @@ -137,7 +137,7 @@ class PersistentNotificationPlugin @Inject constructor( line1aa += "$line1." } } else { - line1aa = rh.gs(info.nightscout.core.ui.R.string.missed_bg_readings) + line1aa = rh.gs(app.aaps.core.ui.R.string.missed_bg_readings) line1 = line1aa } val activeTemp = iobCobCalculator.getTempBasalIncludingConvertedExtended(System.currentTimeMillis()) @@ -149,15 +149,15 @@ class PersistentNotificationPlugin @Inject constructor( val bolusIob = iobCobCalculator.calculateIobFromBolus().round() val basalIob = iobCobCalculator.calculateIobFromTempBasalsIncludingConvertedExtended().round() line2 = - rh.gs(info.nightscout.core.ui.R.string.treatments_iob_label_string) + " " + decimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + rh.gs( - info.nightscout.core.ui.R + rh.gs(app.aaps.core.ui.R.string.treatments_iob_label_string) + " " + decimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U " + rh.gs( + app.aaps.core.ui.R .string.cob ) + ": " + iobCobCalculator.getCobInfo( "PersistentNotificationPlugin" ).generateCOBString(decimalFormatter) val line2aa = - rh.gs(info.nightscout.core.ui.R.string.treatments_iob_label_string) + " " + decimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U. " + rh.gs( - info.nightscout.core.ui.R + rh.gs(app.aaps.core.ui.R.string.treatments_iob_label_string) + " " + decimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U. " + rh.gs( + app.aaps.core.ui.R .string.cob ) + ": " + iobCobCalculator.getCobInfo( "PersistentNotificationPlugin" @@ -200,7 +200,7 @@ class PersistentNotificationPlugin @Inject constructor( unreadConversationBuilder.addMessage(line3aa) /// End Android Auto } else { - line1 = rh.gs(info.nightscout.core.ui.R.string.no_profile_set) + line1 = rh.gs(app.aaps.core.ui.R.string.no_profile_set) } val builder = NotificationCompat.Builder(context, notificationHolder.channelID) builder.setOngoing(true) diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt index 5c083246c2..8194d67478 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt @@ -308,7 +308,7 @@ class SmsCommunicatorPlugin @Inject constructor( if (!remoteCommandsAllowed) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remote_command_not_allowed))) else if (commandQueue.bolusInQueue()) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_another_bolus_in_queue))) else if (divided.size == 2 && dateUtil.now() - lastRemoteBolusTime < minDistance) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.smscommunicator_remote_bolus_not_allowed))) - else if (divided.size == 2 && pump.isSuspended()) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(info.nightscout.core.ui.R.string.pumpsuspended))) + else if (divided.size == 2 && pump.isSuspended()) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(app.aaps.core.ui.R.string.pumpsuspended))) else if (divided.size == 2 || divided.size == 3) processBOLUS(divided, receivedSms) else sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format))) @@ -370,7 +370,7 @@ class SmsCommunicatorPlugin @Inject constructor( reply += (rh.gs(R.string.sms_iob) + " " + decimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob) + "U (" + rh.gs(R.string.sms_bolus) + " " + decimalFormatter.to2Decimal(bolusIob.iob) + "U " + rh.gs(R.string.sms_basal) + " " + decimalFormatter.to2Decimal(basalIob.basaliob) + "U), " - + rh.gs(info.nightscout.core.ui.R.string.cob) + ": " + cobInfo.generateCOBString(decimalFormatter)) + + rh.gs(app.aaps.core.ui.R.string.cob) + ": " + cobInfo.generateCOBString(decimalFormatter)) sendSMS(Sms(receivedSms.phoneNumber, reply)) receivedSms.processed = true } @@ -397,7 +397,7 @@ class SmsCommunicatorPlugin @Inject constructor( } }) } else - sendSMS(Sms(receivedSms.phoneNumber, rh.gs(info.nightscout.core.ui.R.string.loopisdisabled))) + sendSMS(Sms(receivedSms.phoneNumber, rh.gs(app.aaps.core.ui.R.string.loopisdisabled))) receivedSms.processed = true } @@ -424,7 +424,7 @@ class SmsCommunicatorPlugin @Inject constructor( if (loop.isSuspended) rh.gs(R.string.sms_loop_suspended_for, loop.minutesToEndOfSuspend()) else rh.gs(R.string.smscommunicator_loop_is_enabled) + " - " + getApsModeText() } else - rh.gs(info.nightscout.core.ui.R.string.loopisdisabled) + rh.gs(app.aaps.core.ui.R.string.loopisdisabled) sendSMS(Sms(receivedSms.phoneNumber, reply)) receivedSms.processed = true } @@ -513,7 +513,7 @@ class SmsCommunicatorPlugin @Inject constructor( override fun run() { uel.log(Action.LGS_LOOP_MODE, Sources.SMS) sp.putString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.LGS.name) - rxBus.send(EventPreferenceChange(rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend))) + rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.ui.R.string.lowglucosesuspend))) val replyText = rh.gs(R.string.smscommunicator_current_loop_mode, getApsModeText()) sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText)) } @@ -528,7 +528,7 @@ class SmsCommunicatorPlugin @Inject constructor( override fun run() { uel.log(Action.CLOSED_LOOP_MODE, Sources.SMS) sp.putString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.CLOSED.name) - rxBus.send(EventPreferenceChange(rh.gs(info.nightscout.core.ui.R.string.closedloop))) + rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.ui.R.string.closedloop))) val replyText = rh.gs(R.string.smscommunicator_current_loop_mode, getApsModeText()) sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText)) } @@ -568,7 +568,7 @@ class SmsCommunicatorPlugin @Inject constructor( private fun processPUMP(divided: Array, receivedSms: Sms) { if (divided.size == 1) { - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.sms), object : Callback() { + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.sms), object : Callback() { override fun run() { val pump = activePlugin.activePump if (result.success) { @@ -638,7 +638,7 @@ class SmsCommunicatorPlugin @Inject constructor( val anInterface = activePlugin.activeProfileSource val store = anInterface.profile if (store == null) { - sendSMS(Sms(receivedSms.phoneNumber, rh.gs(info.nightscout.core.ui.R.string.notconfigured))) + sendSMS(Sms(receivedSms.phoneNumber, rh.gs(app.aaps.core.ui.R.string.notconfigured))) receivedSms.processed = true return } @@ -647,7 +647,7 @@ class SmsCommunicatorPlugin @Inject constructor( if (divided[1].uppercase(Locale.getDefault()) == "STATUS") { sendSMS(Sms(receivedSms.phoneNumber, profileName)) } else if (divided[1].uppercase(Locale.getDefault()) == "LIST") { - if (list.isEmpty()) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(info.nightscout.core.ui.R.string.invalid_profile))) + if (list.isEmpty()) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(app.aaps.core.ui.R.string.invalid_profile))) else { var reply = "" for (i in list.indices) { @@ -666,7 +666,7 @@ class SmsCommunicatorPlugin @Inject constructor( else if (pIndex == 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format))) else { val profile = store.getSpecificProfile(list[pIndex - 1] as String) - if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(info.nightscout.core.ui.R.string.noprofile))) + if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(app.aaps.core.ui.R.string.noprofile))) else { val passCode = generatePassCode() val reply = rh.gs(R.string.smscommunicator_profile_reply_with_code, list[pIndex - 1], percentage, passCode) @@ -682,7 +682,7 @@ class SmsCommunicatorPlugin @Inject constructor( ValueWithUnit.SimpleString(rh.gsNotLocalised(R.string.sms_profile_switch_created)) ) } else { - sendSMS(Sms(receivedSms.phoneNumber, rh.gs(info.nightscout.core.ui.R.string.invalid_profile))) + sendSMS(Sms(receivedSms.phoneNumber, rh.gs(app.aaps.core.ui.R.string.invalid_profile))) } } }) @@ -728,7 +728,7 @@ class SmsCommunicatorPlugin @Inject constructor( var duration = 30 if (divided.size > 2) duration = SafeParse.stringToInt(divided[2]) val profile = profileFunction.getProfile() - if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(info.nightscout.core.ui.R.string.noprofile))) + if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(app.aaps.core.ui.R.string.noprofile))) else if (tempBasalPct == 0 && divided[1] != "0%") sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format))) else if (duration <= 0 || duration % durationStep != 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.sms_wrong_tbr_duration, durationStep))) else { @@ -783,7 +783,7 @@ class SmsCommunicatorPlugin @Inject constructor( var duration = 30 if (divided.size > 2) duration = SafeParse.stringToInt(divided[2]) val profile = profileFunction.getProfile() - if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(info.nightscout.core.ui.R.string.noprofile))) + if (profile == null) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(app.aaps.core.ui.R.string.noprofile))) else if (tempBasal == 0.0 && divided[1] != "0") sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.wrong_format))) else if (duration <= 0 || duration % durationStep != 0) sendSMS(Sms(receivedSms.phoneNumber, rh.gs(R.string.sms_wrong_tbr_duration, durationStep))) else { @@ -876,7 +876,7 @@ class SmsCommunicatorPlugin @Inject constructor( override fun run() { if (result.success) { var replyText = rh.gs(R.string.smscommunicator_extended_set, aDouble, duration) - if (config.APS) replyText += "\n" + rh.gs(info.nightscout.core.ui.R.string.loopsuspended) + if (config.APS) replyText += "\n" + rh.gs(app.aaps.core.ui.R.string.loopsuspended) replyText += "\n" + activePlugin.activePump.shortStatus(true) sendSMSToAllNumbers(Sms(receivedSms.phoneNumber, replyText)) if (config.APS) @@ -887,10 +887,10 @@ class SmsCommunicatorPlugin @Inject constructor( R.string.smscommunicator_extended_set, aDouble, duration - ) + " / " + rh.gs(info.nightscout.core.ui.R.string.loopsuspended), + ) + " / " + rh.gs(app.aaps.core.ui.R.string.loopsuspended), ValueWithUnit.Insulin(aDouble ?: 0.0), ValueWithUnit.Minute(duration), - ValueWithUnit.SimpleString(rh.gsNotLocalised(info.nightscout.core.ui.R.string.loopsuspended)) + ValueWithUnit.SimpleString(rh.gsNotLocalised(app.aaps.core.ui.R.string.loopsuspended)) ) else uel.log( @@ -936,7 +936,7 @@ class SmsCommunicatorPlugin @Inject constructor( override fun run() { val resultSuccess = result.success val resultBolusDelivered = result.bolusDelivered - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.sms), object : Callback() { + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.sms), object : Callback() { override fun run() { if (resultSuccess) { var replyText = if (isMeal) @@ -1255,7 +1255,7 @@ class SmsCommunicatorPlugin @Inject constructor( false } } catch (e: SecurityException) { - val notification = Notification(Notification.MISSING_SMS_PERMISSION, rh.gs(info.nightscout.core.ui.R.string.smscommunicator_missingsmspermission), Notification.NORMAL) + val notification = Notification(Notification.MISSING_SMS_PERMISSION, rh.gs(app.aaps.core.ui.R.string.smscommunicator_missingsmspermission), Notification.NORMAL) rxBus.send(EventNewNotification(notification)) return false } @@ -1292,9 +1292,9 @@ class SmsCommunicatorPlugin @Inject constructor( private fun getApsModeText(): String = when (ApsMode.fromString(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name))) { - ApsMode.OPEN -> rh.gs(info.nightscout.core.ui.R.string.openloop) - ApsMode.CLOSED -> rh.gs(info.nightscout.core.ui.R.string.closedloop) - ApsMode.LGS -> rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend) - else -> rh.gs(info.nightscout.core.ui.R.string.unknown) + ApsMode.OPEN -> rh.gs(app.aaps.core.ui.R.string.openloop) + ApsMode.CLOSED -> rh.gs(app.aaps.core.ui.R.string.closedloop) + ApsMode.LGS -> rh.gs(app.aaps.core.ui.R.string.lowglucosesuspend) + else -> rh.gs(app.aaps.core.ui.R.string.unknown) } } diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt index 29373a4741..1b15bb5c58 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt @@ -16,9 +16,9 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import com.google.common.primitives.Ints.min import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.plugins.R diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt index 5841879b13..07d2f4bf3c 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt @@ -36,7 +36,7 @@ class OneTimePassword @Inject constructor( * Name of master device (target of OTP) */ fun name(): String { - val defaultUserName = rh.gs(info.nightscout.core.ui.R.string.patient_name_default) + val defaultUserName = rh.gs(app.aaps.core.ui.R.string.patient_name_default) var userName = sp.getString(info.nightscout.core.utils.R.string.key_patient_name, defaultUserName).replace(":", "").trim() if (userName.isEmpty()) userName = defaultUserName diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt index 8f48b57d88..eb93115e49 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearFragment.kt @@ -21,7 +21,7 @@ import app.aaps.core.interfaces.rx.weardata.ResFileMap import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.DateUtil import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.plugins.R import info.nightscout.plugins.databinding.WearFragmentBinding import info.nightscout.plugins.general.wear.activities.CwfInfosActivity diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt index e24367d31f..7a626723fa 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/WearPlugin.kt @@ -48,7 +48,7 @@ class WearPlugin @Inject constructor( .mainType(PluginType.GENERAL) .fragmentClass(WearFragment::class.java.name) .pluginIcon(app.aaps.core.main.R.drawable.ic_watch) - .pluginName(info.nightscout.core.ui.R.string.wear) + .pluginName(app.aaps.core.ui.R.string.wear) .shortName(R.string.wear_shortname) .preferencesId(R.xml.pref_wear) .description(R.string.description_wear), @@ -69,7 +69,7 @@ class WearPlugin @Inject constructor( .subscribe({ event: EventDismissBolusProgressIfRunning -> event.resultSuccess?.let { val status = - if (it) rh.gs(info.nightscout.core.ui.R.string.success) + if (it) rh.gs(app.aaps.core.ui.R.string.success) else rh.gs(R.string.no_success) if (isEnabled()) rxBus.send(EventMobileToWear(EventData.BolusProgress(percent = 100, status = status))) } diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt index e9a54a4908..6c0b696b7c 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/activities/CwfInfosActivity.kt @@ -23,7 +23,7 @@ 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.versionChecker.VersionCheckerUtils -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.plugins.R import info.nightscout.plugins.databinding.CwfInfosActivityBinding import info.nightscout.plugins.databinding.CwfInfosActivityPrefItemBinding @@ -98,7 +98,7 @@ class CwfInfosActivity : TranslatedDaggerAppCompatActivity() { binding.author.text = rh.gs(CwfMetadataKey.CWF_AUTHOR.label, metadata[CwfMetadataKey.CWF_AUTHOR] ?: "") binding.createdAt.text = rh.gs(CwfMetadataKey.CWF_CREATED_AT.label, metadata[CwfMetadataKey.CWF_CREATED_AT] ?: "") binding.cwfVersion.text = rh.gs(CwfMetadataKey.CWF_VERSION.label, metadata[CwfMetadataKey.CWF_VERSION] ?: "") - val colorAttr = if (checkCustomVersion(metadata)) info.nightscout.core.ui.R.attr.metadataTextOkColor else info.nightscout.core.ui.R.attr.metadataTextWarningColor + val colorAttr = if (checkCustomVersion(metadata)) app.aaps.core.ui.R.attr.metadataTextOkColor else app.aaps.core.ui.R.attr.metadataTextWarningColor binding.cwfVersion.setTextColor(rh.gac(binding.cwfVersion.context, colorAttr)) binding.cwfComment.text = rh.gs(CwfMetadataKey.CWF_COMMENT.label, metadata[CwfMetadataKey.CWF_COMMENT] ?: "") if (metadata.count { it.key.isPref } > 0) { diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt index 9de405922e..b1bcdcee15 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/general/wear/wearintegration/DataHandlerMobile.kt @@ -51,7 +51,7 @@ import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.TrendCalculator import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.BolusCalculatorResult @@ -338,7 +338,7 @@ class DataHandlerMobile @Inject constructor( message = "OLD DATA - " //if pump is not busy: try to fetch data if (activePump.isBusy()) { - message += rh.gs(info.nightscout.core.ui.R.string.pump_busy) + message += rh.gs(app.aaps.core.ui.R.string.pump_busy) } else { message += rh.gs(R.string.pump_fetching_data) commandQueue.loadTDDs(object : Callback() { @@ -353,7 +353,7 @@ class DataHandlerMobile @Inject constructor( rxBus.send( EventMobileToWear( EventData.ConfirmAction( - rh.gs(info.nightscout.core.ui.R.string.tdd), + rh.gs(app.aaps.core.ui.R.string.tdd), reloadMessage, returnCommand = null ) @@ -368,7 +368,7 @@ class DataHandlerMobile @Inject constructor( rxBus.send( EventMobileToWear( EventData.ConfirmAction( - rh.gs(info.nightscout.core.ui.R.string.tdd), + rh.gs(app.aaps.core.ui.R.string.tdd), message, returnCommand = null ) @@ -379,30 +379,30 @@ class DataHandlerMobile @Inject constructor( private fun handleWizardPreCheck(command: EventData.ActionWizardPreCheck) { val pump = activePlugin.activePump if (!pump.isInitialized() || pump.isSuspended() || loop.isDisconnected) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_pump_not_available)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_pump_not_available)) return } val carbsBeforeConstraints = command.carbs val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(carbsBeforeConstraints, aapsLogger)).value() if (carbsAfterConstraints - carbsBeforeConstraints != 0) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_carbs_constraint)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_carbs_constraint)) return } val percentage = command.percentage val profile = profileFunction.getProfile() val profileName = profileFunction.getProfileName() if (profile == null) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_no_active_profile)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_no_active_profile)) return } val bgReading = iobCobCalculator.ads.actualBg() if (bgReading == null) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_no_actual_bg)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_no_actual_bg)) return } val cobInfo = iobCobCalculator.getCobInfo("Wizard wear") if (cobInfo.displayCob == null) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_no_cob)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_no_cob)) return } val dbRecord = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet() @@ -429,7 +429,7 @@ class DataHandlerMobile @Inject constructor( val insulinAfterConstraints = bolusWizard.insulinAfterConstraints val minStep = pump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints) if (abs(insulinAfterConstraints - bolusWizard.calculatedTotalInsulin) >= minStep) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_constraint_bolus_size, bolusWizard.calculatedTotalInsulin)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_constraint_bolus_size, bolusWizard.calculatedTotalInsulin)) return } if (bolusWizard.calculatedTotalInsulin <= 0 && bolusWizard.carbs <= 0) { @@ -442,7 +442,7 @@ class DataHandlerMobile @Inject constructor( rxBus.send( EventMobileToWear( EventData.ConfirmAction( - rh.gs(info.nightscout.core.ui.R.string.confirm).uppercase(), message, + rh.gs(app.aaps.core.ui.R.string.confirm).uppercase(), message, returnCommand = EventData.ActionWizardConfirmed(bolusWizard.timeStamp) ) ) @@ -460,21 +460,21 @@ class DataHandlerMobile @Inject constructor( return } if (actualBg == null) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_no_actual_bg)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_no_actual_bg)) return } if (profile == null) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_no_active_profile)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_no_active_profile)) return } val cobInfo = iobCobCalculator.getCobInfo("QuickWizard wear") if (cobInfo.displayCob == null) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_no_cob)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_no_cob)) return } val pump = activePlugin.activePump if (!pump.isInitialized() || pump.isSuspended() || loop.isDisconnected) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_pump_not_available)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_pump_not_available)) return } @@ -482,13 +482,13 @@ class DataHandlerMobile @Inject constructor( val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(quickWizardEntry.carbs(), aapsLogger)).value() if (carbsAfterConstraints != quickWizardEntry.carbs()) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_carbs_constraint)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_carbs_constraint)) return } val insulinAfterConstraints = wizard.insulinAfterConstraints val minStep = pump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints) if (abs(insulinAfterConstraints - wizard.calculatedTotalInsulin) >= minStep) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_constraint_bolus_size, wizard.calculatedTotalInsulin)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_constraint_bolus_size, wizard.calculatedTotalInsulin)) return } @@ -498,7 +498,7 @@ class DataHandlerMobile @Inject constructor( rxBus.send( EventMobileToWear( EventData.ConfirmAction( - rh.gs(info.nightscout.core.ui.R.string.confirm).uppercase(), message, + rh.gs(app.aaps.core.ui.R.string.confirm).uppercase(), message, returnCommand = EventData.ActionBolusConfirmed(insulinAfterConstraints, carbsAfterConstraints) ) ) @@ -510,18 +510,18 @@ class DataHandlerMobile @Inject constructor( val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(command.carbs, aapsLogger)).value() val pump = activePlugin.activePump if (insulinAfterConstraints > 0 && (!pump.isInitialized() || pump.isSuspended() || loop.isDisconnected)) { - sendError(rh.gs(info.nightscout.core.ui.R.string.wizard_pump_not_available)) + sendError(rh.gs(app.aaps.core.ui.R.string.wizard_pump_not_available)) return } var message = "" - message += rh.gs(info.nightscout.core.ui.R.string.bolus) + ": " + insulinAfterConstraints + rh.gs(R.string.units_short) + "\n" - message += rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + carbsAfterConstraints + rh.gs(R.string.grams_short) + message += rh.gs(app.aaps.core.ui.R.string.bolus) + ": " + insulinAfterConstraints + rh.gs(R.string.units_short) + "\n" + message += rh.gs(app.aaps.core.ui.R.string.carbs) + ": " + carbsAfterConstraints + rh.gs(R.string.grams_short) if (insulinAfterConstraints - command.insulin != 0.0 || carbsAfterConstraints - command.carbs != 0) - message += "\n" + rh.gs(info.nightscout.core.ui.R.string.constraint_applied) + message += "\n" + rh.gs(app.aaps.core.ui.R.string.constraint_applied) rxBus.send( EventMobileToWear( EventData.ConfirmAction( - rh.gs(info.nightscout.core.ui.R.string.confirm).uppercase(), message, + rh.gs(app.aaps.core.ui.R.string.confirm).uppercase(), message, returnCommand = EventData.ActionBolusConfirmed(insulinAfterConstraints, carbsAfterConstraints) ) ) @@ -531,11 +531,11 @@ class DataHandlerMobile @Inject constructor( private fun handleECarbsPreCheck(command: EventData.ActionECarbsPreCheck) { val startTimeStamp = System.currentTimeMillis() + T.mins(command.carbsTimeShift.toLong()).msecs() val carbsAfterConstraints = constraintChecker.applyCarbsConstraints(ConstraintObject(command.carbs, aapsLogger)).value() - var message = rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + carbsAfterConstraints + rh.gs(R.string.grams_short) + - "\n" + rh.gs(info.nightscout.core.ui.R.string.time) + ": " + dateUtil.timeString(startTimeStamp) + - "\n" + rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + command.duration + rh.gs(R.string.hour_short) + var message = rh.gs(app.aaps.core.ui.R.string.carbs) + ": " + carbsAfterConstraints + rh.gs(R.string.grams_short) + + "\n" + rh.gs(app.aaps.core.ui.R.string.time) + ": " + dateUtil.timeString(startTimeStamp) + + "\n" + rh.gs(app.aaps.core.ui.R.string.duration) + ": " + command.duration + rh.gs(R.string.hour_short) if (carbsAfterConstraints - command.carbs != 0) { - message += "\n" + rh.gs(info.nightscout.core.ui.R.string.constraint_applied) + message += "\n" + rh.gs(app.aaps.core.ui.R.string.constraint_applied) } if (carbsAfterConstraints <= 0) { sendError("Carbs = 0! No action taken!") @@ -544,7 +544,7 @@ class DataHandlerMobile @Inject constructor( rxBus.send( EventMobileToWear( EventData.ConfirmAction( - rh.gs(info.nightscout.core.ui.R.string.confirm).uppercase(), message, + rh.gs(app.aaps.core.ui.R.string.confirm).uppercase(), message, returnCommand = EventData.ActionECarbsConfirmed(carbsAfterConstraints, startTimeStamp, command.duration) ) ) @@ -559,12 +559,12 @@ class DataHandlerMobile @Inject constructor( else -> return } val insulinAfterConstraints = constraintChecker.applyBolusConstraints(ConstraintObject(amount, aapsLogger)).value() - var message = rh.gs(info.nightscout.core.ui.R.string.prime_fill) + ": " + insulinAfterConstraints + rh.gs(R.string.units_short) - if (insulinAfterConstraints - amount != 0.0) message += "\n" + rh.gs(info.nightscout.core.ui.R.string.constraint_applied) + var message = rh.gs(app.aaps.core.ui.R.string.prime_fill) + ": " + insulinAfterConstraints + rh.gs(R.string.units_short) + if (insulinAfterConstraints - amount != 0.0) message += "\n" + rh.gs(app.aaps.core.ui.R.string.constraint_applied) rxBus.send( EventMobileToWear( EventData.ConfirmAction( - rh.gs(info.nightscout.core.ui.R.string.confirm).uppercase(), message, + rh.gs(app.aaps.core.ui.R.string.confirm).uppercase(), message, returnCommand = EventData.ActionFillConfirmed(insulinAfterConstraints) ) ) @@ -573,12 +573,12 @@ class DataHandlerMobile @Inject constructor( private fun handleFillPreCheck(command: EventData.ActionFillPreCheck) { val insulinAfterConstraints = constraintChecker.applyBolusConstraints(ConstraintObject(command.insulin, aapsLogger)).value() - var message = rh.gs(info.nightscout.core.ui.R.string.prime_fill) + ": " + insulinAfterConstraints + rh.gs(R.string.units_short) - if (insulinAfterConstraints - command.insulin != 0.0) message += "\n" + rh.gs(info.nightscout.core.ui.R.string.constraint_applied) + var message = rh.gs(app.aaps.core.ui.R.string.prime_fill) + ": " + insulinAfterConstraints + rh.gs(R.string.units_short) + if (insulinAfterConstraints - command.insulin != 0.0) message += "\n" + rh.gs(app.aaps.core.ui.R.string.constraint_applied) rxBus.send( EventMobileToWear( EventData.ConfirmAction( - rh.gs(info.nightscout.core.ui.R.string.confirm).uppercase(), message, + rh.gs(app.aaps.core.ui.R.string.confirm).uppercase(), message, returnCommand = EventData.ActionFillConfirmed(insulinAfterConstraints) ) ) @@ -604,16 +604,16 @@ class DataHandlerMobile @Inject constructor( sendError(rh.gs(R.string.no_active_profile)) } if (command.percentage < Constants.CPP_MIN_PERCENTAGE || command.percentage > Constants.CPP_MAX_PERCENTAGE) { - sendError(rh.gs(info.nightscout.core.ui.R.string.valueoutofrange, "Profile-Percentage")) + sendError(rh.gs(app.aaps.core.ui.R.string.valueoutofrange, "Profile-Percentage")) } if (command.timeShift < 0 || command.timeShift > 23) { - sendError(rh.gs(info.nightscout.core.ui.R.string.valueoutofrange, "Profile-Timeshift")) + sendError(rh.gs(app.aaps.core.ui.R.string.valueoutofrange, "Profile-Timeshift")) } val message = rh.gs(R.string.profile_message, command.timeShift, command.percentage) rxBus.send( EventMobileToWear( EventData.ConfirmAction( - rh.gs(info.nightscout.core.ui.R.string.confirm).uppercase(), message, + rh.gs(app.aaps.core.ui.R.string.confirm).uppercase(), message, returnCommand = EventData.ActionProfileSwitchConfirmed(command.timeShift, command.percentage) ) ) @@ -621,14 +621,14 @@ class DataHandlerMobile @Inject constructor( } private fun handleTempTargetPreCheck(action: EventData.ActionTempTargetPreCheck) { - val title = rh.gs(info.nightscout.core.ui.R.string.confirm).uppercase() + val title = rh.gs(app.aaps.core.ui.R.string.confirm).uppercase() var message = "" val presetIsMGDL = profileFunction.getUnits() == GlucoseUnit.MGDL when (action.command) { EventData.ActionTempTargetPreCheck.TempTargetCommand.PRESET_ACTIVITY -> { val activityTTDuration = defaultValueHelper.determineActivityTTDuration() val activityTT = defaultValueHelper.determineActivityTT() - val reason = rh.gs(info.nightscout.core.ui.R.string.activity) + val reason = rh.gs(app.aaps.core.ui.R.string.activity) message += rh.gs(R.string.wear_action_tempt_preset_message, reason, activityTT, activityTTDuration) rxBus.send( EventMobileToWear( @@ -643,7 +643,7 @@ class DataHandlerMobile @Inject constructor( EventData.ActionTempTargetPreCheck.TempTargetCommand.PRESET_HYPO -> { val hypoTTDuration = defaultValueHelper.determineHypoTTDuration() val hypoTT = defaultValueHelper.determineHypoTT() - val reason = rh.gs(info.nightscout.core.ui.R.string.hypo) + val reason = rh.gs(app.aaps.core.ui.R.string.hypo) message += rh.gs(R.string.wear_action_tempt_preset_message, reason, hypoTT, hypoTTDuration) rxBus.send( EventMobileToWear( @@ -658,7 +658,7 @@ class DataHandlerMobile @Inject constructor( EventData.ActionTempTargetPreCheck.TempTargetCommand.PRESET_EATING -> { val eatingSoonTTDuration = defaultValueHelper.determineEatingSoonTTDuration() val eatingSoonTT = defaultValueHelper.determineEatingSoonTT() - val reason = rh.gs(info.nightscout.core.ui.R.string.eatingsoon) + val reason = rh.gs(app.aaps.core.ui.R.string.eatingsoon) message += rh.gs(R.string.wear_action_tempt_preset_message, reason, eatingSoonTT, eatingSoonTTDuration) rxBus.send( EventMobileToWear( @@ -897,7 +897,7 @@ class DataHandlerMobile @Inject constructor( private fun sendStatus() { val profile = profileFunction.getProfile() - var status = rh.gs(info.nightscout.core.ui.R.string.noprofile) + var status = rh.gs(app.aaps.core.ui.R.string.noprofile) var iobSum = "" var iobDetail = "" var cobString = "" @@ -911,7 +911,7 @@ class DataHandlerMobile @Inject constructor( cobString = iobCobCalculator.getCobInfo("WatcherUpdaterService").generateCOBString(decimalFormatter) currentBasal = iobCobCalculator.getTempBasalIncludingConvertedExtended(System.currentTimeMillis())?.toStringShort(decimalFormatter) ?: rh.gs( - info.nightscout.core.ui.R.string.pump_base_basal_rate, profile + app.aaps.core.ui.R.string.pump_base_basal_rate, profile .getBasal() ) @@ -1022,13 +1022,13 @@ class DataHandlerMobile @Inject constructor( val usedAPS = activePlugin.activeAPS val result = usedAPS.lastAPSResult ?: return rh.gs(R.string.last_aps_result_na) ret += if (!result.isChangeRequested) { - rh.gs(info.nightscout.core.ui.R.string.nochangerequested) + "\n" + rh.gs(app.aaps.core.ui.R.string.nochangerequested) + "\n" } else if (result.rate == 0.0 && result.duration == 0) { - rh.gs(info.nightscout.core.ui.R.string.cancel_temp) + "\n" + rh.gs(app.aaps.core.ui.R.string.cancel_temp) + "\n" } else { rh.gs(R.string.rate_duration, result.rate, result.rate / activePlugin.activePump.baseBasalRate * 100, result.duration) + "\n" } - ret += "\n" + rh.gs(info.nightscout.core.ui.R.string.reason) + ": " + result.reason + ret += "\n" + rh.gs(app.aaps.core.ui.R.string.reason) + ": " + result.reason return ret } @@ -1136,7 +1136,7 @@ class DataHandlerMobile @Inject constructor( private fun generateStatusString(profile: Profile?): String { var status = "" - profile ?: return rh.gs(info.nightscout.core.ui.R.string.noprofile) + profile ?: return rh.gs(app.aaps.core.ui.R.string.noprofile) if (!loop.isEnabled()) status += rh.gs(R.string.disabled_loop) + "\n" return status } @@ -1199,7 +1199,7 @@ class DataHandlerMobile @Inject constructor( commandQueue.bolus(detailedBolusInfo, object : Callback() { override fun run() { if (!result.success) - sendError(rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror) + "\n" + result.comment) + sendError(rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror) + "\n" + result.comment) } }) bolusCalculatorResult?.let { persistenceLayer.insertOrUpdate(it) } @@ -1216,7 +1216,7 @@ class DataHandlerMobile @Inject constructor( commandQueue.bolus(detailedBolusInfo, object : Callback() { override fun run() { if (!result.success) { - sendError(rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror) + "\n" + result.comment) + sendError(rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror) + "\n" + result.comment) } } }) @@ -1246,7 +1246,7 @@ class DataHandlerMobile @Inject constructor( } @Synchronized private fun sendError(errorMessage: String) { - rxBus.send(EventMobileToWear(EventData.ConfirmAction(rh.gs(info.nightscout.core.ui.R.string.error), errorMessage, returnCommand = EventData.Error(dateUtil.now())))) // ignore return path + rxBus.send(EventMobileToWear(EventData.ConfirmAction(rh.gs(app.aaps.core.ui.R.string.error), errorMessage, returnCommand = EventData.Error(dateUtil.now())))) // ignore return path } /** Stores heart rate events coming from the Wear device. */ diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt index a4d34abdbe..383cafc230 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt @@ -30,7 +30,7 @@ import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.SafeParse import com.google.android.material.tabs.TabLayout import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit import info.nightscout.plugins.R @@ -67,7 +67,7 @@ class ProfileFragment : DaggerFragment() { private val save = Runnable { doEdit() - basalView?.updateLabel(rh.gs(info.nightscout.core.ui.R.string.basal_label) + ": " + sumLabel()) + basalView?.updateLabel(rh.gs(app.aaps.core.ui.R.string.basal_label) + ": " + sumLabel()) profilePlugin.getEditedProfile()?.let { binding.basalGraph.show(ProfileSealed.Pure(it)) binding.icGraph.show(ProfileSealed.Pure(it)) @@ -90,7 +90,7 @@ class ProfileFragment : DaggerFragment() { private fun sumLabel(): String { val profile = profilePlugin.getEditedProfile() val sum = profile?.let { ProfileSealed.Pure(profile).baseBasalSum() } ?: 0.0 - return " ∑" + decimalFormatter.to2Decimal(sum) + rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + return " ∑" + decimalFormatter.to2Decimal(sum) + rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) } private var _binding: ProfileFragmentBinding? = null @@ -146,7 +146,7 @@ class ProfileFragment : DaggerFragment() { requireView(), R.id.ic_holder, "IC", - rh.gs(info.nightscout.core.ui.R.string.ic_long_label), + rh.gs(app.aaps.core.ui.R.string.ic_long_label), currentProfile.ic, null, doubleArrayOf(hardLimits.minIC(), hardLimits.maxIC()), @@ -163,7 +163,7 @@ class ProfileFragment : DaggerFragment() { requireView(), R.id.basal_holder, "BASAL", - rh.gs(info.nightscout.core.ui.R.string.basal_long_label) + ": " + sumLabel(), + rh.gs(app.aaps.core.ui.R.string.basal_long_label) + ": " + sumLabel(), currentProfile.basal, null, doubleArrayOf(pumpDescription.basalMinimumRate, pumpDescription.basalMaximumRate), @@ -181,7 +181,7 @@ class ProfileFragment : DaggerFragment() { requireView(), R.id.isf_holder, "ISF", - rh.gs(info.nightscout.core.ui.R.string.isf_long_label), + rh.gs(app.aaps.core.ui.R.string.isf_long_label), currentProfile.isf, null, isfRange, @@ -197,7 +197,7 @@ class ProfileFragment : DaggerFragment() { requireView(), R.id.target_holder, "TARGET", - rh.gs(info.nightscout.core.ui.R.string.target_long_label), + rh.gs(app.aaps.core.ui.R.string.target_long_label), currentProfile.targetLow, currentProfile.targetHigh, HardLimits.VERY_HARD_LIMIT_MIN_BG, @@ -212,7 +212,7 @@ class ProfileFragment : DaggerFragment() { roundDown(profileUtil.fromMgdlToUnits(HardLimits.MAX_ISF, GlucoseUnit.MMOL)) ) TimeListEdit( - requireContext(), aapsLogger, dateUtil, requireView(), R.id.isf_holder, "ISF", rh.gs(info.nightscout.core.ui.R.string.isf_long_label), currentProfile.isf, null, isfRange, null, 0.1, + requireContext(), aapsLogger, dateUtil, requireView(), R.id.isf_holder, "ISF", rh.gs(app.aaps.core.ui.R.string.isf_long_label), currentProfile.isf, null, isfRange, null, 0.1, DecimalFormat ("0.0"), save ) @@ -232,7 +232,7 @@ class ProfileFragment : DaggerFragment() { requireView(), R.id.target_holder, "TARGET", - rh.gs(info.nightscout.core.ui.R.string.target_long_label), + rh.gs(app.aaps.core.ui.R.string.target_long_label), currentProfile.targetLow, currentProfile.targetHigh, range1, @@ -245,7 +245,7 @@ class ProfileFragment : DaggerFragment() { context?.let { context -> val profileList: ArrayList = profilePlugin.profile?.getProfileList() ?: ArrayList() - binding.profileList.setAdapter(ArrayAdapter(context, info.nightscout.core.ui.R.layout.spinner_centered, profileList)) + binding.profileList.setAdapter(ArrayAdapter(context, app.aaps.core.ui.R.layout.spinner_centered, profileList)) } ?: return binding.profileList.onItemClickListener = AdapterView.OnItemClickListener { _, _, position, _ -> @@ -317,7 +317,7 @@ class ProfileFragment : DaggerFragment() { // if (!pumpDescription.isTempBasalCapable) binding.basal.visibility = View.GONE @Suppress("SetTextI18n") - binding.units.text = rh.gs(R.string.units_colon) + " " + (if (currentProfile.mgdl) rh.gs(info.nightscout.core.ui.R.string.mgdl) else rh.gs(info.nightscout.core.ui.R.string.mmol)) + binding.units.text = rh.gs(R.string.units_colon) + " " + (if (currentProfile.mgdl) rh.gs(app.aaps.core.ui.R.string.mgdl) else rh.gs(app.aaps.core.ui.R.string.mmol)) binding.profileswitch.setOnClickListener { uiInteraction.runProfileSwitchDialog(childFragmentManager, profilePlugin.currentProfile()?.name) @@ -385,7 +385,7 @@ class ProfileFragment : DaggerFragment() { val isValid = profilePlugin.isValidEditState(activity) val isEdited = profilePlugin.isEdited if (isValid) { - this.view?.setBackgroundColor(rh.gac(context, info.nightscout.core.ui.R.attr.okBackgroundColor)) + this.view?.setBackgroundColor(rh.gac(context, app.aaps.core.ui.R.attr.okBackgroundColor)) binding.profileList.isEnabled = true if (isEdited) { @@ -397,7 +397,7 @@ class ProfileFragment : DaggerFragment() { binding.save.visibility = View.GONE } } else { - this.view?.setBackgroundColor(rh.gac(context, info.nightscout.core.ui.R.attr.errorBackgroundColor)) + this.view?.setBackgroundColor(rh.gac(context, app.aaps.core.ui.R.attr.errorBackgroundColor)) binding.profileList.isEnabled = false binding.profileswitch.visibility = View.GONE binding.save.visibility = View.GONE //don't save an invalid profile diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt index 22e8ca8d74..56618be07a 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt @@ -31,8 +31,8 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.HardLimits import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.JsonHelper import info.nightscout.plugins.R import org.json.JSONArray @@ -93,7 +93,7 @@ class ProfilePlugin @Inject constructor( val pumpDescription = activePlugin.activePump.pumpDescription with(profiles[currentProfileIndex]) { if (dia < hardLimits.minDia() || dia > hardLimits.maxDia()) { - ToastUtils.errorToast(activity, rh.gs(info.nightscout.core.ui.R.string.value_out_of_hard_limits, rh.gs(info.nightscout.core.ui.R.string.profile_dia), dia)) + ToastUtils.errorToast(activity, rh.gs(app.aaps.core.ui.R.string.value_out_of_hard_limits, rh.gs(app.aaps.core.ui.R.string.profile_dia), dia)) return false } if (name.isEmpty()) { diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt index a4bff832b4..6fbc1a7ad8 100644 --- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt +++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ui/TimeListEdit.kt @@ -15,8 +15,8 @@ import androidx.core.widget.TextViewCompat import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.SafeParse.stringToDouble -import info.nightscout.core.ui.elements.NumberPicker -import info.nightscout.core.ui.elements.SpinnerHelper +import app.aaps.core.ui.elements.NumberPicker +import app.aaps.core.ui.elements.SpinnerHelper import org.json.JSONArray import org.json.JSONException import org.json.JSONObject @@ -257,7 +257,7 @@ class TimeListEdit( } val adapter = SpinnerAdapter( context, - info.nightscout.core.ui.R.layout.spinner_centered, timeList, timeListValues + app.aaps.core.ui.R.layout.spinner_centered, timeList, timeListValues ) spinner.adapter = adapter spinner.setSelection(posInList, false) diff --git a/plugins/main/src/main/res/layout/actions_fragment.xml b/plugins/main/src/main/res/layout/actions_fragment.xml index 7dd28c7b6c..1a449a749b 100644 --- a/plugins/main/src/main/res/layout/actions_fragment.xml +++ b/plugins/main/src/main/res/layout/actions_fragment.xml @@ -41,7 +41,7 @@ android:padding="10dip" app:columnCount="2"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/main/src/main/res/layout/timelistedit_element_vertical.xml b/plugins/main/src/main/res/layout/timelistedit_element_vertical.xml index 67fd5dea44..d7eca7392e 100644 --- a/plugins/main/src/main/res/layout/timelistedit_element_vertical.xml +++ b/plugins/main/src/main/res/layout/timelistedit_element_vertical.xml @@ -20,13 +20,13 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - diff --git a/plugins/main/src/main/res/layout/wear_fragment.xml b/plugins/main/src/main/res/layout/wear_fragment.xml index bd72587c38..bf3c223f0e 100644 --- a/plugins/main/src/main/res/layout/wear_fragment.xml +++ b/plugins/main/src/main/res/layout/wear_fragment.xml @@ -110,7 +110,7 @@ android:padding="10dip" app:columnCount="2"> - - - - @@ -190,7 +190,7 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() { `when`(rh.gs(R.string.smscommunicator_suspend_reply_with_code)).thenReturn("To suspend loop for %1\$d minutes reply with code %2\$s") `when`(rh.gs(R.string.smscommunicator_loop_suspended)).thenReturn("Loop suspended") `when`(rh.gs(R.string.smscommunicator_unknown_command)).thenReturn("Unknown command or wrong reply") - `when`(rh.gs(info.nightscout.core.ui.R.string.notconfigured)).thenReturn("Not configured") + `when`(rh.gs(app.aaps.core.ui.R.string.notconfigured)).thenReturn("Not configured") `when`(rh.gs(R.string.smscommunicator_profile_reply_with_code)).thenReturn("To switch profile to %1\$s %2\$d%% reply with code %3\$s") `when`(rh.gs(R.string.sms_profile_switch_created)).thenReturn("Profile switch created") `when`(rh.gs(R.string.smscommunicator_basal_stop_reply_with_code)).thenReturn("To stop temp basal reply with code %1\$s") @@ -209,12 +209,12 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() { `when`(rh.gs(R.string.smscommunicator_calibration_sent)).thenReturn("Calibration sent. Receiving must be enabled in xDrip.") `when`(rh.gs(R.string.smscommunicator_carbs_reply_with_code)).thenReturn("To enter %1\$dg at %2\$s reply with code %3\$s") `when`(rh.gs(R.string.smscommunicator_carbs_set)).thenReturn("Carbs %1\$dg entered successfully") - `when`(rh.gs(info.nightscout.core.ui.R.string.noprofile)).thenReturn("No profile loaded from NS yet") - `when`(rh.gs(info.nightscout.core.ui.R.string.pumpsuspended)).thenReturn("Pump suspended") + `when`(rh.gs(app.aaps.core.ui.R.string.noprofile)).thenReturn("No profile loaded from NS yet") + `when`(rh.gs(app.aaps.core.ui.R.string.pumpsuspended)).thenReturn("Pump suspended") `when`(rh.gs(R.string.sms_delta)).thenReturn("Delta:") `when`(rh.gs(R.string.sms_bolus)).thenReturn("Bolus:") `when`(rh.gs(R.string.sms_basal)).thenReturn("Basal:") - `when`(rh.gs(info.nightscout.core.ui.R.string.cob)).thenReturn("COB") + `when`(rh.gs(app.aaps.core.ui.R.string.cob)).thenReturn("COB") `when`(rh.gs(R.string.smscommunicator_meal_bolus_delivered)).thenReturn("Meal Bolus %1\$.2fU delivered successfully") `when`(rh.gs(R.string.smscommunicator_meal_bolus_delivered_tt)).thenReturn("Target %1\$s for %2\$d minutes") `when`(rh.gs(R.string.sms_actual_bg)).thenReturn("BG:") @@ -228,19 +228,19 @@ class SmsCommunicatorPluginTest : TestBaseWithProfile() { `when`(rh.gs(R.string.smscommunicator_pump_connect_fail)).thenReturn("Connection to pump failed") `when`(rh.gs(R.string.smscommunicator_pump_disconnected)).thenReturn("Pump disconnected") `when`(rh.gs(R.string.smscommunicator_code_from_authenticator_for)).thenReturn("from Authenticator app for: %1\$s followed by PIN") - `when`(rh.gs(info.nightscout.core.ui.R.string.patient_name_default)).thenReturn("User") - `when`(rh.gs(info.nightscout.core.ui.R.string.invalid_profile)).thenReturn("Invalid profile !!!") - `when`(rh.gs(info.nightscout.core.ui.R.string.sms)).thenReturn("SMS") - `when`(rh.gsNotLocalised(info.nightscout.core.ui.R.string.loopsuspended)).thenReturn("Loop suspended") + `when`(rh.gs(app.aaps.core.ui.R.string.patient_name_default)).thenReturn("User") + `when`(rh.gs(app.aaps.core.ui.R.string.invalid_profile)).thenReturn("Invalid profile !!!") + `when`(rh.gs(app.aaps.core.ui.R.string.sms)).thenReturn("SMS") + `when`(rh.gsNotLocalised(app.aaps.core.ui.R.string.loopsuspended)).thenReturn("Loop suspended") `when`(rh.gsNotLocalised(R.string.smscommunicator_stopped_sms)).thenReturn("SMS Remote Service stopped. To reactivate it, use AAPS on master smartphone.") `when`(rh.gsNotLocalised(R.string.sms_profile_switch_created)).thenReturn("Profile switch created") `when`(rh.gsNotLocalised(R.string.smscommunicator_tempbasal_canceled)).thenReturn("Temp basal canceled") `when`(rh.gsNotLocalised(R.string.smscommunicator_calibration_sent)).thenReturn("Calibration sent. Receiving must be enabled in xDrip+.") `when`(rh.gsNotLocalised(R.string.smscommunicator_tt_canceled)).thenReturn("Temp Target canceled successfully") - `when`(rh.gs(info.nightscout.core.ui.R.string.closedloop)).thenReturn(modeClosed) - `when`(rh.gs(info.nightscout.core.ui.R.string.openloop)).thenReturn(modeOpen) - `when`(rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend)).thenReturn(modeLgs) - `when`(rh.gs(info.nightscout.core.ui.R.string.unknown)).thenReturn(modeUnknown) + `when`(rh.gs(app.aaps.core.ui.R.string.closedloop)).thenReturn(modeClosed) + `when`(rh.gs(app.aaps.core.ui.R.string.openloop)).thenReturn(modeOpen) + `when`(rh.gs(app.aaps.core.ui.R.string.lowglucosesuspend)).thenReturn(modeLgs) + `when`(rh.gs(app.aaps.core.ui.R.string.unknown)).thenReturn(modeUnknown) `when`(rh.gs(R.string.smscommunicator_set_closed_loop_reply_with_code)).thenReturn("In order to switch Loop mode to Closed loop reply with code %1\$s") `when`(rh.gs(R.string.smscommunicator_current_loop_mode)).thenReturn("Current loop mode: %1\$s") `when`(rh.gs(R.string.smscommunicator_set_lgs_reply_with_code)).thenReturn("In order to switch Loop mode to LGS (Low Glucose Suspend) reply with code %1\$s") diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt index 02272aabcc..caa3709692 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt @@ -40,7 +40,7 @@ class SensitivityAAPSPlugin @Inject constructor( ) : AbstractSensitivityPlugin( PluginDescription() .mainType(PluginType.SENSITIVITY) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_generic_icon) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_generic_icon) .pluginName(R.string.sensitivity_aaps) .shortName(R.string.sensitivity_shortname) .preferencesId(R.xml.pref_absorption_aaps) diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt index 73eae74a48..ac4d076a7a 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt @@ -43,7 +43,7 @@ class SensitivityOref1Plugin @Inject constructor( ) : AbstractSensitivityPlugin( PluginDescription() .mainType(PluginType.SENSITIVITY) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_generic_icon) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_generic_icon) .pluginName(R.string.sensitivity_oref1) .shortName(R.string.sensitivity_shortname) .enableByDefault(true) diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt index ce403ff5e5..f275d58e6b 100644 --- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt +++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt @@ -39,7 +39,7 @@ class SensitivityWeightedAveragePlugin @Inject constructor( ) : AbstractSensitivityPlugin( PluginDescription() .mainType(PluginType.SENSITIVITY) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_generic_icon) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_generic_icon) .pluginName(R.string.sensitivity_weighted_average) .shortName(R.string.sensitivity_shortname) .preferencesId(R.xml.pref_absorption_aaps) diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt b/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt index 0d59739652..9cd4f53a48 100644 --- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt +++ b/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt @@ -25,7 +25,7 @@ class AvgSmoothingPlugin @Inject constructor( ) : PluginBase( PluginDescription() .mainType(PluginType.SMOOTHING) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_timeline_24) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_timeline_24) .pluginName(R.string.avg_smoothing_name) .shortName(R.string.smoothing_shortname) .description(R.string.description_avg_smoothing), diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt b/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt index 7d02fef9d2..d7a95dc76d 100644 --- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt +++ b/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt @@ -24,7 +24,7 @@ class ExponentialSmoothingPlugin @Inject constructor( ) : PluginBase( PluginDescription() .mainType(PluginType.SMOOTHING) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_timeline_24) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_timeline_24) .pluginName(R.string.exponential_smoothing_name) .shortName(R.string.smoothing_shortname) .description(R.string.description_exponential_smoothing), diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt b/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt index 7e69a603f6..6efcd8beda 100644 --- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt +++ b/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt @@ -21,7 +21,7 @@ class NoSmoothingPlugin @Inject constructor( ) : PluginBase( PluginDescription() .mainType(PluginType.SMOOTHING) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_timeline_24) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_timeline_24) .setDefault(true) .pluginName(R.string.no_smoothing_name) .shortName(R.string.smoothing_shortname) diff --git a/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt b/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt index 70d7f565cd..5ada3bc9eb 100644 --- a/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt +++ b/plugins/source/src/main/java/info/nightscout/source/BGSourceFragment.kt @@ -32,7 +32,7 @@ import app.aaps.core.interfaces.rx.events.EventNewBG import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.database.entities.GlucoseValue import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -149,7 +149,7 @@ class BGSourceFragment : DaggerFragment(), MenuProvider { val previous = glucoseValues[position - 1] val diff = previous.timestamp - glucoseValue.timestamp if (diff < T.secs(20).msecs()) - holder.binding.root.setBackgroundColor(rh.gac(context, info.nightscout.core.ui.R.attr.bgsourceError)) + holder.binding.root.setBackgroundColor(rh.gac(context, app.aaps.core.ui.R.attr.bgsourceError)) } holder.binding.root.setOnLongClickListener { @@ -186,12 +186,12 @@ class BGSourceFragment : DaggerFragment(), MenuProvider { val glucoseValue = selectedItems.valueAt(0) return dateUtil.dateAndTimeString(glucoseValue.timestamp) + "\n" + profileUtil.fromMgdlToUnits(glucoseValue.value) } - return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) + return rh.gs(app.aaps.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) } private fun removeSelected(selectedItems: SparseArray) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { selectedItems.forEach { _, glucoseValue -> val source = when ((activePlugin.activeBgSource as PluginBase).pluginDescription.pluginName) { R.string.dexcom_app_patched -> Sources.Dexcom diff --git a/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt index 5403205da2..1c0b834266 100644 --- a/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt +++ b/plugins/source/src/main/java/info/nightscout/source/IntelligoPlugin.kt @@ -47,7 +47,7 @@ class IntelligoPlugin @Inject constructor( PluginDescription() .mainType(PluginType.BGSOURCE) .fragmentClass(BGSourceFragment::class.java.name) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_intelligo) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_intelligo) .preferencesId(R.xml.pref_bgsource) .pluginName(R.string.intelligo) .shortName(R.string.intelligo) diff --git a/plugins/source/src/main/java/info/nightscout/source/activities/RequestDexcomPermissionActivity.kt b/plugins/source/src/main/java/info/nightscout/source/activities/RequestDexcomPermissionActivity.kt index 5a6ef6242c..eef10403b2 100644 --- a/plugins/source/src/main/java/info/nightscout/source/activities/RequestDexcomPermissionActivity.kt +++ b/plugins/source/src/main/java/info/nightscout/source/activities/RequestDexcomPermissionActivity.kt @@ -1,7 +1,7 @@ package info.nightscout.source.activities import android.os.Bundle -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.source.DexcomPlugin class RequestDexcomPermissionActivity : TranslatedDaggerAppCompatActivity() { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt index 9cc587aeaa..c08b14d466 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt @@ -32,7 +32,7 @@ import app.aaps.core.interfaces.rx.events.EventNSClientNewLog import app.aaps.core.interfaces.rx.events.EventNSClientRestart import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry import info.nightscout.plugins.sync.R @@ -145,7 +145,7 @@ class NSClientFragment : DaggerFragment(), MenuProvider, PluginFragment { OKDialog.showConfirmation( context, rh.gs(R.string.ns_client), rh.gs(R.string.full_sync_comment), Runnable { - OKDialog.showConfirmation(requireContext(), rh.gs(R.string.ns_client), rh.gs(info.nightscout.core.ui.R.string.cleanup_db_confirm_sync), Runnable { + OKDialog.showConfirmation(requireContext(), rh.gs(R.string.ns_client), rh.gs(app.aaps.core.ui.R.string.cleanup_db_confirm_sync), Runnable { disposable += Completable.fromAction { result = persistenceLayer.cleanupDatabase(93, deleteTrackedChanges = true) } .subscribeOn(aapsSchedulers.io) .observeOn(aapsSchedulers.main) @@ -155,8 +155,8 @@ class NSClientFragment : DaggerFragment(), MenuProvider, PluginFragment { if (result.isNotEmpty()) OKDialog.show( requireContext(), - rh.gs(info.nightscout.core.ui.R.string.result), - HtmlHelper.fromHtml("" + rh.gs(info.nightscout.core.ui.R.string.cleared_entries) + "
" + result) + rh.gs(app.aaps.core.ui.R.string.result), + HtmlHelper.fromHtml("" + rh.gs(app.aaps.core.ui.R.string.cleared_entries) + "
" + result) .toSpanned() ) aapsLogger.info(LTag.CORE, "Cleaned up databases with result: $result") @@ -222,7 +222,7 @@ class NSClientFragment : DaggerFragment(), MenuProvider, PluginFragment { private fun updateQueue() { val size = nsClientPlugin?.dataSyncSelector?.queueSize() ?: 0L - _binding?.queue?.text = if (size >= 0) size.toString() else rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short) + _binding?.queue?.text = if (size >= 0) size.toString() else rh.gs(app.aaps.core.ui.R.string.value_unavailable_short) } private fun updateStatus() { diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt index 2ba7aefc02..0cd900515f 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/NSClientPlugin.kt @@ -69,7 +69,7 @@ class NSClientPlugin @Inject constructor( PluginDescription() .mainType(PluginType.SYNC) .fragmentClass(NSClientFragment::class.java.name) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_nightscout_syncs) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_nightscout_syncs) .pluginName(R.string.ns_client) .shortName(R.string.ns_client_short_name) .preferencesId(R.xml.pref_ns_client) diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt index f5cbfa3662..7d9b802161 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt @@ -16,7 +16,7 @@ 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.ui.UiInteraction -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.core.utils.JsonHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Action @@ -249,7 +249,7 @@ class NSSettingsStatusImpl @Inject constructor( uel.log(Action.NS_SETTINGS_COPIED, UserEntry.Sources.NSClient) } - if (context != null) OKDialog.showConfirmation(context, rh.gs(info.nightscout.core.ui.R.string.statuslights), rh.gs(R.string.copy_existing_values), action) + if (context != null) OKDialog.showConfirmation(context, rh.gs(app.aaps.core.ui.R.string.statuslights), rh.gs(R.string.copy_existing_values), action) else action.run() } } \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt index 1aff7b2eb3..dd7dd270ad 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/ProcessedDeviceStatusDataImpl.kt @@ -38,8 +38,8 @@ class ProcessedDeviceStatusDataImpl @Inject constructor( //String[] ALL_STATUS_FIELDS = {"reservoir", "battery", "clock", "status", "device"}; val string = StringBuilder() - .append("") - .append(rh.gs(info.nightscout.core.ui.R.string.pump)) + .append("") + .append(rh.gs(app.aaps.core.ui.R.string.pump)) .append(": ") val pumpData = pumpData ?: return HtmlHelper.fromHtml(string.toString()) @@ -57,7 +57,7 @@ class ProcessedDeviceStatusDataImpl @Inject constructor( else -> ProcessedDeviceStatusData.Levels.INFO } string.append("") - // val insulinUnit = rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + // val insulinUnit = rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) // val fields = nsSettingsStatus.pumpExtendedSettingsFields() // Removed here. Same value is in StatusLights // if (pumpData.reservoirDisplayOverride != "") string.append(pumpData.reservoirDisplayOverride).append("$insulinUnit ") @@ -95,7 +95,7 @@ class ProcessedDeviceStatusDataImpl @Inject constructor( override val openApsStatus: Spanned get() { val string = StringBuilder() - .append("") + .append("") .append(rh.gs(R.string.openaps_short)) .append(": ") @@ -138,7 +138,7 @@ class ProcessedDeviceStatusDataImpl @Inject constructor( get() { var isCharging = false val string = StringBuilder() - string.append("") + string.append("") string.append(rh.gs(R.string.uploader_short)) string.append(": ") val iterator: Iterator<*> = uploaderMap.entries.iterator() diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt index ae8edca077..844ddc4941 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt @@ -132,7 +132,7 @@ class NSClientV3Plugin @Inject constructor( PluginDescription() .mainType(PluginType.SYNC) .fragmentClass(NSClientFragment::class.java.name) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_nightscout_syncs) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_nightscout_syncs) .pluginName(R.string.ns_client_v3) .shortName(R.string.ns_client_v3_short_name) .preferencesId(R.xml.pref_ns_client_v3) @@ -156,16 +156,16 @@ class NSClientV3Plugin @Inject constructor( override val status get() = when { - sp.getBoolean(R.string.key_ns_paused, false) -> rh.gs(info.nightscout.core.ui.R.string.paused) + sp.getBoolean(R.string.key_ns_paused, false) -> rh.gs(app.aaps.core.ui.R.string.paused) isAllowed.not() -> blockingReason sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && wsConnected -> "WS: " + rh.gs(app.aaps.core.interfaces.R.string.connected) sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_use_ws, true) && !wsConnected -> "WS: " + rh.gs(R.string.not_connected) - lastOperationError != null -> rh.gs(info.nightscout.core.ui.R.string.error) + lastOperationError != null -> rh.gs(app.aaps.core.ui.R.string.error) nsAndroidClient?.lastStatus == null -> rh.gs(R.string.not_connected) workIsRunning() -> rh.gs(R.string.working) nsAndroidClient?.lastStatus?.apiPermissions?.isFull() == true -> rh.gs(app.aaps.core.interfaces.R.string.connected) nsAndroidClient?.lastStatus?.apiPermissions?.isRead() == true -> rh.gs(R.string.read_only) - else -> rh.gs(info.nightscout.core.ui.R.string.unknown) + else -> rh.gs(app.aaps.core.ui.R.string.unknown) } var lastOperationError: String? = null diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHLoginActivity.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHLoginActivity.kt index bc770012c4..c420df08ad 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHLoginActivity.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/openhumans/ui/OHLoginActivity.kt @@ -15,7 +15,7 @@ import androidx.core.view.updatePadding import androidx.core.widget.NestedScrollView import com.google.android.material.appbar.MaterialToolbar import com.google.android.material.button.MaterialButton -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.di.AuthUrl import info.nightscout.plugins.sync.di.ViewModelFactory diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt index fa9034a704..242a98979c 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolFragment.kt @@ -60,7 +60,7 @@ class TidepoolFragment : DaggerFragment(), MenuProvider { } override fun onCreateMenu(menu: Menu, inflater: MenuInflater) { - menu.add(Menu.FIRST, ID_MENU_LOGIN, 0, rh.gs(info.nightscout.core.ui.R.string.login)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) + menu.add(Menu.FIRST, ID_MENU_LOGIN, 0, rh.gs(app.aaps.core.ui.R.string.login)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) menu.add(Menu.FIRST, ID_MENU_SEND_NOW, 0, rh.gs(R.string.upload_now)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) menu.add(Menu.FIRST, ID_MENU_REMOVE_ALL, 0, rh.gs(R.string.remove_all)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) menu.add(Menu.FIRST, ID_MENU_FULL_SYNC, 0, rh.gs(R.string.full_sync)).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER) diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt index 6c4150d9c0..aa9f70ba91 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/TidepoolPlugin.kt @@ -178,7 +178,7 @@ class TidepoolPlugin @Inject constructor( } textLog = HtmlHelper.fromHtml(newTextLog.toString()) } catch (e: OutOfMemoryError) { - uiInteraction.showToastAndNotification(context, "Out of memory!\nStop using this phone !!!", info.nightscout.core.ui.R.raw.error) + uiInteraction.showToastAndNotification(context, "Out of memory!\nStop using this phone !!!", app.aaps.core.ui.R.raw.error) } } diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt index d2bf302040..6977beb937 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/tidepool/comm/TidepoolUploader.kt @@ -11,7 +11,7 @@ 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.T -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsclient.ReceiverDelegate import info.nightscout.plugins.sync.tidepool.events.EventTidepoolStatus diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt index 00a296a8a5..983c292d33 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripFragment.kt @@ -22,7 +22,7 @@ import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.databinding.XdripFragmentBinding import info.nightscout.plugins.sync.xdrip.events.EventXdripUpdateGUI @@ -110,6 +110,6 @@ class XdripFragment : DaggerFragment(), MenuProvider, PluginFragment { if (_binding == null) return binding.log.text = xdripPlugin.textLog() val size = dataSyncSelector.queueSize() - binding.queue.text = if (size >= 0) size.toString() else rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short) + binding.queue.text = if (size >= 0) size.toString() else rh.gs(app.aaps.core.ui.R.string.value_unavailable_short) } } \ No newline at end of file diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt index 7906d3bafb..e73d07d326 100644 --- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt +++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/XdripPlugin.kt @@ -45,7 +45,7 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.shared.impl.extensions.safeQueryBroadcastReceivers import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.HtmlHelper import info.nightscout.plugins.sync.R import info.nightscout.plugins.sync.nsclient.extensions.toJson @@ -174,7 +174,7 @@ class XdripPlugin @Inject constructor( } return HtmlHelper.fromHtml(newTextLog.toString()) } catch (e: OutOfMemoryError) { - uiInteraction.showToastAndNotification(context, "Out of memory!\nStop using this phone !!!", info.nightscout.core.ui.R.raw.error) + uiInteraction.showToastAndNotification(context, "Out of memory!\nStop using this phone !!!", app.aaps.core.ui.R.raw.error) } return HtmlHelper.fromHtml("") } @@ -245,7 +245,7 @@ class XdripPlugin @Inject constructor( //IOB val bolusIob = iobCobCalculator.calculateIobFromBolus().round() val basalIob = iobCobCalculator.calculateIobFromTempBasalsIncludingConvertedExtended().round() - status.append(decimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob)).append(rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname)) + status.append(decimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob)).append(rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname)) if (sp.getBoolean(R.string.key_xdrip_status_detailed_iob, true)) status.append("(") .append(decimalFormatter.to2Decimal(bolusIob.iob)) diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtensionKtTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtensionKtTest.kt index eed855f93f..9192f46763 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtensionKtTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtensionKtTest.kt @@ -49,7 +49,7 @@ internal class ExtendedBolusExtensionKtTest : TestBaseWithProfile() { val converted = extendedBolus.toNSExtendedBolus(validProfile) assertIs(converted) - assertThat((converted as NSTemporaryBasal).extendedEmulated).isNotNull() + assertThat(converted.extendedEmulated).isNotNull() val convertedBack = converted.convertToRemoteAndBack() assertIs(convertedBack) 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 432f0b37f2..9f982b6c96 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 @@ -59,7 +59,7 @@ class ComboFragment : DaggerFragment() { .subscribe({ updateGui() }, fabricPrivacy::logException) binding.comboRefreshButton.setOnClickListener { binding.comboRefreshButton.isEnabled = false - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.user_request), object : Callback() { + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.user_request), object : Callback() { override fun run() { activity?.runOnUiThread { binding.comboRefreshButton.isEnabled = true } } @@ -80,15 +80,15 @@ class ComboFragment : DaggerFragment() { binding.comboState.text = comboPlugin.stateSummary val ps = comboPlugin.pump.state if (ps.insulinState == PumpState.EMPTY || ps.batteryState == PumpState.EMPTY || ps.activeAlert != null && ps.activeAlert.errorCode != null) { - binding.comboState.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor)) + binding.comboState.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.warningColor)) binding.comboState.setTypeface(null, Typeface.BOLD) } else if (comboPlugin.pump.state.suspended || ps.activeAlert != null && ps.activeAlert.warningCode != null ) { - binding.comboState.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.omniYellowColor)) + binding.comboState.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.omniYellowColor)) binding.comboState.setTypeface(null, Typeface.BOLD) } else { - binding.comboState.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.comboState.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) binding.comboState.setTypeface(null, Typeface.NORMAL) } @@ -96,27 +96,27 @@ class ComboFragment : DaggerFragment() { val activity = comboPlugin.pump.activity when { activity != null -> { - binding.comboActivity.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.comboActivity.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) binding.comboActivity.textSize = 14f binding.comboActivity.text = activity } commandQueue.size() > 0 -> { - binding.comboActivity.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.comboActivity.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) binding.comboActivity.textSize = 14f binding.comboActivity.text = "" } comboPlugin.isInitialized() -> { - binding.comboActivity.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.comboActivity.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) binding.comboActivity.textSize = 20f binding.comboActivity.text = "{fa-bed}" } else -> { - binding.comboActivity.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor)) + binding.comboActivity.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.warningColor)) binding.comboActivity.textSize = 14f - binding.comboActivity.text = rh.gs(info.nightscout.core.ui.R.string.pump_unreachable) + binding.comboActivity.text = rh.gs(app.aaps.core.ui.R.string.pump_unreachable) } } if (comboPlugin.isInitialized()) { @@ -125,12 +125,12 @@ class ComboFragment : DaggerFragment() { when (ps.batteryState) { PumpState.EMPTY -> { binding.comboPumpstateBattery.text = "{fa-battery-empty}" - binding.comboPumpstateBattery.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor)) + binding.comboPumpstateBattery.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.warningColor)) } PumpState.LOW -> { binding.comboPumpstateBattery.text = "{fa-battery-quarter}" - binding.comboPumpstateBattery.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.omniYellowColor)) + binding.comboPumpstateBattery.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.omniYellowColor)) } else -> { @@ -142,29 +142,29 @@ class ComboFragment : DaggerFragment() { // reservoir val reservoirLevel = comboPlugin.pump.reservoirLevel when { - reservoirLevel != -1 -> binding.comboInsulinstate.text = reservoirLevel.toString() + " " + rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + reservoirLevel != -1 -> binding.comboInsulinstate.text = reservoirLevel.toString() + " " + rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) ps.insulinState == PumpState.LOW -> binding.comboInsulinstate.text = rh.gs(R.string.combo_reservoir_low) ps.insulinState == PumpState.EMPTY -> binding.comboInsulinstate.text = rh.gs(R.string.combo_reservoir_empty) else -> binding.comboInsulinstate.text = rh.gs(R.string.combo_reservoir_normal) } when (ps.insulinState) { PumpState.UNKNOWN -> { - binding.comboInsulinstate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.comboInsulinstate.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) binding.comboInsulinstate.setTypeface(null, Typeface.NORMAL) } PumpState.LOW -> { - binding.comboInsulinstate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.omniYellowColor)) + binding.comboInsulinstate.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.omniYellowColor)) binding.comboInsulinstate.setTypeface(null, Typeface.BOLD) } PumpState.EMPTY -> { - binding.comboInsulinstate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor)) + binding.comboInsulinstate.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.warningColor)) binding.comboInsulinstate.setTypeface(null, Typeface.BOLD) } else -> { - binding.comboInsulinstate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.comboInsulinstate.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) binding.comboInsulinstate.setTypeface(null, Typeface.NORMAL) } } @@ -175,17 +175,17 @@ class ComboFragment : DaggerFragment() { when { comboPlugin.pump.lastSuccessfulCmdTime + 60 * 1000 > System.currentTimeMillis() -> { binding.comboLastconnection.setText(R.string.combo_pump_connected_now) - binding.comboLastconnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.comboLastconnection.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) } comboPlugin.pump.lastSuccessfulCmdTime + 30 * 60 * 1000 < System.currentTimeMillis() -> { binding.comboLastconnection.text = rh.gs(R.string.combo_no_pump_connection, min) - binding.comboLastconnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor)) + binding.comboLastconnection.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.warningColor)) } else -> { binding.comboLastconnection.text = minAgo - binding.comboLastconnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.comboLastconnection.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) } } @@ -194,7 +194,7 @@ class ComboFragment : DaggerFragment() { if (bolus != null) { val agoMsc = System.currentTimeMillis() - bolus.timestamp val bolusMinAgo = agoMsc / 60.0 / 1000.0 - val unit = rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + val unit = rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) val ago: String = when { agoMsc < 60 * 1000 -> rh.gs(R.string.combo_pump_connected_now) bolusMinAgo < 60 -> dateUtil.minAgo(rh, bolus.timestamp) @@ -207,7 +207,7 @@ class ComboFragment : DaggerFragment() { } // base basal rate - binding.comboBaseBasalRate.text = rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, comboPlugin.baseBasalRate) + binding.comboBaseBasalRate.text = rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, comboPlugin.baseBasalRate) // TBR var tbrStr = "" diff --git a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java index 068e12bb7e..9a763828bf 100644 --- a/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java +++ b/pump/combo/src/main/java/info/nightscout/pump/combo/ComboPlugin.java @@ -106,10 +106,10 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain event.setStatus(getRh().gs(R.string.combo_programming_bolus)); break; case DELIVERING: - event.setStatus(getRh().gs(info.nightscout.core.ui.R.string.bolus_delivering, delivered)); + event.setStatus(getRh().gs(app.aaps.core.ui.R.string.bolus_delivering, delivered)); break; case DELIVERED: - event.setStatus(getRh().gs(info.nightscout.core.ui.R.string.bolus_delivered_successfully, delivered)); + event.setStatus(getRh().gs(app.aaps.core.ui.R.string.bolus_delivered_successfully, delivered)); break; case STOPPING: event.setStatus(getRh().gs(R.string.bolusstopping)); @@ -175,7 +175,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain super(new PluginDescription() .mainType(PluginType.PUMP) .fragmentClass(ComboFragment.class.getName()) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_combo_128) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_combo_128) .pluginName(R.string.combopump) .shortName(R.string.combopump_shortname) .preferencesId(R.xml.pref_combo) @@ -217,7 +217,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain } else if (!pump.initialized) { return getRh().gs(R.string.combo_pump_state_initializing); } else if (!validBasalRateProfileSelectedOnPump) { - return getRh().gs(info.nightscout.core.ui.R.string.loop_disabled); + return getRh().gs(app.aaps.core.ui.R.string.loop_disabled); } return getRh().gs(R.string.combo_pump_state_running); } @@ -281,8 +281,8 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain // note that this should not happen anymore since the queue is present, which // issues a READSTATE when starting to issue commands which initializes the pump getAapsLogger().error("setNewBasalProfile not initialized"); - uiInteraction.addNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, getRh().gs(info.nightscout.core.ui.R.string.pump_not_initialized_profile_not_set), Notification.URGENT); - return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(info.nightscout.core.ui.R.string.pump_not_initialized_profile_not_set); + uiInteraction.addNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, getRh().gs(app.aaps.core.ui.R.string.pump_not_initialized_profile_not_set), Notification.URGENT); + return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(app.aaps.core.ui.R.string.pump_not_initialized_profile_not_set); } BasalProfile requestedBasalProfile = convertProfileToComboProfile(profile); @@ -301,8 +301,8 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain CommandResult setResult = runCommand(getRh().gs(R.string.combo_activity_setting_basal_profile), 2, () -> ruffyScripter.setBasalProfile(requestedBasalProfile)); if (!setResult.success) { - uiInteraction.addNotification(Notification.FAILED_UPDATE_PROFILE, getRh().gs(info.nightscout.core.ui.R.string.failed_update_basal_profile), Notification.URGENT); - return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(info.nightscout.core.ui.R.string.failed_update_basal_profile); + uiInteraction.addNotification(Notification.FAILED_UPDATE_PROFILE, getRh().gs(app.aaps.core.ui.R.string.failed_update_basal_profile), Notification.URGENT); + return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(app.aaps.core.ui.R.string.failed_update_basal_profile); } pump.basalProfile = requestedBasalProfile; @@ -312,7 +312,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain rxBus.send(new EventDismissNotification(Notification.FAILED_UPDATE_PROFILE)); //issue success notification uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, - getRh().gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60); + getRh().gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60); return new PumpEnactResult(getInjector()).success(true).enacted(true); } @@ -404,7 +404,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain if (stateResult.state.unsafeUsageDetected == PumpState.UNSUPPORTED_BASAL_RATE_PROFILE) { uiInteraction.addNotificationWithSound(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_force_disabled_notification), - Notification.URGENT, info.nightscout.core.ui.R.raw.alarm); + Notification.URGENT, app.aaps.core.ui.R.raw.alarm); return; } @@ -818,7 +818,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain ); return new PumpEnactResult(getInjector()).isTempCancel(true).success(true).enacted(true); } else { - return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(info.nightscout.core.ui.R.string.canceling_eb_failed); + return new PumpEnactResult(getInjector()).success(false).enacted(false).comment(app.aaps.core.ui.R.string.canceling_eb_failed); } } else if (activeTemp == null) { return new PumpEnactResult(getInjector()).success(true).enacted(false); @@ -891,7 +891,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain setValidBasalRateProfileSelectedOnPump(false); uiInteraction.addNotificationWithSound(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_force_disabled_notification), - Notification.URGENT, info.nightscout.core.ui.R.raw.alarm); + Notification.URGENT, app.aaps.core.ui.R.raw.alarm); commandQueue.cancelTempBasal(true, null); } updateLocalData(commandResult); @@ -1062,7 +1062,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain if (lowSuspendOnlyLoopEnforcedUntil > System.currentTimeMillis() && violationWarningRaisedForBolusAt != lowSuspendOnlyLoopEnforcedUntil) { uiInteraction.addNotificationWithSound(Notification.COMBO_PUMP_ALARM, getRh().gs(R.string.combo_low_suspend_forced_notification), - Notification.URGENT, info.nightscout.core.ui.R.raw.alarm); + Notification.URGENT, app.aaps.core.ui.R.raw.alarm); violationWarningRaisedForBolusAt = lowSuspendOnlyLoopEnforcedUntil; commandQueue.cancelTempBasal(true, null); } @@ -1130,7 +1130,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain * Reads the pump's history and updates the DB accordingly. */ private boolean readHistory(@Nullable PumpHistoryRequest request) { - CommandResult historyResult = runCommand(getRh().gs(info.nightscout.core.ui.R.string.reading_pump_history), 3, () -> ruffyScripter.readHistory(request)); + CommandResult historyResult = runCommand(getRh().gs(app.aaps.core.ui.R.string.reading_pump_history), 3, () -> ruffyScripter.readHistory(request)); PumpHistory history = historyResult.history; if (!historyResult.success || history == null) { return false; @@ -1216,7 +1216,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain // fetch new records long lastKnownPumpRecordTimestamp = recentBoluses.isEmpty() ? 0 : recentBoluses.get(0).timestamp; - CommandResult historyResult = runCommand(getRh().gs(info.nightscout.core.ui.R.string.reading_pump_history), 3, () -> + CommandResult historyResult = runCommand(getRh().gs(app.aaps.core.ui.R.string.reading_pump_history), 3, () -> ruffyScripter.readHistory(new PumpHistoryRequest().bolusHistory(lastKnownPumpRecordTimestamp))); if (!historyResult.success) { pumpHistoryChanged = true; @@ -1380,14 +1380,14 @@ public class ComboPlugin extends PumpPluginBase implements Pump, PluginConstrain @NonNull @Override public Constraint isLoopInvocationAllowed(@NonNull Constraint value) { if (!validBasalRateProfileSelectedOnPump) - value.set(false, getRh().gs(info.nightscout.core.ui.R.string.no_valid_basal_rate), this); + value.set(false, getRh().gs(app.aaps.core.ui.R.string.no_valid_basal_rate), this); return value; } @NonNull @Override public Constraint applyMaxIOBConstraints(@NonNull Constraint maxIob) { if (lowSuspendOnlyLoopEnforcedUntil > System.currentTimeMillis()) - maxIob.setIfSmaller(0d, getRh().gs(info.nightscout.core.ui.R.string.limiting_iob, 0d, getRh().gs(R.string.unsafeusage)), this); + maxIob.setIfSmaller(0d, getRh().gs(app.aaps.core.ui.R.string.limiting_iob, 0d, getRh().gs(R.string.unsafeusage)), this); return maxIob; } diff --git a/pump/combo/src/main/res/layout/combopump_fragment.xml b/pump/combo/src/main/res/layout/combopump_fragment.xml index 607d332db3..61835fc828 100644 --- a/pump/combo/src/main/res/layout/combopump_fragment.xml +++ b/pump/combo/src/main/res/layout/combopump_fragment.xml @@ -613,7 +613,7 @@ android:orientation="horizontal" android:paddingEnd="4dp"> - val text = when (connectionState) { ComboV2Plugin.DriverState.NotInitialized -> rh.gs(R.string.combov2_not_initialized) - ComboV2Plugin.DriverState.Disconnected -> rh.gs(info.nightscout.core.ui.R.string.disconnected) - ComboV2Plugin.DriverState.Connecting -> rh.gs(info.nightscout.core.ui.R.string.connecting) + ComboV2Plugin.DriverState.Disconnected -> rh.gs(app.aaps.core.ui.R.string.disconnected) + ComboV2Plugin.DriverState.Connecting -> rh.gs(app.aaps.core.ui.R.string.connecting) ComboV2Plugin.DriverState.CheckingPump -> rh.gs(R.string.combov2_checking_pump) ComboV2Plugin.DriverState.Ready -> rh.gs(R.string.combov2_ready) ComboV2Plugin.DriverState.Suspended -> rh.gs(R.string.combov2_suspended) - ComboV2Plugin.DriverState.Error -> rh.gs(info.nightscout.core.ui.R.string.error) + ComboV2Plugin.DriverState.Error -> rh.gs(app.aaps.core.ui.R.string.error) is ComboV2Plugin.DriverState.ExecutingCommand -> when (val desc = connectionState.description) { is ComboCtlPump.GettingBasalProfileCommandDesc -> @@ -169,7 +169,7 @@ class ComboV2Fragment : DaggerFragment() { combov2Plugin.reservoirLevelUIFlow .onEach { reservoirLevel -> binding.combov2Reservoir.text = if (reservoirLevel != null) - "${reservoirLevel.availableUnits} ${rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname)}" + "${reservoirLevel.availableUnits} ${rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname)}" else "" @@ -199,7 +199,7 @@ class ComboV2Fragment : DaggerFragment() { combov2Plugin.baseBasalRateUIFlow .onEach { baseBasalRate -> binding.combov2BaseBasalRate.text = if (baseBasalRate != null) - rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, baseBasalRate) + rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, baseBasalRate) else "" } @@ -287,7 +287,7 @@ class ComboV2Fragment : DaggerFragment() { rh.gs( R.string.combov2_last_bolus, lastBolus.bolusAmount.cctlBolusToIU(), - rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname), + rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname), bolusAgoText ) } diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt index 60c23bc722..cf7def4f64 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/ComboV2Plugin.kt @@ -59,8 +59,8 @@ import info.nightscout.comboctl.parser.AlertScreenContent import info.nightscout.comboctl.parser.AlertScreenException import info.nightscout.comboctl.parser.BatteryState import info.nightscout.comboctl.parser.ReservoirState -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.combov2.activities.ComboV2PairingActivity import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope @@ -857,14 +857,14 @@ class ComboV2Plugin @Inject constructor( uiInteraction.addNotification( Notification.PROFILE_NOT_SET_NOT_INITIALIZED, - rh.gs(info.nightscout.core.ui.R.string.pump_not_initialized_profile_not_set), + rh.gs(app.aaps.core.ui.R.string.pump_not_initialized_profile_not_set), Notification.URGENT ) return PumpEnactResult(injector).apply { success = false enacted = false - comment = rh.gs(info.nightscout.core.ui.R.string.pump_not_initialized_profile_not_set) + comment = rh.gs(app.aaps.core.ui.R.string.pump_not_initialized_profile_not_set) } } @@ -888,7 +888,7 @@ class ComboV2Plugin @Inject constructor( uiInteraction.addNotificationValidFor( Notification.PROFILE_SET_OK, - rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), + rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60 ) @@ -926,14 +926,14 @@ class ComboV2Plugin @Inject constructor( uiInteraction.addNotification( Notification.FAILED_UPDATE_PROFILE, - rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile), + rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile), Notification.URGENT ) pumpEnactResult.apply { success = false enacted = false - comment = rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile) + comment = rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile) } } } @@ -1070,7 +1070,7 @@ class ComboV2Plugin @Inject constructor( is RTCommandProgressStage.DeliveringBolus -> { val bolusingEvent = EventOverviewBolusProgress bolusingEvent.percent = (progressReport.overallProgress * 100.0).toInt() - bolusingEvent.status = rh.gs(info.nightscout.core.ui.R.string.bolus_delivering, detailedBolusInfo.insulin) + bolusingEvent.status = rh.gs(app.aaps.core.ui.R.string.bolus_delivering, detailedBolusInfo.insulin) rxBus.send(bolusingEvent) } @@ -1105,7 +1105,7 @@ class ComboV2Plugin @Inject constructor( acquiredPump.deliverBolus(requestedBolusAmount, bolusReason) } - reportFinishedBolus(rh.gs(info.nightscout.core.ui.R.string.bolus_delivered_successfully, detailedBolusInfo.insulin), pumpEnactResult, succeeded = true) + reportFinishedBolus(rh.gs(app.aaps.core.ui.R.string.bolus_delivered_successfully, detailedBolusInfo.insulin), pumpEnactResult, succeeded = true) } catch (e: CancellationException) { // Cancellation is not an error, but it also means // that the profile update was not enacted. @@ -1222,7 +1222,7 @@ class ComboV2Plugin @Inject constructor( pumpEnactResult.apply { success = false enacted = false - comment = rh.gs(info.nightscout.core.ui.R.string.error) + comment = rh.gs(app.aaps.core.ui.R.string.error) } return pumpEnactResult } @@ -1254,7 +1254,7 @@ class ComboV2Plugin @Inject constructor( pumpEnactResult.apply { success = false enacted = false - comment = rh.gs(info.nightscout.core.ui.R.string.error) + comment = rh.gs(app.aaps.core.ui.R.string.error) } return pumpEnactResult } @@ -1683,7 +1683,7 @@ class ComboV2Plugin @Inject constructor( // Notifications on the AAPS overview fragment are not useful here // because the pairing activity obscures that fragment. So, instead, // alert the user by showing the notification via the toaster. - ToastUtils.errorToast(context, info.nightscout.core.ui.R.string.ble_not_enabled) + ToastUtils.errorToast(context, app.aaps.core.ui.R.string.ble_not_enabled) ComboCtlPumpManager.PairingResult.ExceptionDuringPairing(e) } } @@ -1707,7 +1707,7 @@ class ComboV2Plugin @Inject constructor( // queue will contain a pump_driver_changed readstatus // command already. The queue will see that and ignore // this readStatus() call automatically. - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.pump_paired), null) + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.pump_paired), null) } finally { pairingJob = null pairingPINChannel?.close() diff --git a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/activities/ComboV2PairingActivity.kt b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/activities/ComboV2PairingActivity.kt index a50dff00fc..309448863b 100644 --- a/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/activities/ComboV2PairingActivity.kt +++ b/pump/combov2/src/main/kotlin/info/nightscout/pump/combov2/activities/ComboV2PairingActivity.kt @@ -23,9 +23,9 @@ import app.aaps.core.interfaces.resources.ResourceHelper import info.nightscout.comboctl.base.BasicProgressStage import info.nightscout.comboctl.base.PAIRING_PIN_SIZE import info.nightscout.comboctl.base.PairingPIN -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.combov2.ComboV2Plugin import info.nightscout.pump.combov2.R import info.nightscout.pump.combov2.databinding.Combov2PairingActivityBinding diff --git a/pump/combov2/src/main/res/layout/combov2_fragment.xml b/pump/combov2/src/main/res/layout/combov2_fragment.xml index 58bd02c224..16aede9c87 100644 --- a/pump/combov2/src/main/res/layout/combov2_fragment.xml +++ b/pump/combov2/src/main/res/layout/combov2_fragment.xml @@ -438,7 +438,7 @@ android:layout_alignParentBottom="true" android:orientation="vertical"> - - { - holder.binding.dailyBasal.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, record.dailyBasal) - holder.binding.dailyBolus.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, record.dailyBolus) - holder.binding.dailyTotal.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, record.dailyBolus + record.dailyBasal) + holder.binding.dailyBasal.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, record.dailyBasal) + holder.binding.dailyBolus.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, record.dailyBolus) + holder.binding.dailyTotal.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, record.dailyBolus + record.dailyBasal) holder.binding.time.text = dateUtil.dateString(record.timestamp) holder.binding.time.visibility = View.VISIBLE holder.binding.value.visibility = View.GONE 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 fff58e96dd..08c08ed938 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 @@ -15,7 +15,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 info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.R import info.nightscout.pump.dana.databinding.DanarUserOptionsActivityBinding @@ -162,7 +162,7 @@ class DanaUserOptionsActivity : TranslatedDaggerAppCompatActivity() { commandQueue.setUserOptions(object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(R.string.pumperror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(R.string.pumperror), app.aaps.core.ui.R.raw.boluserror) } } }) diff --git a/pump/dana/src/main/res/layout/danar_fragment.xml b/pump/dana/src/main/res/layout/danar_fragment.xml index 3667cdbef6..d1e8bcdee8 100644 --- a/pump/dana/src/main/res/layout/danar_fragment.xml +++ b/pump/dana/src/main/res/layout/danar_fragment.xml @@ -660,7 +660,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - - - - - - - (percent, getAapsLogger()), profile).value(); if (percent < 0) { - result.isTempCancel(false).enacted(false).success(false).comment(info.nightscout.core.ui.R.string.invalid_input); + result.isTempCancel(false).enacted(false).success(false).comment(app.aaps.core.ui.R.string.invalid_input); aapsLogger.error("setTempBasalPercent: Invalid input"); return result; } if (percent > getPumpDescription().getMaxTempPercent()) percent = getPumpDescription().getMaxTempPercent(); if (danaPump.isTempBasalInProgress() && danaPump.getTempBasalPercent() == percent && danaPump.getTempBasalRemainingMin() > 4 && !enforceNew) { - result.enacted(false).success(true).isTempCancel(false).comment(info.nightscout.core.ui.R.string.ok).duration(pump.getTempBasalRemainingMin()).percent(pump.getTempBasalPercent()).isPercent(true); + result.enacted(false).success(true).isTempCancel(false).comment(app.aaps.core.ui.R.string.ok).duration(pump.getTempBasalRemainingMin()).percent(pump.getTempBasalPercent()).isPercent(true); aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: Correct value already set"); return result; } @@ -312,11 +312,11 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin { connectionOK = sExecutionService.tempBasal(percent, durationInHours); } if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) { - result.enacted(true).success(true).comment(info.nightscout.core.ui.R.string.ok).isTempCancel(false).duration(pump.getTempBasalRemainingMin()).percent(pump.getTempBasalPercent()).isPercent(true); + result.enacted(true).success(true).comment(app.aaps.core.ui.R.string.ok).isTempCancel(false).duration(pump.getTempBasalRemainingMin()).percent(pump.getTempBasalPercent()).isPercent(true); aapsLogger.debug(LTag.PUMP, "setTempBasalPercent: OK"); return result; } - result.enacted(false).success(false).comment(info.nightscout.core.ui.R.string.temp_basal_delivery_error); + result.enacted(false).success(false).comment(app.aaps.core.ui.R.string.temp_basal_delivery_error); aapsLogger.error("setTempBasalPercent: Failed to set temp basal"); return result; } @@ -326,7 +326,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin { PumpEnactResult result = new PumpEnactResult(getInjector()); boolean connectionOK = sExecutionService.highTempBasal(percent, durationInMinutes); if (connectionOK && pump.isTempBasalInProgress() && pump.getTempBasalPercent() == percent) { - result.enacted(true).success(true).comment(info.nightscout.core.ui.R.string.ok).isTempCancel(false).duration(pump.getTempBasalRemainingMin()).percent(pump.getTempBasalPercent()).isPercent(true); + result.enacted(true).success(true).comment(app.aaps.core.ui.R.string.ok).isTempCancel(false).duration(pump.getTempBasalRemainingMin()).percent(pump.getTempBasalPercent()).isPercent(true); aapsLogger.debug(LTag.PUMP, "setHighTempBasalPercent: OK"); return result; } @@ -342,7 +342,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin { sExecutionService.tempBasalStop(); result.success(true).enacted(true).isTempCancel(true); } else { - result.success(true).isTempCancel(true).comment(info.nightscout.core.ui.R.string.ok); + result.success(true).isTempCancel(true).comment(app.aaps.core.ui.R.string.ok); aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK"); } return result; @@ -360,7 +360,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin { if (danaPump.isExtendedInProgress() && Math.abs(danaPump.getExtendedBolusAmount() - insulin) < pumpDescription.getExtendedBolusStep()) { result.enacted(false) .success(true) - .comment(info.nightscout.core.ui.R.string.ok) + .comment(app.aaps.core.ui.R.string.ok) .duration(pump.getExtendedBolusRemainingMinutes()) .absolute(pump.getExtendedBolusAbsoluteRate()) .isPercent(false) @@ -372,7 +372,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin { if (connectionOK && pump.isExtendedInProgress() && Math.abs(pump.getExtendedBolusAmount() - insulin) < getPumpDescription().getExtendedBolusStep()) { result.enacted(true) .success(true) - .comment(info.nightscout.core.ui.R.string.ok) + .comment(app.aaps.core.ui.R.string.ok) .isTempCancel(false) .duration(pump.getExtendedBolusRemainingMinutes()) .absolute(pump.getExtendedBolusAbsoluteRate()) @@ -394,7 +394,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin { sExecutionService.extendedBolusStop(); result.enacted(true).success(!danaPump.isExtendedInProgress()).isTempCancel(true); } else { - result.success(true).enacted(false).comment(info.nightscout.core.ui.R.string.ok); + result.success(true).enacted(false).comment(app.aaps.core.ui.R.string.ok); getAapsLogger().debug(LTag.PUMP, "cancelExtendedBolus: OK"); } return result; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt index f3a4083271..55955dbacc 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt @@ -36,7 +36,7 @@ class MsgCheckValue_v2( //If profile coming from pump, switch it as well configBuilder.storeSettings("ChangingDanaRv2Driver") rxBus.send(EventRebuildTabs()) - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.pump_driver_change), null) // force new connection + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.pump_driver_change), null) // force new connection return } if (danaPump.protocol != 2) { @@ -52,7 +52,7 @@ class MsgCheckValue_v2( //If profile coming from pump, switch it as well configBuilder.storeSettings("ChangingDanaRv2Driver") rxBus.send(EventRebuildTabs()) - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.pump_driver_change), null) // force new connection + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.pump_driver_change), null) // force new connection return } aapsLogger.debug(LTag.PUMPCOMM, "Model: " + String.format("%02X ", danaPump.hwModel)) diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java index 9f9b1f5553..2bdb60c890 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java @@ -193,7 +193,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService { if (Math.abs(timeDiff) > 60 * 60 * 1.5) { aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds - large difference"); //If time-diff is very large, warn user until we can synchronize history readings properly - uiInteraction.runAlarm(rh.gs(info.nightscout.pump.dana.R.string.largetimediff), rh.gs(info.nightscout.pump.dana.R.string.largetimedifftitle), info.nightscout.core.ui.R.raw.error); + uiInteraction.runAlarm(rh.gs(info.nightscout.pump.dana.R.string.largetimediff), rh.gs(info.nightscout.pump.dana.R.string.largetimedifftitle), app.aaps.core.ui.R.raw.error); //deinitialize pump danaPump.reset(); @@ -348,7 +348,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService { mSerialIOThread.sendMessage(msgSetHistoryEntry_v2); danaPump.readHistoryFrom = Math.min(danaPump.readHistoryFrom, carbtime - T.Companion.mins(1).msecs()); if (!msgSetHistoryEntry_v2.isReceived() || msgSetHistoryEntry_v2.getFailed()) - uiInteraction.runAlarm(rh.gs(info.nightscout.pump.dana.R.string.carbs_store_error), rh.gs(info.nightscout.core.ui.R.string.error), info.nightscout.core.ui.R.raw.boluserror); + uiInteraction.runAlarm(rh.gs(info.nightscout.pump.dana.R.string.carbs_store_error), rh.gs(app.aaps.core.ui.R.string.error), app.aaps.core.ui.R.raw.boluserror); } final long bolusStart = System.currentTimeMillis(); diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java index 3100716120..a9934d9079 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java @@ -88,7 +88,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump super(new PluginDescription() .mainType(PluginType.PUMP) .fragmentClass(DanaFragment.class.getName()) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_danars_128) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_danars_128) .pluginName(info.nightscout.pump.dana.R.string.danarspump) .shortName(info.nightscout.pump.dana.R.string.danarpump_shortname) .preferencesId(R.xml.pref_danar) @@ -122,7 +122,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump if (event.isChanged(getRh().gs(info.nightscout.pump.dana.R.string.key_danar_bt_name))) { danaPump.reset(); pumpSync.connectNewPump(true); - getCommandQueue().readStatus(getRh().gs(info.nightscout.core.ui.R.string.device_changed), null); + getCommandQueue().readStatus(getRh().gs(app.aaps.core.ui.R.string.device_changed), null); } }) ); @@ -157,19 +157,19 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump } if (!isInitialized()) { getAapsLogger().error("setNewBasalProfile not initialized"); - uiInteraction.addNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, getRh().gs(info.nightscout.core.ui.R.string.pump_not_initialized_profile_not_set), Notification.URGENT); - result.comment(info.nightscout.core.ui.R.string.pump_not_initialized_profile_not_set); + uiInteraction.addNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, getRh().gs(app.aaps.core.ui.R.string.pump_not_initialized_profile_not_set), Notification.URGENT); + result.comment(app.aaps.core.ui.R.string.pump_not_initialized_profile_not_set); return result; } else { rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED)); } if (!sExecutionService.updateBasalsInPump(profile)) { - uiInteraction.addNotification(Notification.FAILED_UPDATE_PROFILE, getRh().gs(info.nightscout.core.ui.R.string.failed_update_basal_profile), Notification.URGENT); - result.comment(info.nightscout.core.ui.R.string.failed_update_basal_profile); + uiInteraction.addNotification(Notification.FAILED_UPDATE_PROFILE, getRh().gs(app.aaps.core.ui.R.string.failed_update_basal_profile), Notification.URGENT); + result.comment(app.aaps.core.ui.R.string.failed_update_basal_profile); } else { rxBus.send(new EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED)); rxBus.send(new EventDismissNotification(Notification.FAILED_UPDATE_PROFILE)); - uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, getRh().gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60); + uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, getRh().gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60); result.success(true).enacted(true).comment("OK"); } return result; @@ -228,7 +228,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump PumpEnactResult result = new PumpEnactResult(getInjector()); percent = constraintChecker.applyBasalPercentConstraints(new ConstraintObject<>(percent, getAapsLogger()), profile).value(); if (percent < 0) { - result.isTempCancel(false).enacted(false).success(false).comment(info.nightscout.core.ui.R.string.invalid_input); + result.isTempCancel(false).enacted(false).success(false).comment(app.aaps.core.ui.R.string.invalid_input); getAapsLogger().error("setTempBasalPercent: Invalid input"); return result; } @@ -236,7 +236,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump percent = getPumpDescription().getMaxTempPercent(); if (danaPump.isTempBasalInProgress() && danaPump.getTempBasalPercent() == percent && danaPump.getTempBasalRemainingMin() > 4 && !enforceNew) { result.enacted(false).success(true).isTempCancel(false) - .comment(info.nightscout.core.ui.R.string.ok) + .comment(app.aaps.core.ui.R.string.ok) .duration(danaPump.getTempBasalRemainingMin()) .percent(danaPump.getTempBasalPercent()) .isPercent(true); @@ -248,7 +248,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump if (connectionOK && danaPump.isTempBasalInProgress() && danaPump.getTempBasalPercent() == percent) { result.enacted(true) .success(true) - .comment(info.nightscout.core.ui.R.string.ok) + .comment(app.aaps.core.ui.R.string.ok) .isTempCancel(false) .duration((int) danaPump.getTempBasalDuration()) .percent(danaPump.getTempBasalPercent()) @@ -266,7 +266,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump ); return result; } - result.enacted(false).success(false).comment(info.nightscout.core.ui.R.string.temp_basal_delivery_error); + result.enacted(false).success(false).comment(app.aaps.core.ui.R.string.temp_basal_delivery_error); getAapsLogger().error("setTempBasalPercent: Failed to set temp basal"); return result; } @@ -282,7 +282,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump if (danaPump.isExtendedInProgress() && Math.abs(danaPump.getExtendedBolusAmount() - insulin) < getPumpDescription().getExtendedBolusStep()) { result.enacted(false) .success(true) - .comment(info.nightscout.core.ui.R.string.ok) + .comment(app.aaps.core.ui.R.string.ok) .duration(danaPump.getExtendedBolusRemainingMinutes()) .absolute(danaPump.getExtendedBolusAbsoluteRate()) .isPercent(false) @@ -302,7 +302,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump if (connectionOK && danaPump.isExtendedInProgress() && Math.abs(danaPump.getExtendedBolusAmount() - insulin) < getPumpDescription().getExtendedBolusStep()) { result.enacted(true) .success(true) - .comment(info.nightscout.core.ui.R.string.ok) + .comment(app.aaps.core.ui.R.string.ok) .isTempCancel(false) .duration(danaPump.getExtendedBolusRemainingMinutes()) .absolute(danaPump.getExtendedBolusAbsoluteRate()) @@ -341,9 +341,9 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump serialNumber() ); } else - result.success(false).enacted(false).isTempCancel(true).comment(info.nightscout.core.ui.R.string.canceling_eb_failed); + result.success(false).enacted(false).isTempCancel(true).comment(app.aaps.core.ui.R.string.canceling_eb_failed); } else { - result.success(true).comment(info.nightscout.core.ui.R.string.ok).isTempCancel(true); + result.success(true).comment(app.aaps.core.ui.R.string.ok).isTempCancel(true); getAapsLogger().debug(LTag.PUMP, "cancelExtendedBolus: OK"); } return result; @@ -465,21 +465,21 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump @NonNull @Override public Constraint applyBasalConstraints(Constraint absoluteRate, @NonNull Profile profile) { - absoluteRate.setIfSmaller(danaPump.getMaxBasal(), getRh().gs(info.nightscout.core.ui.R.string.limitingbasalratio, danaPump.getMaxBasal(), getRh().gs(info.nightscout.core.ui.R.string.pumplimit)), this); + absoluteRate.setIfSmaller(danaPump.getMaxBasal(), getRh().gs(app.aaps.core.ui.R.string.limitingbasalratio, danaPump.getMaxBasal(), getRh().gs(app.aaps.core.ui.R.string.pumplimit)), this); return absoluteRate; } @NonNull @Override public Constraint applyBasalPercentConstraints(Constraint percentRate, @NonNull Profile profile) { - percentRate.setIfGreater(0, getRh().gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, getRh().gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this); - percentRate.setIfSmaller(getPumpDescription().getMaxTempPercent(), getRh().gs(info.nightscout.core.ui.R.string.limitingpercentrate, getPumpDescription().getMaxTempPercent(), getRh().gs(info.nightscout.core.ui.R.string.pumplimit)), this); + percentRate.setIfGreater(0, getRh().gs(app.aaps.core.ui.R.string.limitingpercentrate, 0, getRh().gs(app.aaps.core.ui.R.string.itmustbepositivevalue)), this); + percentRate.setIfSmaller(getPumpDescription().getMaxTempPercent(), getRh().gs(app.aaps.core.ui.R.string.limitingpercentrate, getPumpDescription().getMaxTempPercent(), getRh().gs(app.aaps.core.ui.R.string.pumplimit)), this); return percentRate; } @NonNull @Override public Constraint applyBolusConstraints(Constraint insulin) { - insulin.setIfSmaller(danaPump.getMaxBolus(), getRh().gs(info.nightscout.core.ui.R.string.limitingbolus, danaPump.getMaxBolus(), getRh().gs(info.nightscout.core.ui.R.string.pumplimit)), this); + insulin.setIfSmaller(danaPump.getMaxBolus(), getRh().gs(app.aaps.core.ui.R.string.limitingbolus, danaPump.getMaxBolus(), getRh().gs(app.aaps.core.ui.R.string.pumplimit)), this); return insulin; } 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 d6dd640366..b0ca803e80 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 @@ -172,7 +172,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin { if (!result.getSuccess()) result.comment(rh.gs(info.nightscout.pump.dana.R.string.boluserrorcode, detailedBolusInfo.insulin, t.getInsulin(), danaPump.getBolusStartErrorCode())); else - result.comment(info.nightscout.core.ui.R.string.ok); + result.comment(app.aaps.core.ui.R.string.ok); aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.getBolusDelivered()); detailedBolusInfo.insulin = t.getInsulin(); detailedBolusInfo.timestamp = System.currentTimeMillis(); @@ -194,7 +194,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin { return result; } else { PumpEnactResult result = new PumpEnactResult(getInjector()); - result.success(false).bolusDelivered(0d).comment(info.nightscout.core.ui.R.string.invalid_input); + result.success(false).bolusDelivered(0d).comment(app.aaps.core.ui.R.string.invalid_input); aapsLogger.error("deliverTreatment: Invalid input"); return result; } @@ -328,7 +328,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin { return cancelExtendedBolus(); } PumpEnactResult result = new PumpEnactResult(getInjector()); - result.success(true).enacted(false).comment(info.nightscout.core.ui.R.string.ok).isTempCancel(true); + result.success(true).enacted(false).comment(app.aaps.core.ui.R.string.ok).isTempCancel(true); return result; } @@ -348,11 +348,11 @@ public class DanaRPlugin extends AbstractDanaRPlugin { getPumpDescription().getPumpType(), serialNumber() ); - result.success(true).enacted(true).isTempCancel(true).comment(info.nightscout.core.ui.R.string.ok); + result.success(true).enacted(true).isTempCancel(true).comment(app.aaps.core.ui.R.string.ok); } else - result.success(false).enacted(false).isTempCancel(true).comment(info.nightscout.core.ui.R.string.canceling_eb_failed); + result.success(false).enacted(false).isTempCancel(true).comment(app.aaps.core.ui.R.string.canceling_eb_failed); } else { - result.success(true).isTempCancel(true).comment(info.nightscout.core.ui.R.string.ok); + result.success(true).isTempCancel(true).comment(app.aaps.core.ui.R.string.ok); aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK"); } return result; diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt index 2fca128d83..355e7797e7 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt @@ -19,7 +19,7 @@ class MsgBolusProgress( danaPump.bolusProgressLastTimeStamp = System.currentTimeMillis() danaPump.bolusingTreatment?.insulin = deliveredInsulin val bolusingEvent = EventOverviewBolusProgress - bolusingEvent.status = rh.gs(info.nightscout.core.ui.R.string.bolus_delivering, deliveredInsulin) + bolusingEvent.status = rh.gs(app.aaps.core.ui.R.string.bolus_delivering, deliveredInsulin) bolusingEvent.t = danaPump.bolusingTreatment bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100) aapsLogger.debug(LTag.PUMPCOMM, "Delivered insulin so far: $deliveredInsulin") diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt index 417ebff211..f403a09683 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt @@ -29,7 +29,7 @@ class MsgInitConnStatusTime( //If profile coming from pump, switch it as well configBuilder.storeSettings("ChangingDanaDriver") rxBus.send(EventRebuildTabs()) - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.pump_driver_change), null) // force new connection + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.pump_driver_change), null) // force new connection failed = false return } else { diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt index cb92779531..25c2427faf 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt @@ -29,7 +29,7 @@ class MsgSetBasalProfile( } else { failed = false aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile result: $result") - uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60) + uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60) } } } \ No newline at end of file diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt index c53a172990..dd0d4d6e73 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt @@ -27,7 +27,7 @@ class MsgSetSingleBasalProfile( } else { failed = false aapsLogger.debug(LTag.PUMPCOMM, "Set basal profile result: $result") - uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60) + uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60) } } } \ No newline at end of file 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 04cddac32e..857b538390 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 @@ -55,7 +55,7 @@ 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 info.nightscout.core.ui.toast.ToastUtils; +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; @@ -222,7 +222,7 @@ public abstract class AbstractDanaRExecutionService extends DaggerService { ToastUtils.INSTANCE.errorToast(context.getApplicationContext(), info.nightscout.pump.dana.R.string.devicenotfound); } } else { - ToastUtils.INSTANCE.errorToast(context, info.nightscout.core.ui.R.string.need_connect_permission); + ToastUtils.INSTANCE.errorToast(context, app.aaps.core.ui.R.string.need_connect_permission); } } diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java index 4c728aa425..583b1d3391 100644 --- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java +++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java @@ -340,7 +340,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService { } } } else { - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.bolus_ok), null); + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.bolus_ok), null); } } return !start.getFailed(); diff --git a/pump/danar/src/main/res/xml/pref_danar.xml b/pump/danar/src/main/res/xml/pref_danar.xml index f8f6950820..052fb1a462 100644 --- a/pump/danar/src/main/res/xml/pref_danar.xml +++ b/pump/danar/src/main/res/xml/pref_danar.xml @@ -8,7 +8,7 @@ android:title="@string/danar_pump_settings" app:initialExpandedChildrenCount="0"> - diff --git a/pump/danar/src/main/res/xml/pref_danarkorean.xml b/pump/danar/src/main/res/xml/pref_danarkorean.xml index de69debd04..2a2ee5f60f 100644 --- a/pump/danar/src/main/res/xml/pref_danarkorean.xml +++ b/pump/danar/src/main/res/xml/pref_danarkorean.xml @@ -8,7 +8,7 @@ android:title="@string/danar_pump_settings" app:initialExpandedChildrenCount="0"> - diff --git a/pump/danar/src/main/res/xml/pref_danarv2.xml b/pump/danar/src/main/res/xml/pref_danarv2.xml index f217e95ac5..4dfb6f8b33 100644 --- a/pump/danar/src/main/res/xml/pref_danarv2.xml +++ b/pump/danar/src/main/res/xml/pref_danarv2.xml @@ -8,7 +8,7 @@ android:title="@string/danar_pump_settings" app:initialExpandedChildrenCount="0"> - diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt index 4f1c268485..258902b9ed 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/DanaRPluginTest.kt @@ -38,10 +38,10 @@ class DanaRPluginTest : TestBaseWithProfile() { fun prepareMocks() { `when`(sp.getString(info.nightscout.pump.dana.R.string.key_danars_address, "")).thenReturn("") `when`(sp.getString(info.nightscout.pump.dana.R.string.key_danar_bt_name, "")).thenReturn("") - `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit") - `when`(rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") + `when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") danaPump = DanaPump(aapsLogger, sp, dateUtil, instantiator, decimalFormatter) danaRPlugin = DanaRPlugin( injector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, pumpSync, diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusProgressTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusProgressTest.kt index 62063e7dc7..7ab2ab35b0 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusProgressTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaR/comm/MsgBolusProgressTest.kt @@ -10,7 +10,7 @@ import org.mockito.Mockito.`when` class MsgBolusProgressTest : DanaRTestBase() { @Test fun runTest() { - `when`(rh.gs(ArgumentMatchers.eq(info.nightscout.core.ui.R.string.bolus_delivering), ArgumentMatchers.anyDouble())).thenReturn("Delivering %1\$.2fU") + `when`(rh.gs(ArgumentMatchers.eq(app.aaps.core.ui.R.string.bolus_delivering), ArgumentMatchers.anyDouble())).thenReturn("Delivering %1\$.2fU") danaPump.bolusingTreatment = EventOverviewBolusProgress.Treatment(0.0, 0, true, 0) danaPump.bolusAmountToBeDelivered = 3.0 val packet = MsgBolusProgress(injector) diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt index bd60bfc2cd..e27f95f90d 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaRKorean/DanaRKoreanPluginTest.kt @@ -38,10 +38,10 @@ class DanaRKoreanPluginTest : TestBaseWithProfile() { fun prepareMocks() { `when`(sp.getString(info.nightscout.pump.dana.R.string.key_danars_address, "")).thenReturn("") `when`(sp.getString(info.nightscout.pump.dana.R.string.key_danar_bt_name, "")).thenReturn("") - `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit") - `when`(rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") + `when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") danaPump = DanaPump(aapsLogger, sp, dateUtil, instantiator, decimalFormatter) danaRPlugin = DanaRKoreanPlugin( injector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, activePlugin, sp, commandQueue, danaPump, dateUtil, fabricPrivacy, diff --git a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt index 7108ad0411..3b2822b407 100644 --- a/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt +++ b/pump/danar/src/test/java/info/nightscout/pump/danaRv2/DanaRv2PluginTest.kt @@ -42,10 +42,10 @@ class DanaRv2PluginTest : TestBaseWithProfile() { fun prepareMocks() { `when`(sp.getString(info.nightscout.pump.dana.R.string.key_danar_bt_name, "")).thenReturn("") `when`(sp.getString(info.nightscout.pump.dana.R.string.key_danars_address, "")).thenReturn("") - `when`(rh.gs(info.nightscout.core.ui.R.string.pumplimit)).thenReturn("pump limit") - `when`(rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") - `when`(rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") + `when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") + `when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") danaPump = DanaPump(aapsLogger, sp, dateUtil, instantiator, decimalFormatter) danaRv2Plugin = DanaRv2Plugin( injector, aapsLogger, aapsSchedulers, rxBus, context, rh, constraintChecker, activePlugin, sp, commandQueue, danaPump, detailedBolusInfoStorage, 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 5944f25f26..0244ad3127 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 @@ -46,7 +46,7 @@ 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 info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.dana.DanaFragment import info.nightscout.pump.dana.DanaPump import info.nightscout.pump.dana.comm.RecordTypes @@ -87,8 +87,8 @@ class DanaRSPlugin @Inject constructor( PluginDescription() .mainType(PluginType.PUMP) .fragmentClass(DanaFragment::class.java.name) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_danai_128) - .pluginIcon2(info.nightscout.core.ui.R.drawable.ic_danars_128) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_danai_128) + .pluginIcon2(app.aaps.core.ui.R.drawable.ic_danars_128) .pluginName(info.nightscout.pump.dana.R.string.danarspump) .shortName(info.nightscout.pump.dana.R.string.danarspump_shortname) .preferencesId(R.xml.pref_danars) @@ -109,7 +109,7 @@ class DanaRSPlugin @Inject constructor( if (pref.key == rh.gs(info.nightscout.pump.dana.R.string.key_danars_name)) { val value = sp.getStringOrNull(info.nightscout.pump.dana.R.string.key_danars_name, null) pref.summary = value - ?: rh.gs(info.nightscout.core.ui.R.string.not_set_short) + ?: rh.gs(app.aaps.core.ui.R.string.not_set_short) } } @@ -159,14 +159,14 @@ class DanaRSPlugin @Inject constructor( mDeviceName = sp.getString(info.nightscout.pump.dana.R.string.key_danars_name, "") danaPump.serialNumber = sp.getString(info.nightscout.pump.dana.R.string.key_danars_name, "") danaPump.reset() - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.device_changed), null) + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.device_changed), null) } override fun connect(reason: String) { aapsLogger.debug(LTag.PUMP, "RS connect from: $reason") if (danaRSService != null && mDeviceAddress != "" && mDeviceName != "") { val success = danaRSService?.connect(reason, mDeviceAddress) ?: false - if (!success) ToastUtils.errorToast(context, info.nightscout.core.ui.R.string.ble_not_supported_or_not_paired) + if (!success) ToastUtils.errorToast(context, app.aaps.core.ui.R.string.ble_not_supported_or_not_paired) } } @@ -204,22 +204,22 @@ class DanaRSPlugin @Inject constructor( // Constraints interface override fun applyBasalConstraints(absoluteRate: Constraint, profile: Profile): Constraint { - absoluteRate.setIfSmaller(danaPump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, danaPump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this) + absoluteRate.setIfSmaller(danaPump.maxBasal, rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, danaPump.maxBasal, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this) return absoluteRate } override fun applyBasalPercentConstraints(percentRate: Constraint, profile: Profile): Constraint { - percentRate.setIfGreater(0, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this) + percentRate.setIfGreater(0, rh.gs(app.aaps.core.ui.R.string.limitingpercentrate, 0, rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)), this) percentRate.setIfSmaller( pumpDescription.maxTempPercent, - rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, pumpDescription.maxTempPercent, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), + rh.gs(app.aaps.core.ui.R.string.limitingpercentrate, pumpDescription.maxTempPercent, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this ) return percentRate } override fun applyBolusConstraints(insulin: Constraint): Constraint { - insulin.setIfSmaller(danaPump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, danaPump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this) + insulin.setIfSmaller(danaPump.maxBolus, rh.gs(app.aaps.core.ui.R.string.limitingbolus, danaPump.maxBolus, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this) return insulin } @@ -241,20 +241,20 @@ class DanaRSPlugin @Inject constructor( val result = PumpEnactResult(injector) if (!isInitialized()) { aapsLogger.error("setNewBasalProfile not initialized") - uiInteraction.addNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, rh.gs(info.nightscout.core.ui.R.string.pump_not_initialized_profile_not_set), Notification.URGENT) - result.comment = rh.gs(info.nightscout.core.ui.R.string.pump_not_initialized_profile_not_set) + uiInteraction.addNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, rh.gs(app.aaps.core.ui.R.string.pump_not_initialized_profile_not_set), Notification.URGENT) + result.comment = rh.gs(app.aaps.core.ui.R.string.pump_not_initialized_profile_not_set) return result } else { rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED)) } return if (danaRSService?.updateBasalsInPump(profile) != true) { - uiInteraction.addNotification(Notification.FAILED_UPDATE_PROFILE, rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile), Notification.URGENT) - result.comment = rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile) + uiInteraction.addNotification(Notification.FAILED_UPDATE_PROFILE, rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile), Notification.URGENT) + result.comment = rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile) result } else { rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED)) rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE)) - uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60) + uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60) result.success = true result.enacted = true result.comment = "OK" @@ -323,14 +323,14 @@ class DanaRSPlugin @Inject constructor( 0x80 -> error = rh.gs(info.nightscout.pump.dana.R.string.insulinlimitviolation) } result.comment = rh.gs(info.nightscout.pump.dana.R.string.boluserrorcode, detailedBolusInfo.insulin, t.insulin, error) - } else result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + } else result.comment = rh.gs(app.aaps.core.ui.R.string.ok) aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered) result } else { val result = PumpEnactResult(injector) result.success = false result.bolusDelivered = 0.0 - result.comment = rh.gs(info.nightscout.core.ui.R.string.invalid_input) + result.comment = rh.gs(app.aaps.core.ui.R.string.invalid_input) aapsLogger.error("deliverTreatment: Invalid input") result } @@ -424,7 +424,7 @@ class DanaRSPlugin @Inject constructor( result.isTempCancel = false result.enacted = false result.success = false - result.comment = rh.gs(info.nightscout.core.ui.R.string.invalid_input) + result.comment = rh.gs(app.aaps.core.ui.R.string.invalid_input) aapsLogger.error("setTempBasalPercent: Invalid input") return result } @@ -433,7 +433,7 @@ class DanaRSPlugin @Inject constructor( result.enacted = false result.success = true result.isTempCancel = false - result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + result.comment = rh.gs(app.aaps.core.ui.R.string.ok) result.duration = danaPump.tempBasalRemainingMin result.percent = danaPump.tempBasalPercent result.isPercent = true @@ -451,7 +451,7 @@ class DanaRSPlugin @Inject constructor( if (connectionOK && danaPump.isTempBasalInProgress && danaPump.tempBasalPercent == percentAfterConstraint) { result.enacted = true result.success = true - result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + result.comment = rh.gs(app.aaps.core.ui.R.string.ok) result.isTempCancel = false result.duration = danaPump.tempBasalRemainingMin result.percent = danaPump.tempBasalPercent @@ -461,7 +461,7 @@ class DanaRSPlugin @Inject constructor( } result.enacted = false result.success = false - result.comment = rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error) + result.comment = rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error) aapsLogger.error("setTempBasalPercent: Failed to set temp basal. connectionOK: $connectionOK isTempBasalInProgress: ${danaPump.isTempBasalInProgress} tempBasalPercent: ${danaPump.tempBasalPercent}") return result } @@ -472,7 +472,7 @@ class DanaRSPlugin @Inject constructor( if (connectionOK && danaPump.isTempBasalInProgress && danaPump.tempBasalPercent == percent) { result.enacted = true result.success = true - result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + result.comment = rh.gs(app.aaps.core.ui.R.string.ok) result.isTempCancel = false result.duration = danaPump.tempBasalRemainingMin result.percent = danaPump.tempBasalPercent @@ -497,7 +497,7 @@ class DanaRSPlugin @Inject constructor( if (danaPump.isExtendedInProgress && abs(danaPump.extendedBolusAmount - insulinAfterConstraint) < pumpDescription.extendedBolusStep) { result.enacted = false result.success = true - result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + result.comment = rh.gs(app.aaps.core.ui.R.string.ok) result.duration = danaPump.extendedBolusRemainingMinutes result.absolute = danaPump.extendedBolusAbsoluteRate result.isPercent = false @@ -510,7 +510,7 @@ class DanaRSPlugin @Inject constructor( if (connectionOK && danaPump.isExtendedInProgress && abs(danaPump.extendedBolusAmount - insulinAfterConstraint) < pumpDescription.extendedBolusStep) { result.enacted = true result.success = true - result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + result.comment = rh.gs(app.aaps.core.ui.R.string.ok) result.isTempCancel = false result.duration = danaPump.extendedBolusRemainingMinutes result.absolute = danaPump.extendedBolusAbsoluteRate @@ -535,14 +535,14 @@ class DanaRSPlugin @Inject constructor( .success(!danaPump.isTempBasalInProgress) .enacted(true) .isTempCancel(true) - .comment(info.nightscout.core.ui.R.string.canceling_tbr_failed) + .comment(app.aaps.core.ui.R.string.canceling_tbr_failed) } else { aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK") return PumpEnactResult(injector) .success(true) .enacted(false) .isTempCancel(true) - .comment(info.nightscout.core.ui.R.string.ok) + .comment(app.aaps.core.ui.R.string.ok) } } @@ -553,14 +553,14 @@ class DanaRSPlugin @Inject constructor( return PumpEnactResult(injector) .success(!danaPump.isExtendedInProgress) .enacted(true) - .comment(info.nightscout.core.ui.R.string.canceling_eb_failed) + .comment(app.aaps.core.ui.R.string.canceling_eb_failed) } else { aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: OK") return PumpEnactResult(injector) .success(true) .enacted(false) .isTempCancel(true) - .comment(info.nightscout.core.ui.R.string.ok) + .comment(app.aaps.core.ui.R.string.ok) } } diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt index 7d0d12e4c4..6fe99d3a04 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/BLEScanActivity.kt @@ -24,8 +24,8 @@ import app.aaps.core.interfaces.pump.BlePreCheck import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.extensions.safeEnable import info.nightscout.pump.danars.R import info.nightscout.pump.danars.databinding.DanarsBlescannerActivityBinding @@ -74,7 +74,7 @@ class BLEScanActivity : TranslatedDaggerAppCompatActivity() { bluetoothAdapter?.safeEnable() startScan() } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) } } @@ -92,7 +92,7 @@ class BLEScanActivity : TranslatedDaggerAppCompatActivity() { } catch (ignore: IllegalStateException) { } // ignore BT not on } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) } private fun stopScan() = @@ -102,7 +102,7 @@ class BLEScanActivity : TranslatedDaggerAppCompatActivity() { } catch (ignore: IllegalStateException) { } // ignore BT not on } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) } @SuppressLint("MissingPermission") @@ -163,7 +163,7 @@ class BLEScanActivity : TranslatedDaggerAppCompatActivity() { item.device.createBond() rxBus.send(EventDanaRSDeviceChange()) } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) } finish() } 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 628ec98ea5..085f96803c 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 @@ -8,8 +8,8 @@ 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 info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.core.utils.hexStringToByteArray import info.nightscout.core.validators.DefaultEditTextValidator import info.nightscout.core.validators.EditTextValidator @@ -59,7 +59,7 @@ class EnterPinActivity : TranslatedDaggerAppCompatActivity() { if (result) { bleComm.finishV3Pairing() finish() - } else OKDialog.show(this, rh.gs(info.nightscout.core.ui.R.string.error), rh.gs(info.nightscout.core.ui.R.string.invalid_input)) + } else OKDialog.show(this, rh.gs(app.aaps.core.ui.R.string.error), rh.gs(app.aaps.core.ui.R.string.invalid_input)) } } binding.okcancel.cancel.setOnClickListener { finish() } diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/PairingHelperActivity.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/PairingHelperActivity.kt index f8fb960f45..65b90ec874 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/activities/PairingHelperActivity.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/activities/PairingHelperActivity.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.content.Intent import android.content.pm.ActivityInfo import android.os.Bundle -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.danars.dialogs.PairingProgressDialog class PairingHelperActivity : TranslatedDaggerAppCompatActivity() { diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt index 8d4f013499..42a1f82052 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt @@ -28,7 +28,7 @@ class DanaRSPacketNotifyDeliveryComplete( val deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100.0 danaPump.bolusingTreatment?.insulin = deliveredInsulin val bolusingEvent = EventOverviewBolusProgress - bolusingEvent.status = rh.gs(info.nightscout.core.ui.R.string.bolus_delivering, deliveredInsulin) + bolusingEvent.status = rh.gs(app.aaps.core.ui.R.string.bolus_delivering, deliveredInsulin) bolusingEvent.t = danaPump.bolusingTreatment bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100) danaPump.bolusDone = true diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt index dff8395555..7e374d9491 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt @@ -28,7 +28,7 @@ class DanaRSPacketNotifyDeliveryRateDisplay( danaPump.bolusProgressLastTimeStamp = System.currentTimeMillis() danaPump.bolusingTreatment?.insulin = deliveredInsulin val bolusingEvent = EventOverviewBolusProgress - bolusingEvent.status = rh.gs(info.nightscout.core.ui.R.string.bolus_delivering, deliveredInsulin) + bolusingEvent.status = rh.gs(app.aaps.core.ui.R.string.bolus_delivering, deliveredInsulin) bolusingEvent.t = danaPump.bolusingTreatment bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100) failed = bolusingEvent.percent < 100 diff --git a/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt b/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt index c3648eafff..b51cd5e5d7 100644 --- a/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt +++ b/pump/danars/src/main/java/info/nightscout/pump/danars/services/BLEComm.kt @@ -32,7 +32,7 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import info.nightscout.androidaps.danars.encryption.BleEncryption -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.notifyAll import info.nightscout.core.utils.waitMillis import info.nightscout.pump.dana.DanaPump @@ -106,7 +106,7 @@ class BLEComm @Inject internal constructor( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) aapsLogger.error(LTag.PUMPBTCOMM, "missing permission: $from") return false } @@ -591,14 +591,14 @@ class BLEComm @Inject internal constructor( } else if (decryptedBuffer.size == 6 && decryptedBuffer[2] == 'B'.code.toByte() && decryptedBuffer[3] == 'U'.code.toByte() && decryptedBuffer[4] == 'S'.code.toByte() && decryptedBuffer[5] == 'Y'.code.toByte()) { aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (BUSY)" + " " + DanaRSPacket.toHexString(decryptedBuffer)) mSendQueue.clear() - rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(info.nightscout.core.ui.R.string.pump_busy))) + rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(app.aaps.core.ui.R.string.pump_busy))) } else { // ERROR in response, wrong serial number aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + "ENCRYPTION__PUMP_CHECK (ERROR)" + " " + DanaRSPacket.toHexString(decryptedBuffer)) mSendQueue.clear() - rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(info.nightscout.core.ui.R.string.connection_error))) + rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED, rh.gs(app.aaps.core.ui.R.string.connection_error))) danaRSPlugin.clearPairing() - uiInteraction.addNotification(Notification.WRONG_SERIAL_NUMBER, rh.gs(info.nightscout.core.ui.R.string.password_cleared), Notification.URGENT) + uiInteraction.addNotification(Notification.WRONG_SERIAL_NUMBER, rh.gs(app.aaps.core.ui.R.string.password_cleared), Notification.URGENT) } } 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 2b46587cc4..e1ac8c8467 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 @@ -199,7 +199,7 @@ class DanaRSService : DaggerService() { if (abs(timeDiff) > 60 * 60 * 1.5) { aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds - large difference") //If time-diff is very large, warn user until we can synchronize history readings properly - uiInteraction.runAlarm(rh.gs(R.string.largetimediff), rh.gs(R.string.largetimedifftitle), info.nightscout.core.ui.R.raw.error) + uiInteraction.runAlarm(rh.gs(R.string.largetimediff), rh.gs(R.string.largetimedifftitle), app.aaps.core.ui.R.raw.error) //de-initialize pump danaPump.reset() @@ -228,7 +228,7 @@ class DanaRSService : DaggerService() { aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds") } } - rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.core.ui.R.string.reading_pump_history))) + rxBus.send(EventPumpStatusChanged(rh.gs(app.aaps.core.ui.R.string.reading_pump_history))) loadEvents() // RS doesn't provide exact timestamp = rely on history val eb = pumpSync.expectedPumpState().extendedBolus @@ -302,7 +302,7 @@ class DanaRSService : DaggerService() { sendMessage(msgSetHistoryEntryV2) danaPump.readHistoryFrom = min(danaPump.readHistoryFrom, carbTime - T.mins(1).msecs()) if (!msgSetHistoryEntryV2.isReceived || msgSetHistoryEntryV2.failed) - uiInteraction.runAlarm(rh.gs(R.string.carbs_store_error), rh.gs(info.nightscout.core.ui.R.string.error), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(rh.gs(R.string.carbs_store_error), rh.gs(app.aaps.core.ui.R.string.error), app.aaps.core.ui.R.raw.boluserror) } val bolusStart = System.currentTimeMillis() if (insulin > 0) { diff --git a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt index 01ca2e64c4..402b348a45 100644 --- a/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt +++ b/pump/danars/src/test/java/info/nightscout/pump/danars/DanaRSPluginTest.kt @@ -56,8 +56,8 @@ class DanaRSPluginTest : DanaRSTestBase() { fun prepareMocks() { Mockito.`when`(sp.getString(info.nightscout.pump.dana.R.string.key_danars_name, "")).thenReturn("") Mockito.`when`(sp.getString(info.nightscout.pump.dana.R.string.key_danars_address, "")).thenReturn("") - Mockito.`when`(rh.gs(eq(info.nightscout.core.ui.R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio") - Mockito.`when`(rh.gs(eq(info.nightscout.core.ui.R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate") + Mockito.`when`(rh.gs(eq(app.aaps.core.ui.R.string.limitingbasalratio), anyObject(), anyObject())).thenReturn("limitingbasalratio") + Mockito.`when`(rh.gs(eq(app.aaps.core.ui.R.string.limitingpercentrate), anyObject(), anyObject())).thenReturn("limitingpercentrate") danaRSPlugin = DanaRSPlugin( 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 c24a836e92..964e278d8a 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 @@ -83,7 +83,7 @@ class DiaconnG8Fragment : DaggerFragment() { binding.btconnection.setOnClickListener { aapsLogger.debug(LTag.PUMP, "Clicked connect to pump") diaconnG8Pump.lastConnection = 0 - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.clicked_connect_to_pump), null) + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.clicked_connect_to_pump), null) } } @@ -172,7 +172,7 @@ class DiaconnG8Fragment : DaggerFragment() { // max 6h back binding.lastbolus.text = dateUtil.timeString(pump.lastBolusTime) + " " + dateUtil.sinceString(pump.lastBolusTime, rh) + " " + rh.gs( - info.nightscout.core.ui.R.string.format_insulin_units, + app.aaps.core.ui.R.string.format_insulin_units, pump.lastBolusAmount ) else @@ -181,13 +181,13 @@ class DiaconnG8Fragment : DaggerFragment() { val todayInsulinAmount = (pump.todayBaseAmount + pump.todaySnackAmount + pump.todayMealAmount) val todayInsulinLimitAmount = (pump.maxBasal.toInt() * 24) + pump.maxBolusePerDay.toInt() - binding.dailyunits.text = rh.gs(info.nightscout.core.ui.R.string.reservoir_value, todayInsulinAmount, todayInsulinLimitAmount) + binding.dailyunits.text = rh.gs(app.aaps.core.ui.R.string.reservoir_value, todayInsulinAmount, todayInsulinLimitAmount) warnColors.setColor(binding.dailyunits, todayInsulinAmount, todayInsulinLimitAmount * 0.75, todayInsulinLimitAmount * 0.9) - binding.basabasalrate.text = pump.baseInjAmount.toString() + " / " + rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, plugin.baseBasalRate) + binding.basabasalrate.text = pump.baseInjAmount.toString() + " / " + rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, plugin.baseBasalRate) binding.tempbasal.text = diaconnG8Pump.temporaryBasalToString() binding.extendedbolus.text = diaconnG8Pump.extendedBolusToString() - binding.reservoir.text = rh.gs(info.nightscout.core.ui.R.string.reservoir_value, pump.systemRemainInsulin, 307) + binding.reservoir.text = rh.gs(app.aaps.core.ui.R.string.reservoir_value, pump.systemRemainInsulin, 307) warnColors.setColorInverse(binding.reservoir, pump.systemRemainInsulin, 50.0, 20.0) binding.battery.text = "{fa-battery-" + pump.systemRemainBattery / 25 + "}" + " (" + pump.systemRemainBattery + " %)" warnColors.setColorInverse(binding.battery, pump.systemRemainBattery.toDouble(), 51.0, 26.0) 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 2423ae4dac..ac2aa5edb7 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 @@ -49,7 +49,7 @@ 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 info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.diaconn.database.DiaconnHistoryDatabase import info.nightscout.pump.diaconn.events.EventDiaconnG8DeviceChange import info.nightscout.pump.diaconn.service.DiaconnG8Service @@ -86,7 +86,7 @@ class DiaconnG8Plugin @Inject constructor( PluginDescription() .mainType(PluginType.PUMP) .fragmentClass(DiaconnG8Fragment::class.java.name) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_diaconn_g8) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_diaconn_g8) .pluginName(R.string.diaconn_g8_pump) .shortName(R.string.diaconn_g8_pump_shortname) .preferencesId(R.xml.pref_diaconn) @@ -145,14 +145,14 @@ class DiaconnG8Plugin @Inject constructor( mDeviceAddress = sp.getString(R.string.key_diaconn_g8_address, "") mDeviceName = sp.getString(R.string.key_diaconn_g8_name, "") diaconnG8Pump.reset() - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.device_changed), null) + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.device_changed), null) } override fun connect(reason: String) { aapsLogger.debug(LTag.PUMP, "Diaconn G8 connect from: $reason") if (diaconnG8Service != null && mDeviceAddress != "" && mDeviceName != "") { val success = diaconnG8Service?.connect(reason, mDeviceAddress) ?: false - if (!success) ToastUtils.errorToast(context, info.nightscout.core.ui.R.string.ble_not_supported) + if (!success) ToastUtils.errorToast(context, app.aaps.core.ui.R.string.ble_not_supported) } } @@ -187,22 +187,22 @@ class DiaconnG8Plugin @Inject constructor( // Constraints interface override fun applyBasalConstraints(absoluteRate: Constraint, profile: Profile): Constraint { - absoluteRate.setIfSmaller(diaconnG8Pump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.limitingbasalratio, diaconnG8Pump.maxBasal, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this) + absoluteRate.setIfSmaller(diaconnG8Pump.maxBasal, rh.gs(app.aaps.core.ui.R.string.limitingbasalratio, diaconnG8Pump.maxBasal, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this) return absoluteRate } override fun applyBasalPercentConstraints(percentRate: Constraint, profile: Profile): Constraint { - percentRate.setIfGreater(0, rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, 0, rh.gs(info.nightscout.core.ui.R.string.itmustbepositivevalue)), this) + percentRate.setIfGreater(0, rh.gs(app.aaps.core.ui.R.string.limitingpercentrate, 0, rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)), this) percentRate.setIfSmaller( pumpDescription.maxTempPercent, - rh.gs(info.nightscout.core.ui.R.string.limitingpercentrate, pumpDescription.maxTempPercent, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), + rh.gs(app.aaps.core.ui.R.string.limitingpercentrate, pumpDescription.maxTempPercent, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this ) return percentRate } override fun applyBolusConstraints(insulin: Constraint): Constraint { - insulin.setIfSmaller(diaconnG8Pump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.limitingbolus, diaconnG8Pump.maxBolus, rh.gs(info.nightscout.core.ui.R.string.pumplimit)), this) + insulin.setIfSmaller(diaconnG8Pump.maxBolus, rh.gs(app.aaps.core.ui.R.string.limitingbolus, diaconnG8Pump.maxBolus, rh.gs(app.aaps.core.ui.R.string.pumplimit)), this) return insulin } @@ -223,20 +223,20 @@ class DiaconnG8Plugin @Inject constructor( override fun setNewBasalProfile(profile: Profile): PumpEnactResult { val result = PumpEnactResult(injector) if (!isInitialized()) { - uiInteraction.addNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, rh.gs(info.nightscout.core.ui.R.string.pump_not_initialized_profile_not_set), Notification.URGENT) - result.comment = rh.gs(info.nightscout.core.ui.R.string.pump_not_initialized_profile_not_set) + uiInteraction.addNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, rh.gs(app.aaps.core.ui.R.string.pump_not_initialized_profile_not_set), Notification.URGENT) + result.comment = rh.gs(app.aaps.core.ui.R.string.pump_not_initialized_profile_not_set) return result } else { rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED)) } return if (diaconnG8Service?.updateBasalsInPump(profile) != true) { - uiInteraction.addNotification(Notification.FAILED_UPDATE_PROFILE, rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile), Notification.URGENT) - result.comment = rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile) + uiInteraction.addNotification(Notification.FAILED_UPDATE_PROFILE, rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile), Notification.URGENT) + result.comment = rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile) result } else { rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED)) rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE)) - uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60) + uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60) result.success = true result.enacted = true result.comment = "OK" @@ -289,14 +289,14 @@ class DiaconnG8Plugin @Inject constructor( if (result.success) result.enacted = true if (!result.success) { setErrorMsg(diaconnG8Pump.resultErrorCode, result) - } else result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + } else result.comment = rh.gs(app.aaps.core.ui.R.string.ok) aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered) result } else { val result = PumpEnactResult(injector) result.success = false result.bolusDelivered = 0.0 - result.comment = rh.gs(info.nightscout.core.ui.R.string.invalid_input) + result.comment = rh.gs(app.aaps.core.ui.R.string.invalid_input) aapsLogger.error("deliverTreatment: Invalid input") result } @@ -362,7 +362,7 @@ class DiaconnG8Plugin @Inject constructor( if (connectionOK && diaconnG8Pump.isTempBasalInProgress && diaconnG8Pump.tempBasalAbsoluteRate == absoluteAfterConstrain) { result.enacted = true result.success = true - result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + result.comment = rh.gs(app.aaps.core.ui.R.string.ok) result.isTempCancel = false result.duration = diaconnG8Pump.tempBasalRemainingMin result.absolute = diaconnG8Pump.tempBasalAbsoluteRate @@ -374,7 +374,7 @@ class DiaconnG8Plugin @Inject constructor( result.enacted = false result.success = false - result.comment = rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error) + result.comment = rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error) aapsLogger.error("setTempBasalAbsolute: Failed to set temp basal") return result } @@ -405,7 +405,7 @@ class DiaconnG8Plugin @Inject constructor( if (diaconnG8Pump.isExtendedInProgress && abs(diaconnG8Pump.extendedBolusAmount - insulinAfterConstraint) < pumpDescription.extendedBolusStep) { result.enacted = false result.success = true - result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + result.comment = rh.gs(app.aaps.core.ui.R.string.ok) result.duration = diaconnG8Pump.extendedBolusRemainingMinutes result.absolute = diaconnG8Pump.extendedBolusAbsoluteRate result.isPercent = false @@ -419,7 +419,7 @@ class DiaconnG8Plugin @Inject constructor( if (connectionOK) { result.enacted = true result.success = true - result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + result.comment = rh.gs(app.aaps.core.ui.R.string.ok) result.isTempCancel = false result.duration = diaconnG8Pump.extendedBolusRemainingMinutes result.absolute = diaconnG8Pump.extendedBolusAbsoluteRate @@ -449,7 +449,7 @@ class DiaconnG8Plugin @Inject constructor( result.success = true result.enacted = false result.isTempCancel = true - result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + result.comment = rh.gs(app.aaps.core.ui.R.string.ok) aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK") } return result @@ -469,7 +469,7 @@ class DiaconnG8Plugin @Inject constructor( } else { result.success = true result.enacted = false - result.comment = rh.gs(info.nightscout.core.ui.R.string.ok) + result.comment = rh.gs(app.aaps.core.ui.R.string.ok) aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: OK") } return result diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt index 909fdbbb11..d86c4dc31e 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8BLEScanActivity.kt @@ -26,8 +26,8 @@ import androidx.core.app.ActivityCompat import app.aaps.core.interfaces.pump.BlePreCheck import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.extensions.safeEnable import info.nightscout.pump.diaconn.R import info.nightscout.pump.diaconn.databinding.DiaconnG8BlescannerActivityBinding @@ -76,7 +76,7 @@ class DiaconnG8BLEScanActivity : TranslatedDaggerAppCompatActivity() { bluetoothAdapter?.safeEnable() startScan() } else { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) } } @@ -115,7 +115,7 @@ class DiaconnG8BLEScanActivity : TranslatedDaggerAppCompatActivity() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) return } if (device == null || device.name == null || device.name == "") { 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 8b3604aa0c..5bdc24cf81 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 @@ -21,7 +21,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 info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.diaconn.R import info.nightscout.pump.diaconn.common.RecordTypes import info.nightscout.pump.diaconn.database.DiaconnHistoryRecord @@ -75,7 +75,7 @@ class DiaconnG8HistoryActivity : TranslatedDaggerAppCompatActivity() { binding = DiaconnG8HistoryActivityBinding.inflate(layoutInflater) setContentView(binding.root) - title = rh.gs(info.nightscout.core.ui.R.string.pump_history) + title = rh.gs(app.aaps.core.ui.R.string.pump_history) supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayShowHomeEnabled(true) @@ -93,7 +93,7 @@ class DiaconnG8HistoryActivity : TranslatedDaggerAppCompatActivity() { typeList.add(TypeList(RecordTypes.RECORD_TYPE_DAILY, rh.gs(R.string.diaconn_g8_history_dailyinsulin))) typeList.add(TypeList(RecordTypes.RECORD_TYPE_REFILL, rh.gs(R.string.diaconn_g8_history_refill))) typeList.add(TypeList(RecordTypes.RECORD_TYPE_SUSPEND, rh.gs(R.string.diaconn_g8_history_suspend))) - binding.typeList.setAdapter(ArrayAdapter(this, info.nightscout.core.ui.R.layout.spinner_centered, typeList)) + binding.typeList.setAdapter(ArrayAdapter(this, app.aaps.core.ui.R.layout.spinner_centered, typeList)) binding.reload.setOnClickListener { val selected = typeList.firstOrNull { it.name == binding.typeList.text.toString() } ?: return@setOnClickListener @@ -158,9 +158,9 @@ class DiaconnG8HistoryActivity : TranslatedDaggerAppCompatActivity() { } RecordTypes.RECORD_TYPE_DAILY -> { - holder.dailyBasal.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, record.dailyBasal) - holder.dailyBolus.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, record.dailyBolus) - holder.dailyTotal.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, record.dailyBolus + record.dailyBasal) + holder.dailyBasal.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, record.dailyBasal) + holder.dailyBolus.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, record.dailyBolus) + holder.dailyTotal.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, record.dailyBolus + record.dailyBasal) holder.time.text = dateUtil.dateString(record.timestamp) holder.time.visibility = View.VISIBLE holder.value.visibility = View.GONE 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 064f8ff954..7c95ad3e7c 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 @@ -14,8 +14,8 @@ 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 info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.diaconn.DiaconnG8Pump import info.nightscout.pump.diaconn.R import info.nightscout.pump.diaconn.databinding.DiaconnG8UserOptionsActivityBinding @@ -159,7 +159,7 @@ class DiaconnG8UserOptionsActivity : TranslatedDaggerAppCompatActivity() { commandQueue.setUserOptions(object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(R.string.pumperror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(R.string.pumperror), app.aaps.core.ui.R.raw.boluserror) } } }) @@ -172,7 +172,7 @@ class DiaconnG8UserOptionsActivity : TranslatedDaggerAppCompatActivity() { categories.add(rh.gs(R.string.diaconn_g8_pumpalarm_vibrate)) categories.add(rh.gs(R.string.diaconn_g8_pumpalarm_silent)) context.let { context -> - val adapterCategories = ArrayAdapter(context, info.nightscout.core.ui.R.layout.spinner_centered, categories) + val adapterCategories = ArrayAdapter(context, app.aaps.core.ui.R.layout.spinner_centered, categories) binding.beepAndAlarm.adapter = adapterCategories } } @@ -183,7 +183,7 @@ class DiaconnG8UserOptionsActivity : TranslatedDaggerAppCompatActivity() { categories.add(rh.gs(R.string.diaconn_g8_pumpalarm_intensity_middle)) categories.add(rh.gs(R.string.diaconn_g8_pumpalarm_intensity_high)) context.let { context -> - val adapterCategories = ArrayAdapter(context, info.nightscout.core.ui.R.layout.spinner_centered, categories) + val adapterCategories = ArrayAdapter(context, app.aaps.core.ui.R.layout.spinner_centered, categories) binding.alarmIntesity.adapter = adapterCategories } } diff --git a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt index 9cbd210c69..88b7b4cdeb 100644 --- a/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt +++ b/pump/diaconn/src/main/java/info/nightscout/pump/diaconn/service/BLECommonService.kt @@ -23,7 +23,7 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import app.aaps.core.interfaces.ui.UiInteraction import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.notifyAll import info.nightscout.core.utils.waitMillis import info.nightscout.pump.diaconn.DiaconnG8Pump @@ -91,7 +91,7 @@ class BLECommonService @Inject internal constructor( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) aapsLogger.error(LTag.PUMPBTCOMM, "missing permission: $from") return false } @@ -357,20 +357,20 @@ class BLECommonService @Inject internal constructor( if (message is InjectionBlockReportPacket) { message.handleMessage(data) diaconnG8Pump.bolusBlocked = true - uiInteraction.runAlarm(rh.gs(R.string.injectionblocked), rh.gs(R.string.injectionblocked), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(rh.gs(R.string.injectionblocked), rh.gs(R.string.injectionblocked), app.aaps.core.ui.R.raw.boluserror) return } // battery warning report if (message is BatteryWarningReportPacket) { message.handleMessage(data) - uiInteraction.runAlarm(rh.gs(R.string.needbatteryreplace), rh.gs(R.string.batterywarning), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(rh.gs(R.string.needbatteryreplace), rh.gs(R.string.batterywarning), app.aaps.core.ui.R.raw.boluserror) return } // insulin lack warning report if (message is InsulinLackReportPacket) { message.handleMessage(data) - uiInteraction.runAlarm(rh.gs(R.string.needinsullinreplace), rh.gs(R.string.insulinlackwarning), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(rh.gs(R.string.needinsullinreplace), rh.gs(R.string.insulinlackwarning), app.aaps.core.ui.R.raw.boluserror) return } 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 23c11b540c..5a926c4f74 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 @@ -212,7 +212,7 @@ class DiaconnG8Service : DaggerService() { if (abs(timeDiff) > 60 * 60 * 1.5) { aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds - large difference") //If time-diff is very large, warn user until we can synchronize history readings properly - uiInteraction.runAlarm(rh.gs(R.string.largetimediff), rh.gs(R.string.largetimedifftitle), info.nightscout.core.ui.R.raw.error) + uiInteraction.runAlarm(rh.gs(R.string.largetimediff), rh.gs(R.string.largetimedifftitle), app.aaps.core.ui.R.raw.error) //de-initialize pump diaconnG8Pump.reset() diff --git a/pump/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml b/pump/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml index 0cd6b04de7..cac939ef9f 100644 --- a/pump/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml +++ b/pump/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml @@ -260,7 +260,7 @@ android:layout_marginEnd="20dp" android:orientation="horizontal"> - = BehaviorSubject.create() @@ -215,7 +215,7 @@ class EopatchPumpPlugin @Inject constructor( disposable.dispose() aapsLogger.info(LTag.PUMP, "Basal Profile was set: ${isSuccess ?: false}") return if (isSuccess == true) { - uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60) + uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60) PumpEnactResult(injector).success(true).enacted(true) } else { PumpEnactResult(injector) @@ -223,7 +223,7 @@ class EopatchPumpPlugin @Inject constructor( } else { preferenceManager.getNormalBasalManager().setNormalBasal(profile) preferenceManager.flushNormalBasalManager() - uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60) + uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60) return PumpEnactResult(injector).success(true).enacted(true) } } @@ -299,7 +299,7 @@ class EopatchPumpPlugin @Inject constructor( if (patchManager.patchConnectionState.isConnected) { val delivering = patchManager.bolusCurrent.nowBolus.injected rxBus.send(EventOverviewBolusProgress.apply { - status = rh.gs(info.nightscout.core.ui.R.string.bolus_delivering, delivering) + status = rh.gs(app.aaps.core.ui.R.string.bolus_delivering, delivering) percent = min((delivering / detailedBolusInfo.insulin * 100).toInt(), 100) t = tr }) @@ -307,7 +307,7 @@ class EopatchPumpPlugin @Inject constructor( } while (!patchManager.bolusCurrent.nowBolus.endTimeSynced && isSuccess) rxBus.send(EventOverviewBolusProgress.apply { - status = rh.gs(info.nightscout.core.ui.R.string.bolus_delivered_successfully, detailedBolusInfo.insulin) + status = rh.gs(app.aaps.core.ui.R.string.bolus_delivered_successfully, detailedBolusInfo.insulin) percent = 100 }) @@ -323,7 +323,7 @@ class EopatchPumpPlugin @Inject constructor( } else { // no bolus required - return PumpEnactResult(injector).success(false).enacted(false).bolusDelivered(0.0).comment(rh.gs(info.nightscout.core.ui.R.string.error)) + return PumpEnactResult(injector).success(false).enacted(false).bolusDelivered(0.0).comment(rh.gs(app.aaps.core.ui.R.string.error)) } } @@ -333,7 +333,7 @@ class EopatchPumpPlugin @Inject constructor( .observeOn(aapsSchedulers.main) .subscribe { it -> rxBus.send(EventOverviewBolusProgress.apply { - status = rh.gs(info.nightscout.core.ui.R.string.bolus_delivered_successfully, (it.injectedBolusAmount * 0.05f)) + status = rh.gs(app.aaps.core.ui.R.string.bolus_delivered_successfully, (it.injectedBolusAmount * 0.05f)) }) } ) @@ -424,7 +424,7 @@ class EopatchPumpPlugin @Inject constructor( .map { PumpEnactResult(injector).success(true).enacted(true) } .onErrorReturnItem( PumpEnactResult(injector).success(false).enacted(false).bolusDelivered(0.0) - .comment(rh.gs(info.nightscout.core.ui.R.string.error)) + .comment(rh.gs(app.aaps.core.ui.R.string.error)) ) .blockingGet() } @@ -461,7 +461,7 @@ class EopatchPumpPlugin @Inject constructor( .map { PumpEnactResult(injector).success(true).enacted(true).isTempCancel(true) } .onErrorReturnItem( PumpEnactResult(injector).success(false).enacted(false) - .comment(rh.gs(info.nightscout.core.ui.R.string.error)) + .comment(rh.gs(app.aaps.core.ui.R.string.error)) ) .blockingGet() } @@ -482,7 +482,7 @@ class EopatchPumpPlugin @Inject constructor( .map { PumpEnactResult(injector).success(true).enacted(true).isTempCancel(true) } .onErrorReturnItem( PumpEnactResult(injector).success(false).enacted(false) - .comment(rh.gs(info.nightscout.core.ui.R.string.canceling_eb_failed)) + .comment(rh.gs(app.aaps.core.ui.R.string.canceling_eb_failed)) ) .blockingGet() } else { 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 5bab5f9096..ad4258368c 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 @@ -146,7 +146,7 @@ class AlarmManager @Inject constructor() : IAlarmManager { private fun showAlarmDialog(alarmCode: AlarmCode) { val i = Intent(context, AlarmHelperActivity::class.java) - i.putExtra("soundid", info.nightscout.core.ui.R.raw.error) + i.putExtra("soundid", app.aaps.core.ui.R.raw.error) i.putExtra("code", alarmCode.name) i.putExtra("status", resourceHelper.gs(alarmCode.resId)) i.putExtra("title", resourceHelper.gs(R.string.string_alarm)) @@ -198,7 +198,7 @@ class AlarmManager @Inject constructor() : IAlarmManager { } ) }, - soundId = info.nightscout.core.ui.R.raw.error, + soundId = app.aaps.core.ui.R.raw.error, date = pm.getAlarms().getOccuredAlarmTimestamp(alarmCode) ) diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt index d2c7aaeaa1..c5453eff2c 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/AlarmHelperActivity.kt @@ -10,8 +10,8 @@ import info.nightscout.androidaps.plugins.pump.eopatch.event.EventDialog import info.nightscout.androidaps.plugins.pump.eopatch.event.EventProgressDialog import info.nightscout.androidaps.plugins.pump.eopatch.ui.dialogs.AlarmDialog import info.nightscout.androidaps.plugins.pump.eopatch.ui.dialogs.ProgressDialogHelper -import info.nightscout.core.ui.R -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.R +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/DialogHelperActivity.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/DialogHelperActivity.kt index ad8b16b73d..741f85d181 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/DialogHelperActivity.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/DialogHelperActivity.kt @@ -2,8 +2,8 @@ package info.nightscout.androidaps.plugins.pump.eopatch.ui import android.os.Bundle import info.nightscout.androidaps.plugins.pump.eopatch.ui.dialogs.ActivationNotCompleteDialog -import info.nightscout.core.ui.R -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.R +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity class DialogHelperActivity : TranslatedDaggerAppCompatActivity() { @Override diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt index f5a3546040..0238df4a10 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EoBaseActivity.kt @@ -9,7 +9,7 @@ import androidx.databinding.ViewDataBinding import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.rx.AapsSchedulers import info.nightscout.androidaps.plugins.pump.eopatch.dagger.EopatchPluginQualifier -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchActivity.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchActivity.kt index f85e64a223..b8754f74aa 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchActivity.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchActivity.kt @@ -171,7 +171,7 @@ class EopatchActivity : EoBaseActivity() { if (patchStep.value?.isSafeDeactivation == true || connectionTryCnt >= 2) { val cancelLabel = commCheckCancelLabel.value ?: getString(R.string.cancel) val message = "${getString(R.string.patch_comm_error_during_discard_desc_2)}\n${getString(R.string.patch_communication_check_helper_2)}" - mPatchCommCheckDialog = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity) + mPatchCommCheckDialog = app.aaps.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity) .setTitle(R.string.patch_communication_failed) .setMessage(message) .setCancelable(false) @@ -185,7 +185,7 @@ class EopatchActivity : EoBaseActivity() { } else { val cancelLabel = commCheckCancelLabel.value ?: getString(R.string.cancel) val message = "${getString(R.string.patch_communication_check_helper_1)}\n${getString(R.string.patch_communication_check_helper_2)}" - mPatchCommCheckDialog = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity) + mPatchCommCheckDialog = app.aaps.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity) .setTitle(R.string.patch_communication_failed) .setMessage(message) .setCancelable(false) @@ -201,7 +201,7 @@ class EopatchActivity : EoBaseActivity() { EventType.SHOW_BONDED_DIALOG -> { dismissProgressDialog() - info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity) + app.aaps.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity) .setTitle(R.string.patch_communication_succeed) .setMessage(R.string.patch_communication_succeed_message) .setPositiveButton(R.string.confirm) { _, _ -> @@ -210,7 +210,7 @@ class EopatchActivity : EoBaseActivity() { } EventType.SHOW_CHANGE_PATCH_DIALOG -> { - info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity).apply { + app.aaps.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity).apply { setTitle(R.string.string_discard_patch) setMessage( when { @@ -234,7 +234,7 @@ class EopatchActivity : EoBaseActivity() { // EventType.SHOW_BONDED_DIALOG -> this@EopatchActivity.finish() EventType.SHOW_DISCARD_DIALOG -> { val cancelLabel = isInAlarmHandling.takeOne(null, getString(R.string.cancel)) - info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity).apply { + app.aaps.core.ui.dialogs.AlertDialogHelper.Builder(this@EopatchActivity).apply { setTitle(R.string.string_discard_patch) if (isBolusActive) { setMessage(R.string.patch_change_confirm_bolus_is_active_desc) diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchConnectNewFragment.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchConnectNewFragment.kt index 1ff5cef20c..59dbd395d2 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchConnectNewFragment.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchConnectNewFragment.kt @@ -12,7 +12,7 @@ import info.nightscout.androidaps.plugins.pump.eopatch.ui.viewmodel.EopatchViewM import info.nightscout.androidaps.plugins.pump.eopatch.ui.viewmodel.EopatchViewModel.SetupStep.GET_PATCH_INFO_FAILED import info.nightscout.androidaps.plugins.pump.eopatch.ui.viewmodel.EopatchViewModel.SetupStep.SCAN_FAILED import info.nightscout.androidaps.plugins.pump.eopatch.ui.viewmodel.EopatchViewModel.SetupStep.SELF_TEST_FAILED -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils class EopatchConnectNewFragment : EoBaseFragment() { diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt index d6fb052607..d4a4d5fb21 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchOverviewFragment.kt @@ -17,7 +17,7 @@ import info.nightscout.androidaps.plugins.pump.eopatch.core.code.BolusType import info.nightscout.androidaps.plugins.pump.eopatch.databinding.FragmentEopatchOverviewBinding import info.nightscout.androidaps.plugins.pump.eopatch.extension.takeOne import info.nightscout.androidaps.plugins.pump.eopatch.ui.viewmodel.EopatchOverviewViewModel -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject @@ -95,7 +95,7 @@ class EopatchOverviewFragment : EoBaseFragment() private fun suspend() { binding.viewmodel?.apply { activity?.let { - val builder = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(it) + val builder = app.aaps.core.ui.dialogs.AlertDialogHelper.Builder(it) val msg = getSuspendDialogText() val dialog = builder.setTitle(R.string.string_suspend) @@ -114,7 +114,7 @@ class EopatchOverviewFragment : EoBaseFragment() private fun resume() { binding.viewmodel?.apply { activity?.let { - val builder = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(it) + val builder = app.aaps.core.ui.dialogs.AlertDialogHelper.Builder(it) val dialog = builder.setTitle(R.string.string_resume_insulin_delivery_title) .setMessage(R.string.string_resume_insulin_delivery_message) .setPositiveButton(R.string.confirm) { _, _ -> @@ -135,7 +135,7 @@ class EopatchOverviewFragment : EoBaseFragment() private fun openPauseTimePicker() { binding.viewmodel?.apply { activity?.let { - val builder = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(it) + val builder = app.aaps.core.ui.dialogs.AlertDialogHelper.Builder(it) val listArr = requireContext().resources.getStringArray(R.array.suspend_duration_array) var select = 0 val dialog = builder.setTitle(R.string.string_suspend_time_insulin_delivery_title) diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchRotateKnobFragment.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchRotateKnobFragment.kt index 74fdfc5557..dcb52d9952 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchRotateKnobFragment.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/EopatchRotateKnobFragment.kt @@ -9,7 +9,7 @@ import info.nightscout.androidaps.plugins.pump.eopatch.R import info.nightscout.androidaps.plugins.pump.eopatch.code.PatchStep import info.nightscout.androidaps.plugins.pump.eopatch.databinding.FragmentEopatchRotateKnobBinding import info.nightscout.androidaps.plugins.pump.eopatch.ui.viewmodel.EopatchViewModel -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils class EopatchRotateKnobFragment : EoBaseFragment() { diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt index 9f3811b5c8..b5ecd65749 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/AlarmDialog.kt @@ -22,7 +22,7 @@ import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPatchManager import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager import info.nightscout.androidaps.plugins.pump.eopatch.databinding.DialogAlarmBinding import info.nightscout.androidaps.plugins.pump.eopatch.ui.AlarmHelperActivity -import info.nightscout.core.ui.R +import app.aaps.core.ui.R import io.reactivex.rxjava3.disposables.Disposable import javax.inject.Inject diff --git a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/CommonDialog.kt b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/CommonDialog.kt index 014ef999e7..9b3993e937 100644 --- a/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/CommonDialog.kt +++ b/pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ui/dialogs/CommonDialog.kt @@ -22,7 +22,7 @@ class CommonDialog : DaggerDialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return activity?.let { - val builder = info.nightscout.core.ui.dialogs.AlertDialogHelper.Builder(it).apply { + val builder = app.aaps.core.ui.dialogs.AlertDialogHelper.Builder(it).apply { if (title != 0) setTitle(title) if (message != 0) setMessage(message) setPositiveButton(positiveBtn, diff --git a/pump/eopatch/src/main/res/layout/fragment_eopatch_overview.xml b/pump/eopatch/src/main/res/layout/fragment_eopatch_overview.xml index 1faba137c0..b1b9c02757 100644 --- a/pump/eopatch/src/main/res/layout/fragment_eopatch_overview.xml +++ b/pump/eopatch/src/main/res/layout/fragment_eopatch_overview.xml @@ -508,7 +508,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:orientation="horizontal"> - - - "{fa-bluetooth-b} " + rh.gs(rileyLinkError.getResourceId(RileyLinkTargetDevice.MedtronicPump)) else -> "{fa-bluetooth-b} " + rh.gs(resourceId) } - binding.rlStatus.setTextColor(rh.gac(context, if (rileyLinkError != null) info.nightscout.core.ui.R.attr.warningColor else info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.rlStatus.setTextColor(rh.gac(context, if (rileyLinkError != null) app.aaps.core.ui.R.attr.warningColor else app.aaps.core.ui.R.attr.defaultTextColor)) binding.errors.text = rileyLinkServiceData.rileyLinkError?.let { @@ -271,7 +271,7 @@ class MedtronicFragment : DaggerFragment() { val min = (System.currentTimeMillis() - medtronicPumpStatus.lastConnection) / 1000 / 60 if (medtronicPumpStatus.lastConnection + 60 * 1000 > System.currentTimeMillis()) { binding.lastConnection.setText(R.string.medtronic_pump_connected_now) - binding.lastConnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.lastConnection.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) } else if (medtronicPumpStatus.lastConnection + 30 * 60 * 1000 < System.currentTimeMillis()) { if (min < 60) { @@ -287,10 +287,10 @@ class MedtronicFragment : DaggerFragment() { binding.lastConnection.text = (rh.gq(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R.plurals.duration_days, d, d) + " " + rh.gs(R.string.ago)) } - binding.lastConnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor)) + binding.lastConnection.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.warningColor)) } else { binding.lastConnection.text = minAgo - binding.lastConnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + binding.lastConnection.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) } } @@ -300,7 +300,7 @@ class MedtronicFragment : DaggerFragment() { if (bolus != null && bolusTime != null) { val agoMsc = System.currentTimeMillis() - bolusTime.time val bolusMinAgo = agoMsc.toDouble() / 60.0 / 1000.0 - val unit = rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + val unit = rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) val ago = when { agoMsc < 60 * 1000 -> rh.gs(R.string.medtronic_pump_connected_now) bolusMinAgo < 60 -> dateUtil.minAgo(rh, bolusTime.time) @@ -313,7 +313,7 @@ class MedtronicFragment : DaggerFragment() { // base basal rate binding.baseBasalRate.text = ("(" + medtronicPumpStatus.activeProfileName + ") " - + rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, medtronicPumpPlugin.baseBasalRate)) + + rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, medtronicPumpPlugin.baseBasalRate)) // TBR var tbrStr = "" @@ -334,7 +334,7 @@ class MedtronicFragment : DaggerFragment() { warnColors.setColorInverse(binding.pumpStateBattery, medtronicPumpStatus.batteryRemaining.toDouble(), 25.0, 10.0) // reservoir - binding.reservoir.text = rh.gs(info.nightscout.core.ui.R.string.reservoir_value, medtronicPumpStatus.reservoirRemainingUnits, medtronicPumpStatus.reservoirFullUnits) + binding.reservoir.text = rh.gs(app.aaps.core.ui.R.string.reservoir_value, medtronicPumpStatus.reservoirRemainingUnits, medtronicPumpStatus.reservoirFullUnits) warnColors.setColorInverse(binding.reservoir, medtronicPumpStatus.reservoirRemainingUnits, 50.0, 20.0) medtronicPumpPlugin.rileyLinkService?.verifyConfiguration() 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 c643520267..de3fa15986 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 @@ -112,7 +112,7 @@ class MedtronicPumpPlugin @Inject constructor( PluginDescription() // .mainType(PluginType.PUMP) // .fragmentClass(MedtronicFragment::class.java.name) // - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_veo_128) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_veo_128) .pluginName(R.string.medtronic_name) // .shortName(R.string.medtronic_name_short) // .preferencesId(R.xml.pref_medtronic) @@ -172,7 +172,7 @@ class MedtronicPumpPlugin @Inject constructor( super.updatePreferenceSummary(pref) if (pref.key == rh.gs(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R.string.key_rileylink_mac_address)) { val value = sp.getStringOrNull(info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R.string.key_rileylink_mac_address, null) - pref.summary = value ?: rh.gs(info.nightscout.core.ui.R.string.not_set_short) + pref.summary = value ?: rh.gs(app.aaps.core.ui.R.string.not_set_short) } } @@ -643,7 +643,7 @@ class MedtronicPumpPlugin @Inject constructor( // LOG.debug("MedtronicPumpPlugin::deliverBolus - Delivery Canceled after Bolus started."); Thread { SystemClock.sleep(2000) - uiInteraction.runAlarm(rh.gs(R.string.medtronic_cmd_cancel_bolus_not_supported), rh.gs(R.string.medtronic_warning), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(rh.gs(R.string.medtronic_cmd_cancel_bolus_not_supported), rh.gs(R.string.medtronic_warning), app.aaps.core.ui.R.raw.boluserror) }.start() } val now = System.currentTimeMillis() @@ -1171,13 +1171,13 @@ class MedtronicPumpPlugin @Inject constructor( private val customActionWakeUpAndTune = CustomAction( R.string.medtronic_custom_action_wake_and_tune, MedtronicCustomActionType.WakeUpAndTune, - info.nightscout.core.ui.R.drawable.ic_actions_profileswitch + app.aaps.core.ui.R.drawable.ic_actions_profileswitch ) private val customActionClearBolusBlock = CustomAction( - R.string.medtronic_custom_action_clear_bolus_block, MedtronicCustomActionType.ClearBolusBlock, info.nightscout.core.ui.R.drawable.ic_actions_profileswitch, false + R.string.medtronic_custom_action_clear_bolus_block, MedtronicCustomActionType.ClearBolusBlock, app.aaps.core.ui.R.drawable.ic_actions_profileswitch, false ) private val customActionResetRLConfig = CustomAction( - R.string.medtronic_custom_action_reset_rileylink, MedtronicCustomActionType.ResetRileyLinkConfiguration, info.nightscout.core.ui.R.drawable.ic_actions_profileswitch, true + R.string.medtronic_custom_action_reset_rileylink, MedtronicCustomActionType.ResetRileyLinkConfiguration, app.aaps.core.ui.R.drawable.ic_actions_profileswitch, true ) override fun getCustomActions(): List? { @@ -1197,7 +1197,7 @@ class MedtronicPumpPlugin @Inject constructor( if (rileyLinkMedtronicService?.verifyConfiguration() == true) { serviceTaskExecutor.startTask(WakeAndTuneTask(injector)) } else { - uiInteraction.runAlarm(rh.gs(R.string.medtronic_error_operation_not_possible_no_configuration), rh.gs(R.string.medtronic_warning), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(rh.gs(R.string.medtronic_error_operation_not_possible_no_configuration), rh.gs(R.string.medtronic_warning), app.aaps.core.ui.R.raw.boluserror) } } diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt index 0c29f38e8d..79ee235906 100644 --- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt +++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/dialog/MedtronicHistoryActivity.kt @@ -96,7 +96,7 @@ class MedtronicHistoryActivity : DaggerActivity() { recyclerView.adapter = recyclerViewAdapter statusView.visibility = View.GONE typeListFull = getTypeList(PumpHistoryEntryGroup.getTranslatedList(rh)) - val spinnerAdapter = ArrayAdapter(this, info.nightscout.core.ui.R.layout.spinner_centered, typeListFull) + val spinnerAdapter = ArrayAdapter(this, app.aaps.core.ui.R.layout.spinner_centered, typeListFull) historyTypeSpinner.adapter = spinnerAdapter historyTypeSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { 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 f0982d19b5..c9d6447b41 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 @@ -47,8 +47,8 @@ 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 info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.validators.ValidatingEditTextPreference import info.nightscout.pump.medtrum.comm.enums.MedtrumPumpState import info.nightscout.pump.medtrum.services.MedtrumService @@ -82,7 +82,7 @@ import kotlin.math.abs PluginDescription() .mainType(PluginType.PUMP) .fragmentClass(MedtrumOverviewFragment::class.java.name) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_medtrum_128) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_medtrum_128) .pluginName(R.string.medtrum) .shortName(R.string.medtrum_pump_shortname) .preferencesId(R.xml.pref_medtrum_pump) @@ -275,7 +275,7 @@ import kotlin.math.abs if (medtrumService != null) { aapsLogger.debug(LTag.PUMP, "Medtrum connect - Attempt connection!") val success = medtrumService?.connect(reason) ?: false - if (!success) ToastUtils.errorToast(context, info.nightscout.core.ui.R.string.ble_not_supported_or_not_paired) + if (!success) ToastUtils.errorToast(context, app.aaps.core.ui.R.string.ble_not_supported_or_not_paired) } } } @@ -310,10 +310,10 @@ import kotlin.math.abs return if (medtrumService?.updateBasalsInPump(profile) == true) { rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE)) - uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60) + uiInteraction.addNotificationValidFor(Notification.PROFILE_SET_OK, rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60) PumpEnactResult(injector).success(true).enacted(true) } else { - uiInteraction.addNotification(Notification.FAILED_UPDATE_PROFILE, rh.gs(info.nightscout.core.ui.R.string.failed_update_basal_profile), Notification.URGENT) + uiInteraction.addNotification(Notification.FAILED_UPDATE_PROFILE, rh.gs(app.aaps.core.ui.R.string.failed_update_basal_profile), Notification.URGENT) PumpEnactResult(injector) } } @@ -369,7 +369,7 @@ import kotlin.math.abs val result = PumpEnactResult(injector) result.success = false result.bolusDelivered = 0.0 - result.comment = rh.gs(info.nightscout.core.ui.R.string.invalid_input) + result.comment = rh.gs(app.aaps.core.ui.R.string.invalid_input) aapsLogger.error("deliverTreatment: Invalid input") result } diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/BLEComm.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/BLEComm.kt index 9076e0a521..cc5283b9dd 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/BLEComm.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/services/BLEComm.kt @@ -24,7 +24,7 @@ import android.os.SystemClock import androidx.core.app.ActivityCompat import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.comm.ManufacturerData import info.nightscout.pump.medtrum.comm.ReadDataPacket import info.nightscout.pump.medtrum.comm.WriteCommandPackets @@ -95,7 +95,7 @@ class BLEComm @Inject internal constructor( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) aapsLogger.error(LTag.PUMPBTCOMM, "missing permissions") return false } @@ -124,7 +124,7 @@ class BLEComm @Inject internal constructor( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && ActivityCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) != PackageManager.PERMISSION_GRANTED ) { - ToastUtils.errorToast(context, context.getString(info.nightscout.core.ui.R.string.need_connect_permission)) + ToastUtils.errorToast(context, context.getString(app.aaps.core.ui.R.string.need_connect_permission)) aapsLogger.error(LTag.PUMPBTCOMM, "missing permission: $from") return false } 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 dc247ca830..eb0448d5ff 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 @@ -242,9 +242,9 @@ class MedtrumService : DaggerService(), BLECommCallback { } medtrumPump.bolusingTreatment = EventOverviewBolusProgress.Treatment(0.0, 0, detailedBolusInfo?.bolusType == DetailedBolusInfo.BolusType.SMB, detailedBolusInfo?.id ?: 0) if (detailedBolusInfo?.bolusType == DetailedBolusInfo.BolusType.SMB) { - rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.core.ui.R.string.smb_bolus_u, detailedBolusInfo.insulin))) + rxBus.send(EventPumpStatusChanged(rh.gs(app.aaps.core.ui.R.string.smb_bolus_u, detailedBolusInfo.insulin))) } else { - rxBus.send(EventPumpStatusChanged(rh.gs(info.nightscout.core.ui.R.string.bolus_u_min, detailedBolusInfo?.insulin ?: 0.0))) + rxBus.send(EventPumpStatusChanged(rh.gs(app.aaps.core.ui.R.string.bolus_u_min, detailedBolusInfo?.insulin ?: 0.0))) } waitForBolusProgress() } @@ -256,7 +256,7 @@ class MedtrumService : DaggerService(), BLECommCallback { aapsLogger.debug(LTag.PUMPCOMM, "Pump time updated") uiInteraction.addNotification( Notification.INSIGHT_DATE_TIME_UPDATED, // :---) - rh.gs(info.nightscout.core.ui.R.string.pump_time_updated), + rh.gs(app.aaps.core.ui.R.string.pump_time_updated), Notification.INFO, ) } else { @@ -659,10 +659,10 @@ class MedtrumService : DaggerService(), BLECommCallback { Notification.PUMP_ERROR, rh.gs(R.string.pump_error, alarmState?.let { medtrumPump.alarmStateToString(it) }), Notification.URGENT, - info.nightscout.core.ui.R.raw.alarm + app.aaps.core.ui.R.raw.alarm ) // Get pump status, use readStatus here as for loadEvents() we cannot be sure callback is executed - commandQueue.readStatus(rh.gs(info.nightscout.core.ui.R.string.device_changed), object : Callback() { + commandQueue.readStatus(rh.gs(app.aaps.core.ui.R.string.device_changed), object : Callback() { override fun run() { // Make sure a 0 temp is set medtrumPump.setFakeTBRIfNotSet() diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt index fb2eeba19b..6fd251c34a 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateCompleteFragment.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.databinding.FragmentMedtrumActivateCompleteBinding import info.nightscout.pump.medtrum.ui.viewmodel.MedtrumViewModel diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt index 44093b2456..44df41ee78 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumActivateFragment.kt @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.databinding.FragmentMedtrumActivateBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt index 1fb4dcd6ef..136304caa2 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumAttachPatchFragment.kt @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.databinding.FragmentMedtrumAttachPatchBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumBaseActivity.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumBaseActivity.kt index 11976db381..ac455765ee 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumBaseActivity.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumBaseActivity.kt @@ -8,7 +8,7 @@ import androidx.databinding.DataBindingUtil import androidx.databinding.ViewDataBinding import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.rx.AapsSchedulers -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.medtrum.di.MedtrumPluginQualifier import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt index df9a3086b8..9201a158da 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumDeactivatePatchFragment.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.databinding.FragmentMedtrumDeactivatePatchBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt index cc2d0ffab2..6753450b2c 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumOverviewFragment.kt @@ -7,7 +7,7 @@ import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.protection.ProtectionCheck import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.rx.AapsSchedulers -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.pump.medtrum.MedtrumPump import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.EventType @@ -67,11 +67,11 @@ class MedtrumOverviewFragment : MedtrumBaseFragment { - OKDialog.show(requireActivity(), rh.gs(info.nightscout.core.ui.R.string.message), rh.gs(R.string.no_profile_selected)) + OKDialog.show(requireActivity(), rh.gs(app.aaps.core.ui.R.string.message), rh.gs(R.string.no_profile_selected)) } EventType.SERIAL_NOT_SET -> { - OKDialog.show(requireActivity(), rh.gs(info.nightscout.core.ui.R.string.message), rh.gs(R.string.no_sn_in_settings)) + OKDialog.show(requireActivity(), rh.gs(app.aaps.core.ui.R.string.message), rh.gs(R.string.no_sn_in_settings)) } } } diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt index 5c30a5405f..6d0fd9f242 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPreparePatchConnectFragment.kt @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.databinding.FragmentMedtrumPreparePatchConnectBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt index aa5660dc78..515ff3b2ea 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeCompleteFragment.kt @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.databinding.FragmentMedtrumPrimeCompleteBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt index 54f473376f..26eaaa01e4 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimeFragment.kt @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.databinding.FragmentMedtrumPrimeBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt index bc6fb43876..245e4a9526 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumPrimingFragment.kt @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.databinding.FragmentMedtrumPrimingBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt index 7145e25c22..8637c70e6d 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationConnectFragment.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.databinding.FragmentMedtrumRetryActivationConnectBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt index fafa37e183..ac395e984b 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumRetryActivationFragment.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.databinding.FragmentMedtrumRetryActivationBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt index b743d9aaf4..1ff79bcf6a 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/MedtrumStartDeactivationFragment.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.resources.ResourceHelper -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.pump.medtrum.R import info.nightscout.pump.medtrum.code.PatchStep import info.nightscout.pump.medtrum.databinding.FragmentMedtrumStartDeactivationBinding diff --git a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt index 0697b710dc..decdcf3745 100644 --- a/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt +++ b/pump/medtrum/src/main/java/info/nightscout/pump/medtrum/ui/viewmodel/MedtrumOverviewViewModel.kt @@ -131,8 +131,8 @@ class MedtrumOverviewViewModel @Inject constructor( if (!medtrumPump.bolusDone && medtrumPlugin.isInitialized()) { _activeBolusStatus.postValue( dateUtil.timeString(medtrumPump.bolusStartTime) + " " + dateUtil.sinceString(medtrumPump.bolusStartTime, rh) - + " " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, bolusAmount) + " / " + rh.gs( - info.nightscout.core.ui.R.string.format_insulin_units, medtrumPump.bolusAmountToBeDelivered + + " " + rh.gs(app.aaps.core.ui.R.string.format_insulin_units, bolusAmount) + " / " + rh.gs( + app.aaps.core.ui.R.string.format_insulin_units, medtrumPump.bolusAmountToBeDelivered ) ) } @@ -188,7 +188,7 @@ class MedtrumOverviewViewModel @Inject constructor( // max 6h back _lastBolus.postValue( dateUtil.timeString(medtrumPump.lastBolusTime) + " " + dateUtil.sinceString(medtrumPump.lastBolusTime, rh) + " " + rh.gs( - info.nightscout.core.ui.R.string.format_insulin_units, medtrumPump.lastBolusAmount + app.aaps.core.ui.R.string.format_insulin_units, medtrumPump.lastBolusAmount ) ) else _lastBolus.postValue("") diff --git a/pump/medtrum/src/main/res/layout/fragment_medtrum_overview.xml b/pump/medtrum/src/main/res/layout/fragment_medtrum_overview.xml index fdabdfd1a2..b0d09ebda6 100644 --- a/pump/medtrum/src/main/res/layout/fragment_medtrum_overview.xml +++ b/pump/medtrum/src/main/res/layout/fragment_medtrum_overview.xml @@ -672,7 +672,7 @@ android:orientation="horizontal"> - - - (R.id.button_next).setOnClickListener { context?.let { - AlertDialog.Builder(it, info.nightscout.core.ui.R.style.DialogTheme) + AlertDialog.Builder(it, app.aaps.core.ui.R.style.DialogTheme) .setIcon(android.R.drawable.ic_dialog_alert) .setTitle(getString(getTitleId())) .setMessage(getString(R.string.omnipod_common_pod_activation_wizard_attach_pod_confirm_insert_cannula_text)) diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/activity/OmnipodWizardActivityBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/activity/OmnipodWizardActivityBase.kt index 6b8caea079..4bcd349a12 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/activity/OmnipodWizardActivityBase.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/activity/OmnipodWizardActivityBase.kt @@ -6,7 +6,7 @@ import androidx.appcompat.app.AlertDialog import androidx.navigation.NavController import androidx.navigation.fragment.NavHostFragment import info.nightscout.androidaps.plugins.pump.omnipod.common.R -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity abstract class OmnipodWizardActivityBase : TranslatedDaggerAppCompatActivity() { @@ -23,7 +23,7 @@ abstract class OmnipodWizardActivityBase : TranslatedDaggerAppCompatActivity() { if (getNavController().previousBackStackEntry == null) { finish() } else { - AlertDialog.Builder(this, info.nightscout.core.ui.R.style.DialogTheme) + AlertDialog.Builder(this, app.aaps.core.ui.R.style.DialogTheme) .setIcon(android.R.drawable.ic_dialog_alert) .setTitle(getString(R.string.omnipod_common_wizard_exit_confirmation_title)) .setMessage(getString(R.string.omnipod_common_wizard_exit_confirmation_text)) diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt index 9021b859d0..82dd11c892 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/WizardFragmentBase.kt @@ -51,7 +51,7 @@ abstract class WizardFragmentBase : DaggerFragment() { if (nextPage == null) { binding.navButtonsLayout.buttonNext.text = getString(R.string.omnipod_common_wizard_button_finish) binding.navButtonsLayout.buttonNext.backgroundTintList = - ColorStateList.valueOf(rh.gac(context, info.nightscout.core.ui.R.attr.omniWizardFinishButtonColor)) + ColorStateList.valueOf(rh.gac(context, app.aaps.core.ui.R.attr.omniWizardFinishButtonColor)) } updateProgressIndication() diff --git a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt index ff78d1d7f1..b21b02a7d7 100644 --- a/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt +++ b/pump/omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt @@ -34,7 +34,7 @@ class DeactivatePodFragment : ActionFragmentBase() { buttonDiscardPod = view.findViewById(R.id.omnipod_wizard_button_discard_pod) buttonDiscardPod.setOnClickListener { context?.let { - AlertDialog.Builder(it, info.nightscout.core.ui.R.style.DialogTheme) + AlertDialog.Builder(it, app.aaps.core.ui.R.style.DialogTheme) .setIcon(android.R.drawable.ic_dialog_alert) .setTitle(getString(R.string.omnipod_common_pod_deactivation_wizard_discard_pod)) .setMessage(getString(R.string.omnipod_common_pod_deactivation_wizard_discard_pod_confirmation)) 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 213d0ef7b9..a32baed166 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 @@ -129,7 +129,7 @@ class OmnipodDashPumpPlugin @Inject constructor( private val pluginDescription = PluginDescription() .mainType(PluginType.PUMP) .fragmentClass(OmnipodDashOverviewFragment::class.java.name) - .pluginIcon(info.nightscout.core.ui.R.drawable.ic_pod_128) + .pluginIcon(app.aaps.core.ui.R.drawable.ic_pod_128) .pluginName(R.string.omnipod_dash_name) .shortName(R.string.omnipod_dash_name_short) .preferencesId(R.xml.omnipod_dash_preferences) @@ -193,7 +193,7 @@ class OmnipodDashPumpPlugin @Inject constructor( Notification.OMNIPOD_POD_SUSPENDED, rh.gs(R.string.insulin_delivery_suspended), Notification.NORMAL, - info.nightscout.core.ui.R.raw.boluserror + app.aaps.core.ui.R.raw.boluserror ) } else { rxBus.send(EventDismissNotification(Notification.OMNIPOD_POD_SUSPENDED)) @@ -371,7 +371,7 @@ class OmnipodDashPumpPlugin @Inject constructor( Notification.OMNIPOD_POD_FAULT, it.toString(), Notification.URGENT, - info.nightscout.core.ui.R.raw.boluserror + app.aaps.core.ui.R.raw.boluserror ) } pumpSync.insertAnnouncement( @@ -426,14 +426,14 @@ class OmnipodDashPumpPlugin @Inject constructor( Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.failed_to_set_the_new_basal_profile), Notification.URGENT, - info.nightscout.core.ui.R.raw.boluserror + app.aaps.core.ui.R.raw.boluserror ) } else { showNotification( Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.setting_basal_profile_might_have_failed), Notification.URGENT, - info.nightscout.core.ui.R.raw.boluserror + app.aaps.core.ui.R.raw.boluserror ) } Completable.error(java.lang.IllegalStateException("Command not confirmed")) @@ -465,7 +465,7 @@ class OmnipodDashPumpPlugin @Inject constructor( notifyOnUnconfirmed( Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.suspend_delivery_is_unconfirmed), - info.nightscout.core.ui.R.raw.boluserror, + app.aaps.core.ui.R.raw.boluserror, ) } } @@ -629,11 +629,11 @@ class OmnipodDashPumpPlugin @Inject constructor( Notification.OMNIPOD_UNCERTAIN_SMB, "Unable to verify whether SMB bolus ($requestedBolusAmount U) succeeded. " + "Refresh pod status to confirm or deny this command.", - info.nightscout.core.ui.R.raw.boluserror + app.aaps.core.ui.R.raw.boluserror ) } else { if (podStateManager.activeCommand != null) { - val sound = if (hasBolusErrorBeepEnabled()) info.nightscout.core.ui.R.raw.boluserror else 0 + val sound = if (hasBolusErrorBeepEnabled()) app.aaps.core.ui.R.raw.boluserror else 0 showErrorDialog(rh.gs(R.string.bolus_delivery_status_uncertain), sound) } } @@ -847,7 +847,7 @@ class OmnipodDashPumpPlugin @Inject constructor( notifyOnUnconfirmed( Notification.OMNIPOD_TBR_ALERTS, rh.gs(R.string.setting_temp_basal_might_have_basal_failed), - info.nightscout.core.ui.R.raw.boluserror, + app.aaps.core.ui.R.raw.boluserror, ) }.toPumpEnactResultImpl() @@ -905,7 +905,7 @@ class OmnipodDashPumpPlugin @Inject constructor( notifyOnUnconfirmed( Notification.OMNIPOD_TBR_ALERTS, rh.gs(R.string.cancelling_temp_basal_might_have_failed), - info.nightscout.core.ui.R.raw.boluserror, + app.aaps.core.ui.R.raw.boluserror, ) } } @@ -960,7 +960,7 @@ class OmnipodDashPumpPlugin @Inject constructor( notifyOnUnconfirmed( Notification.OMNIPOD_TBR_ALERTS, rh.gs(R.string.cancel_temp_basal_result_is_uncertain), - info.nightscout.core.ui.R.raw.boluserror, // TODO: add setting for this + app.aaps.core.ui.R.raw.boluserror, // TODO: add setting for this ) }.toPumpEnactResultImpl() } @@ -1187,7 +1187,7 @@ class OmnipodDashPumpPlugin @Inject constructor( notifyOnUnconfirmed( Notification.FAILED_UPDATE_PROFILE, rh.gs(R.string.unconfirmed_resumedelivery_command_please_refresh_pod_status), - info.nightscout.core.ui.R.raw.boluserror + app.aaps.core.ui.R.raw.boluserror ) }.toPumpEnactResultImpl() } ?: PumpEnactResult(injector).success(false).enacted(false).comment("No profile active") // TODO i18n @@ -1545,7 +1545,7 @@ class OmnipodDashPumpPlugin @Inject constructor( if (tbr != null && podStateManager.deliveryStatus?.basalActive() == true) { aapsLogger.error(LTag.PUMP, "AAPS expected a TBR running but pump has no TBR running! AAPS: ${pumpSync.expectedPumpState().temporaryBasal} Pump: ${podStateManager.deliveryStatus}") // Alert user - val sound = if (hasBolusErrorBeepEnabled()) info.nightscout.core.ui.R.raw.boluserror else 0 + val sound = if (hasBolusErrorBeepEnabled()) app.aaps.core.ui.R.raw.boluserror else 0 showErrorDialog(rh.gs(R.string.temp_basal_out_of_sync), sound) // Sync stopped basal with AAPS val ret = pumpSync.syncStopTemporaryBasalWithPumpId( @@ -1559,7 +1559,7 @@ class OmnipodDashPumpPlugin @Inject constructor( } else if (tbr == null && podStateManager.deliveryStatus?.tempBasalActive() == true) { aapsLogger.error(LTag.PUMP, "AAPS expected no TBR running but pump has a TBR running! AAPS: ${pumpSync.expectedPumpState().temporaryBasal} Pump: ${podStateManager.deliveryStatus}") // Alert user - val sound = if (hasBolusErrorBeepEnabled()) info.nightscout.core.ui.R.raw.boluserror else 0 + val sound = if (hasBolusErrorBeepEnabled()) app.aaps.core.ui.R.raw.boluserror else 0 showErrorDialog(rh.gs(R.string.temp_basal_out_of_sync), sound) // If this is reached is reached there is probably a something wrong with the time (maybe it has changed?). // No way to calculate the TBR end time and update pumpSync properly. @@ -1574,7 +1574,7 @@ class OmnipodDashPumpPlugin @Inject constructor( } private fun showErrorDialog(message: String, sound: Int) { - uiInteraction.runAlarm(message, rh.gs(info.nightscout.core.ui.R.string.error), sound) + uiInteraction.runAlarm(message, rh.gs(app.aaps.core.ui.R.string.error), sound) } private fun showNotification(id: Int, message: String, urgency: Int, sound: Int?) { diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt index a2e2ceab86..aee75d4179 100644 --- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt +++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/ui/DashPodHistoryActivity.kt @@ -25,7 +25,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.History import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.InitialResult import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.ResolvedResult import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.data.TempBasalRecord -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.core.utils.DateTimeUtil import info.nightscout.pump.common.defs.PumpHistoryEntryGroup import info.nightscout.pump.common.utils.ProfileUtil @@ -177,7 +177,7 @@ class DashPodHistoryActivity : TranslatedDaggerAppCompatActivity() { historyTypeSpinner = findViewById(R.id.omnipod_historytype) typeListFull = getTypeList(PumpHistoryEntryGroup.Companion.getTranslatedList(rh)) - val spinnerAdapter: ArrayAdapter = ArrayAdapter(this, info.nightscout.core.ui.R.layout.spinner_centered, typeListFull!!) + val spinnerAdapter: ArrayAdapter = ArrayAdapter(this, app.aaps.core.ui.R.layout.spinner_centered, typeListFull!!) historyTypeSpinner?.run { adapter = spinnerAdapter onItemSelectedListener = object : AdapterView.OnItemSelectedListener { @@ -236,7 +236,7 @@ class DashPodHistoryActivity : TranslatedDaggerAppCompatActivity() { private fun setTextViewColor(checkResult: Boolean, textview: TextView, record: HistoryRecord) { if (checkResult && !record.isSuccess()) { // Record says not success - textview.setTextColor(rh.gac(textview.context, info.nightscout.core.ui.R.attr.omniYellowColor)) + textview.setTextColor(rh.gac(textview.context, app.aaps.core.ui.R.attr.omniYellowColor)) return } // On success set color @@ -250,23 +250,23 @@ class DashPodHistoryActivity : TranslatedDaggerAppCompatActivity() { OmnipodCommandType.SUSPEND_DELIVERY, OmnipodCommandType.RESUME_DELIVERY, OmnipodCommandType.SET_BASAL_PROFILE -> { - info.nightscout.core.ui.R.attr.omniCyanColor + app.aaps.core.ui.R.attr.omniCyanColor } // User action OmnipodCommandType.PLAY_TEST_BEEP, OmnipodCommandType.ACKNOWLEDGE_ALERTS, OmnipodCommandType.CANCEL_BOLUS -> { - info.nightscout.core.ui.R.attr.omniCyanColor + app.aaps.core.ui.R.attr.omniCyanColor } // Insulin treatment OmnipodCommandType.SET_BOLUS, OmnipodCommandType.SET_TEMPORARY_BASAL -> { - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } else -> // Other - info.nightscout.core.ui.R.attr.omniGrayColor + app.aaps.core.ui.R.attr.omniGrayColor } textview.setTextColor(rh.gac(textview.context, textColorAttr)) } 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 bfd298cb08..73088348b5 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 @@ -20,8 +20,8 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definitio import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.activation.DashPodActivationWizardActivity import info.nightscout.androidaps.plugins.pump.omnipod.dash.ui.wizard.deactivation.DashPodDeactivationWizardActivity -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog +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 @@ -154,6 +154,6 @@ class DashPodManagementActivity : TranslatedDaggerAppCompatActivity() { } private fun displayErrorDialog(title: String, message: String, @Suppress("SameParameterValue") withSound: Boolean) { - uiInteraction.runAlarm(message, title, if (withSound) info.nightscout.core.ui.R.raw.boluserror else 0) + uiInteraction.runAlarm(message, title, if (withSound) app.aaps.core.ui.R.raw.boluserror else 0) } } 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 fd588549d7..39e82a5943 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 @@ -41,8 +41,8 @@ import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definitio import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.AlertType import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.definition.PodConstants import info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.state.OmnipodDashPodStateManager -import info.nightscout.core.ui.UIRunnable -import info.nightscout.core.ui.dialogs.OKDialog +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 @@ -270,13 +270,13 @@ class OmnipodDashOverviewFragment : DaggerFragment() { context, when { connectionSuccessPercentage < 70 && podStateManager.successfulConnectionAttemptsAfterRetries > 50 -> - info.nightscout.core.ui.R.attr.warningColor + app.aaps.core.ui.R.attr.warningColor connectionSuccessPercentage < 90 && podStateManager.successfulConnectionAttemptsAfterRetries > 50 -> - info.nightscout.core.ui.R.attr.omniYellowColor + app.aaps.core.ui.R.attr.omniYellowColor else -> - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) bluetoothStatusBinding.omnipodDashBluetoothConnectionQuality.setTextColor(connectionStatsColor) @@ -300,11 +300,11 @@ class OmnipodDashOverviewFragment : DaggerFragment() { podInfoBinding.firmwareVersion.text = PLACEHOLDER podInfoBinding.timeOnPod.text = PLACEHOLDER podInfoBinding.podExpiryDate.text = PLACEHOLDER - podInfoBinding.podExpiryDate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.podExpiryDate.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) podInfoBinding.baseBasalRate.text = PLACEHOLDER podInfoBinding.totalDelivered.text = PLACEHOLDER podInfoBinding.reservoir.text = PLACEHOLDER - podInfoBinding.reservoir.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.reservoir.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) podInfoBinding.podActiveAlerts.text = PLACEHOLDER } else { podInfoBinding.uniqueId.text = podStateManager.uniqueId.toString() @@ -343,13 +343,13 @@ class OmnipodDashOverviewFragment : DaggerFragment() { context, when { !podStateManager.sameTimeZone -> - info.nightscout.core.ui.R.attr.omniMagentaColor + app.aaps.core.ui.R.attr.omniMagentaColor timeDeviationTooBig -> - info.nightscout.core.ui.R.attr.omniYellowColor + app.aaps.core.ui.R.attr.omniYellowColor else -> - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) ) @@ -365,13 +365,13 @@ class OmnipodDashOverviewFragment : DaggerFragment() { context, when { expiresAt != null && ZonedDateTime.now().isAfter(expiresAt) -> - info.nightscout.core.ui.R.attr.warningColor + app.aaps.core.ui.R.attr.warningColor expiresAt != null && ZonedDateTime.now().isAfter(expiresAt.minusHours(4)) -> - info.nightscout.core.ui.R.attr.omniYellowColor + app.aaps.core.ui.R.attr.omniYellowColor else -> - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) ) @@ -390,7 +390,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() { podInfoBinding.baseBasalRate.text = if (podStateManager.basalProgram != null && !podStateManager.isSuspended) { rh.gs( - info.nightscout.core.ui.R.string.pump_base_basal_rate, + app.aaps.core.ui.R.string.pump_base_basal_rate, omnipodDashPumpPlugin.model() .determineCorrectBasalSize(podStateManager.basalProgram!!.rateAt(System.currentTimeMillis())) ) @@ -413,7 +413,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() { if (podStateManager.pulsesRemaining == null) { podInfoBinding.reservoir.text = rh.gs(info.nightscout.androidaps.plugins.pump.omnipod.common.R.string.omnipod_common_overview_reservoir_value_over50) - podInfoBinding.reservoir.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.reservoir.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) } else { // TODO // val lowReservoirThreshold = (omnipodAlertUtil.lowReservoirAlertUnits @@ -428,9 +428,9 @@ class OmnipodDashOverviewFragment : DaggerFragment() { rh.gac( context, if (podStateManager.pulsesRemaining!! < lowReservoirThreshold) { - info.nightscout.core.ui.R.attr.warningColor + app.aaps.core.ui.R.attr.warningColor } else { - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) ) @@ -443,10 +443,10 @@ class OmnipodDashOverviewFragment : DaggerFragment() { if (errors.size == 0) { podInfoBinding.errors.text = PLACEHOLDER - podInfoBinding.errors.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.errors.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) } else { podInfoBinding.errors.text = StringUtils.join(errors, System.lineSeparator()) - podInfoBinding.errors.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor)) + podInfoBinding.errors.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.warningColor)) } } @@ -492,14 +492,14 @@ class OmnipodDashOverviewFragment : DaggerFragment() { rh.gac( context, if (omnipodDashPumpPlugin.isUnreachableAlertTimeoutExceeded(getPumpUnreachableTimeout().toMillis())) { - info.nightscout.core.ui.R.attr.warningColor + app.aaps.core.ui.R.attr.warningColor } else { - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) podInfoBinding.lastConnection.setTextColor(lastConnectionColor) } else { - podInfoBinding.lastConnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.lastConnection.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) podInfoBinding.lastConnection.text = PLACEHOLDER } } @@ -539,13 +539,13 @@ class OmnipodDashOverviewFragment : DaggerFragment() { context, when { !podStateManager.isActivationCompleted || podStateManager.isPodKaput || podStateManager.isSuspended -> - info.nightscout.core.ui.R.attr.warningColor + app.aaps.core.ui.R.attr.warningColor podStateManager.activeCommand != null -> - info.nightscout.core.ui.R.attr.omniYellowColor + app.aaps.core.ui.R.attr.omniYellowColor else -> - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) podInfoBinding.podStatus.setTextColor(podStatusColor) @@ -553,18 +553,18 @@ class OmnipodDashOverviewFragment : DaggerFragment() { private fun updateLastBolus() { - var textColorAttr = info.nightscout.core.ui.R.attr.defaultTextColor + var textColorAttr = app.aaps.core.ui.R.attr.defaultTextColor podStateManager.activeCommand?.let { val requestedBolus = it.requestedBolus if (requestedBolus != null) { var text = rh.gs( info.nightscout.androidaps.plugins.pump.omnipod.common.R.string.omnipod_common_overview_last_bolus_value, omnipodDashPumpPlugin.model().determineCorrectBolusSize(requestedBolus), - rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname), + rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname), readableDuration(Duration.ofMillis(SystemClock.elapsedRealtime() - it.createdRealtime)) ) text += " (uncertain) " - textColorAttr = info.nightscout.core.ui.R.attr.warningColor + textColorAttr = app.aaps.core.ui.R.attr.warningColor podInfoBinding.lastBolus.text = text podInfoBinding.lastBolus.setTextColor(rh.gac(context, textColorAttr)) return @@ -580,11 +580,11 @@ class OmnipodDashOverviewFragment : DaggerFragment() { val text = rh.gs( info.nightscout.androidaps.plugins.pump.omnipod.common.R.string.omnipod_common_overview_last_bolus_value, omnipodDashPumpPlugin.model().determineCorrectBolusSize(bolusSize), - rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname), + rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname), readableDuration(Duration.ofMillis(System.currentTimeMillis() - it.startTime)) ) if (!it.deliveryComplete) { - textColorAttr = info.nightscout.core.ui.R.attr.omniYellowColor + textColorAttr = app.aaps.core.ui.R.attr.omniYellowColor } podInfoBinding.lastBolus.text = text podInfoBinding.lastBolus.setTextColor(rh.gac(context, textColorAttr)) @@ -691,7 +691,7 @@ class OmnipodDashOverviewFragment : DaggerFragment() { } private fun displayErrorDialog(title: String, message: String, withSound: Boolean) { - uiInteraction.runAlarm(message, title, if (withSound) info.nightscout.core.ui.R.raw.boluserror else 0) + uiInteraction.runAlarm(message, title, if (withSound) app.aaps.core.ui.R.raw.boluserror else 0) } private fun displayOkDialog(title: String, message: String) { diff --git a/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml b/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml index f6ebff7a21..30f0313f70 100644 --- a/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml +++ b/pump/omnipod-dash/src/main/res/layout/omnipod_dash_pod_management.xml @@ -25,7 +25,7 @@ android:orientation="horizontal" app:layout_constraintGuide_percent="0" /> - - - - - 0) { // bolus needed, ask pump to deliver it return deliverBolus(detailedBolusInfo); diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java index 3638f34a98..fdebfb270e 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/manager/AapsOmnipodErosManager.java @@ -305,7 +305,7 @@ public class AapsOmnipodErosManager { if (profile == null) { String note = getStringResource(info.nightscout.androidaps.plugins.pump.omnipod.common.R.string.omnipod_common_error_failed_to_set_profile_empty_profile); if (showNotifications) { - showNotification(Notification.FAILED_UPDATE_PROFILE, note, Notification.URGENT, info.nightscout.core.ui.R.raw.boluserror); + showNotification(Notification.FAILED_UPDATE_PROFILE, note, Notification.URGENT, app.aaps.core.ui.R.raw.boluserror); } return new PumpEnactResult(injector).success(false).enacted(false).comment(note); } @@ -327,14 +327,14 @@ public class AapsOmnipodErosManager { } catch (CommandFailedAfterChangingDeliveryStatusException ex) { createSuspendedFakeTbrIfNotExists(); if (showNotifications) { - showNotification(Notification.FAILED_UPDATE_PROFILE, getStringResource(R.string.omnipod_eros_error_set_basal_failed_delivery_suspended), Notification.URGENT, info.nightscout.core.ui.R.raw.boluserror); + showNotification(Notification.FAILED_UPDATE_PROFILE, getStringResource(R.string.omnipod_eros_error_set_basal_failed_delivery_suspended), Notification.URGENT, app.aaps.core.ui.R.raw.boluserror); } String errorMessage = translateException(ex.getCause()); addFailureToHistory(historyEntryType, errorMessage); return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage); } catch (PrecedingCommandFailedUncertainlyException ex) { if (showNotifications) { - showNotification(Notification.FAILED_UPDATE_PROFILE, getStringResource(R.string.omnipod_eros_error_set_basal_failed_delivery_might_be_suspended), Notification.URGENT, info.nightscout.core.ui.R.raw.boluserror); + showNotification(Notification.FAILED_UPDATE_PROFILE, getStringResource(R.string.omnipod_eros_error_set_basal_failed_delivery_might_be_suspended), Notification.URGENT, app.aaps.core.ui.R.raw.boluserror); } String errorMessage = translateException(ex.getCause()); addFailureToHistory(historyEntryType, errorMessage); @@ -347,7 +347,7 @@ public class AapsOmnipodErosManager { } else { note = getStringResource(R.string.omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended); } - showNotification(Notification.FAILED_UPDATE_PROFILE, note, Notification.URGENT, info.nightscout.core.ui.R.raw.boluserror); + showNotification(Notification.FAILED_UPDATE_PROFILE, note, Notification.URGENT, app.aaps.core.ui.R.raw.boluserror); } String errorMessage = translateException(ex); addFailureToHistory(historyEntryType, errorMessage); @@ -362,7 +362,7 @@ public class AapsOmnipodErosManager { addSuccessToHistory(historyEntryType, profile.getBasalValues()); if (showNotifications) { - showNotification(Notification.PROFILE_SET_OK, rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, null); + showNotification(Notification.PROFILE_SET_OK, rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, null); } dismissNotification(Notification.FAILED_UPDATE_PROFILE); @@ -413,9 +413,9 @@ public class AapsOmnipodErosManager { if (OmnipodManager.CommandDeliveryStatus.UNCERTAIN_FAILURE.equals(bolusCommandResult.getCommandDeliveryStatus())) { // For safety reasons, we treat this as a bolus that has successfully been delivered, in order to prevent insulin overdose if (detailedBolusInfo.getBolusType() == DetailedBolusInfo.BolusType.SMB) { - showNotification(Notification.OMNIPOD_UNCERTAIN_SMB, getStringResource(R.string.omnipod_eros_error_bolus_failed_uncertain_smb, detailedBolusInfo.insulin), Notification.URGENT, isNotificationUncertainSmbSoundEnabled() ? info.nightscout.core.ui.R.raw.boluserror : null); + showNotification(Notification.OMNIPOD_UNCERTAIN_SMB, getStringResource(R.string.omnipod_eros_error_bolus_failed_uncertain_smb, detailedBolusInfo.insulin), Notification.URGENT, isNotificationUncertainSmbSoundEnabled() ? app.aaps.core.ui.R.raw.boluserror : null); } else { - showErrorDialog(getStringResource(R.string.omnipod_eros_error_bolus_failed_uncertain), isNotificationUncertainBolusSoundEnabled() ? info.nightscout.core.ui.R.raw.boluserror : 0); + showErrorDialog(getStringResource(R.string.omnipod_eros_error_bolus_failed_uncertain), isNotificationUncertainBolusSoundEnabled() ? app.aaps.core.ui.R.raw.boluserror : 0); } } @@ -516,7 +516,7 @@ public class AapsOmnipodErosManager { String errorMessage = translateException(ex.getCause()); addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, errorMessage); - showNotification(Notification.OMNIPOD_TBR_ALERTS, getStringResource(R.string.omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled), Notification.URGENT, isNotificationUncertainTbrSoundEnabled() ? info.nightscout.core.ui.R.raw.boluserror : null); + showNotification(Notification.OMNIPOD_TBR_ALERTS, getStringResource(R.string.omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled), Notification.URGENT, isNotificationUncertainTbrSoundEnabled() ? app.aaps.core.ui.R.raw.boluserror : null); splitActiveTbr(); // Split any active TBR so when we recover from the uncertain TBR status,we only cancel the part after the cancellation @@ -526,7 +526,7 @@ public class AapsOmnipodErosManager { long pumpId = addFailureToHistory(PodHistoryEntryType.SET_TEMPORARY_BASAL, errorMessage); if (!OmnipodManager.isCertainFailure(ex)) { - showNotification(Notification.OMNIPOD_TBR_ALERTS, getStringResource(R.string.omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed), Notification.URGENT, isNotificationUncertainTbrSoundEnabled() ? info.nightscout.core.ui.R.raw.boluserror : null); + showNotification(Notification.OMNIPOD_TBR_ALERTS, getStringResource(R.string.omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed), Notification.URGENT, isNotificationUncertainTbrSoundEnabled() ? app.aaps.core.ui.R.raw.boluserror : null); // Assume that setting the temp basal succeeded here, because in case it didn't succeed, // The next StatusResponse that we receive will allow us to recover from the wrong state @@ -558,7 +558,7 @@ public class AapsOmnipodErosManager { executeCommand(() -> delegate.cancelTemporaryBasal(isTbrBeepsEnabled())); } catch (Exception ex) { if (OmnipodManager.isCertainFailure(ex)) { - showNotification(Notification.OMNIPOD_TBR_ALERTS, getStringResource(R.string.omnipod_eros_error_cancel_temp_basal_failed_uncertain), Notification.URGENT, isNotificationUncertainTbrSoundEnabled() ? info.nightscout.core.ui.R.raw.boluserror : null); + showNotification(Notification.OMNIPOD_TBR_ALERTS, getStringResource(R.string.omnipod_eros_error_cancel_temp_basal_failed_uncertain), Notification.URGENT, isNotificationUncertainTbrSoundEnabled() ? app.aaps.core.ui.R.raw.boluserror : null); } else { splitActiveTbr(); // Split any active TBR so when we recover from the uncertain TBR status,we only cancel the part after the cancellation } @@ -619,21 +619,21 @@ public class AapsOmnipodErosManager { } catch (CommandFailedAfterChangingDeliveryStatusException ex) { createSuspendedFakeTbrIfNotExists(); if (showNotifications) { - showNotification(Notification.FAILED_UPDATE_PROFILE, getStringResource(R.string.omnipod_eros_error_set_time_failed_delivery_suspended), Notification.URGENT, info.nightscout.core.ui.R.raw.boluserror); + showNotification(Notification.FAILED_UPDATE_PROFILE, getStringResource(R.string.omnipod_eros_error_set_time_failed_delivery_suspended), Notification.URGENT, app.aaps.core.ui.R.raw.boluserror); } String errorMessage = translateException(ex.getCause()); addFailureToHistory(PodHistoryEntryType.SET_TIME, errorMessage); return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage); } catch (PrecedingCommandFailedUncertainlyException ex) { if (showNotifications) { - showNotification(Notification.FAILED_UPDATE_PROFILE, getStringResource(R.string.omnipod_eros_error_set_time_failed_delivery_might_be_suspended), Notification.URGENT, info.nightscout.core.ui.R.raw.boluserror); + showNotification(Notification.FAILED_UPDATE_PROFILE, getStringResource(R.string.omnipod_eros_error_set_time_failed_delivery_might_be_suspended), Notification.URGENT, app.aaps.core.ui.R.raw.boluserror); } String errorMessage = translateException(ex.getCause()); addFailureToHistory(PodHistoryEntryType.SET_TIME, errorMessage); return new PumpEnactResult(injector).success(false).enacted(false).comment(errorMessage); } catch (Exception ex) { if (showNotifications) { - showNotification(Notification.FAILED_UPDATE_PROFILE, getStringResource(R.string.omnipod_eros_error_set_time_failed_delivery_might_be_suspended), Notification.URGENT, info.nightscout.core.ui.R.raw.boluserror); + showNotification(Notification.FAILED_UPDATE_PROFILE, getStringResource(R.string.omnipod_eros_error_set_time_failed_delivery_might_be_suspended), Notification.URGENT, app.aaps.core.ui.R.raw.boluserror); } String errorMessage = translateException(ex); addFailureToHistory(PodHistoryEntryType.SET_TIME, errorMessage); @@ -984,11 +984,11 @@ public class AapsOmnipodErosManager { } private void showErrorDialog(String message, Integer sound) { - uiInteraction.runAlarm(message, rh.gs(info.nightscout.core.ui.R.string.error), sound); + uiInteraction.runAlarm(message, rh.gs(app.aaps.core.ui.R.string.error), sound); } private void showPodFaultNotification(FaultEventCode faultEventCode) { - showPodFaultNotification(faultEventCode, info.nightscout.core.ui.R.raw.boluserror); + showPodFaultNotification(faultEventCode, app.aaps.core.ui.R.raw.boluserror); } private void showPodFaultNotification(FaultEventCode faultEventCode, Integer sound) { diff --git a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.kt b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.kt index b5544a5ef4..19bbf16497 100644 --- a/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.kt +++ b/pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/ui/ErosPodHistoryActivity.kt @@ -22,7 +22,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.definition.PodHistor import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.ErosHistory import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryRecordEntity import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.common.defs.PumpHistoryEntryGroup import info.nightscout.pump.common.defs.PumpHistoryEntryGroup.Companion.getTranslatedList import info.nightscout.pump.common.defs.TempBasalPair @@ -109,7 +109,7 @@ class ErosPodHistoryActivity : TranslatedDaggerAppCompatActivity() { recyclerView?.adapter = recyclerViewAdapter statusView?.visibility = View.GONE typeListFull = getTypeList(getTranslatedList(rh)) - historyTypeSpinner?.adapter = ArrayAdapter(this, info.nightscout.core.ui.R.layout.spinner_centered, typeListFull) + historyTypeSpinner?.adapter = ArrayAdapter(this, app.aaps.core.ui.R.layout.spinner_centered, typeListFull) historyTypeSpinner?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { override fun onItemSelected(parent: AdapterView<*>?, view: View, position: Int, id: Long) { if (manualChange) return 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 407861fa5a..307ce6cadb 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 @@ -33,8 +33,8 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodE import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandReadPulseLog import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.activation.ErosPodActivationWizardActivity import info.nightscout.androidaps.plugins.pump.omnipod.eros.ui.wizard.deactivation.ErosPodDeactivationWizardActivity -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog +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 @@ -247,12 +247,12 @@ class ErosPodManagementActivity : TranslatedDaggerAppCompatActivity() { } private fun displayErrorDialog(title: String, message: String, @Suppress("SameParameterValue") withSound: Boolean) { - uiInteraction.runAlarm(message, title, if (withSound) info.nightscout.core.ui.R.raw.boluserror else 0) + uiInteraction.runAlarm(message, title, if (withSound) app.aaps.core.ui.R.raw.boluserror else 0) } private fun displayNotConfiguredDialog() { context.let { - info.nightscout.core.ui.UIRunnable { + app.aaps.core.ui.UIRunnable { OKDialog.show( it, rh.gs(info.nightscout.androidaps.plugins.pump.omnipod.common.R.string.omnipod_common_warning), rh.gs(R.string.omnipod_eros_error_operation_not_possible_no_configuration), null 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 c30f2caae8..a5acdad887 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 @@ -49,7 +49,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.manager.AapsOmnipodE import info.nightscout.androidaps.plugins.pump.omnipod.eros.queue.command.CommandGetPodStatus import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.AapsOmnipodUtil import info.nightscout.androidaps.plugins.pump.omnipod.eros.util.OmnipodAlertUtil -import info.nightscout.core.ui.dialogs.OKDialog +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 @@ -123,7 +123,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() { context?.let { context -> protectionCheck.queryProtection( activity, ProtectionCheck.Protection.PREFERENCES, - info.nightscout.core.ui.UIRunnable { startActivity(Intent(context, ErosPodManagementActivity::class.java)) } + app.aaps.core.ui.UIRunnable { startActivity(Intent(context, ErosPodManagementActivity::class.java)) } ) } } @@ -249,7 +249,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() { rileyLinkStatusBinding.rileyLinkStatus.setTextColor( rh.gac( context, - if (rileyLinkServiceState.isError || rileyLinkError != null) info.nightscout.core.ui.R.attr.warningColor else info.nightscout.core.ui.R.attr.defaultTextColor + if (rileyLinkServiceState.isError || rileyLinkError != null) app.aaps.core.ui.R.attr.warningColor else app.aaps.core.ui.R.attr.defaultTextColor ) ) } @@ -279,11 +279,11 @@ class OmnipodErosOverviewFragment : DaggerFragment() { podInfoBinding.firmwareVersion.text = PLACEHOLDER podInfoBinding.timeOnPod.text = PLACEHOLDER podInfoBinding.podExpiryDate.text = PLACEHOLDER - podInfoBinding.podExpiryDate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.podExpiryDate.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) podInfoBinding.baseBasalRate.text = PLACEHOLDER podInfoBinding.totalDelivered.text = PLACEHOLDER podInfoBinding.reservoir.text = PLACEHOLDER - podInfoBinding.reservoir.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.reservoir.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) podInfoBinding.podActiveAlerts.text = PLACEHOLDER } else { podInfoBinding.uniqueId.text = podStateManager.address.toString() @@ -296,25 +296,25 @@ class OmnipodErosOverviewFragment : DaggerFragment() { rh.gac( context, if (podStateManager.timeDeviatesMoreThan(OmnipodConstants.TIME_DEVIATION_THRESHOLD)) { - info.nightscout.core.ui.R.attr.warningColor + app.aaps.core.ui.R.attr.warningColor } else { - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) ) val expiresAt = podStateManager.expiresAt if (expiresAt == null) { podInfoBinding.podExpiryDate.text = PLACEHOLDER - podInfoBinding.podExpiryDate.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.podExpiryDate.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) } else { podInfoBinding.podExpiryDate.text = readableZonedTime(expiresAt) podInfoBinding.podExpiryDate.setTextColor( rh.gac( context, if (DateTime.now().isAfter(expiresAt)) { - info.nightscout.core.ui.R.attr.warningColor + app.aaps.core.ui.R.attr.warningColor } else { - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) ) @@ -329,7 +329,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() { // base basal rate podInfoBinding.baseBasalRate.text = if (podStateManager.isPodActivationCompleted) { rh.gs( - info.nightscout.core.ui.R.string.pump_base_basal_rate, + app.aaps.core.ui.R.string.pump_base_basal_rate, omnipodErosPumpPlugin.model().determineCorrectBasalSize(podStateManager.basalSchedule.rateAt(TimeUtil.toDuration(DateTime.now()))) ) } else { @@ -349,7 +349,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() { // reservoir if (podStateManager.reservoirLevel == null) { podInfoBinding.reservoir.text = rh.gs(info.nightscout.androidaps.plugins.pump.omnipod.common.R.string.omnipod_common_overview_reservoir_value_over50) - podInfoBinding.reservoir.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.reservoir.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) } else { val lowReservoirThreshold = (omnipodAlertUtil.lowReservoirAlertUnits ?: OmnipodConstants.DEFAULT_MAX_RESERVOIR_ALERT_THRESHOLD).toDouble() @@ -359,9 +359,9 @@ class OmnipodErosOverviewFragment : DaggerFragment() { rh.gac( context, if (podStateManager.reservoirLevel < lowReservoirThreshold) { - info.nightscout.core.ui.R.attr.warningColor + app.aaps.core.ui.R.attr.warningColor } else { - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) ) @@ -376,10 +376,10 @@ class OmnipodErosOverviewFragment : DaggerFragment() { if (errors.size == 0) { podInfoBinding.errors.text = PLACEHOLDER - podInfoBinding.errors.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.errors.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) } else { podInfoBinding.errors.text = StringUtils.join(errors, System.lineSeparator()) - podInfoBinding.errors.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor)) + podInfoBinding.errors.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.warningColor)) } } @@ -390,14 +390,14 @@ class OmnipodErosOverviewFragment : DaggerFragment() { rh.gac( context, if (omnipodErosPumpPlugin.isUnreachableAlertTimeoutExceeded(getPumpUnreachableTimeout().millis)) { - info.nightscout.core.ui.R.attr.warningColor + app.aaps.core.ui.R.attr.warningColor } else { - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) podInfoBinding.lastConnection.setTextColor(lastConnectionColor) } else { - podInfoBinding.lastConnection.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.lastConnection.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) podInfoBinding.lastConnection.text = if (podStateManager.hasPodState() && podStateManager.lastSuccessfulCommunication != null) { readableDuration(podStateManager.lastSuccessfulCommunication) } else { @@ -445,9 +445,9 @@ class OmnipodErosOverviewFragment : DaggerFragment() { rh.gac( context, if (!podStateManager.isPodActivationCompleted || podStateManager.isPodDead || podStateManager.isSuspended || (podStateManager.isPodRunning && !podStateManager.isBasalCertain)) { - info.nightscout.core.ui.R.attr.warningColor + app.aaps.core.ui.R.attr.warningColor } else { - info.nightscout.core.ui.R.attr.defaultTextColor + app.aaps.core.ui.R.attr.defaultTextColor } ) podInfoBinding.podStatus.setTextColor(podStatusColor) @@ -459,14 +459,14 @@ class OmnipodErosOverviewFragment : DaggerFragment() { rh.gs( info.nightscout.androidaps.plugins.pump.omnipod.common.R.string.omnipod_common_overview_last_bolus_value, omnipodErosPumpPlugin.model().determineCorrectBolusSize(podStateManager.lastBolusAmount), - rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname), + rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname), readableDuration(podStateManager.lastBolusStartTime) ) val textColor: Int if (podStateManager.isLastBolusCertain) { - textColor = rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor) + textColor = rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor) } else { - textColor = rh.gac(context, info.nightscout.core.ui.R.attr.warningColor) + textColor = rh.gac(context, app.aaps.core.ui.R.attr.warningColor) text += " (" + rh.gs(R.string.omnipod_eros_uncertain) + ")" } @@ -475,7 +475,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() { } else { podInfoBinding.lastBolus.text = PLACEHOLDER - podInfoBinding.lastBolus.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor)) + podInfoBinding.lastBolus.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor)) } } @@ -483,7 +483,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() { if (podStateManager.isPodActivationCompleted && podStateManager.isTempBasalRunning) { if (!podStateManager.hasTempBasal()) { podInfoBinding.tempBasal.text = "???" - podInfoBinding.tempBasal.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.warningColor)) + podInfoBinding.tempBasal.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.warningColor)) } else { val now = DateTime.now() @@ -504,9 +504,9 @@ class OmnipodErosOverviewFragment : DaggerFragment() { duration.standardMinutes ) if (podStateManager.isTempBasalCertain) { - textColor = rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor) + textColor = rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor) } else { - textColor = rh.gac(context, info.nightscout.core.ui.R.attr.warningColor) + textColor = rh.gac(context, app.aaps.core.ui.R.attr.warningColor) text += " (" + rh.gs(R.string.omnipod_eros_uncertain) + ")" } @@ -518,9 +518,9 @@ class OmnipodErosOverviewFragment : DaggerFragment() { val textColor: Int if (!podStateManager.isPodActivationCompleted || podStateManager.isTempBasalCertain) { - textColor = rh.gac(context, info.nightscout.core.ui.R.attr.defaultTextColor) + textColor = rh.gac(context, app.aaps.core.ui.R.attr.defaultTextColor) } else { - textColor = rh.gac(context, info.nightscout.core.ui.R.attr.warningColor) + textColor = rh.gac(context, app.aaps.core.ui.R.attr.warningColor) text += " (" + rh.gs(R.string.omnipod_eros_uncertain) + ")" } @@ -601,7 +601,7 @@ class OmnipodErosOverviewFragment : DaggerFragment() { private fun displayNotConfiguredDialog() { context?.let { - info.nightscout.core.ui.UIRunnable { + app.aaps.core.ui.UIRunnable { OKDialog.show( it, rh.gs(info.nightscout.androidaps.plugins.pump.omnipod.common.R.string.omnipod_common_warning), rh.gs(R.string.omnipod_eros_error_operation_not_possible_no_configuration), null @@ -611,12 +611,12 @@ class OmnipodErosOverviewFragment : DaggerFragment() { } private fun displayErrorDialog(title: String, message: String, withSound: Boolean) { - uiInteraction.runAlarm(message, title, if (withSound) info.nightscout.core.ui.R.raw.boluserror else 0) + uiInteraction.runAlarm(message, title, if (withSound) app.aaps.core.ui.R.raw.boluserror else 0) } private fun displayOkDialog(title: String, message: String) { context?.let { - info.nightscout.core.ui.UIRunnable { + app.aaps.core.ui.UIRunnable { OKDialog.show(it, title, message, null) }.run() } diff --git a/pump/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml b/pump/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml index 2df7c5d38f..a5589c743b 100644 --- a/pump/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml +++ b/pump/omnipod-eros/src/main/res/layout/omnipod_eros_pod_management.xml @@ -61,7 +61,7 @@ android:orientation="horizontal" app:layout_constraintGuide_percent="0" /> - - - - - - - - 0) { // bolus needed, ask pump to deliver it deliverBolus(detailedBolusInfo) diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt index 11a5ffafaa..dd8cbd0898 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/defs/PumpDriverState.kt @@ -8,7 +8,7 @@ import info.nightscout.pump.common.R enum class PumpDriverState(var resourceId: Int) { NotInitialized(R.string.pump_status_not_initialized), // this state should be set only when driver is created - Connecting(info.nightscout.core.ui.R.string.connecting), // + Connecting(app.aaps.core.ui.R.string.connecting), // Connected(app.aaps.core.interfaces.R.string.connected), // Initialized(R.string.pump_status_initialized), // this is weird state that probably won't be used, since its more driver centric that communication centric EncryptCommunication(R.string.pump_status_encrypt), // @@ -17,7 +17,7 @@ enum class PumpDriverState(var resourceId: Int) { Suspended(R.string.pump_status_suspended), // ExecutingCommand(R.string.pump_status_executing_command), Disconnecting(app.aaps.core.interfaces.R.string.disconnecting), - Disconnected(info.nightscout.core.ui.R.string.disconnected); + Disconnected(app.aaps.core.ui.R.string.disconnected); fun isConnected(): Boolean = this == Connected || this == Initialized || this == Busy || this == Suspended fun isInitialized(): Boolean = this == Initialized || this == Busy || this == Suspended diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt index a232d4dc2c..4358f93766 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpBLEConfigActivity.kt @@ -25,8 +25,8 @@ import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.pump.BlePreCheck import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.sharedPreferences.SP -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.pump.common.R import info.nightscout.pump.common.databinding.PumpBleConfigActivityBinding import info.nightscout.pump.common.driver.PumpDriverConfigurationCapable diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt index d64b2b6e23..fd29182aff 100644 --- a/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt +++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/ui/PumpHistoryActivity.kt @@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.plugin.ActivePlugin -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.pump.common.R import info.nightscout.pump.common.databinding.PumpHistoryActivityBinding import info.nightscout.pump.common.defs.PumpHistoryEntryGroup @@ -104,7 +104,7 @@ class PumpHistoryActivity : TranslatedDaggerAppCompatActivity() { binding.pumpHistoryRecyclerView.adapter = recyclerViewAdapter binding.pumpHistoryStatus.visibility = View.GONE typeListFull = getTypeList(historyDataProvider.getAllowedPumpHistoryGroups()) - val spinnerAdapter = ArrayAdapter(this, info.nightscout.core.ui.R.layout.spinner_centered, typeListFull!!) + val spinnerAdapter = ArrayAdapter(this, app.aaps.core.ui.R.layout.spinner_centered, typeListFull!!) binding.pumpHistoryText.text = historyDataProvider.getText(PumpHistoryText.PUMP_HISTORY) diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt index 066d62091c..e118910538 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEConfigActivity.kt @@ -37,8 +37,8 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.GattAttributes import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.databinding.RileyLinkBleConfigActivityBinding import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.dialogs.OKDialog import org.apache.commons.lang3.StringUtils import java.util.Locale import javax.inject.Inject diff --git a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt index 86bd3e596a..7aef10e00b 100644 --- a/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt +++ b/pump/rileylink/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusActivity.kt @@ -8,7 +8,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper import com.google.android.material.tabs.TabLayoutMediator import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.R import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.databinding.RileylinkStatusBinding -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import javax.inject.Inject class RileyLinkStatusActivity : TranslatedDaggerAppCompatActivity() { 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 35ee40b0cd..2ec74087bd 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 @@ -94,13 +94,13 @@ class VirtualPumpFragment : DaggerFragment() { private fun updateGui() { if (_binding == null) return val profile = profileFunction.getProfile() ?: return - binding.baseBasalRate.text = rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, virtualPumpPlugin.baseBasalRate) + binding.baseBasalRate.text = rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, virtualPumpPlugin.baseBasalRate) binding.tempbasal.text = iobCobCalculator.getTempBasal(dateUtil.now())?.toStringFull(profile, dateUtil, decimalFormatter) ?: "" binding.extendedbolus.text = iobCobCalculator.getExtendedBolus(dateUtil.now())?.toStringFull(dateUtil, decimalFormatter) ?: "" - binding.battery.text = rh.gs(info.nightscout.core.ui.R.string.format_percent, virtualPumpPlugin.batteryPercent) - binding.reservoir.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, virtualPumpPlugin.reservoirInUnits.toDouble()) + binding.battery.text = rh.gs(app.aaps.core.ui.R.string.format_percent, virtualPumpPlugin.batteryPercent) + binding.reservoir.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, virtualPumpPlugin.reservoirInUnits.toDouble()) virtualPumpPlugin.refreshConfiguration() val pumpType = virtualPumpPlugin.pumpType 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 3d673c0741..1b40a5cbdb 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 @@ -72,7 +72,7 @@ open class VirtualPumpPlugin @Inject constructor( .mainType(PluginType.PUMP) .fragmentClass(VirtualPumpFragment::class.java.name) .pluginIcon(app.aaps.core.main.R.drawable.ic_virtual_pump) - .pluginName(info.nightscout.core.ui.R.string.virtual_pump) + .pluginName(app.aaps.core.ui.R.string.virtual_pump) .shortName(R.string.virtual_pump_shortname) .preferencesId(R.xml.pref_virtual_pump) .description(R.string.description_pump_virtual) @@ -160,7 +160,7 @@ open class VirtualPumpPlugin @Inject constructor( override fun setNewBasalProfile(profile: Profile): PumpEnactResult { lastDataTime = System.currentTimeMillis() - rxBus.send(EventNewNotification(Notification(Notification.PROFILE_SET_OK, rh.gs(info.nightscout.core.ui.R.string.profile_set_ok), Notification.INFO, 60))) + rxBus.send(EventNewNotification(Notification(Notification.PROFILE_SET_OK, rh.gs(app.aaps.core.ui.R.string.profile_set_ok), Notification.INFO, 60))) // Do nothing here. we are using database profile return PumpEnactResult(injector).success(true).enacted(true) } @@ -185,13 +185,13 @@ open class VirtualPumpPlugin @Inject constructor( .success(true) .bolusDelivered(detailedBolusInfo.insulin) .enacted(detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) - .comment(rh.gs(info.nightscout.core.ui.R.string.virtualpump_resultok)) + .comment(rh.gs(app.aaps.core.ui.R.string.virtualpump_resultok)) val bolusingEvent = EventOverviewBolusProgress bolusingEvent.t = EventOverviewBolusProgress.Treatment(0.0, 0, detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB, detailedBolusInfo.id) var delivering = 0.0 while (delivering < detailedBolusInfo.insulin) { SystemClock.sleep(200) - bolusingEvent.status = rh.gs(info.nightscout.core.ui.R.string.bolus_delivering, delivering) + bolusingEvent.status = rh.gs(app.aaps.core.ui.R.string.bolus_delivering, delivering) bolusingEvent.percent = min((delivering / detailedBolusInfo.insulin * 100).toInt(), 100) rxBus.send(bolusingEvent) delivering += 0.1 @@ -199,10 +199,10 @@ open class VirtualPumpPlugin @Inject constructor( return PumpEnactResult(injector) .success(false) .enacted(false) - .comment(rh.gs(info.nightscout.core.ui.R.string.stop)) + .comment(rh.gs(app.aaps.core.ui.R.string.stop)) } SystemClock.sleep(200) - bolusingEvent.status = rh.gs(info.nightscout.core.ui.R.string.bolus_delivered_successfully, detailedBolusInfo.insulin) + bolusingEvent.status = rh.gs(app.aaps.core.ui.R.string.bolus_delivered_successfully, detailedBolusInfo.insulin) bolusingEvent.percent = 100 rxBus.send(bolusingEvent) SystemClock.sleep(1000) @@ -233,7 +233,7 @@ open class VirtualPumpPlugin @Inject constructor( result.isTempCancel = false result.absolute = absoluteRate result.duration = durationInMinutes - result.comment = rh.gs(info.nightscout.core.ui.R.string.virtualpump_resultok) + result.comment = rh.gs(app.aaps.core.ui.R.string.virtualpump_resultok) pumpSync.syncTemporaryBasalWithPumpId( timestamp = dateUtil.now(), rate = absoluteRate, @@ -258,7 +258,7 @@ open class VirtualPumpPlugin @Inject constructor( result.isPercent = true result.isTempCancel = false result.duration = durationInMinutes - result.comment = rh.gs(info.nightscout.core.ui.R.string.virtualpump_resultok) + result.comment = rh.gs(app.aaps.core.ui.R.string.virtualpump_resultok) pumpSync.syncTemporaryBasalWithPumpId( timestamp = dateUtil.now(), rate = percent.toDouble(), @@ -283,7 +283,7 @@ open class VirtualPumpPlugin @Inject constructor( result.bolusDelivered = insulin result.isTempCancel = false result.duration = durationInMinutes - result.comment = rh.gs(info.nightscout.core.ui.R.string.virtualpump_resultok) + result.comment = rh.gs(app.aaps.core.ui.R.string.virtualpump_resultok) pumpSync.syncExtendedBolusWithPumpId( timestamp = dateUtil.now(), amount = insulin, @@ -303,7 +303,7 @@ open class VirtualPumpPlugin @Inject constructor( val result = PumpEnactResult(injector) result.success = true result.isTempCancel = true - result.comment = rh.gs(info.nightscout.core.ui.R.string.virtualpump_resultok) + result.comment = rh.gs(app.aaps.core.ui.R.string.virtualpump_resultok) if (pumpSync.expectedPumpState().temporaryBasal != null) { result.enacted = true pumpSync.syncStopTemporaryBasalWithPumpId( @@ -332,7 +332,7 @@ open class VirtualPumpPlugin @Inject constructor( result.success = true result.enacted = true result.isTempCancel = true - result.comment = rh.gs(info.nightscout.core.ui.R.string.virtualpump_resultok) + result.comment = rh.gs(app.aaps.core.ui.R.string.virtualpump_resultok) aapsLogger.debug(LTag.PUMP, "Canceling extended bolus: ${result.toText(rh)}") rxBus.send(EventVirtualPumpUpdateGui()) lastDataTime = System.currentTimeMillis() diff --git a/pump/virtual/src/main/java/info/nightscout/pump/virtual/extensions/PumpEnactResultExtension.kt b/pump/virtual/src/main/java/info/nightscout/pump/virtual/extensions/PumpEnactResultExtension.kt index 8361ef781d..3ce896db3e 100644 --- a/pump/virtual/src/main/java/info/nightscout/pump/virtual/extensions/PumpEnactResultExtension.kt +++ b/pump/virtual/src/main/java/info/nightscout/pump/virtual/extensions/PumpEnactResultExtension.kt @@ -4,37 +4,37 @@ import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.resources.ResourceHelper fun PumpEnactResult.toText(rh: ResourceHelper): String { - var ret = rh.gs(info.nightscout.core.ui.R.string.success) + ": " + success + var ret = rh.gs(app.aaps.core.ui.R.string.success) + ": " + success if (enacted) { when { bolusDelivered > 0 -> { - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.enacted)}: $enacted" - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.comment)}: $comment" - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.configbuilder_insulin)}: $bolusDelivered ${rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname)}" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.enacted)}: $enacted" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.comment)}: $comment" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.configbuilder_insulin)}: $bolusDelivered ${rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname)}" } isTempCancel -> { - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.enacted)}: $enacted" - if (comment.isNotEmpty()) ret += "\n${rh.gs(info.nightscout.core.ui.R.string.comment)}: $comment" - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.cancel_temp)}" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.enacted)}: $enacted" + if (comment.isNotEmpty()) ret += "\n${rh.gs(app.aaps.core.ui.R.string.comment)}: $comment" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.cancel_temp)}" } isPercent -> { - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.enacted)}: $enacted" - if (comment.isNotEmpty()) ret += "\n${rh.gs(info.nightscout.core.ui.R.string.comment)}: $comment" - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.duration)}: $duration min" - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.percent)}: $percent%" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.enacted)}: $enacted" + if (comment.isNotEmpty()) ret += "\n${rh.gs(app.aaps.core.ui.R.string.comment)}: $comment" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.duration)}: $duration min" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.percent)}: $percent%" } else -> { - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.enacted)}: $enacted" - if (comment.isNotEmpty()) ret += "\n${rh.gs(info.nightscout.core.ui.R.string.comment)}: $comment" - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.duration)}: $duration min" - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.absolute)}: $absolute U/h" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.enacted)}: $enacted" + if (comment.isNotEmpty()) ret += "\n${rh.gs(app.aaps.core.ui.R.string.comment)}: $comment" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.duration)}: $duration min" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.absolute)}: $absolute U/h" } } } else { - ret += "\n${rh.gs(info.nightscout.core.ui.R.string.comment)}: $comment" + ret += "\n${rh.gs(app.aaps.core.ui.R.string.comment)}: $comment" } return ret } diff --git a/ui/src/main/java/info/nightscout/ui/activities/BolusProgressHelperActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/BolusProgressHelperActivity.kt index 440ec2cde6..4713d4d5e7 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/BolusProgressHelperActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/BolusProgressHelperActivity.kt @@ -1,7 +1,7 @@ package info.nightscout.ui.activities import android.os.Bundle -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.ui.dialogs.BolusProgressDialog class BolusProgressHelperActivity : TranslatedDaggerAppCompatActivity() { diff --git a/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt index 129724ba7c..a27156395a 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/ErrorHelperActivity.kt @@ -2,7 +2,7 @@ package info.nightscout.ui.activities import android.os.Bundle import app.aaps.core.interfaces.sharedPreferences.SP -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction import info.nightscout.ui.alertDialogs.ErrorDialog @@ -24,7 +24,7 @@ class ErrorHelperActivity : TranslatedDaggerAppCompatActivity() { val errorDialog = ErrorDialog() errorDialog.helperActivity = this errorDialog.status = intent.getStringExtra(AlarmSoundService.STATUS) ?: "" - errorDialog.sound = intent.getIntExtra(AlarmSoundService.SOUND_ID, info.nightscout.core.ui.R.raw.error) + errorDialog.sound = intent.getIntExtra(AlarmSoundService.SOUND_ID, app.aaps.core.ui.R.raw.error) errorDialog.title = intent.getStringExtra(AlarmSoundService.TITLE) ?: "" errorDialog.show(supportFragmentManager, "Error") diff --git a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt index 284dc58cb1..654938f6dd 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt @@ -22,9 +22,9 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import com.google.android.material.tabs.TabLayout import com.google.common.collect.Lists -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.entities.EffectiveProfileSwitch import info.nightscout.database.impl.AppRepository import info.nightscout.ui.R @@ -101,9 +101,9 @@ class ProfileHelperActivity : TranslatedDaggerAppCompatActivity() { rh.gs(R.string.dpv_default_profile), rh.gs(R.string.current_profile), rh.gs(R.string.available_profile), - rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch) + rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch) ) - binding.profileType.setAdapter(ArrayAdapter(this, info.nightscout.core.ui.R.layout.spinner_centered, profileTypeList)) + binding.profileType.setAdapter(ArrayAdapter(this, app.aaps.core.ui.R.layout.spinner_centered, profileTypeList)) binding.profileType.setOnItemClickListener { _, _, _, _ -> when (binding.profileType.text.toString()) { @@ -111,14 +111,14 @@ class ProfileHelperActivity : TranslatedDaggerAppCompatActivity() { rh.gs(R.string.dpv_default_profile) -> switchTab(tabSelected, ProfileType.DPV_DEFAULT) rh.gs(R.string.current_profile) -> switchTab(tabSelected, ProfileType.CURRENT) rh.gs(R.string.available_profile) -> switchTab(tabSelected, ProfileType.AVAILABLE_PROFILE) - rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch) -> switchTab(tabSelected, ProfileType.PROFILE_SWITCH) + rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch) -> switchTab(tabSelected, ProfileType.PROFILE_SWITCH) } } // Active profile profileList = activePlugin.activeProfileSource.profile?.getProfileList() ?: ArrayList() - binding.availableProfileList.setAdapter(ArrayAdapter(this, info.nightscout.core.ui.R.layout.spinner_centered, profileList)) + binding.availableProfileList.setAdapter(ArrayAdapter(this, app.aaps.core.ui.R.layout.spinner_centered, profileList)) binding.availableProfileList.setOnItemClickListener { _, _, index, _ -> profileUsed[tabSelected] = index } @@ -127,7 +127,7 @@ class ProfileHelperActivity : TranslatedDaggerAppCompatActivity() { profileSwitch = repository.getEffectiveProfileSwitchDataFromTime(dateUtil.now() - T.months(2).msecs(), true).blockingGet() val profileswitchListNames = profileSwitch.map { it.originalCustomizedName } - binding.profileswitchList.setAdapter(ArrayAdapter(this, info.nightscout.core.ui.R.layout.spinner_centered, profileswitchListNames)) + binding.profileswitchList.setAdapter(ArrayAdapter(this, app.aaps.core.ui.R.layout.spinner_centered, profileswitchListNames)) binding.profileswitchList.setOnItemClickListener { _, _, index, _ -> profileSwitchUsed[tabSelected] = index } @@ -142,7 +142,7 @@ class ProfileHelperActivity : TranslatedDaggerAppCompatActivity() { val profile = if (typeSelected[tabSelected] == ProfileType.MOTOL_DEFAULT) defaultProfile.profile(age, tdd, weight, profileFunction.getUnits()) else defaultProfileDPV.profile(age, tdd, pct / 100.0, profileFunction.getUnits()) profile?.let { - OKDialog.showConfirmation(this, rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch), rh.gs(info.nightscout.core.ui.R.string.copytolocalprofile), Runnable { + OKDialog.showConfirmation(this, rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch), rh.gs(app.aaps.core.ui.R.string.copytolocalprofile), Runnable { activePlugin.activeProfileSource.addProfile( activePlugin.activeProfileSource.copyFrom( it, "DefaultProfile " + @@ -173,7 +173,7 @@ class ProfileHelperActivity : TranslatedDaggerAppCompatActivity() { binding.basalPctFromTdd.setParams(32.0, 32.0, 37.0, 1.0, DecimalFormat("0"), false, null) - binding.tdds.addView(TextView(this).apply { text = rh.gs(info.nightscout.core.ui.R.string.tdd) + ": " + rh.gs(R.string.calculation_in_progress) }) + binding.tdds.addView(TextView(this).apply { text = rh.gs(app.aaps.core.ui.R.string.tdd) + ": " + rh.gs(R.string.calculation_in_progress) }) disposable += Single.fromCallable { tddCalculator.stats(this) } .subscribeOn(aapsSchedulers.io) .observeOn(aapsSchedulers.main) @@ -242,7 +242,7 @@ class ProfileHelperActivity : TranslatedDaggerAppCompatActivity() { return@setOnClickListener } } - ToastUtils.warnToast(this, info.nightscout.core.ui.R.string.invalid_input) + ToastUtils.warnToast(this, app.aaps.core.ui.R.string.invalid_input) } binding.ageLabel.labelFor = binding.age.editTextId binding.tddLabel.labelFor = binding.tdd.editTextId @@ -295,7 +295,7 @@ class ProfileHelperActivity : TranslatedDaggerAppCompatActivity() { ProfileType.DPV_DEFAULT -> rh.gs(R.string.dpv_default_profile) ProfileType.CURRENT -> rh.gs(R.string.current_profile) ProfileType.AVAILABLE_PROFILE -> rh.gs(R.string.available_profile) - ProfileType.PROFILE_SWITCH -> rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch) + ProfileType.PROFILE_SWITCH -> rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch) }, false ) diff --git a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt index d465375182..58a81a105d 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/QuickWizardListActivity.kt @@ -26,11 +26,11 @@ 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 info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.dragHelpers.ItemTouchHelperAdapter -import info.nightscout.core.ui.dragHelpers.OnStartDragListener -import info.nightscout.core.ui.dragHelpers.SimpleItemTouchHelperCallback +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dragHelpers.ItemTouchHelperAdapter +import app.aaps.core.ui.dragHelpers.OnStartDragListener +import app.aaps.core.ui.dragHelpers.SimpleItemTouchHelperCallback import info.nightscout.ui.R import info.nightscout.ui.databinding.ActivityQuickwizardListBinding import info.nightscout.ui.databinding.QuickwizardListItemBinding @@ -139,7 +139,7 @@ class QuickWizardListActivity : TranslatedDaggerAppCompatActivity(), OnStartDrag actionHelper.setOnRemoveHandler { removeSelected(it) } actionHelper.enableSort = true - title = rh.gs(info.nightscout.core.ui.R.string.quickwizard) + title = rh.gs(app.aaps.core.ui.R.string.quickwizard) supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayShowHomeEnabled(true) @@ -182,7 +182,7 @@ class QuickWizardListActivity : TranslatedDaggerAppCompatActivity(), OnStartDrag } private fun removeSelected(selectedItems: SparseArray) { - OKDialog.showConfirmation(this, rh.gs(info.nightscout.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { + OKDialog.showConfirmation(this, rh.gs(app.aaps.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { selectedItems.forEach { _, item -> quickWizard.remove(item.position) rxBus.send(EventQuickWizardChange()) @@ -194,10 +194,10 @@ class QuickWizardListActivity : TranslatedDaggerAppCompatActivity(), OnStartDrag private fun getConfirmationText(selectedItems: SparseArray): String { if (selectedItems.size() == 1) { val entry = selectedItems.valueAt(0) - return "${rh.gs(info.nightscout.core.ui.R.string.remove_button)} ${entry.buttonText()} ${rh.gs(app.aaps.core.main.R.string.format_carbs, entry.carbs())}\n" + + return "${rh.gs(app.aaps.core.ui.R.string.remove_button)} ${entry.buttonText()} ${rh.gs(app.aaps.core.main.R.string.format_carbs, entry.carbs())}\n" + "${dateUtil.timeString(entry.validFromDate())} - ${dateUtil.timeString(entry.validToDate())}" } - return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) + return rh.gs(app.aaps.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) } } diff --git a/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt index 0eb28bbe0c..ee4671c7b7 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt @@ -12,8 +12,8 @@ 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 info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.impl.AppRepository @@ -51,8 +51,8 @@ class StatsActivity : TranslatedDaggerAppCompatActivity() { supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayShowHomeEnabled(true) - binding.tdds.addView(TextView(this).apply { text = getString(info.nightscout.core.ui.R.string.tdd) + ": " + rh.gs(R.string.calculation_in_progress) }) - binding.tir.addView(TextView(this).apply { text = getString(info.nightscout.core.ui.R.string.tir) + ": " + rh.gs(R.string.calculation_in_progress) }) + binding.tdds.addView(TextView(this).apply { text = getString(app.aaps.core.ui.R.string.tdd) + ": " + rh.gs(R.string.calculation_in_progress) }) + binding.tir.addView(TextView(this).apply { text = getString(app.aaps.core.ui.R.string.tir) + ": " + rh.gs(R.string.calculation_in_progress) }) binding.activity.addView(TextView(this).apply { text = getString(R.string.activity_monitor) + ": " + rh.gs(R.string.calculation_in_progress) }) disposable += Single.fromCallable { tddCalculator.stats(this) } diff --git a/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt index 8e6b832426..fd86adcd21 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/SurveyActivity.kt @@ -7,8 +7,8 @@ import app.aaps.core.interfaces.profile.ProfileFunction import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.SafeParse -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.fabric.InstanceId import info.nightscout.ui.R import info.nightscout.ui.databinding.ActivitySurveyBinding @@ -34,7 +34,7 @@ class SurveyActivity : TranslatedDaggerAppCompatActivity() { val profileStore = activePlugin.activeProfileSource.profile val profileList = profileStore?.getProfileList() ?: return - binding.spinner.adapter = ArrayAdapter(this, info.nightscout.core.ui.R.layout.spinner_centered, profileList) + binding.spinner.adapter = ArrayAdapter(this, app.aaps.core.ui.R.layout.spinner_centered, profileList) binding.profile.setOnClickListener { val age = SafeParse.stringToInt(binding.age.text.toString()) diff --git a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt index 5cd62c54bb..9eada2ef72 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/TDDStatsActivity.kt @@ -29,7 +29,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 info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.database.entities.TotalDailyDose import info.nightscout.database.impl.AppRepository import info.nightscout.ui.databinding.ActivityTddStatsBinding @@ -70,7 +70,7 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { binding = ActivityTddStatsBinding.inflate(layoutInflater) setContentView(binding.root) - title = rh.gs(info.nightscout.core.ui.R.string.tdd) + title = rh.gs(app.aaps.core.ui.R.string.tdd) supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayShowHomeEnabled(true) @@ -96,27 +96,27 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { // add stats headers to tables binding.mainTable.addView( TableRow(this).also { trHead -> - trHead.setBackgroundColor(rh.gac(this, info.nightscout.core.ui.R.attr.tddHeaderBackground)) + trHead.setBackgroundColor(rh.gac(this, app.aaps.core.ui.R.attr.tddHeaderBackground)) trHead.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) trHead.addView(TextView(this).also { labelDate -> - labelDate.text = rh.gs(info.nightscout.core.ui.R.string.date) - labelDate.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelDate.text = rh.gs(app.aaps.core.ui.R.string.date) + labelDate.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) trHead.addView(TextView(this).also { labelBasalRate -> - labelBasalRate.text = rh.gs(info.nightscout.core.ui.R.string.basalrate) - labelBasalRate.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelBasalRate.text = rh.gs(app.aaps.core.ui.R.string.basalrate) + labelBasalRate.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) trHead.addView(TextView(this).also { labelBolus -> - labelBolus.text = rh.gs(info.nightscout.core.ui.R.string.bolus) - labelBolus.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelBolus.text = rh.gs(app.aaps.core.ui.R.string.bolus) + labelBolus.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) trHead.addView(TextView(this).also { labelTdd -> - labelTdd.text = rh.gs(info.nightscout.core.ui.R.string.tdd) - labelTdd.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelTdd.text = rh.gs(app.aaps.core.ui.R.string.tdd) + labelTdd.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) trHead.addView(TextView(this).also { labelRatio -> - labelRatio.text = rh.gs(info.nightscout.core.ui.R.string.ratio) - labelRatio.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelRatio.text = rh.gs(app.aaps.core.ui.R.string.ratio) + labelRatio.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) ) @@ -124,19 +124,19 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { // cumulative table binding.cumulativeTable.addView( TableRow(this).also { ctrHead -> - ctrHead.setBackgroundColor(rh.gac(this, info.nightscout.core.ui.R.attr.tddHeaderBackground)) + ctrHead.setBackgroundColor(rh.gac(this, app.aaps.core.ui.R.attr.tddHeaderBackground)) ctrHead.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) ctrHead.addView(TextView(this).also { labelCumAmountDays -> - labelCumAmountDays.text = rh.gs(info.nightscout.core.ui.R.string.amount_days) - labelCumAmountDays.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelCumAmountDays.text = rh.gs(app.aaps.core.ui.R.string.amount_days) + labelCumAmountDays.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) ctrHead.addView(TextView(this).also { labelCumTdd -> - labelCumTdd.text = rh.gs(info.nightscout.core.ui.R.string.tdd) - labelCumTdd.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelCumTdd.text = rh.gs(app.aaps.core.ui.R.string.tdd) + labelCumTdd.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) ctrHead.addView(TextView(this).also { labelCumRatio -> - labelCumRatio.text = rh.gs(info.nightscout.core.ui.R.string.ratio) - labelCumRatio.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelCumRatio.text = rh.gs(app.aaps.core.ui.R.string.ratio) + labelCumRatio.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) ) @@ -144,19 +144,19 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { // exponential table binding.expweightTable.addView( TableRow(this).also { etrHead -> - etrHead.setBackgroundColor(rh.gac(this, info.nightscout.core.ui.R.attr.tddHeaderBackground)) + etrHead.setBackgroundColor(rh.gac(this, app.aaps.core.ui.R.attr.tddHeaderBackground)) etrHead.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) etrHead.addView(TextView(this).also { labelExpWeight -> - labelExpWeight.text = rh.gs(info.nightscout.core.ui.R.string.weight) - labelExpWeight.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelExpWeight.text = rh.gs(app.aaps.core.ui.R.string.weight) + labelExpWeight.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) etrHead.addView(TextView(this).also { labelExpTdd -> - labelExpTdd.text = rh.gs(info.nightscout.core.ui.R.string.tdd) - labelExpTdd.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelExpTdd.text = rh.gs(app.aaps.core.ui.R.string.tdd) + labelExpTdd.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) etrHead.addView(TextView(this).also { labelExpRatio -> - labelExpRatio.text = rh.gs(info.nightscout.core.ui.R.string.ratio) - labelExpRatio.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelExpRatio.text = rh.gs(app.aaps.core.ui.R.string.ratio) + labelExpRatio.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) ) @@ -165,7 +165,7 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { binding.reload.visibility = View.GONE binding.connectionStatus.visibility = View.VISIBLE binding.message.visibility = View.VISIBLE - binding.message.text = rh.gs(info.nightscout.core.ui.R.string.warning_Message) + binding.message.text = rh.gs(app.aaps.core.ui.R.string.warning_Message) commandQueue.loadTDDs(object : Callback() { override fun run() { loadDataFromDB() @@ -295,9 +295,9 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { // Create the table row binding.mainTable.addView( TableRow(this@TDDStatsActivity).also { tr -> - if (i % 2 != 0) tr.setBackgroundColor(rh.gac(this, info.nightscout.core.ui.R.attr.tddHeaderBackground)) + if (i % 2 != 0) tr.setBackgroundColor(rh.gac(this, app.aaps.core.ui.R.attr.tddHeaderBackground)) if (dummies.contains(record)) - tr.setBackgroundColor(rh.gac(this, info.nightscout.core.ui.R.attr.dummyBackground)) + tr.setBackgroundColor(rh.gac(this, app.aaps.core.ui.R.attr.dummyBackground)) tr.id = 100 + i tr.layoutParams = TableLayout.LayoutParams( @@ -309,27 +309,27 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { tr.addView(TextView(this@TDDStatsActivity).also { labelDATE -> labelDATE.id = 200 + i labelDATE.text = df1.format(Date(record.timestamp)) - labelDATE.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelDATE.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) tr.addView(TextView(this@TDDStatsActivity).also { labelBASAL -> labelBASAL.id = 300 + i - labelBASAL.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, record.basalAmount) - labelBASAL.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelBASAL.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, record.basalAmount) + labelBASAL.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) tr.addView(TextView(this@TDDStatsActivity).also { labelBOLUS -> labelBOLUS.id = 400 + i - labelBOLUS.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, record.bolusAmount) - labelBOLUS.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelBOLUS.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, record.bolusAmount) + labelBOLUS.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) tr.addView(TextView(this@TDDStatsActivity).also { labelTDD -> labelTDD.id = 500 + i - labelTDD.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, tdd) - labelTDD.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelTDD.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, tdd) + labelTDD.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) tr.addView(TextView(this@TDDStatsActivity).also { labelRATIO -> labelRATIO.id = 600 + i labelRATIO.text = (100 * tdd / magicNumber).roundToInt().toString() + "%" - labelRATIO.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelRATIO.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) ) @@ -348,7 +348,7 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { // Create the cumulative table row binding.cumulativeTable.addView( TableRow(this@TDDStatsActivity).also { ctr -> - if (i % 2 == 0) ctr.setBackgroundColor(rh.gac(this, info.nightscout.core.ui.R.attr.tddHeaderBackground)) + if (i % 2 == 0) ctr.setBackgroundColor(rh.gac(this, app.aaps.core.ui.R.attr.tddHeaderBackground)) ctr.id = 700 + i ctr.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) @@ -356,27 +356,27 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { ctr.addView(TextView(this@TDDStatsActivity).also { labelDAYS -> labelDAYS.id = 800 + i labelDAYS.text = i.toString() - labelDAYS.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelDAYS.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) ctr.addView(TextView(this@TDDStatsActivity).also { labelCUMTDD -> labelCUMTDD.id = 900 + i - labelCUMTDD.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, sum / i) - labelCUMTDD.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelCUMTDD.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, sum / i) + labelCUMTDD.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) ctr.addView(TextView(this@TDDStatsActivity).also { labelCUMRATIO -> labelCUMRATIO.id = 1000 + i labelCUMRATIO.text = (100 * sum / i / magicNumber).roundToInt().toString() + "%" - labelCUMRATIO.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelCUMRATIO.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) ) } if (isOldData(historyList) && activePlugin.activePump.pumpDescription.needsManualTDDLoad) { binding.message.visibility = View.VISIBLE - binding.message.text = rh.gs(info.nightscout.core.ui.R.string.olddata_Message) - } else binding.mainTable.setBackgroundColor(rh.gac(this, info.nightscout.core.ui.R.attr.mainTableBackground)) + binding.message.text = rh.gs(app.aaps.core.ui.R.string.olddata_Message) + } else binding.mainTable.setBackgroundColor(rh.gac(this, app.aaps.core.ui.R.attr.mainTableBackground)) if (historyList.isNotEmpty() && df1.format(Date(historyList[0].timestamp)) == df1.format(Date())) { //Today should not be included historyList.removeAt(0) @@ -400,7 +400,7 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { // Create the exponential table row binding.expweightTable.addView( TableRow(this@TDDStatsActivity).also { etr -> - if (i % 2 != 0) etr.setBackgroundColor(rh.gac(this, info.nightscout.core.ui.R.attr.tddHeaderBackground)) + if (i % 2 != 0) etr.setBackgroundColor(rh.gac(this, app.aaps.core.ui.R.attr.tddHeaderBackground)) etr.id = 1100 + i etr.layoutParams = TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) @@ -408,16 +408,16 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { etr.addView(TextView(this@TDDStatsActivity).also { labelWEIGHT -> labelWEIGHT.id = 1200 + i labelWEIGHT.text = "0.3\n0.5\n0.7" - labelWEIGHT.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelWEIGHT.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) etr.addView(TextView(this@TDDStatsActivity).also { labelEXPTDD -> labelEXPTDD.id = 1300 + i labelEXPTDD.text = """ - ${rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, weighted03)} - ${rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, weighted05)} - ${rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, weighted07)} + ${rh.gs(app.aaps.core.ui.R.string.format_insulin_units, weighted03)} + ${rh.gs(app.aaps.core.ui.R.string.format_insulin_units, weighted05)} + ${rh.gs(app.aaps.core.ui.R.string.format_insulin_units, weighted07)} """.trimIndent() - labelEXPTDD.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelEXPTDD.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) etr.addView(TextView(this@TDDStatsActivity).also { labelEXPRATIO -> labelEXPRATIO.id = 1400 + i @@ -426,7 +426,7 @@ class TDDStatsActivity : TranslatedDaggerAppCompatActivity() { ${(100 * weighted05 / magicNumber).roundToInt()}% ${(100 * weighted07 / magicNumber).roundToInt()}% """.trimIndent() - labelEXPRATIO.setTextColor(rh.gac(this, info.nightscout.core.ui.R.attr.defaultTextColor)) + labelEXPRATIO.setTextColor(rh.gac(this, app.aaps.core.ui.R.attr.defaultTextColor)) }) }, TableLayout.LayoutParams(TableLayout.LayoutParams.MATCH_PARENT, TableLayout.LayoutParams.WRAP_CONTENT) ) diff --git a/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt b/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt index 058e317673..94fab6bb7c 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/TreatmentsActivity.kt @@ -8,7 +8,7 @@ import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.plugin.ActivePlugin import app.aaps.core.interfaces.resources.ResourceHelper import com.google.android.material.tabs.TabLayout -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.ui.R import info.nightscout.ui.activities.fragments.TreatmentsBolusCarbsFragment import info.nightscout.ui.activities.fragments.TreatmentsCareportalFragment diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt index 4b6bb05bb1..61358d6416 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt @@ -34,8 +34,8 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import com.google.gson.Gson import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.entities.Bolus import info.nightscout.database.entities.BolusCalculatorResult import info.nightscout.database.entities.Carbs @@ -226,24 +226,24 @@ class TreatmentsBolusCarbsFragment : DaggerFragment(), MenuProvider { holder.binding.bolusLayout.visibility = (ml.bolus != null && (ml.bolus.isValid || showInvalidated)).toVisibility() ml.bolus?.let { bolus -> holder.binding.bolusTime.text = dateUtil.timeString(bolus.timestamp) - holder.binding.insulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, bolus.amount) + holder.binding.insulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, bolus.amount) holder.binding.bolusNs.visibility = (bolus.interfaceIDs.nightscoutId != null).toVisibility() holder.binding.bolusPump.visibility = bolus.interfaceIDs.isPumpHistory().toVisibility() holder.binding.bolusInvalid.visibility = bolus.isValid.not().toVisibility() val iob = bolus.iobCalc(activePlugin, System.currentTimeMillis(), profile.dia) if (iob.iobContrib > 0.01) { - holder.binding.iob.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.activeColor)) - holder.binding.iob.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, iob.iobContrib) + holder.binding.iob.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.activeColor)) + holder.binding.iob.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, iob.iobContrib) holder.binding.iobLabel.visibility = View.VISIBLE holder.binding.iob.visibility = View.VISIBLE } else { - holder.binding.iob.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, 0.0) + holder.binding.iob.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, 0.0) holder.binding.iob.setTextColor(holder.binding.insulin.currentTextColor) holder.binding.iobLabel.visibility = View.GONE holder.binding.iob.visibility = View.GONE } if (bolus.timestamp > dateUtil.now()) - holder.binding.date.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.scheduledColor)) else holder.binding.date.setTextColor(holder.binding.carbs.currentTextColor) + holder.binding.date.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.scheduledColor)) else holder.binding.date.setTextColor(holder.binding.carbs.currentTextColor) holder.binding.mealOrCorrection.text = when (ml.bolus.type) { Bolus.Type.SMB -> "SMB" @@ -267,7 +267,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment(), MenuProvider { ml.carbs?.let { carbs -> holder.binding.carbsTime.text = dateUtil.timeString(carbs.timestamp) holder.binding.carbs.text = rh.gs(app.aaps.core.main.R.string.format_carbs, carbs.amount.toInt()) - holder.binding.carbsDuration.text = if (carbs.duration > 0) rh.gs(info.nightscout.core.ui.R.string.format_mins, T.msecs(carbs.duration).mins().toInt()) else "" + holder.binding.carbsDuration.text = if (carbs.duration > 0) rh.gs(app.aaps.core.ui.R.string.format_mins, T.msecs(carbs.duration).mins().toInt()) else "" holder.binding.carbsNs.visibility = (carbs.interfaceIDs.nightscoutId != null).toVisibility() holder.binding.carbsPump.visibility = carbs.interfaceIDs.isPumpHistory().toVisibility() holder.binding.carbsInvalid.visibility = carbs.isValid.not().toVisibility() @@ -357,7 +357,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment(), MenuProvider { private fun deleteFutureTreatments() { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.overview_treatment_label), rh.gs(info.nightscout.core.ui.R.string.delete_future_treatments) + "?", Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.overview_treatment_label), rh.gs(app.aaps.core.ui.R.string.delete_future_treatments) + "?", Runnable { uel.log(Action.DELETE_FUTURE_TREATMENTS, Sources.Treatments) disposable += repository .getBolusesDataFromTime(dateUtil.now(), false) @@ -415,19 +415,19 @@ class TreatmentsBolusCarbsFragment : DaggerFragment(), MenuProvider { val mealLink = selectedItems.valueAt(0) val bolus = mealLink.bolus if (bolus != null) - return rh.gs(info.nightscout.core.ui.R.string.configbuilder_insulin) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, bolus.amount) + "\n" + - rh.gs(info.nightscout.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString(bolus.timestamp) + return rh.gs(app.aaps.core.ui.R.string.configbuilder_insulin) + ": " + rh.gs(app.aaps.core.ui.R.string.format_insulin_units, bolus.amount) + "\n" + + rh.gs(app.aaps.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString(bolus.timestamp) val carbs = mealLink.carbs if (carbs != null) - return rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(app.aaps.core.main.R.string.format_carbs, carbs.amount.toInt()) + "\n" + - rh.gs(info.nightscout.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString(carbs.timestamp) + return rh.gs(app.aaps.core.ui.R.string.carbs) + ": " + rh.gs(app.aaps.core.main.R.string.format_carbs, carbs.amount.toInt()) + "\n" + + rh.gs(app.aaps.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString(carbs.timestamp) } - return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) + return rh.gs(app.aaps.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) } private fun removeSelected(selectedItems: SparseArray) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { selectedItems.forEach { _, ml -> ml.bolus?.let { bolus -> uel.log( diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt index 04a9d7f1cd..bcec529123 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt @@ -29,8 +29,8 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.Translator import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -88,9 +88,9 @@ class TreatmentsCareportalFragment : DaggerFragment(), MenuProvider { private fun removeStartedEvents() { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.careportal), rh.gs(R.string.careportal_remove_started_events), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.careportal), rh.gs(R.string.careportal_remove_started_events), Runnable { uel.log(Action.RESTART_EVENTS_REMOVED, Sources.Treatments) - disposable += repository.runTransactionForResult(InvalidateAAPSStartedTherapyEventTransaction(rh.gs(info.nightscout.core.ui.R.string.androidaps_start))) + disposable += repository.runTransactionForResult(InvalidateAAPSStartedTherapyEventTransaction(rh.gs(app.aaps.core.ui.R.string.androidaps_start))) .subscribe( { result -> result.invalidated.forEach { aapsLogger.debug(LTag.DATABASE, "Invalidated therapy event $it") } }, { aapsLogger.error(LTag.DATABASE, "Error while invalidating therapy event", it) } @@ -220,16 +220,16 @@ class TreatmentsCareportalFragment : DaggerFragment(), MenuProvider { private fun getConfirmationText(selectedItems: SparseArray): String { if (selectedItems.size() == 1) { val therapyEvent = selectedItems.valueAt(0) - return rh.gs(info.nightscout.core.ui.R.string.event_type) + ": " + translator.translate(therapyEvent.type) + "\n" + - rh.gs(info.nightscout.core.ui.R.string.notes_label) + ": " + (therapyEvent.note ?: "") + "\n" + - rh.gs(info.nightscout.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString(therapyEvent.timestamp) + return rh.gs(app.aaps.core.ui.R.string.event_type) + ": " + translator.translate(therapyEvent.type) + "\n" + + rh.gs(app.aaps.core.ui.R.string.notes_label) + ": " + (therapyEvent.note ?: "") + "\n" + + rh.gs(app.aaps.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString(therapyEvent.timestamp) } - return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) + return rh.gs(app.aaps.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) } private fun removeSelected(selectedItems: SparseArray) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { selectedItems.forEach { _, therapyEvent -> uel.log( Action.CAREPORTAL_REMOVED, Sources.Treatments, therapyEvent.note, diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt index 60631385b2..4da760398f 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt @@ -31,8 +31,8 @@ import app.aaps.core.interfaces.rx.events.EventExtendedBolusChange import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -147,21 +147,21 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment(), MenuProvider { holder.binding.date.text = if (newDay) dateUtil.dateStringRelative(extendedBolus.timestamp, rh) else "" if (extendedBolus.isInProgress(dateUtil)) { holder.binding.time.text = dateUtil.timeString(extendedBolus.timestamp) - holder.binding.time.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.activeColor)) + holder.binding.time.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.activeColor)) } else { holder.binding.time.text = dateUtil.timeRangeString(extendedBolus.timestamp, extendedBolus.end) holder.binding.time.setTextColor(holder.binding.insulin.currentTextColor) } val profile = profileFunction.getProfile(extendedBolus.timestamp) ?: return - holder.binding.duration.text = rh.gs(info.nightscout.core.ui.R.string.format_mins, T.msecs(extendedBolus.duration).mins()) - holder.binding.insulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, extendedBolus.amount) + holder.binding.duration.text = rh.gs(app.aaps.core.ui.R.string.format_mins, T.msecs(extendedBolus.duration).mins()) + holder.binding.insulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, extendedBolus.amount) val iob = extendedBolus.iobCalc(System.currentTimeMillis(), profile, activePlugin.activeInsulin) - holder.binding.iob.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, iob.iob) - holder.binding.ratio.text = rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, extendedBolus.rate) + holder.binding.iob.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, iob.iob) + holder.binding.ratio.text = rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, extendedBolus.rate) if (iob.iob != 0.0) holder.binding.iob.setTextColor( rh.gac( context, - info.nightscout.core.ui.R.attr.activeColor + app.aaps.core.ui.R.attr.activeColor ) ) else holder.binding.iob.setTextColor(holder.binding.insulin.currentTextColor) holder.binding.cbRemove.visibility = (extendedBolus.isValid && actionHelper.isRemoving).toVisibility() @@ -224,15 +224,15 @@ class TreatmentsExtendedBolusesFragment : DaggerFragment(), MenuProvider { private fun getConfirmationText(selectedItems: SparseArray): String { if (selectedItems.size() == 1) { val bolus = selectedItems.valueAt(0) - return rh.gs(info.nightscout.core.ui.R.string.extended_bolus) + "\n" + - "${rh.gs(info.nightscout.core.ui.R.string.date)}: ${dateUtil.dateAndTimeString(bolus.timestamp)}" + return rh.gs(app.aaps.core.ui.R.string.extended_bolus) + "\n" + + "${rh.gs(app.aaps.core.ui.R.string.date)}: ${dateUtil.dateAndTimeString(bolus.timestamp)}" } - return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) + return rh.gs(app.aaps.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) } private fun removeSelected(selectedItems: SparseArray) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { selectedItems.forEach { _, extendedBolus -> uel.log( Action.EXTENDED_BOLUS_REMOVED, Sources.Treatments, diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt index 6e48405837..86ddf6dad8 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt @@ -37,8 +37,8 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.database.entities.ValueWithUnit @@ -173,10 +173,10 @@ class TreatmentsProfileSwitchFragment : DaggerFragment(), MenuProvider { holder.binding.date.visibility = newDay.toVisibility() holder.binding.date.text = if (newDay) dateUtil.dateStringRelative(profileSwitch.timestamp, rh) else "" holder.binding.time.text = dateUtil.timeString(profileSwitch.timestamp) - holder.binding.duration.text = rh.gs(info.nightscout.core.ui.R.string.format_mins, T.msecs(profileSwitch.duration ?: 0L).mins()) + holder.binding.duration.text = rh.gs(app.aaps.core.ui.R.string.format_mins, T.msecs(profileSwitch.duration ?: 0L).mins()) holder.binding.name.text = if (profileSwitch is ProfileSealed.PS) profileSwitch.value.getCustomizedName(decimalFormatter) else if (profileSwitch is ProfileSealed.EPS) profileSwitch.value.originalCustomizedName else "" - if (profileSwitch.isInProgress(dateUtil)) holder.binding.date.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.activeColor)) + if (profileSwitch.isInProgress(dateUtil)) holder.binding.date.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.activeColor)) else holder.binding.date.setTextColor(holder.binding.duration.currentTextColor) holder.binding.clone.tag = profileSwitch holder.binding.name.tag = profileSwitch @@ -211,8 +211,8 @@ class TreatmentsProfileSwitchFragment : DaggerFragment(), MenuProvider { val profileSealed = it.tag as ProfileSealed OKDialog.showConfirmation( activity, - rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch), - rh.gs(info.nightscout.core.ui.R.string.copytolocalprofile) + "\n" + profileSwitch.getCustomizedName(decimalFormatter) + "\n" + dateUtil.dateAndTimeString(profileSwitch.timestamp), + rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch), + rh.gs(app.aaps.core.ui.R.string.copytolocalprofile) + "\n" + profileSwitch.getCustomizedName(decimalFormatter) + "\n" + dateUtil.dateAndTimeString(profileSwitch.timestamp), Runnable { uel.log( Action.PROFILE_SWITCH_CLONED, Sources.Treatments, @@ -291,16 +291,16 @@ class TreatmentsProfileSwitchFragment : DaggerFragment(), MenuProvider { private fun getConfirmationText(selectedItems: SparseArray): String { if (selectedItems.size() == 1) { val profileSwitch = selectedItems.valueAt(0) - return rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch) + ": " + profileSwitch.profileName + "\n" + rh.gs(info.nightscout.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString( + return rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch) + ": " + profileSwitch.profileName + "\n" + rh.gs(app.aaps.core.ui.R.string.date) + ": " + dateUtil.dateAndTimeString( profileSwitch.timestamp ) } - return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) + return rh.gs(app.aaps.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) } private fun removeSelected(selectedItems: SparseArray) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { selectedItems.forEach { _, profileSwitch -> uel.log( Action.PROFILE_SWITCH_REMOVED, Sources.Treatments, profileSwitch.profileName, diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt index 75bf212bcb..cfed6e1142 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt @@ -35,8 +35,8 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.Translator import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry.Action @@ -165,14 +165,14 @@ class TreatmentsTempTargetFragment : DaggerFragment(), MenuProvider { holder.binding.date.visibility = newDay.toVisibility() holder.binding.date.text = if (newDay) dateUtil.dateStringRelative(tempTarget.timestamp, rh) else "" holder.binding.time.text = dateUtil.timeRangeString(tempTarget.timestamp, tempTarget.end) - holder.binding.duration.text = rh.gs(info.nightscout.core.ui.R.string.format_mins, T.msecs(tempTarget.duration).mins()) + holder.binding.duration.text = rh.gs(app.aaps.core.ui.R.string.format_mins, T.msecs(tempTarget.duration).mins()) holder.binding.low.text = tempTarget.lowValueToUnitsToString(units, decimalFormatter) holder.binding.high.text = tempTarget.highValueToUnitsToString(units, decimalFormatter) holder.binding.reason.text = translator.translate(tempTarget.reason) holder.binding.time.setTextColor( when { - tempTarget.id == currentlyActiveTarget?.id -> rh.gac(context, info.nightscout.core.ui.R.attr.activeColor) - tempTarget.timestamp > dateUtil.now() -> rh.gac(context, info.nightscout.core.ui.R.attr.scheduledColor) + tempTarget.id == currentlyActiveTarget?.id -> rh.gac(context, app.aaps.core.ui.R.attr.activeColor) + tempTarget.timestamp > dateUtil.now() -> rh.gac(context, app.aaps.core.ui.R.attr.scheduledColor) else -> holder.binding.reasonColon.currentTextColor } ) @@ -224,15 +224,15 @@ class TreatmentsTempTargetFragment : DaggerFragment(), MenuProvider { private fun getConfirmationText(selectedItems: SparseArray): String { if (selectedItems.size() == 1) { val tempTarget = selectedItems.valueAt(0) - return "${rh.gs(info.nightscout.core.ui.R.string.temporary_target)}: ${tempTarget.friendlyDescription(profileUtil.units, rh, profileUtil)}\n" + + return "${rh.gs(app.aaps.core.ui.R.string.temporary_target)}: ${tempTarget.friendlyDescription(profileUtil.units, rh, profileUtil)}\n" + dateUtil.dateAndTimeString(tempTarget.timestamp) } - return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) + return rh.gs(app.aaps.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) } private fun removeSelected(selectedItems: SparseArray) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { selectedItems.forEach { _, tempTarget -> uel.log( Action.TT_REMOVED, Sources.Treatments, diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt index 4da850bd64..f117dd9091 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt @@ -34,8 +34,8 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.TemporaryBasal @@ -184,19 +184,19 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment(), MenuProvider { holder.binding.date.text = if (newDay) dateUtil.dateStringRelative(tempBasal.timestamp, rh) else "" if (tempBasal.isInProgress) { holder.binding.time.text = dateUtil.timeString(tempBasal.timestamp) - holder.binding.time.setTextColor(rh.gac(context, info.nightscout.core.ui.R.attr.activeColor)) + holder.binding.time.setTextColor(rh.gac(context, app.aaps.core.ui.R.attr.activeColor)) } else { holder.binding.time.text = dateUtil.timeRangeString(tempBasal.timestamp, tempBasal.end) holder.binding.time.setTextColor(holder.binding.duration.currentTextColor) } - holder.binding.duration.text = rh.gs(info.nightscout.core.ui.R.string.format_mins, T.msecs(tempBasal.duration).mins()) - if (tempBasal.isAbsolute) holder.binding.rate.text = rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, tempBasal.rate) - else holder.binding.rate.text = rh.gs(info.nightscout.core.ui.R.string.format_percent, tempBasal.rate.toInt()) + holder.binding.duration.text = rh.gs(app.aaps.core.ui.R.string.format_mins, T.msecs(tempBasal.duration).mins()) + if (tempBasal.isAbsolute) holder.binding.rate.text = rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, tempBasal.rate) + else holder.binding.rate.text = rh.gs(app.aaps.core.ui.R.string.format_percent, tempBasal.rate.toInt()) val now = dateUtil.now() var iob = IobTotal(now) val profile = profileFunction.getProfile(now) if (profile != null) iob = tempBasal.iobCalc(now, profile, activePlugin.activeInsulin) - holder.binding.iob.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, iob.basaliob) + holder.binding.iob.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, iob.basaliob) holder.binding.extendedFlag.visibility = (tempBasal.type == TemporaryBasal.Type.FAKE_EXTENDED).toVisibility() holder.binding.suspendFlag.visibility = (tempBasal.type == TemporaryBasal.Type.PUMP_SUSPEND).toVisibility() holder.binding.emulatedSuspendFlag.visibility = (tempBasal.type == TemporaryBasal.Type.EMULATED_PUMP_SUSPEND).toVisibility() @@ -204,7 +204,7 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment(), MenuProvider { if (abs(iob.basaliob) > 0.01) holder.binding.iob.setTextColor( rh.gac( context, - info.nightscout.core.ui.R.attr.activeColor + app.aaps.core.ui.R.attr.activeColor ) ) else holder.binding.iob.setTextColor(holder.binding.duration.currentTextColor) holder.binding.cbRemove.visibility = (tempBasal.isValid && actionHelper.isRemoving).toVisibility() @@ -270,22 +270,22 @@ class TreatmentsTemporaryBasalsFragment : DaggerFragment(), MenuProvider { val isFakeExtended = tempBasal.type == TemporaryBasal.Type.FAKE_EXTENDED val profile = profileFunction.getProfile(dateUtil.now()) if (profile != null) - return "${if (isFakeExtended) rh.gs(info.nightscout.core.ui.R.string.extended_bolus) else rh.gs(info.nightscout.core.ui.R.string.tempbasal_label)}: ${ + return "${if (isFakeExtended) rh.gs(app.aaps.core.ui.R.string.extended_bolus) else rh.gs(app.aaps.core.ui.R.string.tempbasal_label)}: ${ tempBasal.toStringFull( profile, dateUtil, decimalFormatter ) }\n" + - "${rh.gs(info.nightscout.core.ui.R.string.date)}: ${dateUtil.dateAndTimeString(tempBasal.timestamp)}" + "${rh.gs(app.aaps.core.ui.R.string.date)}: ${dateUtil.dateAndTimeString(tempBasal.timestamp)}" } - return rh.gs(info.nightscout.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) + return rh.gs(app.aaps.core.ui.R.string.confirm_remove_multiple_items, selectedItems.size()) } private fun removeSelected(selectedItems: SparseArray) { if (selectedItems.size() > 0) activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.removerecord), getConfirmationText(selectedItems), Runnable { selectedItems.forEach { _, tempBasal -> var extendedBolus: ExtendedBolus? = null val isFakeExtended = tempBasal.type == TemporaryBasal.Type.FAKE_EXTENDED diff --git a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt index 337cf21a9e..7cf334a91e 100644 --- a/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt +++ b/ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt @@ -24,8 +24,8 @@ import app.aaps.core.interfaces.userEntry.UserEntryPresentationHelper import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerFragment -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -74,7 +74,7 @@ class TreatmentsUserEntryFragment : DaggerFragment(), MenuProvider { private fun exportUserEntries() { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.ue_export_to_csv) + "?") { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.ue_export_to_csv) + "?") { uel.log(Action.EXPORT_CSV, Sources.Treatments) importExportPrefs.exportUserEntriesCsv(activity) } diff --git a/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt b/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt index 478cbf55b5..948ba28c41 100644 --- a/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt +++ b/ui/src/main/java/info/nightscout/ui/activityMonitor/ActivityMonitor.kt @@ -81,8 +81,8 @@ class ActivityMonitor @Inject constructor( val lp = TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT).apply { weight = 1f } row.layoutParams = TableRow.LayoutParams(TableRow.LayoutParams.MATCH_PARENT, TableRow.LayoutParams.WRAP_CONTENT) row.gravity = Gravity.CENTER_HORIZONTAL - row.addView(TextView(context).apply { layoutParams = lp.apply { column = 0 }; text = rh.gs(info.nightscout.core.ui.R.string.activity) }) - row.addView(TextView(context).apply { layoutParams = lp.apply { column = 1 }; text = rh.gs(info.nightscout.core.ui.R.string.duration) }) + row.addView(TextView(context).apply { layoutParams = lp.apply { column = 0 }; text = rh.gs(app.aaps.core.ui.R.string.activity) }) + row.addView(TextView(context).apply { layoutParams = lp.apply { column = 1 }; text = rh.gs(app.aaps.core.ui.R.string.duration) }) row.addView(TextView(context).apply { layoutParams = lp.apply { column = 2 } }) } ) diff --git a/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt b/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt index 0f1262aa85..ebe315ea66 100644 --- a/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt @@ -14,7 +14,7 @@ import app.aaps.core.interfaces.logging.UserEntryLogger import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.T import dagger.android.support.DaggerDialogFragment -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.ui.databinding.DialogErrorBinding @@ -44,7 +44,7 @@ class ErrorDialog : DaggerDialogFragment() { savedInstanceState: Bundle? ): View { val theme: Resources.Theme? = context?.theme - theme?.applyStyle(info.nightscout.core.ui.R.style.AppTheme_NoActionBar, true) + theme?.applyStyle(app.aaps.core.ui.R.style.AppTheme_NoActionBar, true) dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE) dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN) @@ -54,7 +54,7 @@ class ErrorDialog : DaggerDialogFragment() { savedInstanceState?.let { bundle -> bundle.getString("status")?.let { status = it } bundle.getString("title")?.let { title = it } - sound = bundle.getInt("sound", info.nightscout.core.ui.R.raw.error) + sound = bundle.getInt("sound", app.aaps.core.ui.R.raw.error) } aapsLogger.debug("Error dialog displayed") _binding = DialogErrorBinding.inflate(inflater, container, false) diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt index e224519fec..cc3b641378 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt @@ -19,7 +19,7 @@ import app.aaps.core.interfaces.rx.events.EventDismissBolusProgressIfRunning import app.aaps.core.interfaces.rx.events.EventOverviewBolusProgress import app.aaps.core.interfaces.rx.events.EventPumpStatusChanged import dagger.android.support.DaggerDialogFragment -import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity +import app.aaps.core.ui.activities.TranslatedDaggerAppCompatActivity import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources import info.nightscout.ui.databinding.DialogBolusprogressBinding @@ -71,7 +71,7 @@ class BolusProgressDialog : DaggerDialogFragment() { dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN) isCancelable = false dialog?.setCanceledOnTouchOutside(false) - context?.theme?.applyStyle(info.nightscout.core.ui.R.style.AppTheme_NoActionBar, true) + context?.theme?.applyStyle(app.aaps.core.ui.R.style.AppTheme_NoActionBar, true) _binding = DialogBolusprogressBinding.inflate(inflater, container, false) return binding.root @@ -81,9 +81,9 @@ class BolusProgressDialog : DaggerDialogFragment() { savedInstanceState?.let { amount = it.getDouble("amount") id = it.getLong("id") - state = it.getString("state") ?: rh.gs(info.nightscout.core.ui.R.string.waitingforpump) + state = it.getString("state") ?: rh.gs(app.aaps.core.ui.R.string.waitingforpump) } - binding.title.text = rh.gs(info.nightscout.core.ui.R.string.goingtodeliver, amount) + binding.title.text = rh.gs(app.aaps.core.ui.R.string.goingtodeliver, amount) binding.stop.setOnClickListener { aapsLogger.debug(LTag.UI, "Stop bolus delivery button pressed") BolusProgressData.stopPressed = true diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt index 1b5bb45e75..38f3712422 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt @@ -12,7 +12,7 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sync.XDripBroadcast import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry.Action import info.nightscout.database.entities.UserEntry.Sources @@ -66,7 +66,7 @@ class CalibrationDialog : DialogFragmentWithDate() { savedInstanceState?.getDouble("bg") ?: bg, 36.0, 500.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok ) - binding.units.text = if (units == GlucoseUnit.MMOL) rh.gs(info.nightscout.core.ui.R.string.mmol) else rh.gs(info.nightscout.core.ui.R.string.mgdl) + binding.units.text = if (units == GlucoseUnit.MMOL) rh.gs(app.aaps.core.ui.R.string.mmol) else rh.gs(app.aaps.core.ui.R.string.mgdl) binding.bgLabel.labelFor = binding.bg.editTextId } @@ -78,20 +78,20 @@ class CalibrationDialog : DialogFragmentWithDate() { override fun submit(): Boolean { if (_binding == null) return false val units = profileUtil.units - val unitLabel = if (units == GlucoseUnit.MMOL) rh.gs(info.nightscout.core.ui.R.string.mmol) else rh.gs(info.nightscout.core.ui.R.string.mgdl) + val unitLabel = if (units == GlucoseUnit.MMOL) rh.gs(app.aaps.core.ui.R.string.mmol) else rh.gs(app.aaps.core.ui.R.string.mgdl) val actions: LinkedList = LinkedList() val bg = binding.bg.value - actions.add(rh.gs(info.nightscout.core.ui.R.string.bg_label) + ": " + profileUtil.stringInCurrentUnitsDetect(bg) + " " + unitLabel) + actions.add(rh.gs(app.aaps.core.ui.R.string.bg_label) + ": " + profileUtil.stringInCurrentUnitsDetect(bg) + " " + unitLabel) if (bg > 0) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.calibration), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.calibration), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { uel.log(Action.CALIBRATION, Sources.CalibrationDialog, ValueWithUnit.fromGlucoseUnit(bg, units.asText)) xDripBroadcast.sendCalibration(bg) }) } } else activity?.let { activity -> - OKDialog.show(activity, rh.gs(info.nightscout.core.ui.R.string.calibration), rh.gs(info.nightscout.core.ui.R.string.no_action_selected)) + OKDialog.show(activity, rh.gs(app.aaps.core.ui.R.string.calibration), rh.gs(app.aaps.core.ui.R.string.no_action_selected)) } return true } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt index 70c461121e..babbdfb01a 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt @@ -32,8 +32,8 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.T import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry.Action @@ -88,11 +88,11 @@ class CarbsDialog : DialogFragmentWithDate() { val time = binding.time.value.toInt() if (time > 12 * 60 || time < -7 * 24 * 60) { binding.time.value = 0.0 - ToastUtils.warnToast(ctx, info.nightscout.core.ui.R.string.constraint_applied) + ToastUtils.warnToast(ctx, app.aaps.core.ui.R.string.constraint_applied) } if (binding.duration.value > 10) { binding.duration.value = 0.0 - ToastUtils.warnToast(ctx, info.nightscout.core.ui.R.string.constraint_applied) + ToastUtils.warnToast(ctx, app.aaps.core.ui.R.string.constraint_applied) } if (binding.carbs.value.toInt() > maxCarbs) { binding.carbs.value = 0.0 @@ -153,7 +153,7 @@ class CarbsDialog : DialogFragmentWithDate() { ) val plus1text = toSignedString(sp.getInt(info.nightscout.core.utils.R.string.key_carbs_button_increment_1, CARBS_FAV1_DEFAULT)) binding.plus1.text = plus1text - binding.plus1.contentDescription = rh.gs(info.nightscout.core.ui.R.string.carbs) + " " + plus1text + binding.plus1.contentDescription = rh.gs(app.aaps.core.ui.R.string.carbs) + " " + plus1text binding.plus1.setOnClickListener { binding.carbs.value = max( 0.0, binding.carbs.value @@ -165,7 +165,7 @@ class CarbsDialog : DialogFragmentWithDate() { val plus2text = toSignedString(sp.getInt(info.nightscout.core.utils.R.string.key_carbs_button_increment_2, CARBS_FAV2_DEFAULT)) binding.plus2.text = plus2text - binding.plus2.contentDescription = rh.gs(info.nightscout.core.ui.R.string.carbs) + " " + plus2text + binding.plus2.contentDescription = rh.gs(app.aaps.core.ui.R.string.carbs) + " " + plus2text binding.plus2.setOnClickListener { binding.carbs.value = max( 0.0, binding.carbs.value @@ -176,7 +176,7 @@ class CarbsDialog : DialogFragmentWithDate() { } val plus3text = toSignedString(sp.getInt(info.nightscout.core.utils.R.string.key_carbs_button_increment_3, CARBS_FAV3_DEFAULT)) binding.plus3.text = plus3text - binding.plus2.contentDescription = rh.gs(info.nightscout.core.ui.R.string.carbs) + " " + plus3text + binding.plus2.contentDescription = rh.gs(app.aaps.core.ui.R.string.carbs) + " " + plus3text binding.plus3.setOnClickListener { binding.carbs.value = max( 0.0, binding.carbs.value @@ -236,7 +236,7 @@ class CarbsDialog : DialogFragmentWithDate() { val hypoTTDuration = defaultValueHelper.determineHypoTTDuration() val hypoTT = defaultValueHelper.determineHypoTT() val actions: LinkedList = LinkedList() - val unitLabel = if (units == GlucoseUnit.MMOL) rh.gs(info.nightscout.core.ui.R.string.mmol) else rh.gs(info.nightscout.core.ui.R.string.mgdl) + val unitLabel = if (units == GlucoseUnit.MMOL) rh.gs(app.aaps.core.ui.R.string.mmol) else rh.gs(app.aaps.core.ui.R.string.mgdl) val useAlarm = binding.alarmCheckBox.isChecked val remindBolus = binding.bolusReminderCheckBox.isChecked @@ -244,61 +244,61 @@ class CarbsDialog : DialogFragmentWithDate() { if (activitySelected) actions.add( rh.gs(R.string.temp_target_short) + ": " + (decimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + rh.gs( - info.nightscout.core.ui.R.string.format_mins, + app.aaps.core.ui.R.string.format_mins, activityTTDuration ) + ")").formatColor( context, rh, - info.nightscout.core.ui.R.attr.tempTargetConfirmation + app.aaps.core.ui.R.attr.tempTargetConfirmation ) ) val eatingSoonSelected = binding.eatingSoonTt.isChecked if (eatingSoonSelected) actions.add( rh.gs(R.string.temp_target_short) + ": " + (decimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + rh.gs( - info.nightscout.core.ui.R.string.format_mins, + app.aaps.core.ui.R.string.format_mins, eatingSoonTTDuration - ) + ")").formatColor(context, rh, info.nightscout.core.ui.R.attr.tempTargetConfirmation) + ) + ")").formatColor(context, rh, app.aaps.core.ui.R.attr.tempTargetConfirmation) ) val hypoSelected = binding.hypoTt.isChecked if (hypoSelected) actions.add( rh.gs(R.string.temp_target_short) + ": " + (decimalFormatter.to1Decimal(hypoTT) + " " + unitLabel + " (" + rh.gs( - info.nightscout.core.ui.R.string.format_mins, + app.aaps.core.ui.R.string.format_mins, hypoTTDuration ) + ")").formatColor( context, rh, - info.nightscout.core.ui.R.attr.tempTargetConfirmation + app.aaps.core.ui.R.attr.tempTargetConfirmation ) ) val timeOffset = binding.time.value.toInt() if (useAlarm && carbs > 0 && timeOffset > 0) - actions.add(rh.gs(info.nightscout.core.ui.R.string.alarminxmin, timeOffset).formatColor(context, rh, info.nightscout.core.ui.R.attr.infoColor)) + actions.add(rh.gs(app.aaps.core.ui.R.string.alarminxmin, timeOffset).formatColor(context, rh, app.aaps.core.ui.R.attr.infoColor)) val duration = binding.duration.value.toInt() if (duration > 0) - actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + duration + rh.gs(app.aaps.core.interfaces.R.string.shorthour)) + actions.add(rh.gs(app.aaps.core.ui.R.string.duration) + ": " + duration + rh.gs(app.aaps.core.interfaces.R.string.shorthour)) if (carbsAfterConstraints > 0) { actions.add( - rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + "" + rh.gs(app.aaps.core.main.R.string.format_carbs, carbsAfterConstraints) + "" ) if (carbsAfterConstraints != carbs) - actions.add("" + rh.gs(R.string.carbs_constraint_applied) + "") + actions.add("" + rh.gs(R.string.carbs_constraint_applied) + "") } val notes = binding.notesLayout.notes.text.toString() if (notes.isNotEmpty()) - actions.add(rh.gs(info.nightscout.core.ui.R.string.notes_label) + ": " + notes) + actions.add(rh.gs(app.aaps.core.ui.R.string.notes_label) + ": " + notes) if (eventTimeChanged) - actions.add(rh.gs(info.nightscout.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) + actions.add(rh.gs(app.aaps.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) if (carbsAfterConstraints > 0 || activitySelected || eatingSoonSelected || hypoSelected) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.carbs), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.carbs), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { when { activitySelected -> { uel.log( @@ -387,7 +387,7 @@ class CarbsDialog : DialogFragmentWithDate() { override fun run() { automation.removeAutomationEventEatReminder() if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror), app.aaps.core.ui.R.raw.boluserror) } else if (sp.getBoolean(info.nightscout.core.utils.R.string.key_usebolusreminder, false) && remindBolus) automation.scheduleAutomationEventBolusReminder() } @@ -400,7 +400,7 @@ class CarbsDialog : DialogFragmentWithDate() { } } else activity?.let { activity -> - OKDialog.show(activity, rh.gs(info.nightscout.core.ui.R.string.carbs), rh.gs(info.nightscout.core.ui.R.string.no_action_selected)) + OKDialog.show(activity, rh.gs(app.aaps.core.ui.R.string.carbs), rh.gs(app.aaps.core.ui.R.string.no_action_selected)) } return true } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt index fbb6881cc4..bc4da61f4f 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt @@ -22,7 +22,7 @@ import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.Translator import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog +import app.aaps.core.ui.dialogs.OKDialog import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry @@ -57,7 +57,7 @@ class CareDialog : DialogFragmentWithDate() { private var valuesWithUnit = mutableListOf() @StringRes - private var event: Int = info.nightscout.core.ui.R.string.none + private var event: Int = app.aaps.core.ui.R.string.none private var _binding: DialogCareBinding? = null @@ -84,7 +84,7 @@ class CareDialog : DialogFragmentWithDate() { super.onViewCreated(view, savedInstanceState) (savedInstanceState ?: arguments)?.let { - event = it.getInt("event", info.nightscout.core.ui.R.string.error) + event = it.getInt("event", app.aaps.core.ui.R.string.error) options = UiInteraction.EventType.values()[it.getInt("options", 0)] } @@ -101,13 +101,13 @@ class CareDialog : DialogFragmentWithDate() { ) binding.title.text = rh.gs( when (options) { - UiInteraction.EventType.BGCHECK -> info.nightscout.core.ui.R.string.careportal_bgcheck - UiInteraction.EventType.SENSOR_INSERT -> info.nightscout.core.ui.R.string.cgm_sensor_insert - UiInteraction.EventType.BATTERY_CHANGE -> info.nightscout.core.ui.R.string.pump_battery_change - UiInteraction.EventType.NOTE -> info.nightscout.core.ui.R.string.careportal_note - UiInteraction.EventType.EXERCISE -> info.nightscout.core.ui.R.string.careportal_exercise - UiInteraction.EventType.QUESTION -> info.nightscout.core.ui.R.string.careportal_question - UiInteraction.EventType.ANNOUNCEMENT -> info.nightscout.core.ui.R.string.careportal_announcement + UiInteraction.EventType.BGCHECK -> app.aaps.core.ui.R.string.careportal_bgcheck + UiInteraction.EventType.SENSOR_INSERT -> app.aaps.core.ui.R.string.cgm_sensor_insert + UiInteraction.EventType.BATTERY_CHANGE -> app.aaps.core.ui.R.string.pump_battery_change + UiInteraction.EventType.NOTE -> app.aaps.core.ui.R.string.careportal_note + UiInteraction.EventType.EXERCISE -> app.aaps.core.ui.R.string.careportal_exercise + UiInteraction.EventType.QUESTION -> app.aaps.core.ui.R.string.careportal_question + UiInteraction.EventType.ANNOUNCEMENT -> app.aaps.core.ui.R.string.careportal_announcement } ) @@ -142,13 +142,13 @@ class CareDialog : DialogFragmentWithDate() { } if (profileFunction.getUnits() == GlucoseUnit.MMOL) { - binding.bgUnits.text = rh.gs(info.nightscout.core.ui.R.string.mmol) + binding.bgUnits.text = rh.gs(app.aaps.core.ui.R.string.mmol) binding.bg.setParams( savedInstanceState?.getDouble("bg") ?: bg, 2.0, 30.0, 0.1, DecimalFormat("0.0"), false, binding.okcancel.ok, bgTextWatcher ) } else { - binding.bgUnits.text = rh.gs(info.nightscout.core.ui.R.string.mgdl) + binding.bgUnits.text = rh.gs(app.aaps.core.ui.R.string.mgdl) binding.bg.setParams( savedInstanceState?.getDouble("bg") ?: bg, 36.0, 500.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok, bgTextWatcher @@ -171,7 +171,7 @@ class CareDialog : DialogFragmentWithDate() { override fun submit(): Boolean { val enteredBy = sp.getString("careportal_enteredby", "AndroidAPS") - val unitResId = if (profileFunction.getUnits() == GlucoseUnit.MGDL) info.nightscout.core.ui.R.string.mgdl else info.nightscout.core.ui.R.string.mmol + val unitResId = if (profileFunction.getUnits() == GlucoseUnit.MGDL) app.aaps.core.ui.R.string.mgdl else app.aaps.core.ui.R.string.mmol eventTime -= eventTime % 1000 @@ -198,24 +198,24 @@ class CareDialog : DialogFragmentWithDate() { else -> TherapyEvent.MeterType.MANUAL } actions.add(rh.gs(R.string.glucose_type) + ": " + translator.translate(meterType)) - actions.add(rh.gs(info.nightscout.core.ui.R.string.bg_label) + ": " + profileUtil.stringInCurrentUnitsDetect(binding.bg.value) + " " + rh.gs(unitResId)) + actions.add(rh.gs(app.aaps.core.ui.R.string.bg_label) + ": " + profileUtil.stringInCurrentUnitsDetect(binding.bg.value) + " " + rh.gs(unitResId)) therapyEvent.glucoseType = meterType therapyEvent.glucose = binding.bg.value valuesWithUnit.add(ValueWithUnit.fromGlucoseUnit(binding.bg.value, profileFunction.getUnits().asText)) valuesWithUnit.add(ValueWithUnit.TherapyEventMeterType(meterType)) } if (options == UiInteraction.EventType.NOTE || options == UiInteraction.EventType.EXERCISE) { - actions.add(rh.gs(info.nightscout.core.ui.R.string.duration_label) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_mins, binding.duration.value.toInt())) + actions.add(rh.gs(app.aaps.core.ui.R.string.duration_label) + ": " + rh.gs(app.aaps.core.ui.R.string.format_mins, binding.duration.value.toInt())) therapyEvent.duration = T.mins(binding.duration.value.toLong()).msecs() valuesWithUnit.add(ValueWithUnit.Minute(binding.duration.value.toInt()).takeIf { !binding.duration.value.equals(0.0) }) } val notes = binding.notesLayout.notes.text.toString() if (notes.isNotEmpty()) { - actions.add(rh.gs(info.nightscout.core.ui.R.string.notes_label) + ": " + notes) + actions.add(rh.gs(app.aaps.core.ui.R.string.notes_label) + ": " + notes) therapyEvent.note = notes } - if (eventTimeChanged) actions.add(rh.gs(info.nightscout.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) + if (eventTimeChanged) actions.add(rh.gs(app.aaps.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) therapyEvent.enteredBy = enteredBy diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/DialogFragmentWithDate.kt b/ui/src/main/java/info/nightscout/ui/dialogs/DialogFragmentWithDate.kt index ec297f8d78..926302c5c4 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/DialogFragmentWithDate.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/DialogFragmentWithDate.kt @@ -77,12 +77,12 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() { eventTimeOriginal = savedInstanceState?.getLong("eventTimeOriginal") ?: dateUtil.nowWithoutMilliseconds() eventTime = savedInstanceState?.getLong("eventTime") ?: eventTimeOriginal - eventDateView = view.findViewById(info.nightscout.core.ui.R.id.eventdate) as TextView? + eventDateView = view.findViewById(app.aaps.core.ui.R.id.eventdate) as TextView? eventDateView?.text = dateUtil.dateString(eventTime) eventDateView?.setOnClickListener { val selection = dateUtil.timeStampToUtcDateMillis(eventTime) MaterialDatePicker.Builder.datePicker() - .setTheme(info.nightscout.core.ui.R.style.DatePicker) + .setTheme(app.aaps.core.ui.R.style.DatePicker) .setSelection(selection) .build() .apply { @@ -96,7 +96,7 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() { .show(parentFragmentManager, "event_time_date_picker") } - eventTimeView = view.findViewById(info.nightscout.core.ui.R.id.eventtime) as TextView? + eventTimeView = view.findViewById(app.aaps.core.ui.R.id.eventtime) as TextView? eventTimeView?.text = dateUtil.timeString(eventTime) eventTimeView?.setOnClickListener { val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H @@ -105,7 +105,7 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() { .setTimeFormat(clockFormat) .setHour(cal.get(Calendar.HOUR_OF_DAY)) .setMinute(cal.get(Calendar.MINUTE)) - .setTheme(info.nightscout.core.ui.R.style.TimePicker) + .setTheme(app.aaps.core.ui.R.style.TimePicker) .build() timePicker.addOnPositiveButtonClickListener { // Randomize seconds to prevent creating record of the same time, if user choose time manually @@ -116,10 +116,10 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() { timePicker.show(parentFragmentManager, "event_time_time_picker") } - (view.findViewById(info.nightscout.core.ui.R.id.notes_layout) as View?)?.visibility = + (view.findViewById(app.aaps.core.ui.R.id.notes_layout) as View?)?.visibility = sp.getBoolean(info.nightscout.core.utils.R.string.key_show_notes_entry_dialogs, false).toVisibility() - (view.findViewById(info.nightscout.core.ui.R.id.ok) as Button?)?.setOnClickListener { + (view.findViewById(app.aaps.core.ui.R.id.ok) as Button?)?.setOnClickListener { synchronized(okClicked) { if (okClicked.get()) { aapsLogger.warn(LTag.UI, "guarding: ok already clicked for dialog: ${this.javaClass.simpleName}") @@ -135,7 +135,7 @@ abstract class DialogFragmentWithDate : DaggerDialogFragment() { } } } - (view.findViewById(info.nightscout.core.ui.R.id.cancel) as Button?)?.setOnClickListener { + (view.findViewById(app.aaps.core.ui.R.id.cancel) as Button?)?.setOnClickListener { aapsLogger.debug(LTag.APS, "Cancel pressed for dialog: ${this.javaClass.simpleName}") dismiss() } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt index 903957e061..4e58840e86 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/EditQuickWizardDialog.kt @@ -18,9 +18,9 @@ import app.aaps.core.interfaces.utils.T import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.TimeFormat import dagger.android.support.DaggerDialogFragment -import info.nightscout.core.ui.extensions.selectedItemPosition -import info.nightscout.core.ui.extensions.setEnableForChildren -import info.nightscout.core.ui.extensions.setSelection +import app.aaps.core.ui.extensions.selectedItemPosition +import app.aaps.core.ui.extensions.setEnableForChildren +import app.aaps.core.ui.extensions.setSelection import info.nightscout.ui.R import info.nightscout.ui.databinding.DialogEditQuickwizardBinding import info.nightscout.ui.events.EventQuickWizardChange diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt index 34ef027356..9b4e7da2f1 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt @@ -19,8 +19,8 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.SafeParse import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -97,13 +97,13 @@ class ExtendedBolusDialog : DialogFragmentWithDate() { val durationInMinutes = binding.duration.value.toInt() val actions: LinkedList = LinkedList() val insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(ConstraintObject(insulin, aapsLogger)).value() - actions.add(rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, insulinAfterConstraint)) - actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_mins, durationInMinutes)) + actions.add(rh.gs(app.aaps.core.ui.R.string.format_insulin_units, insulinAfterConstraint)) + actions.add(rh.gs(app.aaps.core.ui.R.string.duration) + ": " + rh.gs(app.aaps.core.ui.R.string.format_mins, durationInMinutes)) if (abs(insulinAfterConstraint - insulin) > 0.01) - actions.add(rh.gs(info.nightscout.core.ui.R.string.constraint_applied).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) + actions.add(rh.gs(app.aaps.core.ui.R.string.constraint_applied).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)) activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { uel.log( UserEntry.Action.EXTENDED_BOLUS, UserEntry.Sources.ExtendedBolusDialog, ValueWithUnit.Insulin(insulinAfterConstraint), @@ -112,7 +112,7 @@ class ExtendedBolusDialog : DialogFragmentWithDate() { commandQueue.extendedBolus(insulinAfterConstraint, durationInMinutes, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror), app.aaps.core.ui.R.raw.boluserror) } } }) diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt index c89b14cfcb..fd43421117 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt @@ -21,8 +21,8 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.SafeParse import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.TherapyEvent import info.nightscout.database.entities.UserEntry @@ -123,31 +123,31 @@ class FillDialog : DialogFragmentWithDate() { actions.add(rh.gs(R.string.fill_warning)) actions.add("") actions.add( - rh.gs(info.nightscout.core.ui.R.string.bolus) + ": " + decimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump.pumpDescription.bolusStep) - .formatColor(context, rh, info.nightscout.core.ui.R.attr.insulinButtonColor) + rh.gs(app.aaps.core.ui.R.string.bolus) + ": " + decimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump.pumpDescription.bolusStep) + .formatColor(context, rh, app.aaps.core.ui.R.attr.insulinButtonColor) ) if (abs(insulinAfterConstraints - insulin) > 0.01) actions.add( - rh.gs(info.nightscout.core.ui.R.string.bolus_constraint_applied_warn, insulin, insulinAfterConstraints).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor) + rh.gs(app.aaps.core.ui.R.string.bolus_constraint_applied_warn, insulin, insulinAfterConstraints).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor) ) } val siteChange = binding.fillCatheterChange.isChecked if (siteChange) - actions.add(rh.gs(R.string.record_pump_site_change).formatColor(context, rh, info.nightscout.core.ui.R.attr.actionsConfirmColor)) + actions.add(rh.gs(R.string.record_pump_site_change).formatColor(context, rh, app.aaps.core.ui.R.attr.actionsConfirmColor)) val insulinChange = binding.fillCartridgeChange.isChecked if (insulinChange) - actions.add(rh.gs(R.string.record_insulin_cartridge_change).formatColor(context, rh, info.nightscout.core.ui.R.attr.actionsConfirmColor)) + actions.add(rh.gs(R.string.record_insulin_cartridge_change).formatColor(context, rh, app.aaps.core.ui.R.attr.actionsConfirmColor)) val notes: String = binding.notesLayout.notes.text.toString() if (notes.isNotEmpty()) - actions.add(rh.gs(info.nightscout.core.ui.R.string.notes_label) + ": " + notes) + actions.add(rh.gs(app.aaps.core.ui.R.string.notes_label) + ": " + notes) eventTime -= eventTime % 1000 if (eventTimeChanged) - actions.add(rh.gs(info.nightscout.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) + actions.add(rh.gs(app.aaps.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) if (insulinAfterConstraints > 0 || binding.fillCatheterChange.isChecked || binding.fillCartridgeChange.isChecked) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.prime_fill), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.prime_fill), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { if (insulinAfterConstraints > 0) { uel.log( UserEntry.Action.PRIME_BOLUS, UserEntry.Sources.FillDialog, @@ -199,7 +199,7 @@ class FillDialog : DialogFragmentWithDate() { } } else { activity?.let { activity -> - OKDialog.show(activity, rh.gs(info.nightscout.core.ui.R.string.prime_fill), rh.gs(info.nightscout.core.ui.R.string.no_action_selected)) + OKDialog.show(activity, rh.gs(app.aaps.core.ui.R.string.prime_fill), rh.gs(app.aaps.core.ui.R.string.no_action_selected)) } } dismiss() @@ -215,7 +215,7 @@ class FillDialog : DialogFragmentWithDate() { commandQueue.bolus(detailedBolusInfo, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror), app.aaps.core.ui.R.raw.boluserror) } } }) diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt index ab10025b88..673ece2ca0 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt @@ -35,8 +35,8 @@ import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.T import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry @@ -97,7 +97,7 @@ class InsulinDialog : DialogFragmentWithDate() { val maxInsulin = constraintChecker.getMaxBolusAllowed().value() if (abs(binding.time.value.toInt()) > 12 * 60) { binding.time.value = 0.0 - ToastUtils.warnToast(context, info.nightscout.core.ui.R.string.constraint_applied) + ToastUtils.warnToast(context, app.aaps.core.ui.R.string.constraint_applied) } if (binding.amount.value > maxInsulin) { binding.amount.value = 0.0 @@ -141,7 +141,7 @@ class InsulinDialog : DialogFragmentWithDate() { val plus05Text = sp.getDouble(rh.gs(app.aaps.core.interfaces.R.string.key_insulin_button_increment_1), INSULIN_PLUS1_DEFAULT).toSignedString(activePlugin.activePump, decimalFormatter) binding.plus05.text = plus05Text - binding.plus05.contentDescription = rh.gs(info.nightscout.core.ui.R.string.overview_insulin_label) + " " + plus05Text + binding.plus05.contentDescription = rh.gs(app.aaps.core.ui.R.string.overview_insulin_label) + " " + plus05Text binding.plus05.setOnClickListener { binding.amount.value = max( 0.0, binding.amount.value @@ -152,7 +152,7 @@ class InsulinDialog : DialogFragmentWithDate() { } val plus10Text = sp.getDouble(rh.gs(app.aaps.core.interfaces.R.string.key_insulin_button_increment_2), INSULIN_PLUS2_DEFAULT).toSignedString(activePlugin.activePump, decimalFormatter) binding.plus10.text = plus10Text - binding.plus10.contentDescription = rh.gs(info.nightscout.core.ui.R.string.overview_insulin_label) + " " + plus10Text + binding.plus10.contentDescription = rh.gs(app.aaps.core.ui.R.string.overview_insulin_label) + " " + plus10Text binding.plus10.setOnClickListener { binding.amount.value = max( 0.0, binding.amount.value @@ -163,7 +163,7 @@ class InsulinDialog : DialogFragmentWithDate() { } val plus20Text = sp.getDouble(rh.gs(app.aaps.core.interfaces.R.string.key_insulin_button_increment_3), INSULIN_PLUS3_DEFAULT).toSignedString(activePlugin.activePump, decimalFormatter) binding.plus20.text = plus20Text - binding.plus20.contentDescription = rh.gs(info.nightscout.core.ui.R.string.overview_insulin_label) + " " + plus20Text + binding.plus20.contentDescription = rh.gs(app.aaps.core.ui.R.string.overview_insulin_label) + " " + plus20Text binding.plus20.setOnClickListener { binding.amount.value = max( 0.0, binding.amount.value @@ -194,20 +194,20 @@ class InsulinDialog : DialogFragmentWithDate() { val insulinAfterConstraints = constraintChecker.applyBolusConstraints(ConstraintObject(insulin, aapsLogger)).value() val actions: LinkedList = LinkedList() val units = profileFunction.getUnits() - val unitLabel = if (units == GlucoseUnit.MMOL) rh.gs(info.nightscout.core.ui.R.string.mmol) else rh.gs(info.nightscout.core.ui.R.string.mgdl) + val unitLabel = if (units == GlucoseUnit.MMOL) rh.gs(app.aaps.core.ui.R.string.mmol) else rh.gs(app.aaps.core.ui.R.string.mgdl) val recordOnlyChecked = binding.recordOnly.isChecked val eatingSoonChecked = binding.startEatingSoonTt.isChecked if (insulinAfterConstraints > 0) { actions.add( - rh.gs(info.nightscout.core.ui.R.string.bolus) + ": " + decimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump.pumpDescription.bolusStep) - .formatColor(context, rh, info.nightscout.core.ui.R.attr.bolusColor) + rh.gs(app.aaps.core.ui.R.string.bolus) + ": " + decimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump.pumpDescription.bolusStep) + .formatColor(context, rh, app.aaps.core.ui.R.attr.bolusColor) ) if (recordOnlyChecked) - actions.add(rh.gs(info.nightscout.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) + actions.add(rh.gs(app.aaps.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)) if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) actions.add( - rh.gs(info.nightscout.core.ui.R.string.bolus_constraint_applied_warn, insulin, insulinAfterConstraints).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor) + rh.gs(app.aaps.core.ui.R.string.bolus_constraint_applied_warn, insulin, insulinAfterConstraints).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor) ) } val eatingSoonTTDuration = defaultValueHelper.determineEatingSoonTTDuration() @@ -215,24 +215,24 @@ class InsulinDialog : DialogFragmentWithDate() { if (eatingSoonChecked) actions.add( rh.gs(R.string.temp_target_short) + ": " + (decimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + rh.gs( - info.nightscout.core.ui.R.string.format_mins, + app.aaps.core.ui.R.string.format_mins, eatingSoonTTDuration ) + ")") - .formatColor(context, rh, info.nightscout.core.ui.R.attr.tempTargetConfirmation) + .formatColor(context, rh, app.aaps.core.ui.R.attr.tempTargetConfirmation) ) val timeOffset = binding.time.value.toInt() val time = dateUtil.now() + T.mins(timeOffset.toLong()).msecs() if (timeOffset != 0) - actions.add(rh.gs(info.nightscout.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(time)) + actions.add(rh.gs(app.aaps.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(time)) val notes = binding.notesLayout.notes.text.toString() if (notes.isNotEmpty()) - actions.add(rh.gs(info.nightscout.core.ui.R.string.notes_label) + ": " + notes) + actions.add(rh.gs(app.aaps.core.ui.R.string.notes_label) + ": " + notes) if (insulinAfterConstraints > 0 || eatingSoonChecked) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.bolus), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.bolus), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { if (eatingSoonChecked) { uel.log( UserEntry.Action.TT, UserEntry.Sources.InsulinDialog, @@ -265,8 +265,8 @@ class InsulinDialog : DialogFragmentWithDate() { detailedBolusInfo.timestamp = time if (recordOnlyChecked) { uel.log(UserEntry.Action.BOLUS, UserEntry.Sources.InsulinDialog, - rh.gs(info.nightscout.core.ui.R.string.record) + if (notes.isNotEmpty()) ": $notes" else "", - ValueWithUnit.SimpleString(rh.gsNotLocalised(info.nightscout.core.ui.R.string.record)), + rh.gs(app.aaps.core.ui.R.string.record) + if (notes.isNotEmpty()) ": $notes" else "", + ValueWithUnit.SimpleString(rh.gsNotLocalised(app.aaps.core.ui.R.string.record)), ValueWithUnit.Insulin(insulinAfterConstraints), ValueWithUnit.Minute(timeOffset).takeIf { timeOffset != 0 }) persistenceLayer.insertOrUpdateBolus(detailedBolusInfo.createBolus()) @@ -281,7 +281,7 @@ class InsulinDialog : DialogFragmentWithDate() { commandQueue.bolus(detailedBolusInfo, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror), app.aaps.core.ui.R.raw.boluserror) } else { automation.removeAutomationEventBolusReminder() } @@ -293,7 +293,7 @@ class InsulinDialog : DialogFragmentWithDate() { } } else activity?.let { activity -> - OKDialog.show(activity, rh.gs(info.nightscout.core.ui.R.string.bolus), rh.gs(info.nightscout.core.ui.R.string.no_action_selected)) + OKDialog.show(activity, rh.gs(app.aaps.core.ui.R.string.bolus), rh.gs(app.aaps.core.ui.R.string.no_action_selected)) } return true } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt index 859c1d70a3..26560ab0ec 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt @@ -40,8 +40,8 @@ import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import dagger.android.support.DaggerDialogFragment -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.database.entities.OfflineEvent import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -201,7 +201,7 @@ class LoopDialog : DaggerDialogFragment() { loop.isSuspended -> { binding.overviewLoop.visibility = View.GONE binding.overviewSuspend.visibility = View.VISIBLE - binding.overviewSuspendHeader.text = rh.gs(info.nightscout.core.ui.R.string.resumeloop) + binding.overviewSuspendHeader.text = rh.gs(app.aaps.core.ui.R.string.resumeloop) binding.overviewSuspendButtons.visibility = View.VISIBLE binding.overviewResume.visibility = View.VISIBLE binding.overviewPump.visibility = View.GONE @@ -238,7 +238,7 @@ class LoopDialog : DaggerDialogFragment() { } } binding.overviewSuspend.visibility = View.VISIBLE - binding.overviewSuspendHeader.text = rh.gs(info.nightscout.core.ui.R.string.suspendloop) + binding.overviewSuspendHeader.text = rh.gs(app.aaps.core.ui.R.string.suspendloop) binding.overviewSuspendButtons.visibility = View.VISIBLE binding.overviewResume.visibility = View.GONE @@ -254,11 +254,11 @@ class LoopDialog : DaggerDialogFragment() { private fun onClickOkCancelEnabled(v: View): Boolean { var description = "" when (v.id) { - R.id.overview_closeloop -> description = rh.gs(info.nightscout.core.ui.R.string.closedloop) - R.id.overview_lgsloop -> description = rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend) - R.id.overview_openloop -> description = rh.gs(info.nightscout.core.ui.R.string.openloop) - R.id.overview_disable -> description = rh.gs(info.nightscout.core.ui.R.string.disableloop) - R.id.overview_enable -> description = rh.gs(info.nightscout.core.ui.R.string.enableloop) + R.id.overview_closeloop -> description = rh.gs(app.aaps.core.ui.R.string.closedloop) + R.id.overview_lgsloop -> description = rh.gs(app.aaps.core.ui.R.string.lowglucosesuspend) + R.id.overview_openloop -> description = rh.gs(app.aaps.core.ui.R.string.openloop) + R.id.overview_disable -> description = rh.gs(app.aaps.core.ui.R.string.disableloop) + R.id.overview_enable -> description = rh.gs(app.aaps.core.ui.R.string.enableloop) R.id.overview_resume -> description = rh.gs(R.string.resume) R.id.overview_reconnect -> description = rh.gs(R.string.reconnect) R.id.overview_suspend_1h -> description = rh.gs(R.string.suspendloopfor1h) @@ -272,7 +272,7 @@ class LoopDialog : DaggerDialogFragment() { R.id.overview_disconnect_3h -> description = rh.gs(R.string.disconnectpumpfor3h) } activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.confirm), description, Runnable { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.confirm), description, Runnable { onClick(v) }) } @@ -284,21 +284,21 @@ class LoopDialog : DaggerDialogFragment() { R.id.overview_closeloop -> { uel.log(UserEntry.Action.CLOSED_LOOP_MODE, UserEntry.Sources.LoopDialog) sp.putString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.CLOSED.name) - rxBus.send(EventPreferenceChange(rh.gs(info.nightscout.core.ui.R.string.closedloop))) + rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.ui.R.string.closedloop))) return true } R.id.overview_lgsloop -> { uel.log(UserEntry.Action.LGS_LOOP_MODE, UserEntry.Sources.LoopDialog) sp.putString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.LGS.name) - rxBus.send(EventPreferenceChange(rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend))) + rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.ui.R.string.lowglucosesuspend))) return true } R.id.overview_openloop -> { uel.log(UserEntry.Action.OPEN_LOOP_MODE, UserEntry.Sources.LoopDialog) sp.putString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name) - rxBus.send(EventPreferenceChange(rh.gs(info.nightscout.core.ui.R.string.lowglucosesuspend))) + rxBus.send(EventPreferenceChange(rh.gs(app.aaps.core.ui.R.string.lowglucosesuspend))) return true } @@ -311,7 +311,7 @@ class LoopDialog : DaggerDialogFragment() { commandQueue.cancelTempBasal(true, object : Callback() { override fun run() { if (!result.success) { - ToastUtils.errorToast(ctx, rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error)) + ToastUtils.errorToast(ctx, rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error)) } } }) @@ -352,7 +352,7 @@ class LoopDialog : DaggerDialogFragment() { commandQueue.cancelTempBasal(true, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error), app.aaps.core.ui.R.raw.boluserror) } } }) diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt index 23d0c86bab..ddcf4f977d 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt @@ -24,8 +24,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.utils.HardLimits import app.aaps.core.interfaces.utils.T import com.google.common.base.Joiner -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.TemporaryTarget import info.nightscout.database.entities.UserEntry @@ -128,7 +128,7 @@ class ProfileSwitchDialog : DialogFragmentWithDate() { dismiss() return } - binding.profileList.setAdapter(ArrayAdapter(context, info.nightscout.core.ui.R.layout.spinner_centered, profileList)) + binding.profileList.setAdapter(ArrayAdapter(context, app.aaps.core.ui.R.layout.spinner_centered, profileList)) // set selected to actual profile if (profileName != null) binding.profileList.setText(profileName, false) @@ -171,32 +171,32 @@ class ProfileSwitchDialog : DialogFragmentWithDate() { val actions: LinkedList = LinkedList() val duration = binding.duration.value.toInt() if (duration > 0L) - actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_mins, duration)) + actions.add(rh.gs(app.aaps.core.ui.R.string.duration) + ": " + rh.gs(app.aaps.core.ui.R.string.format_mins, duration)) val profileName = binding.profileList.text.toString() - actions.add(rh.gs(info.nightscout.core.ui.R.string.profile) + ": " + profileName) + actions.add(rh.gs(app.aaps.core.ui.R.string.profile) + ": " + profileName) val percent = binding.percentage.value.toInt() if (percent != 100) - actions.add(rh.gs(info.nightscout.core.ui.R.string.percent) + ": " + percent + "%") + actions.add(rh.gs(app.aaps.core.ui.R.string.percent) + ": " + percent + "%") val timeShift = binding.timeshift.value.toInt() if (timeShift != 0) - actions.add(rh.gs(R.string.timeshift_label) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_hours, timeShift.toDouble())) + actions.add(rh.gs(R.string.timeshift_label) + ": " + rh.gs(app.aaps.core.ui.R.string.format_hours, timeShift.toDouble())) val notes = binding.notesLayout.notes.text.toString() if (notes.isNotEmpty()) - actions.add(rh.gs(info.nightscout.core.ui.R.string.notes_label) + ": " + notes) + actions.add(rh.gs(app.aaps.core.ui.R.string.notes_label) + ": " + notes) if (eventTimeChanged) - actions.add(rh.gs(info.nightscout.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) + actions.add(rh.gs(app.aaps.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) val isTT = binding.duration.value > 0 && binding.percentage.value < 100 && binding.tt.isChecked val target = defaultValueHelper.determineActivityTT() val units = profileFunction.getUnits() if (isTT) - actions.add(rh.gs(info.nightscout.core.ui.R.string.temporary_target) + ": " + rh.gs(info.nightscout.core.ui.R.string.activity)) + actions.add(rh.gs(app.aaps.core.ui.R.string.temporary_target) + ": " + rh.gs(app.aaps.core.ui.R.string.activity)) activity?.let { activity -> val ps = profileFunction.buildProfileSwitch(profileStore, profileName, duration, percent, timeShift, eventTime) ?: return@let - val validity = ProfileSealed.PS(ps).isValid(rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch), activePlugin.activePump, config, rh, rxBus, hardLimits, false) + val validity = ProfileSealed.PS(ps).isValid(rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch), activePlugin.activePump, config, rh, rxBus, hardLimits, false) if (validity.isValid) - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { if (profileFunction.createProfileSwitch( profileStore, profileName = profileName, @@ -241,7 +241,7 @@ class ProfileSwitchDialog : DialogFragmentWithDate() { else { OKDialog.show( activity, - rh.gs(info.nightscout.core.ui.R.string.careportal_profileswitch), + rh.gs(app.aaps.core.ui.R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("
").join(validity.reasons)) ) return false diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt index c4e81321e1..75a9803ccd 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/ProfileViewerDialog.kt @@ -154,18 +154,18 @@ class ProfileViewerDialog : DaggerDialogFragment() { binding.noProfile.visibility = View.GONE val validity = profile1.isValid("ProfileViewDialog", activePlugin.activePump, config, rh, rxBus, hardLimits, false) - binding.invalidProfile.text = rh.gs(info.nightscout.core.ui.R.string.invalid_profile) + "\n" + validity.reasons.joinToString(separator = "\n") + binding.invalidProfile.text = rh.gs(app.aaps.core.ui.R.string.invalid_profile) + "\n" + validity.reasons.joinToString(separator = "\n") binding.invalidProfile.visibility = validity.isValid.not().toVisibility() } else profile?.let { binding.units.text = it.units.asText - binding.dia.text = rh.gs(info.nightscout.core.ui.R.string.format_hours, it.dia) + binding.dia.text = rh.gs(app.aaps.core.ui.R.string.format_hours, it.dia) binding.activeProfile.text = profileName binding.date.text = date binding.ic.text = it.getIcList(rh, dateUtil) binding.isf.text = it.getIsfList(rh, dateUtil) - binding.basal.text = "∑ " + rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, it.baseBasalSum()) + "\n" + it.getBasalList(rh, dateUtil) + binding.basal.text = "∑ " + rh.gs(app.aaps.core.ui.R.string.format_insulin_units, it.baseBasalSum()) + "\n" + it.getBasalList(rh, dateUtil) binding.target.text = it.getTargetList(rh, dateUtil) binding.basalGraph.show(it) binding.isfGraph.show(it) @@ -174,7 +174,7 @@ class ProfileViewerDialog : DaggerDialogFragment() { binding.noProfile.visibility = View.GONE val validity = it.isValid("ProfileViewDialog", activePlugin.activePump, config, rh, rxBus, hardLimits, false) - binding.invalidProfile.text = rh.gs(info.nightscout.core.ui.R.string.invalid_profile) + "\n" + validity.reasons.joinToString(separator = "\n") + binding.invalidProfile.text = rh.gs(app.aaps.core.ui.R.string.invalid_profile) + "\n" + validity.reasons.joinToString(separator = "\n") binding.invalidProfile.visibility = validity.isValid.not().toVisibility() } } @@ -204,20 +204,20 @@ class ProfileViewerDialog : DaggerDialogFragment() { } private fun formatColors(label: String, text1: String, text2: String, units: String): String { - var s = "$label" + var s = "$label" s += " " - s += "$text1" + s += "$text1" s += " " - s += "$text2" + s += "$text2" s += " " - s += "$units" + s += "$units" return s } private fun formatColors(text1: String, text2: String): String { - var s = "$text1" + var s = "$text1" s += "
" - s += "$text2" + s += "$text2" return s } @@ -229,7 +229,7 @@ class ProfileViewerDialog : DaggerDialogFragment() { val val1 = profile1.getBasalTimeFromMidnight(hour * 60 * 60) val val2 = profile2.getBasalTimeFromMidnight(hour * 60 * 60) if (val1 != prev1 || val2 != prev2) { - s.append(formatColors(dateUtil.formatHHMM(hour * 60 * 60), val1, val2, DecimalFormat("0.00"), " " + rh.gs(info.nightscout.core.ui.R.string.profile_ins_units_per_hour))) + s.append(formatColors(dateUtil.formatHHMM(hour * 60 * 60), val1, val2, DecimalFormat("0.00"), " " + rh.gs(app.aaps.core.ui.R.string.profile_ins_units_per_hour))) s.append("
") } prev1 = val1 @@ -241,7 +241,7 @@ class ProfileViewerDialog : DaggerDialogFragment() { profile1.baseBasalSum(), profile2.baseBasalSum(), DecimalFormat("0.00"), - rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) ) ) return HtmlHelper.fromHtml(s.toString()) @@ -255,7 +255,7 @@ class ProfileViewerDialog : DaggerDialogFragment() { val val1 = profile1.getIcTimeFromMidnight(hour * 60 * 60) val val2 = profile2.getIcTimeFromMidnight(hour * 60 * 60) if (val1 != prev1 || val2 != prev2) { - s.append(formatColors(dateUtil.formatHHMM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), " " + rh.gs(info.nightscout.core.ui.R.string.profile_carbs_per_unit))) + s.append(formatColors(dateUtil.formatHHMM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), " " + rh.gs(app.aaps.core.ui.R.string.profile_carbs_per_unit))) s.append("
") } prev1 = val1 @@ -273,7 +273,7 @@ class ProfileViewerDialog : DaggerDialogFragment() { val val1 = profileUtil.fromMgdlToUnits(profile1.getIsfMgdlTimeFromMidnight(hour * 60 * 60)) val val2 = profileUtil.fromMgdlToUnits(profile2.getIsfMgdlTimeFromMidnight(hour * 60 * 60)) if (val1 != prev1 || val2 != prev2) { - s.append(formatColors(dateUtil.formatHHMM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), units.asText + " " + rh.gs(info.nightscout.core.ui.R.string.profile_per_unit))) + s.append(formatColors(dateUtil.formatHHMM(hour * 60 * 60), val1, val2, DecimalFormat("0.0"), units.asText + " " + rh.gs(app.aaps.core.ui.R.string.profile_per_unit))) s.append("
") } prev1 = val1 diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt index 98832b3ffa..de60a2abdf 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt @@ -22,8 +22,8 @@ import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.SafeParse import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -121,23 +121,23 @@ class TempBasalDialog : DialogFragmentWithDate() { if (isPercentPump) { val basalPercentInput = SafeParse.stringToInt(binding.basalPercentInput.text) percent = constraintChecker.applyBasalPercentConstraints(ConstraintObject(basalPercentInput, aapsLogger), profile).value() - actions.add(rh.gs(info.nightscout.core.ui.R.string.tempbasal_label) + ": $percent%") - actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_mins, durationInMinutes)) - if (percent != basalPercentInput) actions.add(rh.gs(info.nightscout.core.ui.R.string.constraint_applied)) + actions.add(rh.gs(app.aaps.core.ui.R.string.tempbasal_label) + ": $percent%") + actions.add(rh.gs(app.aaps.core.ui.R.string.duration) + ": " + rh.gs(app.aaps.core.ui.R.string.format_mins, durationInMinutes)) + if (percent != basalPercentInput) actions.add(rh.gs(app.aaps.core.ui.R.string.constraint_applied)) } else { val basalAbsoluteInput = SafeParse.stringToDouble(binding.basalAbsoluteInput.text) absolute = constraintChecker.applyBasalConstraints(ConstraintObject(basalAbsoluteInput, aapsLogger), profile).value() - actions.add(rh.gs(info.nightscout.core.ui.R.string.tempbasal_label) + ": " + rh.gs(info.nightscout.core.ui.R.string.pump_base_basal_rate, absolute)) - actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_mins, durationInMinutes)) + actions.add(rh.gs(app.aaps.core.ui.R.string.tempbasal_label) + ": " + rh.gs(app.aaps.core.ui.R.string.pump_base_basal_rate, absolute)) + actions.add(rh.gs(app.aaps.core.ui.R.string.duration) + ": " + rh.gs(app.aaps.core.ui.R.string.format_mins, durationInMinutes)) if (abs(absolute - basalAbsoluteInput) > 0.01) - actions.add(rh.gs(info.nightscout.core.ui.R.string.constraint_applied).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) + actions.add(rh.gs(app.aaps.core.ui.R.string.constraint_applied).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)) } activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.tempbasal_label), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.tempbasal_label), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { val callback: Callback = object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.temp_basal_delivery_error), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.temp_basal_delivery_error), app.aaps.core.ui.R.raw.boluserror) } } } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt index 8c43bed297..099f323a01 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt @@ -18,8 +18,8 @@ import app.aaps.core.interfaces.protection.ProtectionCheck import app.aaps.core.interfaces.resources.ResourceHelper import com.google.common.base.Joiner import com.google.common.collect.Lists -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.ValueWrapper import info.nightscout.database.entities.TemporaryTarget @@ -92,7 +92,7 @@ class TempTargetDialog : DialogFragmentWithDate() { ) val units = profileUtil.units - binding.units.text = if (units == GlucoseUnit.MMOL) rh.gs(info.nightscout.core.ui.R.string.mmol) else rh.gs(info.nightscout.core.ui.R.string.mgdl) + binding.units.text = if (units == GlucoseUnit.MMOL) rh.gs(app.aaps.core.ui.R.string.mmol) else rh.gs(app.aaps.core.ui.R.string.mgdl) // temp target context?.let { context -> @@ -102,12 +102,12 @@ class TempTargetDialog : DialogFragmentWithDate() { binding.targetCancel.visibility = View.GONE reasonList = Lists.newArrayList( - rh.gs(info.nightscout.core.ui.R.string.manual), - rh.gs(info.nightscout.core.ui.R.string.eatingsoon), - rh.gs(info.nightscout.core.ui.R.string.activity), - rh.gs(info.nightscout.core.ui.R.string.hypo) + rh.gs(app.aaps.core.ui.R.string.manual), + rh.gs(app.aaps.core.ui.R.string.eatingsoon), + rh.gs(app.aaps.core.ui.R.string.activity), + rh.gs(app.aaps.core.ui.R.string.hypo) ) - binding.reasonList.setAdapter(ArrayAdapter(context, info.nightscout.core.ui.R.layout.spinner_centered, reasonList)) + binding.reasonList.setAdapter(ArrayAdapter(context, app.aaps.core.ui.R.layout.spinner_centered, reasonList)) binding.targetCancel.setOnClickListener { binding.duration.value = 0.0; shortClick(it) } binding.eatingSoon.setOnClickListener { shortClick(it) } @@ -141,19 +141,19 @@ class TempTargetDialog : DialogFragmentWithDate() { R.id.eating_soon -> { binding.temptarget.value = defaultValueHelper.determineEatingSoonTT() binding.duration.value = defaultValueHelper.determineEatingSoonTTDuration().toDouble() - binding.reasonList.setText(rh.gs(info.nightscout.core.ui.R.string.eatingsoon), false) + binding.reasonList.setText(rh.gs(app.aaps.core.ui.R.string.eatingsoon), false) } R.id.activity -> { binding.temptarget.value = defaultValueHelper.determineActivityTT() binding.duration.value = defaultValueHelper.determineActivityTTDuration().toDouble() - binding.reasonList.setText(rh.gs(info.nightscout.core.ui.R.string.activity), false) + binding.reasonList.setText(rh.gs(app.aaps.core.ui.R.string.activity), false) } R.id.hypo -> { binding.temptarget.value = defaultValueHelper.determineHypoTT() binding.duration.value = defaultValueHelper.determineHypoTTDuration().toDouble() - binding.reasonList.setText(rh.gs(info.nightscout.core.ui.R.string.hypo), false) + binding.reasonList.setText(rh.gs(app.aaps.core.ui.R.string.hypo), false) } } } @@ -168,49 +168,49 @@ class TempTargetDialog : DialogFragmentWithDate() { if (_binding == null) return false val actions: LinkedList = LinkedList() var reason = binding.reasonList.text.toString() - val unitResId = if (profileFunction.getUnits() == GlucoseUnit.MGDL) info.nightscout.core.ui.R.string.mgdl else info.nightscout.core.ui.R.string.mmol + val unitResId = if (profileFunction.getUnits() == GlucoseUnit.MGDL) app.aaps.core.ui.R.string.mgdl else app.aaps.core.ui.R.string.mmol val target = binding.temptarget.value val duration = binding.duration.value.toInt() if (target != 0.0 && duration != 0) { - actions.add(rh.gs(info.nightscout.core.ui.R.string.reason) + ": " + reason) - actions.add(rh.gs(info.nightscout.core.ui.R.string.target_label) + ": " + profileUtil.stringInCurrentUnitsDetect(target) + " " + rh.gs(unitResId)) - actions.add(rh.gs(info.nightscout.core.ui.R.string.duration) + ": " + rh.gs(info.nightscout.core.ui.R.string.format_mins, duration)) + actions.add(rh.gs(app.aaps.core.ui.R.string.reason) + ": " + reason) + actions.add(rh.gs(app.aaps.core.ui.R.string.target_label) + ": " + profileUtil.stringInCurrentUnitsDetect(target) + " " + rh.gs(unitResId)) + actions.add(rh.gs(app.aaps.core.ui.R.string.duration) + ": " + rh.gs(app.aaps.core.ui.R.string.format_mins, duration)) } else { - actions.add(rh.gs(info.nightscout.core.ui.R.string.stoptemptarget)) - reason = rh.gs(info.nightscout.core.ui.R.string.stoptemptarget) + actions.add(rh.gs(app.aaps.core.ui.R.string.stoptemptarget)) + reason = rh.gs(app.aaps.core.ui.R.string.stoptemptarget) } if (eventTimeChanged) - actions.add(rh.gs(info.nightscout.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) + actions.add(rh.gs(app.aaps.core.ui.R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.temporary_target), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.temporary_target), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { val units = profileFunction.getUnits() when (reason) { - rh.gs(info.nightscout.core.ui.R.string.eatingsoon) -> uel.log( + rh.gs(app.aaps.core.ui.R.string.eatingsoon) -> uel.log( UserEntry.Action.TT, UserEntry.Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason( TemporaryTarget.Reason.EATING_SOON ), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration) ) - rh.gs(info.nightscout.core.ui.R.string.activity) -> uel.log( + rh.gs(app.aaps.core.ui.R.string.activity) -> uel.log( UserEntry.Action.TT, UserEntry.Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason( TemporaryTarget.Reason.ACTIVITY ), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration) ) - rh.gs(info.nightscout.core.ui.R.string.hypo) -> uel.log( + rh.gs(app.aaps.core.ui.R.string.hypo) -> uel.log( UserEntry.Action.TT, UserEntry.Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason( TemporaryTarget.Reason.HYPOGLYCEMIA ), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration) ) - rh.gs(info.nightscout.core.ui.R.string.manual) -> uel.log( + rh.gs(app.aaps.core.ui.R.string.manual) -> uel.log( UserEntry.Action.TT, UserEntry.Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason( TemporaryTarget.Reason.CUSTOM ), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration) ) - rh.gs(info.nightscout.core.ui.R.string.stoptemptarget) -> uel.log( + rh.gs(app.aaps.core.ui.R.string.stoptemptarget) -> uel.log( UserEntry.Action.CANCEL_TT, UserEntry.Sources.TTDialog, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }) @@ -228,9 +228,9 @@ class TempTargetDialog : DialogFragmentWithDate() { timestamp = eventTime, duration = TimeUnit.MINUTES.toMillis(duration.toLong()), reason = when (reason) { - rh.gs(info.nightscout.core.ui.R.string.eatingsoon) -> TemporaryTarget.Reason.EATING_SOON - rh.gs(info.nightscout.core.ui.R.string.activity) -> TemporaryTarget.Reason.ACTIVITY - rh.gs(info.nightscout.core.ui.R.string.hypo) -> TemporaryTarget.Reason.HYPOGLYCEMIA + rh.gs(app.aaps.core.ui.R.string.eatingsoon) -> TemporaryTarget.Reason.EATING_SOON + rh.gs(app.aaps.core.ui.R.string.activity) -> TemporaryTarget.Reason.ACTIVITY + rh.gs(app.aaps.core.ui.R.string.hypo) -> TemporaryTarget.Reason.HYPOGLYCEMIA else -> TemporaryTarget.Reason.CUSTOM }, lowTarget = profileUtil.convertToMgdl(target, profileFunction.getUnits()), diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt index 6744ffc9b3..692d4ca27d 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt @@ -25,8 +25,8 @@ import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.SafeParse import com.google.common.base.Joiner import dagger.android.HasAndroidInjector -import info.nightscout.core.ui.dialogs.OKDialog -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.dialogs.OKDialog +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.entities.UserEntry import info.nightscout.database.entities.ValueWithUnit @@ -143,32 +143,31 @@ class TreatmentDialog : DialogFragmentWithDate() { if (insulinAfterConstraints > 0) { actions.add( - rh.gs(info.nightscout.core.ui.R.string.bolus) + ": " + decimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump.pumpDescription.bolusStep) + rh.gs(app.aaps.core.ui.R.string.bolus) + ": " + decimalFormatter.toPumpSupportedBolus(insulinAfterConstraints, activePlugin.activePump.pumpDescription.bolusStep) .formatColor( context, rh, - info.nightscout.core.ui.R.attr.bolusColor + app.aaps.core.ui.R.attr.bolusColor ) ) if (recordOnlyChecked) - actions.add(rh.gs(info.nightscout.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) + actions.add(rh.gs(app.aaps.core.ui.R.string.bolus_recorded_only).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)) if (abs(insulinAfterConstraints - insulin) > pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) actions.add( - rh.gs(info.nightscout.core.ui.R.string.bolus_constraint_applied_warn, insulin, insulinAfterConstraints).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor) + rh.gs(app.aaps.core.ui.R.string.bolus_constraint_applied_warn, insulin, insulinAfterConstraints).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor) ) } if (carbsAfterConstraints > 0) { actions.add( - rh.gs(info.nightscout.core.ui.R.string.carbs) + ": " + rh.gs(app.aaps.core.main.R.string.format_carbs, carbsAfterConstraints).formatColor( - context, rh, info.nightscout - .core.ui.R.attr.carbsColor + rh.gs(app.aaps.core.ui.R.string.carbs) + ": " + rh.gs(app.aaps.core.main.R.string.format_carbs, carbsAfterConstraints).formatColor( + context, rh, app.aaps.core.ui.R.attr.carbsColor ) ) if (carbsAfterConstraints != carbs) - actions.add(rh.gs(R.string.carbs_constraint_applied).formatColor(context, rh, info.nightscout.core.ui.R.attr.warningColor)) + actions.add(rh.gs(R.string.carbs_constraint_applied).formatColor(context, rh, app.aaps.core.ui.R.attr.warningColor)) } if (insulinAfterConstraints > 0 || carbsAfterConstraints > 0) { activity?.let { activity -> - OKDialog.showConfirmation(activity, rh.gs(info.nightscout.core.ui.R.string.overview_treatment_label), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { + OKDialog.showConfirmation(activity, rh.gs(app.aaps.core.ui.R.string.overview_treatment_label), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { val action = when { insulinAfterConstraints.equals(0.0) -> UserEntry.Action.CARBS carbsAfterConstraints == 0 -> UserEntry.Action.BOLUS @@ -181,9 +180,9 @@ class TreatmentDialog : DialogFragmentWithDate() { detailedBolusInfo.carbs = carbsAfterConstraints.toDouble() detailedBolusInfo.context = context if (recordOnlyChecked) { - uel.log(action, UserEntry.Sources.TreatmentDialog, if (insulinAfterConstraints != 0.0) rh.gs(info.nightscout.core.ui.R.string.record) else "", + uel.log(action, UserEntry.Sources.TreatmentDialog, if (insulinAfterConstraints != 0.0) rh.gs(app.aaps.core.ui.R.string.record) else "", ValueWithUnit.Timestamp(detailedBolusInfo.timestamp).takeIf { eventTimeChanged }, - ValueWithUnit.SimpleString(rh.gsNotLocalised(info.nightscout.core.ui.R.string.record)).takeIf { insulinAfterConstraints != 0.0 }, + ValueWithUnit.SimpleString(rh.gsNotLocalised(app.aaps.core.ui.R.string.record)).takeIf { insulinAfterConstraints != 0.0 }, ValueWithUnit.Insulin(insulinAfterConstraints).takeIf { insulinAfterConstraints != 0.0 }, ValueWithUnit.Gram(carbsAfterConstraints).takeIf { carbsAfterConstraints != 0 }) if (detailedBolusInfo.insulin > 0) @@ -198,7 +197,7 @@ class TreatmentDialog : DialogFragmentWithDate() { commandQueue.bolus(detailedBolusInfo, object : Callback() { override fun run() { if (!result.success) { - uiInteraction.runAlarm(result.comment, rh.gs(info.nightscout.core.ui.R.string.treatmentdeliveryerror), info.nightscout.core.ui.R.raw.boluserror) + uiInteraction.runAlarm(result.comment, rh.gs(app.aaps.core.ui.R.string.treatmentdeliveryerror), app.aaps.core.ui.R.raw.boluserror) } } }) @@ -213,7 +212,7 @@ class TreatmentDialog : DialogFragmentWithDate() { } } else activity?.let { activity -> - OKDialog.show(activity, rh.gs(info.nightscout.core.ui.R.string.overview_treatment_label), rh.gs(info.nightscout.core.ui.R.string.no_action_selected)) + OKDialog.show(activity, rh.gs(app.aaps.core.ui.R.string.overview_treatment_label), rh.gs(app.aaps.core.ui.R.string.no_action_selected)) } return true } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt index 46b776b415..574af384f7 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/WizardDialog.kt @@ -48,7 +48,7 @@ import app.aaps.core.interfaces.utils.SafeParse import app.aaps.core.interfaces.utils.T import dagger.android.HasAndroidInjector import dagger.android.support.DaggerDialogFragment -import info.nightscout.core.ui.toast.ToastUtils +import app.aaps.core.ui.toast.ToastUtils import info.nightscout.core.utils.HtmlHelper import info.nightscout.database.ValueWrapper import info.nightscout.database.impl.AppRepository @@ -204,7 +204,7 @@ class WizardDialog : DaggerDialogFragment() { binding.okcancel.ok, textWatcher ) - binding.correctionUnit.text = rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + binding.correctionUnit.text = rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) } binding.carbTimeInput.setParams( savedInstanceState?.getDouble("carb_time_input") @@ -212,7 +212,7 @@ class WizardDialog : DaggerDialogFragment() { ) handler.post { initDialog() } calculatedPercentage = sp.getInt(info.nightscout.core.utils.R.string.key_boluswizard_percentage, 100).toDouble() - binding.percentUsed.text = rh.gs(info.nightscout.core.ui.R.string.format_percent, sp.getInt(info.nightscout.core.utils.R.string.key_boluswizard_percentage, 100)) + binding.percentUsed.text = rh.gs(app.aaps.core.ui.R.string.format_percent, sp.getInt(info.nightscout.core.utils.R.string.key_boluswizard_percentage, 100)) binding.percentUsed.visibility = (sp.getInt(info.nightscout.core.utils.R.string.key_boluswizard_percentage, 100) != 100 || usePercentage).toVisibility() // ok button binding.okcancel.ok.setOnClickListener { @@ -264,7 +264,7 @@ class WizardDialog : DaggerDialogFragment() { binding.correctionPercent.setOnCheckedChangeListener { _, isChecked -> run { sp.putBoolean(rh.gs(R.string.key_wizard_correction_percent), isChecked) - binding.correctionUnit.text = if (isChecked) "%" else rh.gs(info.nightscout.core.ui.R.string.insulin_unit_shortname) + binding.correctionUnit.text = if (isChecked) "%" else rh.gs(app.aaps.core.ui.R.string.insulin_unit_shortname) usePercentage = binding.correctionPercent.isChecked if (usePercentage) { binding.correctionInput.setParams(calculatedPercentage, 10.0, 200.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher) @@ -373,7 +373,7 @@ class WizardDialog : DaggerDialogFragment() { val tempTarget = repository.getTemporaryTargetActiveAt(dateUtil.now()).blockingGet() if (profile == null || profileStore == null) { - ToastUtils.errorToast(ctx, info.nightscout.core.ui.R.string.noprofile) + ToastUtils.errorToast(ctx, app.aaps.core.ui.R.string.noprofile) dismiss() return } @@ -392,9 +392,9 @@ class WizardDialog : DaggerDialogFragment() { } val profileList: ArrayList = profileStore.getProfileList() - profileList.add(0, rh.gs(info.nightscout.core.ui.R.string.active)) + profileList.add(0, rh.gs(app.aaps.core.ui.R.string.active)) context?.let { context -> - binding.profileList.setAdapter(ArrayAdapter(context, info.nightscout.core.ui.R.layout.spinner_centered, profileList)) + binding.profileList.setAdapter(ArrayAdapter(context, app.aaps.core.ui.R.layout.spinner_centered, profileList)) binding.profileList.setText(profileList[0], false) } @@ -407,7 +407,7 @@ class WizardDialog : DaggerDialogFragment() { binding.ttCheckbox.isEnabled = tempTarget is ValueWrapper.Existing binding.ttCheckboxIcon.visibility = binding.ttCheckbox.isEnabled.toVisibility() - binding.iobInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, -bolusIob.iob - basalIob.basaliob) + binding.iobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, -bolusIob.iob - basalIob.basaliob) calculateInsulin() } @@ -418,7 +418,7 @@ class WizardDialog : DaggerDialogFragment() { val profileStore = activePlugin.activeProfileSource.profile ?: return // not initialized yet var profileName = binding.profileList.text.toString() val specificProfile: Profile? - if (profileName == rh.gs(info.nightscout.core.ui.R.string.active)) { + if (profileName == rh.gs(app.aaps.core.ui.R.string.active)) { specificProfile = profileFunction.getProfile() profileName = profileFunction.getProfileName() } else @@ -482,18 +482,18 @@ class WizardDialog : DaggerDialogFragment() { wizard?.let { wizard -> binding.bg.text = rh.gs(R.string.format_bg_isf, valueToUnitsToString(profileUtil.convertToMgdl(bg, profileFunction.getUnits()), profileFunction.getUnits().asText), wizard.sens) - binding.bgInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.insulinFromBG) + binding.bgInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.insulinFromBG) binding.carbs.text = rh.gs(R.string.format_carbs_ic, carbs.toDouble(), wizard.ic) - binding.carbsInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.insulinFromCarbs) + binding.carbsInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.insulinFromCarbs) - binding.iobInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.insulinFromBolusIOB + wizard.insulinFromBasalIOB) + binding.iobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.insulinFromBolusIOB + wizard.insulinFromBasalIOB) - binding.correctionInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.insulinFromCorrection) + binding.correctionInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.insulinFromCorrection) // Superbolus binding.sb.text = if (binding.sbCheckbox.isChecked) rh.gs(R.string.two_hours) else "" - binding.sbInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.insulinFromSuperBolus) + binding.sbInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.insulinFromSuperBolus) // Trend if (binding.bgTrendCheckbox.isChecked && wizard.glucoseStatus != null) { @@ -503,12 +503,12 @@ class WizardDialog : DaggerDialogFragment() { } else { binding.bgTrend.text = "" } - binding.bgTrendInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.insulinFromTrend) + binding.bgTrendInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.insulinFromTrend) // COB if (binding.cobCheckbox.isChecked) { binding.cob.text = rh.gs(R.string.format_cob_ic, cob, wizard.ic) - binding.cobInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.insulinFromCOB) + binding.cobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.insulinFromCOB) } else { binding.cob.text = "" binding.cobInsulin.text = "" @@ -516,19 +516,19 @@ class WizardDialog : DaggerDialogFragment() { if (wizard.calculatedTotalInsulin > 0.0 || carbsAfterConstraint > 0.0) { val insulinText = - if (wizard.calculatedTotalInsulin > 0.0) rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, wizard.calculatedTotalInsulin) - .formatColor(context, rh, info.nightscout.core.ui.R.attr.bolusColor) else "" + if (wizard.calculatedTotalInsulin > 0.0) rh.gs(app.aaps.core.ui.R.string.format_insulin_units, wizard.calculatedTotalInsulin) + .formatColor(context, rh, app.aaps.core.ui.R.attr.bolusColor) else "" val carbsText = if (carbsAfterConstraint > 0.0) rh.gs(app.aaps.core.main.R.string.format_carbs, carbsAfterConstraint).formatColor( - context, rh, info.nightscout.core.ui.R.attr + context, rh, app.aaps.core.ui.R.attr .carbsColor ) else "" binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.result_insulin_carbs, insulinText, carbsText)) binding.okcancel.ok.visibility = View.VISIBLE } else { - binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt()).formatColor(context, rh, info.nightscout.core.ui.R.attr.carbsColor)) + binding.total.text = HtmlHelper.fromHtml(rh.gs(R.string.missing_carbs, wizard.carbsEquivalent.toInt()).formatColor(context, rh, app.aaps.core.ui.R.attr.carbsColor)) binding.okcancel.ok.visibility = View.INVISIBLE } - binding.percentUsed.text = rh.gs(info.nightscout.core.ui.R.string.format_percent, wizard.percentageCorrection) + binding.percentUsed.text = rh.gs(app.aaps.core.ui.R.string.format_percent, wizard.percentageCorrection) calculatedPercentage = wizard.calculatedPercentage calculatedCorrection = wizard.calculatedCorrection } diff --git a/ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt b/ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt index 3b67bfc09b..ba886aaf69 100644 --- a/ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt +++ b/ui/src/main/java/info/nightscout/ui/dialogs/WizardInfoDialog.kt @@ -60,39 +60,39 @@ class WizardInfoDialog : DaggerDialogFragment() { val trend = profileUtil.fromMgdlToStringInUnits(data.glucoseTrend * 3) // BG binding.bg.text = rh.gs(R.string.format_bg_isf, bgString, isf) - binding.bgInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, data.glucoseInsulin) + binding.bgInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.glucoseInsulin) binding.bgCheckbox.isChecked = data.wasGlucoseUsed binding.ttCheckbox.isChecked = data.wasTempTargetUsed // Trend binding.bgTrend.text = trend - binding.bgTrendInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, data.trendInsulin) + binding.bgTrendInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.trendInsulin) binding.bgTrendCheckbox.isChecked = data.wasTrendUsed // COB binding.cob.text = rh.gs(R.string.format_cob_ic, data.cob, data.ic) - binding.cobInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, data.cobInsulin) + binding.cobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.cobInsulin) binding.cobCheckbox.isChecked = data.wasCOBUsed // Bolus IOB - binding.bolusIobInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, data.bolusIOB) + binding.bolusIobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.bolusIOB) binding.bolusIobCheckbox.isChecked = data.wasBolusIOBUsed // Basal IOB - binding.basalIobInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, data.basalIOB) + binding.basalIobInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.basalIOB) binding.basalIobCheckbox.isChecked = data.wasBasalIOBUsed // Superbolus - binding.sbInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, data.superbolusInsulin) + binding.sbInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.superbolusInsulin) binding.sbCheckbox.isChecked = data.wasSuperbolusUsed // Carbs binding.carbs.text = rh.gs(R.string.format_carbs_ic, data.carbs, data.ic) - binding.carbsInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, data.carbsInsulin) + binding.carbsInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.carbsInsulin) // Correction - binding.correctionInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, data.otherCorrection) + binding.correctionInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.otherCorrection) // Profile binding.profile.text = data.profileName // Notes binding.notes.text = data.note // Percentage - binding.percentUsed.text = rh.gs(info.nightscout.core.ui.R.string.format_percent, data.percentageCorrection) + binding.percentUsed.text = rh.gs(app.aaps.core.ui.R.string.format_percent, data.percentageCorrection) // Total - binding.totalInsulin.text = rh.gs(info.nightscout.core.ui.R.string.format_insulin_units, data.totalInsulin) + binding.totalInsulin.text = rh.gs(app.aaps.core.ui.R.string.format_insulin_units, data.totalInsulin) } override fun onStart() { diff --git a/ui/src/main/java/info/nightscout/ui/services/AlarmSoundService.kt b/ui/src/main/java/info/nightscout/ui/services/AlarmSoundService.kt index 9e1d61651a..179e2bd0fd 100644 --- a/ui/src/main/java/info/nightscout/ui/services/AlarmSoundService.kt +++ b/ui/src/main/java/info/nightscout/ui/services/AlarmSoundService.kt @@ -26,7 +26,7 @@ class AlarmSoundService : DaggerService() { @Inject lateinit var sp: SP private var player: MediaPlayer? = null - private var resourceId = info.nightscout.core.ui.R.raw.error + private var resourceId = app.aaps.core.ui.R.raw.error companion object { @@ -73,7 +73,7 @@ class AlarmSoundService : DaggerService() { player?.let { if (it.isPlaying) it.stop() } - if (intent?.hasExtra(SOUND_ID) == true) resourceId = intent.getIntExtra(SOUND_ID, info.nightscout.core.ui.R.raw.error) + if (intent?.hasExtra(SOUND_ID) == true) resourceId = intent.getIntExtra(SOUND_ID, app.aaps.core.ui.R.raw.error) player = MediaPlayer() try { val afd = rh.openRawResourceFd(resourceId) ?: return START_NOT_STICKY diff --git a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt b/ui/src/main/java/info/nightscout/ui/widget/Widget.kt index b17fda4180..c709796c57 100644 --- a/ui/src/main/java/info/nightscout/ui/widget/Widget.kt +++ b/ui/src/main/java/info/nightscout/ui/widget/Widget.kt @@ -132,12 +132,12 @@ class Widget : AppWidgetProvider() { private fun updateBg(views: RemoteViews) { views.setTextViewText( R.id.bg, - overviewData.lastBg(iobCobCalculator.ads)?.let { profileUtil.fromMgdlToStringInUnits(it.value) } ?: rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short)) + overviewData.lastBg(iobCobCalculator.ads)?.let { profileUtil.fromMgdlToStringInUnits(it.value) } ?: rh.gs(app.aaps.core.ui.R.string.value_unavailable_short)) views.setTextColor( R.id.bg, when { - overviewData.isLow(iobCobCalculator.ads) -> rh.gc(info.nightscout.core.ui.R.color.widget_low) - overviewData.isHigh(iobCobCalculator.ads) -> rh.gc(info.nightscout.core.ui.R.color.widget_high) - else -> rh.gc(info.nightscout.core.ui.R.color.widget_inrange) + overviewData.isLow(iobCobCalculator.ads) -> rh.gc(app.aaps.core.ui.R.color.widget_low) + overviewData.isHigh(iobCobCalculator.ads) -> rh.gc(app.aaps.core.ui.R.color.widget_high) + else -> rh.gc(app.aaps.core.ui.R.color.widget_inrange) } ) trendCalculator.getTrendArrow(iobCobCalculator.ads)?.let { @@ -146,9 +146,9 @@ class Widget : AppWidgetProvider() { views.setViewVisibility(R.id.arrow, (trendCalculator.getTrendArrow(iobCobCalculator.ads) != null).toVisibilityKeepSpace()) views.setInt( R.id.arrow, "setColorFilter", when { - overviewData.isLow(iobCobCalculator.ads) -> rh.gc(info.nightscout.core.ui.R.color.widget_low) - overviewData.isHigh(iobCobCalculator.ads) -> rh.gc(info.nightscout.core.ui.R.color.widget_high) - else -> rh.gc(info.nightscout.core.ui.R.color.widget_inrange) + overviewData.isLow(iobCobCalculator.ads) -> rh.gc(app.aaps.core.ui.R.color.widget_low) + overviewData.isHigh(iobCobCalculator.ads) -> rh.gc(app.aaps.core.ui.R.color.widget_high) + else -> rh.gc(app.aaps.core.ui.R.color.widget_inrange) } ) @@ -158,9 +158,9 @@ class Widget : AppWidgetProvider() { views.setTextViewText(R.id.avg_delta, profileUtil.fromMgdlToSignedStringInUnits(glucoseStatus.shortAvgDelta)) views.setTextViewText(R.id.long_avg_delta, profileUtil.fromMgdlToSignedStringInUnits(glucoseStatus.longAvgDelta)) } else { - views.setTextViewText(R.id.delta, rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short)) - views.setTextViewText(R.id.avg_delta, rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short)) - views.setTextViewText(R.id.long_avg_delta, rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short)) + views.setTextViewText(R.id.delta, rh.gs(app.aaps.core.ui.R.string.value_unavailable_short)) + views.setTextViewText(R.id.avg_delta, rh.gs(app.aaps.core.ui.R.string.value_unavailable_short)) + views.setTextViewText(R.id.long_avg_delta, rh.gs(app.aaps.core.ui.R.string.value_unavailable_short)) } // strike through if BG is old @@ -173,8 +173,8 @@ class Widget : AppWidgetProvider() { private fun updateTemporaryBasal(views: RemoteViews) { views.setTextViewText(R.id.base_basal, overviewData.temporaryBasalText(iobCobCalculator)) - views.setTextColor(R.id.base_basal, iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())?.let { rh.gc(info.nightscout.core.ui.R.color.widget_basal) } - ?: rh.gc(info.nightscout.core.ui.R.color.white)) + views.setTextColor(R.id.base_basal, iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())?.let { rh.gc(app.aaps.core.ui.R.color.widget_basal) } + ?: rh.gc(app.aaps.core.ui.R.color.white)) views.setImageViewResource(R.id.base_basal_icon, overviewData.temporaryBasalIcon(iobCobCalculator)) } @@ -187,7 +187,7 @@ class Widget : AppWidgetProvider() { private fun updateIobCob(views: RemoteViews) { views.setTextViewText(R.id.iob, overviewData.iobText(iobCobCalculator)) // cob - var cobText = overviewData.cobInfo(iobCobCalculator).displayText(rh, decimalFormatter) ?: rh.gs(info.nightscout.core.ui.R.string.value_unavailable_short) + var cobText = overviewData.cobInfo(iobCobCalculator).displayText(rh, decimalFormatter) ?: rh.gs(app.aaps.core.ui.R.string.value_unavailable_short) val constraintsProcessed = loop.lastRun?.constraintsProcessed val lastRun = loop.lastRun @@ -195,7 +195,7 @@ class Widget : AppWidgetProvider() { if (constraintsProcessed.carbsReq > 0) { //only display carbsreq when carbs have not been entered recently if (overviewData.lastCarbsTime < lastRun.lastAPSRun) { - cobText += " | " + constraintsProcessed.carbsReq + " " + rh.gs(info.nightscout.core.ui.R.string.required) + cobText += " | " + constraintsProcessed.carbsReq + " " + rh.gs(app.aaps.core.ui.R.string.required) } } } @@ -209,7 +209,7 @@ class Widget : AppWidgetProvider() { // this is crashing, use background as text for now //views.setTextColor(R.id.temp_target, rh.gc(R.color.ribbonTextWarning)) //views.setInt(R.id.temp_target, "setBackgroundColor", rh.gc(R.color.ribbonWarning)) - views.setTextColor(R.id.temp_target, rh.gc(info.nightscout.core.ui.R.color.widget_ribbonWarning)) + views.setTextColor(R.id.temp_target, rh.gc(app.aaps.core.ui.R.color.widget_ribbonWarning)) views.setTextViewText( R.id.temp_target, profileUtil.toTargetRangeString(tempTarget.lowTarget, tempTarget.highTarget, GlucoseUnit.MGDL, units) + " " + dateUtil.untilString(tempTarget.end, rh) @@ -225,12 +225,12 @@ class Widget : AppWidgetProvider() { // this is crashing, use background as text for now //views.setTextColor(R.id.temp_target, rh.gc(R.color.ribbonTextWarning)) //views.setInt(R.id.temp_target, "setBackgroundResource", rh.gc(R.color.tempTargetBackground)) - views.setTextColor(R.id.temp_target, rh.gc(info.nightscout.core.ui.R.color.widget_ribbonWarning)) + views.setTextColor(R.id.temp_target, rh.gc(app.aaps.core.ui.R.color.widget_ribbonWarning)) } else { // this is crashing, use background as text for now //views.setTextColor(R.id.temp_target, rh.gc(R.color.ribbonTextDefault)) //views.setInt(R.id.temp_target, "setBackgroundColor", rh.gc(R.color.ribbonDefault)) - views.setTextColor(R.id.temp_target, rh.gc(info.nightscout.core.ui.R.color.widget_ribbonTextDefault)) + views.setTextColor(R.id.temp_target, rh.gc(app.aaps.core.ui.R.color.widget_ribbonTextDefault)) views.setTextViewText(R.id.temp_target, profileUtil.toTargetRangeString(profile.getTargetLowMgdl(), profile.getTargetHighMgdl(), GlucoseUnit.MGDL, units)) } } @@ -242,14 +242,14 @@ class Widget : AppWidgetProvider() { profileFunction.getProfile()?.let { if (it is ProfileSealed.EPS) { if (it.value.originalPercentage != 100 || it.value.originalTimeshift != 0L || it.value.originalDuration != 0L) - rh.gc(info.nightscout.core.ui.R.color.widget_ribbonWarning) - else rh.gc(info.nightscout.core.ui.R.color.widget_ribbonTextDefault) + rh.gc(app.aaps.core.ui.R.color.widget_ribbonWarning) + else rh.gc(app.aaps.core.ui.R.color.widget_ribbonTextDefault) } else if (it is ProfileSealed.PS) { - rh.gc(info.nightscout.core.ui.R.color.widget_ribbonTextDefault) + rh.gc(app.aaps.core.ui.R.color.widget_ribbonTextDefault) } else { - rh.gc(info.nightscout.core.ui.R.color.widget_ribbonTextDefault) + rh.gc(app.aaps.core.ui.R.color.widget_ribbonTextDefault) } - } ?: rh.gc(info.nightscout.core.ui.R.color.widget_ribbonCritical) + } ?: rh.gc(app.aaps.core.ui.R.color.widget_ribbonCritical) views.setTextViewText(R.id.active_profile, profileFunction.getProfileNameWithRemainingTime()) // this is crashing, use background as text for now diff --git a/ui/src/main/res/layout/activity_profilehelper.xml b/ui/src/main/res/layout/activity_profilehelper.xml index 8c90375b24..b901895a53 100644 --- a/ui/src/main/res/layout/activity_profilehelper.xml +++ b/ui/src/main/res/layout/activity_profilehelper.xml @@ -71,7 +71,7 @@ android:text="@string/age" android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - baseBasalArray[i] }).also { it.isDrawBackground = true - it.backgroundColor = rh.gac(ctx, info.nightscout.core.ui.R.attr.baseBasalColor) + it.backgroundColor = rh.gac(ctx, app.aaps.core.ui.R.attr.baseBasalColor) it.thickness = 0 } data.overviewData.tempBasalGraphSeries = LineGraphSeries(Array(tempBasalArray.size) { i -> tempBasalArray[i] }).also { it.isDrawBackground = true - it.backgroundColor = rh.gac(ctx, info.nightscout.core.ui.R.attr.tempBasalColor) + it.backgroundColor = rh.gac(ctx, app.aaps.core.ui.R.attr.tempBasalColor) it.thickness = 0 } data.overviewData.basalLineGraphSeries = LineGraphSeries(Array(basalLineArray.size) { i -> basalLineArray[i] }).also { @@ -130,7 +130,7 @@ class PrepareBasalDataWorker( @Suppress("DEPRECATION") paint.strokeWidth = rh.getDisplayMetrics().scaledDensity * 2 paint.pathEffect = DashPathEffect(floatArrayOf(2f, 4f), 0f) - paint.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.basal) + paint.color = rh.gac(ctx, app.aaps.core.ui.R.attr.basal) }) } data.overviewData.absoluteBasalGraphSeries = LineGraphSeries(Array(absoluteBasalLineArray.size) { i -> absoluteBasalLineArray[i] }).also { @@ -138,7 +138,7 @@ class PrepareBasalDataWorker( absolutePaint.style = Paint.Style.STROKE @Suppress("DEPRECATION") absolutePaint.strokeWidth = rh.getDisplayMetrics().scaledDensity * 2 - absolutePaint.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.basal) + absolutePaint.color = rh.gac(ctx, app.aaps.core.ui.R.attr.basal) }) } rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_BASAL_DATA, 100, null)) diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt index 60bd221fbb..7be8954d4b 100644 --- a/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/PrepareIobAutosensGraphDataWorker.kt @@ -112,7 +112,7 @@ class PrepareIobAutosensGraphDataWorker( override val size = 0.5f override val paintStyle: Paint.Style = Paint.Style.FILL override fun color(context: Context?): Int { - return rh.gac(context, info.nightscout.core.ui.R.attr.cobColor) + return rh.gac(context, app.aaps.core.ui.R.attr.cobColor) } } @@ -214,15 +214,15 @@ class PrepareIobAutosensGraphDataWorker( // DEVIATIONS if (autosensData != null) { - var color = rh.gac(ctx, info.nightscout.core.ui.R.attr.deviationBlackColor) // "=" + var color = rh.gac(ctx, app.aaps.core.ui.R.attr.deviationBlackColor) // "=" if (autosensData.type == "" || autosensData.type == "non-meal") { - if (autosensData.pastSensitivity == "C") color = rh.gac(ctx, info.nightscout.core.ui.R.attr.deviationGreyColor) - if (autosensData.pastSensitivity == "+") color = rh.gac(ctx, info.nightscout.core.ui.R.attr.deviationGreenColor) - if (autosensData.pastSensitivity == "-") color = rh.gac(ctx, info.nightscout.core.ui.R.attr.deviationRedColor) + if (autosensData.pastSensitivity == "C") color = rh.gac(ctx, app.aaps.core.ui.R.attr.deviationGreyColor) + if (autosensData.pastSensitivity == "+") color = rh.gac(ctx, app.aaps.core.ui.R.attr.deviationGreenColor) + if (autosensData.pastSensitivity == "-") color = rh.gac(ctx, app.aaps.core.ui.R.attr.deviationRedColor) } else if (autosensData.type == "uam") { - color = rh.gac(ctx, info.nightscout.core.ui.R.attr.uamColor) + color = rh.gac(ctx, app.aaps.core.ui.R.attr.uamColor) } else if (autosensData.type == "csf") { - color = rh.gac(ctx, info.nightscout.core.ui.R.attr.deviationGreyColor) + color = rh.gac(ctx, app.aaps.core.ui.R.attr.deviationGreyColor) } devArray.add(DeviationDataPoint(time.toDouble(), autosensData.deviation, color, data.overviewData.devScale)) data.overviewData.maxDevValueFound = maxOf(data.overviewData.maxDevValueFound, abs(autosensData.deviation), abs(bgi)) @@ -248,14 +248,14 @@ class PrepareIobAutosensGraphDataWorker( // IOB data.overviewData.iobSeries = FixedLineGraphSeries(Array(iobArray.size) { i -> iobArray[i] }).also { it.isDrawBackground = true - it.backgroundColor = -0x7f000001 and rh.gac(ctx, info.nightscout.core.ui.R.attr.iobColor) //50% - it.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.iobColor) + it.backgroundColor = -0x7f000001 and rh.gac(ctx, app.aaps.core.ui.R.attr.iobColor) //50% + it.color = rh.gac(ctx, app.aaps.core.ui.R.attr.iobColor) it.thickness = 3 } data.overviewData.absIobSeries = FixedLineGraphSeries(Array(absIobArray.size) { i -> absIobArray[i] }).also { it.isDrawBackground = true - it.backgroundColor = -0x7f000001 and rh.gac(ctx, info.nightscout.core.ui.R.attr.iobColor) //50% - it.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.iobColor) + it.backgroundColor = -0x7f000001 and rh.gac(ctx, app.aaps.core.ui.R.attr.iobColor) //50% + it.color = rh.gac(ctx, app.aaps.core.ui.R.attr.iobColor) it.thickness = 3 } @@ -266,7 +266,7 @@ class PrepareIobAutosensGraphDataWorker( val iobPrediction: MutableList = ArrayList() val iobPredictionArray = data.iobCobCalculator.calculateIobArrayForSMB(lastAutosensResult, SMBDefaults.exercise_mode, SMBDefaults.half_basal_exercise_target, isTempTarget) for (i in iobPredictionArray) { - iobPrediction.add(IobTotalDataPoint(i).setColor(rh.gac(ctx, info.nightscout.core.ui.R.attr.iobPredASColor))) + iobPrediction.add(IobTotalDataPoint(i).setColor(rh.gac(ctx, app.aaps.core.ui.R.attr.iobPredASColor))) data.overviewData.maxIobValueFound = max(data.overviewData.maxIobValueFound, abs(i.iob)) } data.overviewData.iobPredictions1Series = PointsWithLabelGraphSeries(Array(iobPrediction.size) { i -> iobPrediction[i] }) @@ -278,8 +278,8 @@ class PrepareIobAutosensGraphDataWorker( // COB data.overviewData.cobSeries = FixedLineGraphSeries(Array(cobArray.size) { i -> cobArray[i] }).also { it.isDrawBackground = true - it.backgroundColor = -0x7f000001 and rh.gac(ctx, info.nightscout.core.ui.R.attr.cobColor) //50% - it.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.cobColor) + it.backgroundColor = -0x7f000001 and rh.gac(ctx, app.aaps.core.ui.R.attr.cobColor) //50% + it.color = rh.gac(ctx, app.aaps.core.ui.R.attr.cobColor) it.thickness = 3 } data.overviewData.cobMinFailOverSeries = PointsWithLabelGraphSeries(Array(minFailOverActiveList.size) { i -> minFailOverActiveList[i] }) @@ -287,7 +287,7 @@ class PrepareIobAutosensGraphDataWorker( // ACTIVITY data.overviewData.activitySeries = FixedLineGraphSeries(Array(actArrayHist.size) { i -> actArrayHist[i] }).also { it.isDrawBackground = false - it.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.activityColor) + it.color = rh.gac(ctx, app.aaps.core.ui.R.attr.activityColor) it.thickness = 3 } data.overviewData.activityPredictionSeries = FixedLineGraphSeries(Array(actArrayPrediction.size) { i -> actArrayPrediction[i] }).also { @@ -295,14 +295,14 @@ class PrepareIobAutosensGraphDataWorker( paint.style = Paint.Style.STROKE paint.strokeWidth = 3f paint.pathEffect = DashPathEffect(floatArrayOf(4f, 4f), 0f) - paint.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.activityColor) + paint.color = rh.gac(ctx, app.aaps.core.ui.R.attr.activityColor) }) } // BGI data.overviewData.minusBgiSeries = FixedLineGraphSeries(Array(bgiArrayHist.size) { i -> bgiArrayHist[i] }).also { it.isDrawBackground = false - it.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.bgiColor) + it.color = rh.gac(ctx, app.aaps.core.ui.R.attr.bgiColor) it.thickness = 3 } data.overviewData.minusBgiHistSeries = FixedLineGraphSeries(Array(bgiArrayPrediction.size) { i -> bgiArrayPrediction[i] }).also { @@ -310,7 +310,7 @@ class PrepareIobAutosensGraphDataWorker( paint.style = Paint.Style.STROKE paint.strokeWidth = 3f paint.pathEffect = DashPathEffect(floatArrayOf(4f, 4f), 0f) - paint.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.bgiColor) + paint.color = rh.gac(ctx, app.aaps.core.ui.R.attr.bgiColor) }) } @@ -321,17 +321,17 @@ class PrepareIobAutosensGraphDataWorker( // RATIO data.overviewData.ratioSeries = LineGraphSeries(Array(ratioArray.size) { i -> ratioArray[i] }).also { - it.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.ratioColor) + it.color = rh.gac(ctx, app.aaps.core.ui.R.attr.ratioColor) it.thickness = 3 } // DEV SLOPE data.overviewData.dsMaxSeries = LineGraphSeries(Array(dsMaxArray.size) { i -> dsMaxArray[i] }).also { - it.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.devSlopePosColor) + it.color = rh.gac(ctx, app.aaps.core.ui.R.attr.devSlopePosColor) it.thickness = 3 } data.overviewData.dsMinSeries = LineGraphSeries(Array(dsMinArray.size) { i -> dsMinArray[i] }).also { - it.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.devSlopeNegColor) + it.color = rh.gac(ctx, app.aaps.core.ui.R.attr.devSlopeNegColor) it.thickness = 3 } rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_IOB_AUTOSENS_DATA, 100, null)) diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt index 6a3bbc353e..a68f2c957e 100644 --- a/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/PrepareTemporaryTargetDataWorker.kt @@ -79,7 +79,7 @@ class PrepareTemporaryTargetDataWorker( // create series data.overviewData.temporaryTargetSeries = LineGraphSeries(Array(targetsSeriesArray.size) { i -> targetsSeriesArray[i] }).also { it.isDrawBackground = false - it.color = rh.gac(ctx, info.nightscout.core.ui.R.attr.tempTargetBackgroundColor) + it.color = rh.gac(ctx, app.aaps.core.ui.R.attr.tempTargetBackgroundColor) it.thickness = 2 } rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_TEMPORARY_TARGET_DATA, 100, null)) diff --git a/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt b/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt index 07423fea35..bef591c481 100644 --- a/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt +++ b/workflow/src/main/java/info/nightscout/workflow/PrepareTreatmentsDataWorker.kt @@ -134,7 +134,7 @@ class PrepareTreatmentsDataWorker( data.overviewData.heartRateGraphSeries = PointsWithLabelGraphSeries( repository.getHeartRatesFromTimeToTime(fromTime, endTime) .map { hr -> HeartRateDataPoint(hr, rh) } - .toTypedArray()).apply { color = rh.gac(null, info.nightscout.core.ui.R.attr.heartRateColor) } + .toTypedArray()).apply { color = rh.gac(null, app.aaps.core.ui.R.attr.heartRateColor) } rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_TREATMENTS_DATA, 100, null)) return Result.success()