UserEntryLogger interface

app/src/main/java/info/nightscout/androidaps/MainActivity.kt

@@ -34,7 +34,7 @@ import info.nightscout.androidaps.activities.HistoryBrowseActivity
 import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.activities.SingleFragmentActivity
 import info.nightscout.androidaps.databinding.ActivityMainBinding
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.configuration.setupwizard.SetupWizardActivity
 import info.nightscout.core.activities.NoSplashAppCompatActivity
 import info.nightscout.core.ui.UIRunnable

app/src/main/java/info/nightscout/androidaps/MainApp.kt

@@ -16,7 +16,7 @@ import androidx.work.WorkManager
 import dagger.android.AndroidInjector
 import dagger.android.DaggerApplication
 import info.nightscout.androidaps.di.DaggerAppComponent
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.PluginStore
 import info.nightscout.androidaps.receivers.BTReceiver
 import info.nightscout.androidaps.receivers.ChargingStateReceiver

app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPlugin.kt

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.configBuilder
 import androidx.fragment.app.FragmentActivity
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/ImportExportPrefsImpl.kt

@@ -24,7 +24,7 @@ import info.nightscout.androidaps.BuildConfig
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.activities.PreferencesActivity
 import info.nightscout.androidaps.diaconn.events.EventDiaconnG8PumpLogReset
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.maintenance.formats.EncryptedPrefsFormat
 import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
 import info.nightscout.core.activities.DaggerAppCompatActivityWithResult

app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt

@@ -13,7 +13,7 @@ import info.nightscout.androidaps.dana.database.DanaHistoryDatabase
 import info.nightscout.androidaps.databinding.MaintenanceFragmentBinding
 import info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase
 import info.nightscout.androidaps.insight.database.InsightDatabase
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.maintenance.activities.LogSettingActivity
 import info.nightscout.androidaps.plugins.pump.omnipod.dash.history.database.DashHistoryDatabase
 import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.ErosHistoryDatabase

app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt

@@ -30,7 +30,7 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.extensions.directionToIcon
 import info.nightscout.androidaps.extensions.valueToUnitsString
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.general.overview.activities.QuickWizardListActivity
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewCalcProgress
 import info.nightscout.androidaps.plugins.general.overview.events.EventUpdateOverviewGraph

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt

@@ -8,7 +8,7 @@ import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.extensions.valueToUnits
 import info.nightscout.androidaps.extensions.valueToUnitsString
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.services.AlarmSoundServiceHelper
 import info.nightscout.core.graph.data.GlucoseValueDataPoint

app/src/test/java/info/nightscout/androidaps/plugins/aps/loop/LoopPluginTest.kt

@@ -6,7 +6,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.utils.receivers.ReceiverStatusStore
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.impl.AppRepository
@@ -49,7 +49,7 @@ class LoopPluginTest : TestBase() {
     @Mock lateinit var receiverStatusStore: ReceiverStatusStore
     @Mock lateinit var notificationManager: NotificationManager
     @Mock lateinit var repository: AppRepository
-    @Mock lateinit var uel:UserEntryLogger
+    @Mock lateinit var uel: UserEntryLogger
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var runningConfiguration: RunningConfiguration
     @Mock lateinit var config: Config

app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt

@@ -3,7 +3,7 @@ package info.nightscout.androidaps.plugins.configBuilder
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.rx.bus.RxBus

core/core-main/src/main/java/info/nightscout/core/wizard/BolusWizard.kt

@@ -6,7 +6,7 @@ import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.extensions.highValueToUnitsToString
 import info.nightscout.androidaps.extensions.lowValueToUnitsToString
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.iob.round
 import info.nightscout.core.main.R

core/core-main/src/main/res/values/strings.xml

@@ -2,16 +2,12 @@
 <resources>
     <!--    General-->
     <string name="refresh">Refresh</string>
-    <string name="error">Error</string>
     <string name="save">Save</string>
     <string name="not_set_short">Not set</string>
     <string name="failedupdatebasalprofile">Failed to update basal profile</string>
-    <string name="profile_set_ok">Basal profile in pump updated</string>
-    <string name="invalidinput">Invalid input data</string>
     <string name="tempbasaldeliveryerror">Tempbasal delivery error</string>
     <string name="goingtodeliver">Going to deliver %1$.2f U</string>
     <string name="waitingforpump">Waiting for pump</string>
-    <string name="bolusdelivering">Delivering %1$.2f U</string>
     <string name="connecting">Connecting</string>
     <string name="disconnected">Disconnected</string>
     <string name="androidaps_start">AAPS started</string>

core/ui/src/main/res/values/strings.xml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--    General-->
+    <string name="error">Error</string>
+    <string name="profile_set_ok">Basal profile in pump updated</string>
+    <string name="invalid_input">Invalid input data</string>
+    <string name="bolus_delivering">Delivering %1$.2f U</string>
+
     <!--    Dialogs-->
     <string name="confirmation">Confirmation</string>
     <string name="message">Message</string>

database/impl/src/main/java/info/nightscout/database/impl/transactions/UserEntryTransaction.kt

@@ -1,32 +1,13 @@
 package info.nightscout.database.impl.transactions
 
 import info.nightscout.database.entities.UserEntry
-import info.nightscout.database.entities.UserEntry.Action
-import info.nightscout.database.entities.UserEntry.Sources
-import info.nightscout.database.entities.ValueWithUnit
 
-class UserEntryTransaction(private val entries: List<Entry>) : Transaction<List<UserEntryTransaction.Entry>>() {
+class UserEntryTransaction(private val entries: List<UserEntry>) : Transaction<List<UserEntry>>() {
 
-    data class Entry(
+    override fun run(): List<UserEntry> {
-        val timestamp: Long,
-        val action: Action,
-        val source: Sources,
-        val note: String,
-        val values: List<ValueWithUnit?> = listOf()
-    )
-
-    override fun run(): List<Entry> {
 
         for (entry in entries)
-            database.userEntryDao.insert(
+            database.userEntryDao.insert(entry)
-                UserEntry(
-                    timestamp = entry.timestamp,
-                    action = entry.action,
-                    source = entry.source,
-                    note = entry.note,
-                    values = entry.values
-                )
-            )
         return entries
     }
 }

implementation/src/main/java/info/nightscout/implementation/LocalAlertUtilsImpl.kt

@@ -1,6 +1,6 @@
 package info.nightscout.implementation
 
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.entities.UserEntry.Action

implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt

@@ -1,11 +1,13 @@
-package info.nightscout.androidaps.logging
+package info.nightscout.implementation
 
 import info.nightscout.androidaps.annotations.OpenForTesting
+import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
 import info.nightscout.database.entities.ValueWithUnit
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.UserEntryTransaction
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.userEntry.UserEntryMapper
 import info.nightscout.interfaces.userEntry.ValueWithUnitMapper
 import info.nightscout.rx.AapsSchedulers
@@ -18,25 +20,35 @@ import javax.inject.Singleton
 
 @OpenForTesting
 @Singleton
-class UserEntryLogger @Inject constructor(
+class UserEntryLoggerImpl @Inject constructor(
     private val aapsLogger: AAPSLogger,
     private val repository: AppRepository,
     private val aapsSchedulers: AapsSchedulers,
     private val dateUtil: DateUtil
-) {
+) : UserEntryLogger {
 
     private val compositeDisposable = CompositeDisposable()
 
-    fun log(action: Action, source: Sources, note: String? = "", vararg listValues: ValueWithUnit?) = log(action, source, note, listValues.toList())
+    override fun log(action: Action, source: Sources, note: String?, vararg listValues: ValueWithUnit?) = log(action, source, note, listValues.toList())
 
-    fun log(action: Action, source: Sources, vararg listValues: ValueWithUnit?) = log(action, source, "", listValues.toList())
+    override fun log(action: Action, source: Sources, vararg listValues: ValueWithUnit?) = log(action, source, "", listValues.toList())
 
-    fun log(action: Action, source: Sources, note: String? = "", listValues: List<ValueWithUnit?> = listOf()) {
+    override fun log(action: Action, source: Sources, note: String?, listValues: List<ValueWithUnit?>) {
         val filteredValues = listValues.toList().filterNotNull()
-        log(listOf(UserEntryTransaction.Entry(dateUtil.now(), action, source, note ?: "", filteredValues)))
+        log(
+            listOf(
+                UserEntry(
+                    timestamp = dateUtil.now(),
+                    action = action,
+                    source = source,
+                    note = note ?: "",
+                    values = filteredValues
+                )
+            )
+        )
     }
 
-    fun log(entries: List<UserEntryTransaction.Entry>) {
+    override fun log(entries: List<UserEntry>) {
         compositeDisposable += repository.runTransactionForResult(UserEntryTransaction(entries))
             .subscribeOn(aapsSchedulers.io)
             .observeOn(aapsSchedulers.io)
@@ -46,12 +58,12 @@ class UserEntryLogger @Inject constructor(
             )
     }
 
-    fun log(action: UserEntryMapper.Action, source: UserEntryMapper.Sources, note: String? = "", vararg listValues: ValueWithUnitMapper?) =
+    override fun log(action: UserEntryMapper.Action, source: UserEntryMapper.Sources, note: String?, vararg listValues: ValueWithUnitMapper?) =
         log(action.db, source.db, note, listValues.toList().map { it?.db() })
 
-    fun log(action: UserEntryMapper.Action, source: UserEntryMapper.Sources, vararg listValues: ValueWithUnitMapper?) = log(action.db, source.db, "", listValues.toList().map { it?.db() })
+    override fun log(action: UserEntryMapper.Action, source: UserEntryMapper.Sources, vararg listValues: ValueWithUnitMapper?) = log(action.db, source.db, "", listValues.toList().map { it?.db() })
 
-    fun log(action: UserEntryMapper.Action, source: UserEntryMapper.Sources, note: String? = "", listValues: List<ValueWithUnitMapper?> = listOf()) =
+    override fun log(action: UserEntryMapper.Action, source: UserEntryMapper.Sources, note: String?, listValues: List<ValueWithUnitMapper?>) =
         log(action.db, source.db, note, listValues.map { it?.db() })
 
 }

implementation/src/main/java/info/nightscout/implementation/di/ImplementationModule.kt

@@ -19,6 +19,7 @@ import info.nightscout.implementation.HardLimitsImpl
 import info.nightscout.implementation.LocalAlertUtilsImpl
 import info.nightscout.implementation.TranslatorImpl
 import info.nightscout.implementation.TrendCalculatorImpl
+import info.nightscout.implementation.UserEntryLoggerImpl
 import info.nightscout.implementation.XDripBroadcastImpl
 import info.nightscout.implementation.androidNotification.NotificationHolderImpl
 import info.nightscout.implementation.logging.LoggerUtilsImpl
@@ -44,6 +45,7 @@ import info.nightscout.interfaces.NotificationHolder
 import info.nightscout.interfaces.Translator
 import info.nightscout.interfaces.XDripBroadcast
 import info.nightscout.interfaces.logging.LoggerUtils
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.maintenance.PrefFileListProvider
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.profile.DefaultValueHelper
@@ -61,6 +63,7 @@ import info.nightscout.interfaces.storage.Storage
 import info.nightscout.interfaces.ui.IconsProvider
 import info.nightscout.interfaces.utils.HardLimits
 import info.nightscout.interfaces.utils.TrendCalculator
+import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.shared.interfaces.ResourceHelper
@@ -115,6 +118,15 @@ open class ImplementationModule {
     @Singleton
     fun provideTranslator(rh: ResourceHelper): Translator = TranslatorImpl(rh)
 
+    @Provides
+    @Singleton
+    fun provideUserEntryLogger(
+        aapsLogger: AAPSLogger,
+        repository: AppRepository,
+        aapsSchedulers: AapsSchedulers,
+        dateUtil: DateUtil
+    ): UserEntryLogger = UserEntryLoggerImpl(aapsLogger, repository, aapsSchedulers, dateUtil)
+
     @Provides
     @Singleton
     fun provideOverviewData(

implementation/src/main/java/info/nightscout/implementation/pump/PumpSyncImplementation.kt

@@ -1,6 +1,6 @@
 package info.nightscout.implementation.pump
 
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.main.R
 import info.nightscout.core.pump.fromDbPumpType

interfaces/src/main/java/info/nightscout/interfaces/logging/UserEntryLogger.kt

@@ -0,0 +1,19 @@
+package info.nightscout.interfaces.logging
+
+import info.nightscout.database.entities.UserEntry
+import info.nightscout.database.entities.UserEntry.Action
+import info.nightscout.database.entities.UserEntry.Sources
+import info.nightscout.database.entities.ValueWithUnit
+import info.nightscout.interfaces.userEntry.UserEntryMapper
+import info.nightscout.interfaces.userEntry.ValueWithUnitMapper
+
+interface UserEntryLogger {
+
+    fun log(action: Action, source: Sources, note: String? = "", vararg listValues: ValueWithUnit?)
+    fun log(action: Action, source: Sources, vararg listValues: ValueWithUnit?)
+    fun log(action: Action, source: Sources, note: String? = "", listValues: List<ValueWithUnit?> = listOf())
+    fun log(entries: List<UserEntry>)
+    fun log(action: UserEntryMapper.Action, source: UserEntryMapper.Sources, note: String? = "", vararg listValues: ValueWithUnitMapper?)
+    fun log(action: UserEntryMapper.Action, source: UserEntryMapper.Sources, vararg listValues: ValueWithUnitMapper?)
+    fun log(action: UserEntryMapper.Action, source: UserEntryMapper.Sources, note: String? = "", listValues: List<ValueWithUnitMapper?> = listOf())
+}

plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt

@@ -19,7 +19,7 @@ import android.widget.TableRow
 import android.widget.TextView
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.profile.ProfileStoreObject
 import info.nightscout.core.ui.dialogs.OKDialog

plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt

@@ -3,7 +3,7 @@ package info.nightscout.plugins.general.autotune
 import android.view.View
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.extensions.pureProfileFromJson
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.profile.ProfileStoreObject
 import info.nightscout.database.entities.UserEntry

plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt

@@ -23,7 +23,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.HasAndroidInjector
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.databinding.AutomationEventItemBinding
 import info.nightscout.automation.databinding.AutomationFragmentBinding
 import info.nightscout.automation.dialogs.EditEventDialog

plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt

@@ -4,7 +4,7 @@ import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.extensions.fromConstant
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.automation.R
 import info.nightscout.automation.elements.InputCarePortalMenu

plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt

@@ -2,7 +2,7 @@ package info.nightscout.automation.actions
 
 import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.R
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Sources

plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt

@@ -2,7 +2,7 @@ package info.nightscout.automation.actions
 
 import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.R
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Sources

plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt

@@ -2,7 +2,7 @@ package info.nightscout.automation.actions
 
 import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.R
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Sources

plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt

@@ -3,7 +3,7 @@ package info.nightscout.automation.actions
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.R
 import info.nightscout.automation.elements.InputDuration
 import info.nightscout.automation.elements.LabelWithElement

plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt

@@ -3,7 +3,7 @@ package info.nightscout.automation.actions
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.R
 import info.nightscout.automation.elements.InputProfileName
 import info.nightscout.automation.elements.LabelWithElement

plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt

@@ -3,7 +3,7 @@ package info.nightscout.automation.actions
 import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.R
 import info.nightscout.automation.elements.Comparator
 import info.nightscout.automation.elements.InputDuration

plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt

@@ -4,7 +4,7 @@ import android.widget.LinearLayout
 import androidx.annotation.DrawableRes
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.extensions.friendlyDescription
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.R
 import info.nightscout.automation.elements.ComparatorExists
 import info.nightscout.automation.elements.InputDuration

plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopTempTarget.kt

@@ -1,7 +1,7 @@
 package info.nightscout.automation.actions
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.R
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Sources

plugins/automation/src/test/java/info/nightscout/automation/actions/ActionsTestBase.kt

@@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.TestPumpPlugin
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.automation.triggers.Trigger
 import info.nightscout.database.entities.OfflineEvent
 import info.nightscout.interfaces.ConfigBuilder

plugins/main/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt

@@ -16,7 +16,7 @@ import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.convertedToPercent
 import info.nightscout.androidaps.extensions.plannedRemainingMinutes
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.core.utils.receivers.ReceiverStatusStore

plugins/main/src/main/java/info/nightscout/plugins/constraints/objectives/ObjectivesFragment.kt

@@ -16,7 +16,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSmoothScroller
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.utils.receivers.ReceiverStatusStore
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.fabric.FabricPrivacy

plugins/main/src/main/java/info/nightscout/plugins/general/actions/ActionsFragment.kt

@@ -12,7 +12,7 @@ import androidx.core.content.ContextCompat
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.extensions.toStringMedium
 import info.nightscout.androidaps.extensions.toStringShort
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.elements.SingleClickButton

plugins/main/src/main/java/info/nightscout/plugins/general/food/FoodFragment.kt

@@ -12,7 +12,7 @@ import android.widget.ArrayAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.UIRunnable
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.fabric.FabricPrivacy

plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt

@@ -13,7 +13,7 @@ import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.annotations.OpenForTesting
 import info.nightscout.androidaps.extensions.valueToUnitsString
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
 import info.nightscout.core.events.EventNewNotification

plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/activities/SmsCommunicatorOtpActivity.kt

@@ -12,7 +12,7 @@ import android.view.View
 import android.view.WindowManager
 import com.google.common.primitives.Ints.min
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.activities.NoSplashAppCompatActivity
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils

plugins/main/src/main/java/info/nightscout/plugins/profile/ProfileFragment.kt

@@ -10,7 +10,7 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import com.google.android.material.tabs.TabLayout
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.fabric.FabricPrivacy

plugins/main/src/main/java/info/nightscout/plugins/pump/virtual/VirtualPumpPlugin.kt

@@ -187,7 +187,7 @@ open class VirtualPumpPlugin @Inject constructor(
         var delivering = 0.0
         while (delivering < detailedBolusInfo.insulin) {
             SystemClock.sleep(200)
-            bolusingEvent.status = rh.gs(R.string.bolusdelivering, delivering)
+            bolusingEvent.status = rh.gs(R.string.bolus_delivering, delivering)
             bolusingEvent.percent = min((delivering / detailedBolusInfo.insulin * 100).toInt(), 100)
             rxBus.send(bolusingEvent)
             delivering += 0.1

plugins/main/src/main/java/info/nightscout/plugins/source/BGSourceFragment.kt

@@ -16,7 +16,7 @@ import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.extensions.directionToIcon
 import info.nightscout.androidaps.extensions.valueToUnitsString
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.ActionModeHelper
 import info.nightscout.core.utils.fabric.FabricPrivacy

plugins/main/src/main/java/info/nightscout/plugins/source/DexcomPlugin.kt

@@ -9,7 +9,7 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.extensions.fromConstant
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TherapyEvent

plugins/main/src/main/java/info/nightscout/plugins/source/GlunovoPlugin.kt

@@ -5,7 +5,7 @@ import android.net.Uri
 import android.os.Handler
 import android.os.HandlerThread
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TherapyEvent

plugins/main/src/main/java/info/nightscout/plugins/source/IntelligoPlugin.kt

@@ -7,7 +7,7 @@ import android.os.Handler
 import android.os.HandlerThread
 import android.util.Log
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.entities.TherapyEvent

plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/NSClientFragment.kt

@@ -13,7 +13,7 @@ import android.widget.ScrollView
 import androidx.core.view.MenuProvider
 import androidx.lifecycle.Lifecycle
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.entities.UserEntry

plugins/main/src/main/java/info/nightscout/plugins/sync/nsShared/StoreDataForDb.kt

@@ -5,7 +5,6 @@ import android.os.SystemClock
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.database.entities.Bolus
 import info.nightscout.database.entities.BolusCalculatorResult
@@ -32,10 +31,10 @@ import info.nightscout.database.impl.transactions.SyncNsProfileSwitchTransaction
 import info.nightscout.database.impl.transactions.SyncNsTemporaryBasalTransaction
 import info.nightscout.database.impl.transactions.SyncNsTemporaryTargetTransaction
 import info.nightscout.database.impl.transactions.SyncNsTherapyEventTransaction
-import info.nightscout.database.impl.transactions.UserEntryTransaction
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.XDripBroadcast
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.interfaces.notifications.Notification
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.interfaces.sync.NsClient
@@ -90,7 +89,7 @@ class StoreDataForDb @Inject constructor(
     val profileSwitches: MutableList<ProfileSwitch> = mutableListOf()
     val offlineEvents: MutableList<OfflineEvent> = mutableListOf()
 
-    private val userEntries: MutableList<UserEntryTransaction.Entry> = mutableListOf()
+    private val userEntries: MutableList<UserEntry> = mutableListOf()
 
     private val inserted = HashMap<String, Long>()
     private val updated = HashMap<String, Long>()
@@ -171,10 +170,12 @@ class StoreDataForDb @Inject constructor(
                     boluses.clear()
                     result.inserted.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.BOLUS, UserEntry.Sources.NSClient, it.notes ?: "",
+                                action = UserEntry.Action.BOLUS,
-                                listOf(ValueWithUnit.Timestamp(it.timestamp), ValueWithUnit.Insulin(it.amount))
+                                source = UserEntry.Sources.NSClient,
+                                note = it.notes ?: "",
+                                values = listOf(ValueWithUnit.Timestamp(it.timestamp), ValueWithUnit.Insulin(it.amount))
                             )
                         )
                         aapsLogger.debug(LTag.DATABASE, "Inserted bolus $it")
@@ -182,10 +183,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.invalidated.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.BOLUS_REMOVED, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.BOLUS_REMOVED,
-                                listOf(ValueWithUnit.Timestamp(it.timestamp), ValueWithUnit.Insulin(it.amount))
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(ValueWithUnit.Timestamp(it.timestamp), ValueWithUnit.Insulin(it.amount))
                             )
                         )
                         aapsLogger.debug(LTag.DATABASE, "Invalidated bolus $it")
@@ -214,10 +217,12 @@ class StoreDataForDb @Inject constructor(
                     carbs.clear()
                     result.inserted.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.CARBS, UserEntry.Sources.NSClient, it.notes ?: "",
+                                action = UserEntry.Action.CARBS,
-                                listOf(ValueWithUnit.Timestamp(it.timestamp), ValueWithUnit.Gram(it.amount.toInt()))
+                                source = UserEntry.Sources.NSClient,
+                                note = it.notes ?: "",
+                                values = listOf(ValueWithUnit.Timestamp(it.timestamp), ValueWithUnit.Gram(it.amount.toInt()))
                             )
                         )
                         aapsLogger.debug(LTag.DATABASE, "Inserted carbs $it")
@@ -225,10 +230,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.invalidated.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.CARBS_REMOVED, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.CARBS_REMOVED,
-                                listOf(ValueWithUnit.Timestamp(it.timestamp), ValueWithUnit.Gram(it.amount.toInt()))
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(ValueWithUnit.Timestamp(it.timestamp), ValueWithUnit.Gram(it.amount.toInt()))
                             )
                         )
                         aapsLogger.debug(LTag.DATABASE, "Invalidated carbs $it")
@@ -236,10 +243,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.updated.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.CARBS, UserEntry.Sources.NSClient, it.notes ?: "",
+                                action = UserEntry.Action.CARBS,
-                                listOf(ValueWithUnit.Timestamp(it.timestamp), ValueWithUnit.Gram(it.amount.toInt()))
+                                source = UserEntry.Sources.NSClient,
+                                note = it.notes ?: "",
+                                values = listOf(ValueWithUnit.Timestamp(it.timestamp), ValueWithUnit.Gram(it.amount.toInt()))
                             )
                         )
                         aapsLogger.debug(LTag.DATABASE, "Updated carbs $it")
@@ -265,10 +274,12 @@ class StoreDataForDb @Inject constructor(
                     temporaryTargets.clear()
                     result.inserted.forEach { tt ->
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.TT, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.TT,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.TherapyEventTTReason(tt.reason),
                                     ValueWithUnit.fromGlucoseUnit(tt.lowTarget, Constants.MGDL),
                                     ValueWithUnit.fromGlucoseUnit(tt.highTarget, Constants.MGDL).takeIf { tt.lowTarget != tt.highTarget },
@@ -281,10 +292,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.invalidated.forEach { tt ->
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.TT_REMOVED, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.TT_REMOVED,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.TherapyEventTTReason(tt.reason),
                                     ValueWithUnit.Mgdl(tt.lowTarget),
                                     ValueWithUnit.Mgdl(tt.highTarget).takeIf { tt.lowTarget != tt.highTarget },
@@ -297,10 +310,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.ended.forEach { tt ->
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.CANCEL_TT, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.CANCEL_TT,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.TherapyEventTTReason(tt.reason),
                                     ValueWithUnit.Mgdl(tt.lowTarget),
                                     ValueWithUnit.Mgdl(tt.highTarget).takeIf { tt.lowTarget != tt.highTarget },
@@ -334,10 +349,12 @@ class StoreDataForDb @Inject constructor(
                     temporaryBasals.clear()
                     result.inserted.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.TEMP_BASAL, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.TEMP_BASAL,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.Timestamp(it.timestamp),
                                     if (it.isAbsolute) ValueWithUnit.UnitPerHour(it.rate) else ValueWithUnit.Percent(it.rate.toInt()),
                                     ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt())
@@ -349,10 +366,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.invalidated.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.TEMP_BASAL_REMOVED, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.TEMP_BASAL_REMOVED,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.Timestamp(it.timestamp),
                                     if (it.isAbsolute) ValueWithUnit.UnitPerHour(it.rate) else ValueWithUnit.Percent(it.rate.toInt()),
                                     ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt())
@@ -364,10 +383,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.ended.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.CANCEL_TEMP_BASAL, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.CANCEL_TEMP_BASAL,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.Timestamp(it.timestamp),
                                     if (it.isAbsolute) ValueWithUnit.UnitPerHour(it.rate) else ValueWithUnit.Percent(it.rate.toInt()),
                                     ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(it.duration).toInt())
@@ -400,10 +421,12 @@ class StoreDataForDb @Inject constructor(
                     effectiveProfileSwitches.clear()
                     result.inserted.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.PROFILE_SWITCH, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.PROFILE_SWITCH,
-                                listOf(ValueWithUnit.Timestamp(it.timestamp))
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(ValueWithUnit.Timestamp(it.timestamp))
                             )
                         )
                         aapsLogger.debug(LTag.DATABASE, "Inserted EffectiveProfileSwitch $it")
@@ -411,10 +434,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.invalidated.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.PROFILE_SWITCH_REMOVED, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.PROFILE_SWITCH_REMOVED,
-                                listOf(ValueWithUnit.Timestamp(it.timestamp))
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(ValueWithUnit.Timestamp(it.timestamp))
                             )
                         )
                         aapsLogger.debug(LTag.DATABASE, "Invalidated EffectiveProfileSwitch $it")
@@ -439,10 +464,12 @@ class StoreDataForDb @Inject constructor(
                     profileSwitches.clear()
                     result.inserted.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.PROFILE_SWITCH, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.PROFILE_SWITCH,
-                                listOf(ValueWithUnit.Timestamp(it.timestamp))
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(ValueWithUnit.Timestamp(it.timestamp))
                             )
                         )
                         aapsLogger.debug(LTag.DATABASE, "Inserted ProfileSwitch $it")
@@ -450,10 +477,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.invalidated.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.PROFILE_SWITCH_REMOVED, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.PROFILE_SWITCH_REMOVED,
-                                listOf(ValueWithUnit.Timestamp(it.timestamp))
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(ValueWithUnit.Timestamp(it.timestamp))
                             )
                         )
                         aapsLogger.debug(LTag.DATABASE, "Invalidated ProfileSwitch $it")
@@ -518,10 +547,12 @@ class StoreDataForDb @Inject constructor(
                             else                             -> UserEntry.Action.CAREPORTAL
                         }
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                action, UserEntry.Sources.NSClient, therapyEvent.note ?: "",
+                                action = action,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = therapyEvent.note ?: "",
+                                values = listOf(
                                     ValueWithUnit.Timestamp(therapyEvent.timestamp),
                                     ValueWithUnit.TherapyEventType(therapyEvent.type),
                                     ValueWithUnit.fromGlucoseUnit(therapyEvent.glucose ?: 0.0, therapyEvent.glucoseUnit.toString).takeIf { therapyEvent.glucose != null })
@@ -532,10 +563,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.invalidated.forEach { therapyEvent ->
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.CAREPORTAL_REMOVED, UserEntry.Sources.NSClient, therapyEvent.note ?: "",
+                                action = UserEntry.Action.CAREPORTAL_REMOVED,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = therapyEvent.note ?: "",
+                                values = listOf(
                                     ValueWithUnit.Timestamp(therapyEvent.timestamp),
                                     ValueWithUnit.TherapyEventType(therapyEvent.type),
                                     ValueWithUnit.fromGlucoseUnit(therapyEvent.glucose ?: 0.0, therapyEvent.glucoseUnit.toString).takeIf { therapyEvent.glucose != null })
@@ -566,10 +599,12 @@ class StoreDataForDb @Inject constructor(
                 .also { result ->
                     result.inserted.forEach { oe ->
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.LOOP_CHANGE, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.LOOP_CHANGE,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.OfflineEventReason(oe.reason),
                                     ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(oe.duration).toInt())
                                 )
@@ -580,10 +615,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.invalidated.forEach { oe ->
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.LOOP_REMOVED, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.LOOP_REMOVED,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.OfflineEventReason(oe.reason),
                                     ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(oe.duration).toInt())
                                 )
@@ -594,10 +631,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.ended.forEach { oe ->
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.LOOP_CHANGE, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.LOOP_CHANGE,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.OfflineEventReason(oe.reason),
                                     ValueWithUnit.Minute(TimeUnit.MILLISECONDS.toMinutes(oe.duration).toInt())
                                 )
@@ -628,10 +667,12 @@ class StoreDataForDb @Inject constructor(
                 .also { result ->
                     result.inserted.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.EXTENDED_BOLUS, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.EXTENDED_BOLUS,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.Timestamp(it.timestamp),
                                     ValueWithUnit.Insulin(it.amount),
                                     ValueWithUnit.UnitPerHour(it.rate),
@@ -645,10 +686,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.invalidated.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.EXTENDED_BOLUS_REMOVED, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.EXTENDED_BOLUS_REMOVED,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.Timestamp(it.timestamp),
                                     ValueWithUnit.Insulin(it.amount),
                                     ValueWithUnit.UnitPerHour(it.rate),
@@ -661,10 +704,12 @@ class StoreDataForDb @Inject constructor(
                     }
                     result.ended.forEach {
                         if (config.NSCLIENT.not()) userEntries.add(
-                            UserEntryTransaction.Entry(
+                            UserEntry(
-                                dateUtil.now(),
+                                timestamp = dateUtil.now(),
-                                UserEntry.Action.CANCEL_EXTENDED_BOLUS, UserEntry.Sources.NSClient, "",
+                                action = UserEntry.Action.CANCEL_EXTENDED_BOLUS,
-                                listOf(
+                                source = UserEntry.Sources.NSClient,
+                                note = "",
+                                values = listOf(
                                     ValueWithUnit.Timestamp(it.timestamp),
                                     ValueWithUnit.Insulin(it.amount),
                                     ValueWithUnit.UnitPerHour(it.rate),

plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatus.kt

@@ -2,7 +2,7 @@ package info.nightscout.plugins.sync.nsclient.data
 
 import android.content.Context
 import info.nightscout.androidaps.annotations.OpenForTesting
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry

plugins/main/src/main/java/info/nightscout/plugins/sync/nsclient/workers/NSClientAddUpdateWorker.kt

@@ -6,7 +6,7 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.extensions.bolusCalculatorResultFromJson
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.impl.AppRepository

plugins/main/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/ProcessTreatmentsWorker.kt

@@ -5,7 +5,7 @@ import androidx.work.Worker
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.utils.receivers.DataWorkerStorage
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config

plugins/main/src/test/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt

@@ -5,7 +5,7 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.TestPumpPlugin
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.AutosensDataStoreObject
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.database.entities.GlucoseValue

pump/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java

@@ -477,7 +477,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints {
                 event.setStatus(getRh().gs(R.string.combo_programming_bolus));
                 break;
             case DELIVERING:
-                event.setStatus(getRh().gs(R.string.bolusdelivering, delivered));
+                event.setStatus(getRh().gs(R.string.bolus_delivering, delivered));
                 break;
             case DELIVERED:
                 event.setStatus(getRh().gs(R.string.bolusdelivered, delivered));

pump/combov2/src/main/kotlin/info/nightscout/androidaps/plugins/pump/combov2/ComboV2Plugin.kt

@@ -834,7 +834,7 @@ class ComboV2Plugin @Inject constructor (
                         is RTCommandProgressStage.DeliveringBolus -> {
                             val bolusingEvent = EventOverviewBolusProgress
                             bolusingEvent.percent = (progressReport.overallProgress * 100.0).toInt()
-                            bolusingEvent.status = rh.gs(R.string.bolusdelivering, detailedBolusInfo.insulin)
+                            bolusingEvent.status = rh.gs(R.string.bolus_delivering, detailedBolusInfo.insulin)
                             rxBus.send(bolusingEvent)
                         }
                         BasicProgressStage.Finished -> {

pump/dana/src/main/java/info/nightscout/androidaps/dana/DanaFragment.kt

@@ -14,7 +14,7 @@ import info.nightscout.androidaps.dana.activities.DanaHistoryActivity
 import info.nightscout.androidaps.dana.activities.DanaUserOptionsActivity
 import info.nightscout.androidaps.dana.databinding.DanarFragmentBinding
 import info.nightscout.androidaps.dana.events.EventDanaRNewStatus
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.plugin.ActivePlugin

pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt

@@ -151,7 +151,7 @@ class DanaRKoreanPlugin @Inject constructor(
             result
         } else {
             val result = PumpEnactResult(injector)
-            result.success(false).bolusDelivered(0.0).carbsDelivered(0.0).comment(R.string.invalidinput)
+            result.success(false).bolusDelivered(0.0).carbsDelivered(0.0).comment(R.string.invalid_input)
             aapsLogger.error("deliverTreatment: Invalid input")
             result
         }

pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java

@@ -203,7 +203,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
             return result;
         } else {
             PumpEnactResult result = new PumpEnactResult(getInjector());
-            result.success(false).bolusDelivered(0d).carbsDelivered(0d).comment(R.string.invalidinput);
+            result.success(false).bolusDelivered(0d).carbsDelivered(0d).comment(R.string.invalid_input);
             aapsLogger.error("deliverTreatment: Invalid input");
             return result;
         }
@@ -292,7 +292,7 @@ public class DanaRv2Plugin extends AbstractDanaRPlugin {
         PumpEnactResult result = new PumpEnactResult(getInjector());
         percent = constraintChecker.applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
         if (percent < 0) {
-            result.isTempCancel(false).enacted(false).success(false).comment(R.string.invalidinput);
+            result.isTempCancel(false).enacted(false).success(false).comment(R.string.invalid_input);
             aapsLogger.error("setTempBasalPercent: Invalid input");
             return result;
         }

pump/danar/src/main/java/info/nightscout/androidaps/danar/AbstractDanaRPlugin.java

@@ -218,7 +218,7 @@ public abstract class AbstractDanaRPlugin extends PumpPluginBase implements Pump
         PumpEnactResult result = new PumpEnactResult(getInjector());
         percent = constraintChecker.applyBasalPercentConstraints(new Constraint<>(percent), profile).value();
         if (percent < 0) {
-            result.isTempCancel(false).enacted(false).success(false).comment(R.string.invalidinput);
+            result.isTempCancel(false).enacted(false).success(false).comment(R.string.invalid_input);
             getAapsLogger().error("setTempBasalPercent: Invalid input");
             return result;
         }

pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java

@@ -193,7 +193,7 @@ public class DanaRPlugin extends AbstractDanaRPlugin {
             return result;
         } else {
             PumpEnactResult result = new PumpEnactResult(getInjector());
-            result.success(false).bolusDelivered(0d).carbsDelivered(0d).comment(R.string.invalidinput);
+            result.success(false).bolusDelivered(0d).carbsDelivered(0d).comment(R.string.invalid_input);
             aapsLogger.error("deliverTreatment: Invalid input");
             return result;
         }

pump/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt

@@ -20,7 +20,7 @@ class MsgBolusProgress(
         danaPump.bolusProgressLastTimeStamp = System.currentTimeMillis()
         danaPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
-        bolusingEvent.status = rh.gs(R.string.bolusdelivering, deliveredInsulin)
+        bolusingEvent.status = rh.gs(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")

pump/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt

@@ -325,7 +325,7 @@ class DanaRSPlugin @Inject constructor(
             result.success = false
             result.bolusDelivered = 0.0
             result.carbsDelivered = 0.0
-            result.comment = rh.gs(R.string.invalidinput)
+            result.comment = rh.gs(R.string.invalid_input)
             aapsLogger.error("deliverTreatment: Invalid input")
             result
         }
@@ -419,7 +419,7 @@ class DanaRSPlugin @Inject constructor(
             result.isTempCancel = false
             result.enacted = false
             result.success = false
-            result.comment = rh.gs(R.string.invalidinput)
+            result.comment = rh.gs(R.string.invalid_input)
             aapsLogger.error("setTempBasalPercent: Invalid input")
             return result
         }

pump/danars/src/main/java/info/nightscout/androidaps/danars/activities/EnterPinActivity.kt

@@ -54,7 +54,7 @@ class EnterPinActivity : NoSplashAppCompatActivity() {
                 if (result) {
                     bleComm.finishV3Pairing()
                     finish()
-                } else OKDialog.show(this, rh.gs(R.string.error), rh.gs(R.string.invalidinput))
+                } else OKDialog.show(this, rh.gs(R.string.error), rh.gs(R.string.invalid_input))
             }
         }
         binding.okcancel.cancel.setOnClickListener { finish() }

pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryComplete.kt

@@ -29,7 +29,7 @@ class DanaRSPacketNotifyDeliveryComplete(
         val deliveredInsulin = byteArrayToInt(getBytes(data, DATA_START, 2)) / 100.0
         danaPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
-        bolusingEvent.status = rh.gs(R.string.bolusdelivering, deliveredInsulin)
+        bolusingEvent.status = rh.gs(R.string.bolus_delivering, deliveredInsulin)
         bolusingEvent.t = danaPump.bolusingTreatment
         bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100)
         danaPump.bolusDone = true

pump/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketNotifyDeliveryRateDisplay.kt

@@ -29,7 +29,7 @@ class DanaRSPacketNotifyDeliveryRateDisplay(
         danaPump.bolusProgressLastTimeStamp = System.currentTimeMillis()
         danaPump.bolusingTreatment?.insulin = deliveredInsulin
         val bolusingEvent = EventOverviewBolusProgress
-        bolusingEvent.status = rh.gs(R.string.bolusdelivering, deliveredInsulin)
+        bolusingEvent.status = rh.gs(R.string.bolus_delivering, deliveredInsulin)
         bolusingEvent.t = danaPump.bolusingTreatment
         bolusingEvent.percent = min((deliveredInsulin / danaPump.bolusAmountToBeDelivered * 100).toInt(), 100)
         failed = bolusingEvent.percent < 100

pump/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt

@@ -292,7 +292,7 @@ class DiaconnG8Plugin @Inject constructor(
             result.success = false
             result.bolusDelivered = 0.0
             result.carbsDelivered = 0.0
-            result.comment = rh.gs(R.string.invalidinput)
+            result.comment = rh.gs(R.string.invalid_input)
             aapsLogger.error("deliverTreatment: Invalid input")
             result
         }

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt

@@ -264,7 +264,7 @@ class EopatchPumpPlugin @Inject constructor(
             // neither carbs nor bolus requested
             aapsLogger.error("deliverTreatment: Invalid input: neither carbs nor insulin are set in treatment")
             return PumpEnactResult(injector).success(false).enacted(false).bolusDelivered(0.0).carbsDelivered(0.0)
-                .comment(rh.gs(R.string.invalidinput))
+                .comment(rh.gs(R.string.invalid_input))
         } else if (detailedBolusInfo.insulin > 0.0) {
             var isSuccess = true
             val result = BehaviorSubject.createDefault(true)
@@ -292,7 +292,7 @@ class EopatchPumpPlugin @Inject constructor(
                 if (patchManager.patchConnectionState.isConnected) {
                     val delivering = patchManager.bolusCurrent.nowBolus.injected
                     rxBus.send(EventOverviewBolusProgress.apply {
-                        status = rh.gs(R.string.bolusdelivering, delivering)
+                        status = rh.gs(R.string.bolus_delivering, delivering)
                         percent = min((delivering / detailedBolusInfo.insulin * 100).toInt(), 100)
                         t = tr
                     })
@@ -319,7 +319,7 @@ class EopatchPumpPlugin @Inject constructor(
             patchManager.addBolusToHistory(detailedBolusInfo)
 
             return PumpEnactResult(injector).success(true).enacted(true).bolusDelivered(0.0)
-                .carbsDelivered(detailedBolusInfo.carbs).comment(rh.gs(info.nightscout.core.main.R.string.ok))
+                .carbsDelivered(detailedBolusInfo.carbs).comment(rh.gs(R.string.ok))
         }
     }
 
@@ -420,7 +420,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.main.R.string.error))
+                    .comment(rh.gs(R.string.error))
             )
             .blockingGet()
     }
@@ -457,7 +457,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.main.R.string.error))
+                    .comment(rh.gs(R.string.error))
             )
             .blockingGet()
     }
@@ -478,7 +478,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.main.R.string.error))
+                        .comment(rh.gs(R.string.error))
                 )
                 .blockingGet()
         } else {

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/InternalSuspendedTask.java

@@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import info.nightscout.androidaps.logging.UserEntryLogger;
+import info.nightscout.interfaces.logging.UserEntryLogger;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.api.GetInternalSuspendTime;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.response.PatchInternalSuspendTimeResponse;
 import info.nightscout.interfaces.pump.PumpSync;

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/PauseBasalTask.java

@@ -9,13 +9,13 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import info.nightscout.androidaps.logging.UserEntryLogger;
 import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode;
 import info.nightscout.androidaps.plugins.pump.eopatch.alarm.IAlarmRegistry;
 import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BasalPause;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.response.PatchBooleanResponse;
 import info.nightscout.androidaps.plugins.pump.eopatch.vo.PatchState;
+import info.nightscout.interfaces.logging.UserEntryLogger;
 import info.nightscout.interfaces.pump.PumpSync;
 import info.nightscout.interfaces.queue.Callback;
 import info.nightscout.interfaces.queue.Command;

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/ble/task/StopBasalTask.java

@@ -7,7 +7,7 @@ import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import info.nightscout.androidaps.logging.UserEntryLogger;
+import info.nightscout.interfaces.logging.UserEntryLogger;
 import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.api.BasalStop;
 import info.nightscout.androidaps.plugins.pump.eopatch.core.response.BasalStopResponse;

pump/omnipod-eros/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/eros/OmnipodErosPumpPlugin.java

@@ -670,7 +670,7 @@ public class OmnipodErosPumpPlugin extends PumpPluginBase implements Pump, Riley
             // neither carbs nor bolus requested
             aapsLogger.error("deliverTreatment: Invalid input: neither carbs nor insulin are set in treatment");
             return new PumpEnactResult(getInjector()).success(false).enacted(false).bolusDelivered(0d).carbsDelivered(0d)
-                    .comment(R.string.invalidinput);
+                    .comment(R.string.invalid_input);
         } else if (detailedBolusInfo.insulin > 0) {
             // bolus needed, ask pump to deliver it
             return deliverBolus(detailedBolusInfo);

pump/pump-common/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.kt

@@ -313,7 +313,7 @@ abstract class PumpPluginAbstract protected constructor(
                 // neither carbs nor bolus requested
                 aapsLogger.error("deliverTreatment: Invalid input")
                 PumpEnactResult(injector).success(false).enacted(false).bolusDelivered(0.0).carbsDelivered(0.0)
-                    .comment(R.string.invalidinput)
+                    .comment(R.string.invalid_input)
             } else if (detailedBolusInfo.insulin > 0) {
                 // bolus needed, ask pump to deliver it
                 deliverBolus(detailedBolusInfo)

ui/src/main/java/info/nightscout/ui/activities/ProfileHelperActivity.kt

@@ -234,7 +234,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() {
                     return@setOnClickListener
                 }
             }
-            ToastUtils.warnToast(this, R.string.invalidinput)
+            ToastUtils.warnToast(this, R.string.invalid_input)
         }
         binding.ageLabel.labelFor = binding.age.editTextId
         binding.tddLabel.labelFor = binding.tdd.editTextId

ui/src/main/java/info/nightscout/ui/activities/StatsActivity.kt

@@ -3,7 +3,7 @@ package info.nightscout.ui.activities
 import android.annotation.SuppressLint
 import android.os.Bundle
 import android.widget.TextView
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.activities.NoSplashAppCompatActivity
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.fabric.FabricPrivacy

ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsBolusCarbsFragment.kt

@@ -17,7 +17,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.extensions.iobCalc
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.ActionModeHelper

ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsCareportalFragment.kt

@@ -14,7 +14,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.ActionModeHelper

ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsExtendedBolusesFragment.kt

@@ -17,7 +17,7 @@ import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.extensions.iobCalc
 import info.nightscout.androidaps.extensions.isInProgress
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.ActionModeHelper

ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsProfileSwitchFragment.kt

@@ -17,7 +17,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.extensions.getCustomizedName
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils

ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTempTargetFragment.kt

@@ -18,7 +18,7 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.extensions.friendlyDescription
 import info.nightscout.androidaps.extensions.highValueToUnitsToString
 import info.nightscout.androidaps.extensions.lowValueToUnitsToString
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.ActionModeHelper

ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsTemporaryBasalsFragment.kt

@@ -18,7 +18,7 @@ import dagger.android.support.DaggerFragment
 import info.nightscout.androidaps.extensions.iobCalc
 import info.nightscout.androidaps.extensions.toStringFull
 import info.nightscout.androidaps.extensions.toTemporaryBasal
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.ActionModeHelper

ui/src/main/java/info/nightscout/ui/activities/fragments/TreatmentsUserEntryFragment.kt

@@ -12,7 +12,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils

ui/src/main/java/info/nightscout/ui/alertDialogs/ErrorDialog.kt

@@ -11,7 +11,7 @@ import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.services.AlarmSoundServiceHelper
 import info.nightscout.core.activities.DialogAppCompatActivity
 import info.nightscout.core.main.R

ui/src/main/java/info/nightscout/ui/dialogs/BolusProgressDialog.kt

@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import android.view.Window
 import android.view.WindowManager
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.activities.DialogAppCompatActivity
 import info.nightscout.core.main.R
 import info.nightscout.database.entities.UserEntry.Action

ui/src/main/java/info/nightscout/ui/dialogs/CalibrationDialog.kt

@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.UserEntry.Action

ui/src/main/java/info/nightscout/ui/dialogs/CarbsDialog.kt

@@ -8,7 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils

ui/src/main/java/info/nightscout/ui/dialogs/CareDialog.kt

@@ -11,7 +11,7 @@ import androidx.annotation.StringRes
 import com.google.common.base.Joiner
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.extensions.fromConstant
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.GlucoseStatusProvider
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.database.entities.TherapyEvent

ui/src/main/java/info/nightscout/ui/dialogs/ExtendedBolusDialog.kt

@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.extensions.formatColor

ui/src/main/java/info/nightscout/ui/dialogs/FillDialog.kt

@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.extensions.formatColor

ui/src/main/java/info/nightscout/ui/dialogs/InsulinDialog.kt

@@ -8,7 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.pump.insertBolusTransaction
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils

ui/src/main/java/info/nightscout/ui/dialogs/LoopDialog.kt

@@ -11,7 +11,7 @@ import android.view.Window
 import android.view.WindowManager
 import androidx.fragment.app.FragmentManager
 import dagger.android.support.DaggerDialogFragment
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.fabric.FabricPrivacy

ui/src/main/java/info/nightscout/ui/dialogs/ProfileSwitchDialog.kt

@@ -9,7 +9,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.profile.ProfileSealed
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils

ui/src/main/java/info/nightscout/ui/dialogs/TempBasalDialog.kt

@@ -6,7 +6,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.core.utils.extensions.formatColor

ui/src/main/java/info/nightscout/ui/dialogs/TempTargetDialog.kt

@@ -8,7 +8,7 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import com.google.common.base.Joiner
 import com.google.common.collect.Lists
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.ui.toast.ToastUtils
 import info.nightscout.database.entities.TemporaryTarget

ui/src/main/java/info/nightscout/ui/dialogs/TreatmentDialog.kt

@@ -8,7 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.google.common.base.Joiner
-import info.nightscout.androidaps.logging.UserEntryLogger
+import info.nightscout.interfaces.logging.UserEntryLogger
 import info.nightscout.core.pump.insertBolusTransaction
 import info.nightscout.core.pump.insertCarbsTransaction
 import info.nightscout.core.ui.dialogs.OKDialog