caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:plugins:automation cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-26 12:32:07 +02:00
parent 5e28d9465d
commit 101c528870
148 changed files with 574 additions and 574 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
View file

@ -38,6 +38,7 @@ import app.aaps.plugins.aps.loop.LoopPlugin
import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import app.aaps.plugins.automation.AutomationPlugin
import dagger.android.support.AndroidSupportInjection import dagger.android.support.AndroidSupportInjection
import info.nightscout.androidaps.R import info.nightscout.androidaps.R
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
@ -46,7 +47,6 @@ import info.nightscout.androidaps.danar.DanaRPlugin
import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin import info.nightscout.androidaps.plugins.pump.eopatch.EopatchPumpPlugin
import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
import info.nightscout.automation.AutomationPlugin
import info.nightscout.insulin.InsulinOrefFreePeakPlugin import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.plugins.constraints.safety.SafetyPlugin import info.nightscout.plugins.constraints.safety.SafetyPlugin
import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin

2
app/src/main/kotlin/app/aaps/di/AppComponent.kt
View file

@ -6,6 +6,7 @@ import app.aaps.core.main.di.CoreModule
import app.aaps.core.validators.di.ValidatorsModule import app.aaps.core.validators.di.ValidatorsModule
import app.aaps.implementation.di.ImplementationModule import app.aaps.implementation.di.ImplementationModule
import app.aaps.plugins.aps.di.ApsModule import app.aaps.plugins.aps.di.ApsModule
import app.aaps.plugins.automation.di.AutomationModule
import app.aaps.shared.impl.di.SharedImplModule import app.aaps.shared.impl.di.SharedImplModule
import dagger.BindsInstance import dagger.BindsInstance
import dagger.Component import dagger.Component
@ -19,7 +20,6 @@ import info.nightscout.androidaps.plugins.pump.eopatch.dagger.EopatchModule
import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule import info.nightscout.androidaps.plugins.pump.medtronic.di.MedtronicModule
import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule import info.nightscout.androidaps.plugins.pump.omnipod.dash.di.OmnipodDashModule
import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
import info.nightscout.automation.di.AutomationModule
import info.nightscout.database.impl.DatabaseModule import info.nightscout.database.impl.DatabaseModule
import info.nightscout.insulin.di.InsulinModule import info.nightscout.insulin.di.InsulinModule
import info.nightscout.plugins.constraints.di.PluginsConstraintsModule import info.nightscout.plugins.constraints.di.PluginsConstraintsModule

2
app/src/main/kotlin/app/aaps/di/PluginsListModule.kt
View file

@ -8,6 +8,7 @@ import app.aaps.plugins.aps.loop.LoopPlugin
import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import app.aaps.plugins.automation.AutomationPlugin
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.multibindings.IntKey import dagger.multibindings.IntKey
@ -20,7 +21,6 @@ import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
import info.nightscout.androidaps.plugins.pump.omnipod.dash.OmnipodDashPumpPlugin import info.nightscout.androidaps.plugins.pump.omnipod.dash.OmnipodDashPumpPlugin
import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
import info.nightscout.automation.AutomationPlugin
import info.nightscout.insulin.InsulinLyumjevPlugin import info.nightscout.insulin.InsulinLyumjevPlugin
import info.nightscout.insulin.InsulinOrefFreePeakPlugin import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.insulin.InsulinOrefRapidActingPlugin import info.nightscout.insulin.InsulinOrefRapidActingPlugin

2
plugins/automation/build.gradle
View file

@ -12,7 +12,7 @@ apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android { android {
namespace 'info.nightscout.automation' namespace 'app.aaps.plugins.automation'
} }
dependencies { dependencies {

12
plugins/automation/src/main/java/info/nightscout/automation/AutomationEvent.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationEvent.kt
View file

@ -1,15 +1,15 @@
package info.nightscout.automation package app.aaps.plugins.automation
import app.aaps.core.interfaces.automation.AutomationEvent import app.aaps.core.interfaces.automation.AutomationEvent
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import app.aaps.plugins.automation.actions.Action
import app.aaps.plugins.automation.actions.ActionDummy
import app.aaps.plugins.automation.actions.ActionStopProcessing
import app.aaps.plugins.automation.triggers.TriggerConnector
import app.aaps.plugins.automation.triggers.TriggerDummy
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.actions.Action
import info.nightscout.automation.actions.ActionDummy
import info.nightscout.automation.actions.ActionStopProcessing
import info.nightscout.automation.triggers.TriggerConnector
import info.nightscout.automation.triggers.TriggerDummy
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

14
plugins/automation/src/main/java/info/nightscout/automation/AutomationFragment.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation package app.aaps.plugins.automation
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Context import android.content.Context
@ -36,14 +36,14 @@ import app.aaps.core.ui.dragHelpers.SimpleItemTouchHelperCallback
import app.aaps.core.utils.HtmlHelper import app.aaps.core.utils.HtmlHelper
import app.aaps.database.entities.UserEntry.Action import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.plugins.automation.databinding.AutomationEventItemBinding
import app.aaps.plugins.automation.databinding.AutomationFragmentBinding
import app.aaps.plugins.automation.dialogs.EditEventDialog
import app.aaps.plugins.automation.events.EventAutomationDataChanged
import app.aaps.plugins.automation.events.EventAutomationUpdateGui
import app.aaps.plugins.automation.triggers.TriggerConnector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import dagger.android.support.DaggerFragment import dagger.android.support.DaggerFragment
import info.nightscout.automation.databinding.AutomationEventItemBinding
import info.nightscout.automation.databinding.AutomationFragmentBinding
import info.nightscout.automation.dialogs.EditEventDialog
import info.nightscout.automation.events.EventAutomationDataChanged
import info.nightscout.automation.events.EventAutomationUpdateGui
import info.nightscout.automation.triggers.TriggerConnector
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject import javax.inject.Inject

80
plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/AutomationPlugin.kt
View file

@ -1,11 +1,10 @@
package info.nightscout.automation package app.aaps.plugins.automation
import android.content.Context import android.content.Context
import android.os.Handler import android.os.Handler
import android.os.HandlerThread import android.os.HandlerThread
import android.os.SystemClock import android.os.SystemClock
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.automation.Automation import app.aaps.core.interfaces.automation.Automation
import app.aaps.core.interfaces.automation.AutomationEvent import app.aaps.core.interfaces.automation.AutomationEvent
@ -29,44 +28,45 @@ import app.aaps.core.interfaces.rx.events.EventPreferenceChange
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.automation.actions.Action
import app.aaps.plugins.automation.actions.ActionAlarm
import app.aaps.plugins.automation.actions.ActionCarePortalEvent
import app.aaps.plugins.automation.actions.ActionNotification
import app.aaps.plugins.automation.actions.ActionProfileSwitch
import app.aaps.plugins.automation.actions.ActionProfileSwitchPercent
import app.aaps.plugins.automation.actions.ActionRunAutotune
import app.aaps.plugins.automation.actions.ActionSendSMS
import app.aaps.plugins.automation.actions.ActionStartTempTarget
import app.aaps.plugins.automation.actions.ActionStopProcessing
import app.aaps.plugins.automation.actions.ActionStopTempTarget
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputDelta
import app.aaps.plugins.automation.events.EventAutomationDataChanged
import app.aaps.plugins.automation.events.EventAutomationUpdateGui
import app.aaps.plugins.automation.events.EventLocationChange
import app.aaps.plugins.automation.services.LocationServiceHelper
import app.aaps.plugins.automation.triggers.Trigger
import app.aaps.plugins.automation.triggers.TriggerAutosensValue
import app.aaps.plugins.automation.triggers.TriggerBTDevice
import app.aaps.plugins.automation.triggers.TriggerBg
import app.aaps.plugins.automation.triggers.TriggerBolusAgo
import app.aaps.plugins.automation.triggers.TriggerCOB
import app.aaps.plugins.automation.triggers.TriggerConnector
import app.aaps.plugins.automation.triggers.TriggerDelta
import app.aaps.plugins.automation.triggers.TriggerHeartRate
import app.aaps.plugins.automation.triggers.TriggerIob
import app.aaps.plugins.automation.triggers.TriggerLocation
import app.aaps.plugins.automation.triggers.TriggerProfilePercent
import app.aaps.plugins.automation.triggers.TriggerPumpLastConnection
import app.aaps.plugins.automation.triggers.TriggerRecurringTime
import app.aaps.plugins.automation.triggers.TriggerTempTarget
import app.aaps.plugins.automation.triggers.TriggerTempTargetValue
import app.aaps.plugins.automation.triggers.TriggerTime
import app.aaps.plugins.automation.triggers.TriggerTimeRange
import app.aaps.plugins.automation.triggers.TriggerWifiSsid
import app.aaps.plugins.automation.ui.TimerUtil
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.actions.Action
import info.nightscout.automation.actions.ActionAlarm
import info.nightscout.automation.actions.ActionCarePortalEvent
import info.nightscout.automation.actions.ActionNotification
import info.nightscout.automation.actions.ActionProfileSwitch
import info.nightscout.automation.actions.ActionProfileSwitchPercent
import info.nightscout.automation.actions.ActionRunAutotune
import info.nightscout.automation.actions.ActionSendSMS
import info.nightscout.automation.actions.ActionStartTempTarget
import info.nightscout.automation.actions.ActionStopProcessing
import info.nightscout.automation.actions.ActionStopTempTarget
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputDelta
import info.nightscout.automation.events.EventAutomationDataChanged
import info.nightscout.automation.events.EventAutomationUpdateGui
import info.nightscout.automation.events.EventLocationChange
import info.nightscout.automation.services.LocationServiceHelper
import info.nightscout.automation.triggers.Trigger
import info.nightscout.automation.triggers.TriggerAutosensValue
import info.nightscout.automation.triggers.TriggerBTDevice
import info.nightscout.automation.triggers.TriggerBg
import info.nightscout.automation.triggers.TriggerBolusAgo
import info.nightscout.automation.triggers.TriggerCOB
import info.nightscout.automation.triggers.TriggerConnector
import info.nightscout.automation.triggers.TriggerDelta
import info.nightscout.automation.triggers.TriggerHeartRate
import info.nightscout.automation.triggers.TriggerIob
import info.nightscout.automation.triggers.TriggerLocation
import info.nightscout.automation.triggers.TriggerProfilePercent
import info.nightscout.automation.triggers.TriggerPumpLastConnection
import info.nightscout.automation.triggers.TriggerRecurringTime
import info.nightscout.automation.triggers.TriggerTempTarget
import info.nightscout.automation.triggers.TriggerTempTargetValue
import info.nightscout.automation.triggers.TriggerTime
import info.nightscout.automation.triggers.TriggerTimeRange
import info.nightscout.automation.triggers.TriggerWifiSsid
import info.nightscout.automation.ui.TimerUtil
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign
import org.json.JSONArray import org.json.JSONArray
@ -413,7 +413,7 @@ class AutomationPlugin @Inject constructor(
} }
/** /**
* Generate reminder via [info.nightscout.automation.ui.TimerUtil] * Generate reminder via [app.aaps.plugins.automation.ui.TimerUtil]
* *
* @param seconds seconds to the future * @param seconds seconds to the future
*/ */

4
plugins/automation/src/main/java/info/nightscout/automation/actions/Action.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/Action.kt
View file

@ -1,12 +1,12 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.queue.Callback
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.plugins.automation.triggers.Trigger
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.triggers.Trigger
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

12
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionAlarm.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionAlarm.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.content.Context import android.content.Context
import android.widget.LinearLayout import android.widget.LinearLayout
@ -9,12 +9,12 @@ import app.aaps.core.interfaces.queue.Callback
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.InputString
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.ui.TimerUtil
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputString
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.ui.TimerUtil
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

14
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionCarePortalEvent.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionCarePortalEvent.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
@ -15,12 +15,12 @@ import app.aaps.core.utils.JsonHelper
import app.aaps.database.entities.TherapyEvent import app.aaps.database.entities.TherapyEvent
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.automation.elements.InputCarePortalMenu
import app.aaps.plugins.automation.elements.InputDuration
import app.aaps.plugins.automation.elements.InputString
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.elements.InputCarePortalMenu
import info.nightscout.automation.elements.InputDuration
import info.nightscout.automation.elements.InputString
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
@ -74,7 +74,7 @@ class ActionCarePortalEvent(injector: HasAndroidInjector) : Action(injector) {
} }
} else { } else {
therapyEvent.duration = T.mins(duration.value.toLong()).msecs() therapyEvent.duration = T.mins(duration.value.toLong()).msecs()
valuesWithUnit.add(ValueWithUnit.Minute(duration.value).takeIf { !duration.value.equals(0) }) valuesWithUnit.add(ValueWithUnit.Minute(duration.value).takeIf { duration.value != 0 })
} }
therapyEvent.note = note.value therapyEvent.note = note.value
valuesWithUnit.add(ValueWithUnit.SimpleString(note.value).takeIf { note.value.isNotBlank() }) valuesWithUnit.add(ValueWithUnit.SimpleString(note.value).takeIf { note.value.isNotBlank() })

2
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionDummy.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionDummy.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.queue.Callback
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector

4
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopDisable.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionLoopDisable.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
@ -13,8 +13,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventRefreshOverview import app.aaps.core.interfaces.rx.events.EventRefreshOverview
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.plugins.automation.R
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import javax.inject.Inject import javax.inject.Inject
class ActionLoopDisable(injector: HasAndroidInjector) : Action(injector) { class ActionLoopDisable(injector: HasAndroidInjector) : Action(injector) {

4
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopEnable.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionLoopEnable.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
@ -12,8 +12,8 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventRefreshOverview import app.aaps.core.interfaces.rx.events.EventRefreshOverview
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.plugins.automation.R
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import javax.inject.Inject import javax.inject.Inject
class ActionLoopEnable(injector: HasAndroidInjector) : Action(injector) { class ActionLoopEnable(injector: HasAndroidInjector) : Action(injector) {

4
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopResume.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionLoopResume.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
@ -12,8 +12,8 @@ import app.aaps.core.interfaces.rx.events.EventRefreshOverview
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.plugins.automation.R
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction import info.nightscout.database.impl.transactions.CancelCurrentOfflineEventIfAnyTransaction
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable

10
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionLoopSuspend.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionLoopSuspend.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
@ -12,11 +12,11 @@ import app.aaps.core.utils.JsonHelper
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.InputDuration
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputDuration
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

10
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionNotification.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionNotification.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
@ -9,11 +9,11 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventRefreshOverview import app.aaps.core.interfaces.rx.events.EventRefreshOverview
import app.aaps.core.main.events.EventNewNotification import app.aaps.core.main.events.EventNewNotification
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.InputString
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputString
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable

10
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitch.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionProfileSwitch.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
@ -13,11 +13,11 @@ import app.aaps.core.utils.JsonHelper
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.InputProfileName
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputProfileName
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

16
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionProfileSwitchPercent.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionProfileSwitchPercent.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
@ -11,14 +11,14 @@ import app.aaps.core.utils.JsonHelper
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputDuration
import app.aaps.plugins.automation.elements.InputPercent
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.triggers.TriggerProfilePercent
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputDuration
import info.nightscout.automation.elements.InputPercent
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.triggers.TriggerProfilePercent
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

12
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionRunAutotune.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionRunAutotune.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
@ -12,12 +12,12 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.ui.elements.WeekDay import app.aaps.core.ui.elements.WeekDay
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import app.aaps.plugins.automation.elements.InputDuration
import app.aaps.plugins.automation.elements.InputProfileName
import app.aaps.plugins.automation.elements.InputWeekDay
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.elements.InputDuration
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 org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

10
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionSendSMS.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionSendSMS.kt
View file

@ -1,15 +1,15 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.pump.PumpEnactResult
import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.queue.Callback
import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator import app.aaps.core.interfaces.smsCommunicator.SmsCommunicator
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.InputString
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputString
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

18
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStartTempTarget.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionStartTempTarget.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
@ -19,14 +19,14 @@ import app.aaps.database.entities.TemporaryTarget
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.ComparatorExists
import app.aaps.plugins.automation.elements.InputDuration
import app.aaps.plugins.automation.elements.InputTempTarget
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.triggers.TriggerTempTarget
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.ComparatorExists
import info.nightscout.automation.elements.InputDuration
import info.nightscout.automation.elements.InputTempTarget
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.triggers.TriggerTempTarget
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction import info.nightscout.database.impl.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
@ -107,7 +107,7 @@ class ActionStartTempTarget(injector: HasAndroidInjector) : Action(injector) {
return this return this
} }
fun tt() = TemporaryTarget( private fun tt() = TemporaryTarget(
timestamp = dateUtil.now(), timestamp = dateUtil.now(),
duration = TimeUnit.MINUTES.toMillis(duration.getMinutes().toLong()), duration = TimeUnit.MINUTES.toMillis(duration.getMinutes().toLong()),
reason = TemporaryTarget.Reason.AUTOMATION, reason = TemporaryTarget.Reason.AUTOMATION,

4
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopProcessing.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionStopProcessing.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import androidx.annotation.DrawableRes import androidx.annotation.DrawableRes
import app.aaps.core.interfaces.pump.PumpEnactResult import app.aaps.core.interfaces.pump.PumpEnactResult
import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.queue.Callback
import app.aaps.plugins.automation.R
import com.google.gson.JsonObject import com.google.gson.JsonObject
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import org.json.JSONObject import org.json.JSONObject
class ActionStopProcessing(injector: HasAndroidInjector) : Action(injector) { class ActionStopProcessing(injector: HasAndroidInjector) : Action(injector) {

4
plugins/automation/src/main/java/info/nightscout/automation/actions/ActionStopTempTarget.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/actions/ActionStopTempTarget.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.logging.UserEntryLogger import app.aaps.core.interfaces.logging.UserEntryLogger
@ -7,8 +7,8 @@ import app.aaps.core.interfaces.queue.Callback
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.database.entities.UserEntry import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.UserEntry.Sources import app.aaps.database.entities.UserEntry.Sources
import app.aaps.plugins.automation.R
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction import info.nightscout.database.impl.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable

94
plugins/automation/src/main/java/info/nightscout/automation/di/AutomationModule.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/di/AutomationModule.kt
View file

@ -1,55 +1,55 @@
package info.nightscout.automation.di package app.aaps.plugins.automation.di
import app.aaps.core.interfaces.automation.Automation import app.aaps.core.interfaces.automation.Automation
import app.aaps.plugins.automation.AutomationEventObject
import app.aaps.plugins.automation.AutomationFragment
import app.aaps.plugins.automation.AutomationPlugin
import app.aaps.plugins.automation.actions.Action
import app.aaps.plugins.automation.actions.ActionAlarm
import app.aaps.plugins.automation.actions.ActionCarePortalEvent
import app.aaps.plugins.automation.actions.ActionDummy
import app.aaps.plugins.automation.actions.ActionLoopDisable
import app.aaps.plugins.automation.actions.ActionLoopEnable
import app.aaps.plugins.automation.actions.ActionLoopResume
import app.aaps.plugins.automation.actions.ActionLoopSuspend
import app.aaps.plugins.automation.actions.ActionNotification
import app.aaps.plugins.automation.actions.ActionProfileSwitch
import app.aaps.plugins.automation.actions.ActionProfileSwitchPercent
import app.aaps.plugins.automation.actions.ActionRunAutotune
import app.aaps.plugins.automation.actions.ActionSendSMS
import app.aaps.plugins.automation.actions.ActionStartTempTarget
import app.aaps.plugins.automation.actions.ActionStopProcessing
import app.aaps.plugins.automation.actions.ActionStopTempTarget
import app.aaps.plugins.automation.dialogs.ChooseActionDialog
import app.aaps.plugins.automation.dialogs.ChooseOperationDialog
import app.aaps.plugins.automation.dialogs.ChooseTriggerDialog
import app.aaps.plugins.automation.dialogs.EditActionDialog
import app.aaps.plugins.automation.dialogs.EditEventDialog
import app.aaps.plugins.automation.dialogs.EditTriggerDialog
import app.aaps.plugins.automation.services.LocationService
import app.aaps.plugins.automation.triggers.Trigger
import app.aaps.plugins.automation.triggers.TriggerAutosensValue
import app.aaps.plugins.automation.triggers.TriggerBTDevice
import app.aaps.plugins.automation.triggers.TriggerBg
import app.aaps.plugins.automation.triggers.TriggerBolusAgo
import app.aaps.plugins.automation.triggers.TriggerCOB
import app.aaps.plugins.automation.triggers.TriggerConnector
import app.aaps.plugins.automation.triggers.TriggerDelta
import app.aaps.plugins.automation.triggers.TriggerDummy
import app.aaps.plugins.automation.triggers.TriggerHeartRate
import app.aaps.plugins.automation.triggers.TriggerIob
import app.aaps.plugins.automation.triggers.TriggerLocation
import app.aaps.plugins.automation.triggers.TriggerProfilePercent
import app.aaps.plugins.automation.triggers.TriggerPumpLastConnection
import app.aaps.plugins.automation.triggers.TriggerRecurringTime
import app.aaps.plugins.automation.triggers.TriggerTempTarget
import app.aaps.plugins.automation.triggers.TriggerTempTargetValue
import app.aaps.plugins.automation.triggers.TriggerTime
import app.aaps.plugins.automation.triggers.TriggerTimeRange
import app.aaps.plugins.automation.triggers.TriggerWifiSsid
import dagger.Binds import dagger.Binds
import dagger.Module import dagger.Module
import dagger.android.ContributesAndroidInjector import dagger.android.ContributesAndroidInjector
import info.nightscout.automation.AutomationEventObject
import info.nightscout.automation.AutomationFragment
import info.nightscout.automation.AutomationPlugin
import info.nightscout.automation.actions.Action
import info.nightscout.automation.actions.ActionAlarm
import info.nightscout.automation.actions.ActionCarePortalEvent
import info.nightscout.automation.actions.ActionDummy
import info.nightscout.automation.actions.ActionLoopDisable
import info.nightscout.automation.actions.ActionLoopEnable
import info.nightscout.automation.actions.ActionLoopResume
import info.nightscout.automation.actions.ActionLoopSuspend
import info.nightscout.automation.actions.ActionNotification
import info.nightscout.automation.actions.ActionProfileSwitch
import info.nightscout.automation.actions.ActionProfileSwitchPercent
import info.nightscout.automation.actions.ActionRunAutotune
import info.nightscout.automation.actions.ActionSendSMS
import info.nightscout.automation.actions.ActionStartTempTarget
import info.nightscout.automation.actions.ActionStopProcessing
import info.nightscout.automation.actions.ActionStopTempTarget
import info.nightscout.automation.dialogs.ChooseActionDialog
import info.nightscout.automation.dialogs.ChooseOperationDialog
import info.nightscout.automation.dialogs.ChooseTriggerDialog
import info.nightscout.automation.dialogs.EditActionDialog
import info.nightscout.automation.dialogs.EditEventDialog
import info.nightscout.automation.dialogs.EditTriggerDialog
import info.nightscout.automation.services.LocationService
import info.nightscout.automation.triggers.Trigger
import info.nightscout.automation.triggers.TriggerAutosensValue
import info.nightscout.automation.triggers.TriggerBTDevice
import info.nightscout.automation.triggers.TriggerBg
import info.nightscout.automation.triggers.TriggerBolusAgo
import info.nightscout.automation.triggers.TriggerCOB
import info.nightscout.automation.triggers.TriggerConnector
import info.nightscout.automation.triggers.TriggerDelta
import info.nightscout.automation.triggers.TriggerDummy
import info.nightscout.automation.triggers.TriggerHeartRate
import info.nightscout.automation.triggers.TriggerIob
import info.nightscout.automation.triggers.TriggerLocation
import info.nightscout.automation.triggers.TriggerProfilePercent
import info.nightscout.automation.triggers.TriggerPumpLastConnection
import info.nightscout.automation.triggers.TriggerRecurringTime
import info.nightscout.automation.triggers.TriggerTempTarget
import info.nightscout.automation.triggers.TriggerTempTargetValue
import info.nightscout.automation.triggers.TriggerTime
import info.nightscout.automation.triggers.TriggerTimeRange
import info.nightscout.automation.triggers.TriggerWifiSsid
@Module( @Module(
includes = [ includes = [

2
plugins/automation/src/main/java/info/nightscout/automation/dialogs/BaseDialog.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/BaseDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.dialogs package app.aaps.plugins.automation.dialogs
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View

12
plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseActionDialog.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/ChooseActionDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.dialogs package app.aaps.plugins.automation.dialogs
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -6,12 +6,12 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.RadioButton import android.widget.RadioButton
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.plugins.automation.AutomationPlugin
import app.aaps.plugins.automation.actions.Action
import app.aaps.plugins.automation.databinding.AutomationDialogChooseActionBinding
import app.aaps.plugins.automation.events.EventAutomationAddAction
import app.aaps.plugins.automation.events.EventAutomationUpdateGui
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.AutomationPlugin
import info.nightscout.automation.actions.Action
import info.nightscout.automation.databinding.AutomationDialogChooseActionBinding
import info.nightscout.automation.events.EventAutomationAddAction
import info.nightscout.automation.events.EventAutomationUpdateGui
import javax.inject.Inject import javax.inject.Inject
import kotlin.reflect.full.primaryConstructor import kotlin.reflect.full.primaryConstructor

6
plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseOperationDialog.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/ChooseOperationDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.dialogs package app.aaps.plugins.automation.dialogs
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -6,8 +6,8 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.RadioButton import android.widget.RadioButton
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import info.nightscout.automation.databinding.AutomationDialogChooseOperationBinding import app.aaps.plugins.automation.databinding.AutomationDialogChooseOperationBinding
import info.nightscout.automation.triggers.TriggerConnector import app.aaps.plugins.automation.triggers.TriggerConnector
import javax.inject.Inject import javax.inject.Inject
class ChooseOperationDialog : BaseDialog() { class ChooseOperationDialog : BaseDialog() {

8
plugins/automation/src/main/java/info/nightscout/automation/dialogs/ChooseTriggerDialog.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/ChooseTriggerDialog.kt
View file

@ -1,14 +1,14 @@
package info.nightscout.automation.dialogs package app.aaps.plugins.automation.dialogs
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.RadioButton import android.widget.RadioButton
import app.aaps.plugins.automation.AutomationPlugin
import app.aaps.plugins.automation.databinding.AutomationDialogChooseTriggerBinding
import app.aaps.plugins.automation.triggers.Trigger
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.AutomationPlugin
import info.nightscout.automation.databinding.AutomationDialogChooseTriggerBinding
import info.nightscout.automation.triggers.Trigger
import javax.inject.Inject import javax.inject.Inject
import kotlin.reflect.full.primaryConstructor import kotlin.reflect.full.primaryConstructor

10
plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditActionDialog.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditActionDialog.kt
View file

@ -1,15 +1,15 @@
package info.nightscout.automation.dialogs package app.aaps.plugins.automation.dialogs
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.plugins.automation.actions.Action
import app.aaps.plugins.automation.actions.ActionDummy
import app.aaps.plugins.automation.databinding.AutomationDialogActionBinding
import app.aaps.plugins.automation.events.EventAutomationUpdateAction
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.actions.Action
import info.nightscout.automation.actions.ActionDummy
import info.nightscout.automation.databinding.AutomationDialogActionBinding
import info.nightscout.automation.events.EventAutomationUpdateAction
import org.json.JSONObject import org.json.JSONObject
import javax.inject.Inject import javax.inject.Inject

26
plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditEventDialog.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditEventDialog.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.dialogs package app.aaps.plugins.automation.dialogs
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
@ -9,22 +9,22 @@ import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.extensions.toVisibility import app.aaps.core.interfaces.extensions.toVisibility
import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import dagger.android.HasAndroidInjector import app.aaps.core.main.utils.fabric.FabricPrivacy
import info.nightscout.automation.AutomationEventObject
import info.nightscout.automation.AutomationPlugin
import info.nightscout.automation.R
import info.nightscout.automation.actions.Action
import info.nightscout.automation.databinding.AutomationDialogEventBinding
import info.nightscout.automation.events.EventAutomationAddAction
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 app.aaps.core.ui.toast.ToastUtils import app.aaps.core.ui.toast.ToastUtils
import app.aaps.plugins.automation.AutomationEventObject
import app.aaps.plugins.automation.AutomationPlugin
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.actions.Action
import app.aaps.plugins.automation.databinding.AutomationDialogEventBinding
import app.aaps.plugins.automation.events.EventAutomationAddAction
import app.aaps.plugins.automation.events.EventAutomationDataChanged
import app.aaps.plugins.automation.events.EventAutomationUpdateAction
import app.aaps.plugins.automation.events.EventAutomationUpdateGui
import app.aaps.plugins.automation.events.EventAutomationUpdateTrigger
import dagger.android.HasAndroidInjector
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject import javax.inject.Inject

20
plugins/automation/src/main/java/info/nightscout/automation/dialogs/EditTriggerDialog.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/dialogs/EditTriggerDialog.kt
View file

@ -1,21 +1,21 @@
package info.nightscout.automation.dialogs package app.aaps.plugins.automation.dialogs
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.rx.AapsSchedulers import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.automation.databinding.AutomationDialogEditTriggerBinding
import app.aaps.plugins.automation.events.EventAutomationUpdateTrigger
import app.aaps.plugins.automation.events.EventTriggerChanged
import app.aaps.plugins.automation.events.EventTriggerClone
import app.aaps.plugins.automation.events.EventTriggerRemove
import app.aaps.plugins.automation.triggers.Trigger
import app.aaps.plugins.automation.triggers.TriggerConnector
import app.aaps.plugins.automation.triggers.TriggerDummy
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.databinding.AutomationDialogEditTriggerBinding
import info.nightscout.automation.events.EventAutomationUpdateTrigger
import info.nightscout.automation.events.EventTriggerChanged
import info.nightscout.automation.events.EventTriggerClone
import info.nightscout.automation.events.EventTriggerRemove
import info.nightscout.automation.triggers.Trigger
import info.nightscout.automation.triggers.TriggerConnector
import info.nightscout.automation.triggers.TriggerDummy
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign import io.reactivex.rxjava3.kotlin.plusAssign
import org.json.JSONObject import org.json.JSONObject

4
plugins/automation/src/main/java/info/nightscout/automation/elements/Comparator.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/Comparator.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View
@ -8,7 +8,7 @@ import android.widget.LinearLayout
import android.widget.Spinner import android.widget.Spinner
import androidx.annotation.StringRes import androidx.annotation.StringRes
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import info.nightscout.automation.R import app.aaps.plugins.automation.R
class Comparator(private val rh: ResourceHelper) : Element { class Comparator(private val rh: ResourceHelper) : Element {

4
plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorConnect.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/ComparatorConnect.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View
@ -8,7 +8,7 @@ import android.widget.LinearLayout
import android.widget.Spinner import android.widget.Spinner
import androidx.annotation.StringRes import androidx.annotation.StringRes
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import info.nightscout.automation.R import app.aaps.plugins.automation.R
class ComparatorConnect(private val rh: ResourceHelper) : Element { class ComparatorConnect(private val rh: ResourceHelper) : Element {

2
plugins/automation/src/main/java/info/nightscout/automation/elements/ComparatorExists.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/ComparatorExists.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View

2
plugins/automation/src/main/java/info/nightscout/automation/elements/Element.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/Element.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.widget.LinearLayout import android.widget.LinearLayout

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputBg.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputBg.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.widget.LinearLayout import android.widget.LinearLayout

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputButton.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputButton.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.widget.Button import android.widget.Button

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputCarePortalMenu.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputCarePortalMenu.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View

8
plugins/automation/src/main/java/info/nightscout/automation/elements/InputDateTime.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputDateTime.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.content.Context import android.content.Context
import android.graphics.Typeface import android.graphics.Typeface
@ -11,10 +11,10 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.plugins.automation.R
import com.google.android.material.datepicker.MaterialDatePicker import com.google.android.material.datepicker.MaterialDatePicker
import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.MaterialTimePicker
import com.google.android.material.timepicker.TimeFormat import com.google.android.material.timepicker.TimeFormat
import info.nightscout.automation.R
import java.util.Calendar import java.util.Calendar
class InputDateTime(private val rh: ResourceHelper, private val dateUtil: DateUtil, var value: Long = dateUtil.now()) : Element { class InputDateTime(private val rh: ResourceHelper, private val dateUtil: DateUtil, var value: Long = dateUtil.now()) : Element {
@ -63,8 +63,8 @@ class InputDateTime(private val rh: ResourceHelper, private val dateUtil: DateUt
val timePicker = MaterialTimePicker.Builder() val timePicker = MaterialTimePicker.Builder()
.setTheme(app.aaps.core.ui.R.style.TimePicker) .setTheme(app.aaps.core.ui.R.style.TimePicker)
.setTimeFormat(clockFormat) .setTimeFormat(clockFormat)
.setHour(cal.get(Calendar.HOUR_OF_DAY)) .setHour(cal[Calendar.HOUR_OF_DAY])
.setMinute(cal.get(Calendar.MINUTE)) .setMinute(cal[Calendar.MINUTE])
.build() .build()
timePicker.addOnPositiveButtonClickListener { timePicker.addOnPositiveButtonClickListener {
value = dateUtil.mergeHourMinuteToTimestamp(value, timePicker.hour, timePicker.minute) value = dateUtil.mergeHourMinuteToTimestamp(value, timePicker.hour, timePicker.minute)

4
plugins/automation/src/main/java/info/nightscout/automation/elements/InputDelta.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputDelta.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View
@ -8,8 +8,8 @@ import android.widget.LinearLayout
import android.widget.Spinner import android.widget.Spinner
import androidx.annotation.StringRes import androidx.annotation.StringRes
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import info.nightscout.automation.R
import app.aaps.core.ui.elements.NumberPicker import app.aaps.core.ui.elements.NumberPicker
import app.aaps.plugins.automation.R
import java.text.DecimalFormat import java.text.DecimalFormat
class InputDelta(private val rh: ResourceHelper) : Element { class InputDelta(private val rh: ResourceHelper) : Element {

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputDouble.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputDouble.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.widget.LinearLayout import android.widget.LinearLayout

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputDropdownMenu.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputDropdownMenu.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputDuration.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputDuration.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.widget.LinearLayout import android.widget.LinearLayout

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputInsulin.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputInsulin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.widget.LinearLayout import android.widget.LinearLayout

4
plugins/automation/src/main/java/info/nightscout/automation/elements/InputLocationMode.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputLocationMode.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View
@ -8,7 +8,7 @@ import android.widget.LinearLayout
import android.widget.Spinner import android.widget.Spinner
import androidx.annotation.StringRes import androidx.annotation.StringRes
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import info.nightscout.automation.R import app.aaps.plugins.automation.R
class InputLocationMode(private val rh: ResourceHelper) : Element { class InputLocationMode(private val rh: ResourceHelper) : Element {

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputPercent.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputPercent.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.widget.LinearLayout import android.widget.LinearLayout

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputProfileName.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputProfileName.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.view.View import android.view.View

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputString.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputString.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.text.Editable import android.text.Editable
import android.text.TextWatcher import android.text.TextWatcher

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputTempTarget.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputTempTarget.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.view.Gravity import android.view.Gravity
import android.widget.LinearLayout import android.widget.LinearLayout

8
plugins/automation/src/main/java/info/nightscout/automation/elements/InputTime.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputTime.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.content.Context import android.content.Context
import android.graphics.Typeface import android.graphics.Typeface
@ -13,9 +13,9 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.MidnightTime import app.aaps.core.interfaces.utils.MidnightTime
import app.aaps.core.utils.MidnightUtils import app.aaps.core.utils.MidnightUtils
import app.aaps.plugins.automation.R
import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.MaterialTimePicker
import com.google.android.material.timepicker.TimeFormat import com.google.android.material.timepicker.TimeFormat
import info.nightscout.automation.R
import java.util.Calendar import java.util.Calendar
class InputTime(private val rh: ResourceHelper, private val dateUtil: DateUtil) : Element { class InputTime(private val rh: ResourceHelper, private val dateUtil: DateUtil) : Element {
@ -43,8 +43,8 @@ class InputTime(private val rh: ResourceHelper, private val dateUtil: DateUtil)
val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H
val timePicker = MaterialTimePicker.Builder() val timePicker = MaterialTimePicker.Builder()
.setTimeFormat(clockFormat) .setTimeFormat(clockFormat)
.setHour(cal.get(Calendar.HOUR_OF_DAY)) .setHour(cal[Calendar.HOUR_OF_DAY])
.setMinute(cal.get(Calendar.MINUTE)) .setMinute(cal[Calendar.MINUTE])
.build() .build()
timePicker.addOnPositiveButtonClickListener { timePicker.addOnPositiveButtonClickListener {
value = 60 * timePicker.hour + timePicker.minute value = 60 * timePicker.hour + timePicker.minute

12
plugins/automation/src/main/java/info/nightscout/automation/elements/InputTimeRange.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputTimeRange.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.content.Context import android.content.Context
import android.graphics.Typeface import android.graphics.Typeface
@ -14,9 +14,9 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.MidnightTime import app.aaps.core.interfaces.utils.MidnightTime
import app.aaps.core.utils.MidnightUtils import app.aaps.core.utils.MidnightUtils
import app.aaps.plugins.automation.R
import com.google.android.material.timepicker.MaterialTimePicker import com.google.android.material.timepicker.MaterialTimePicker
import com.google.android.material.timepicker.TimeFormat import com.google.android.material.timepicker.TimeFormat
import info.nightscout.automation.R
import java.util.Calendar import java.util.Calendar
class InputTimeRange(private val rh: ResourceHelper, private val dateUtil: DateUtil) : Element { class InputTimeRange(private val rh: ResourceHelper, private val dateUtil: DateUtil) : Element {
@ -48,8 +48,8 @@ class InputTimeRange(private val rh: ResourceHelper, private val dateUtil: DateU
val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H
val timePicker = MaterialTimePicker.Builder() val timePicker = MaterialTimePicker.Builder()
.setTimeFormat(clockFormat) .setTimeFormat(clockFormat)
.setHour(cal.get(Calendar.HOUR_OF_DAY)) .setHour(cal[Calendar.HOUR_OF_DAY])
.setMinute(cal.get(Calendar.MINUTE)) .setMinute(cal[Calendar.MINUTE])
.build() .build()
timePicker.addOnPositiveButtonClickListener { timePicker.addOnPositiveButtonClickListener {
start = 60 * timePicker.hour + timePicker.minute start = 60 * timePicker.hour + timePicker.minute
@ -69,8 +69,8 @@ class InputTimeRange(private val rh: ResourceHelper, private val dateUtil: DateU
val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H val clockFormat = if (DateFormat.is24HourFormat(context)) TimeFormat.CLOCK_24H else TimeFormat.CLOCK_12H
val timePicker = MaterialTimePicker.Builder() val timePicker = MaterialTimePicker.Builder()
.setTimeFormat(clockFormat) .setTimeFormat(clockFormat)
.setHour(cal.get(Calendar.HOUR_OF_DAY)) .setHour(cal[Calendar.HOUR_OF_DAY])
.setMinute(cal.get(Calendar.MINUTE)) .setMinute(cal[Calendar.MINUTE])
.build() .build()
timePicker.addOnPositiveButtonClickListener { timePicker.addOnPositiveButtonClickListener {
end = 60 * timePicker.hour + timePicker.minute end = 60 * timePicker.hour + timePicker.minute

2
plugins/automation/src/main/java/info/nightscout/automation/elements/InputWeekDay.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/InputWeekDay.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import app.aaps.core.ui.elements.WeekDay import app.aaps.core.ui.elements.WeekDay

2
plugins/automation/src/main/java/info/nightscout/automation/elements/LabelWithElement.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/LabelWithElement.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.graphics.Typeface import android.graphics.Typeface
import android.view.Gravity import android.view.Gravity

2
plugins/automation/src/main/java/info/nightscout/automation/elements/LayoutBuilder.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/LayoutBuilder.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.content.Context import android.content.Context
import android.view.ViewGroup import android.view.ViewGroup

4
plugins/automation/src/main/java/info/nightscout/automation/elements/StaticLabel.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/elements/StaticLabel.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.automation.elements package app.aaps.plugins.automation.elements
import android.graphics.Typeface import android.graphics.Typeface
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.LinearLayout import android.widget.LinearLayout
import android.widget.TextView import android.widget.TextView
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import info.nightscout.automation.triggers.Trigger import app.aaps.plugins.automation.triggers.Trigger
class StaticLabel(private val rh: ResourceHelper) : Element { class StaticLabel(private val rh: ResourceHelper) : Element {

4
plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationAddAction.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/events/EventAutomationAddAction.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.automation.events package app.aaps.plugins.automation.events
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event
import info.nightscout.automation.actions.Action import app.aaps.plugins.automation.actions.Action
class EventAutomationAddAction(val action: Action) : Event() class EventAutomationAddAction(val action: Action) : Event()

2
plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationDataChanged.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/events/EventAutomationDataChanged.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.events package app.aaps.plugins.automation.events
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event

4
plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateAction.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/events/EventAutomationUpdateAction.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.automation.events package app.aaps.plugins.automation.events
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event
import info.nightscout.automation.actions.Action import app.aaps.plugins.automation.actions.Action
class EventAutomationUpdateAction(val action: Action, val position: Int) : Event() class EventAutomationUpdateAction(val action: Action, val position: Int) : Event()

2
plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateGui.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/events/EventAutomationUpdateGui.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.events package app.aaps.plugins.automation.events
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event

4
plugins/automation/src/main/java/info/nightscout/automation/events/EventAutomationUpdateTrigger.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/events/EventAutomationUpdateTrigger.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.automation.events package app.aaps.plugins.automation.events
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event
import info.nightscout.automation.triggers.TriggerConnector import app.aaps.plugins.automation.triggers.TriggerConnector
class EventAutomationUpdateTrigger(val trigger: TriggerConnector) : Event() class EventAutomationUpdateTrigger(val trigger: TriggerConnector) : Event()

2
plugins/automation/src/main/java/info/nightscout/automation/events/EventLocationChange.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/events/EventLocationChange.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.events package app.aaps.plugins.automation.events
import android.location.Location import android.location.Location
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event

2
plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerChanged.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/events/EventTriggerChanged.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.events package app.aaps.plugins.automation.events
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event

4
plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerClone.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/events/EventTriggerClone.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.automation.events package app.aaps.plugins.automation.events
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event
import info.nightscout.automation.triggers.Trigger import app.aaps.plugins.automation.triggers.Trigger
class EventTriggerClone(val trigger: Trigger) : Event() class EventTriggerClone(val trigger: Trigger) : Event()

4
plugins/automation/src/main/java/info/nightscout/automation/events/EventTriggerRemove.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/events/EventTriggerRemove.kt
View file

@ -1,6 +1,6 @@
package info.nightscout.automation.events package app.aaps.plugins.automation.events
import app.aaps.core.interfaces.rx.events.Event import app.aaps.core.interfaces.rx.events.Event
import info.nightscout.automation.triggers.Trigger import app.aaps.plugins.automation.triggers.Trigger
class EventTriggerRemove(val trigger: Trigger) : Event() class EventTriggerRemove(val trigger: Trigger) : Event()

2
plugins/automation/src/main/java/info/nightscout/automation/services/LastLocationDataContainer.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/services/LastLocationDataContainer.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.services package app.aaps.plugins.automation.services
import android.location.Location import android.location.Location
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting

8
plugins/automation/src/main/java/info/nightscout/automation/services/LocationService.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/services/LocationService.kt
View file

@ -1,6 +1,6 @@
@file:Suppress("PrivatePropertyName") @file:Suppress("PrivatePropertyName")
package info.nightscout.automation.services package app.aaps.plugins.automation.services
import android.Manifest import android.Manifest
import android.app.Notification import android.app.Notification
@ -14,7 +14,6 @@ import android.os.Binder
import android.os.Bundle import android.os.Bundle
import android.os.IBinder import android.os.IBinder
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.logging.AAPSLogger import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.notifications.NotificationHolder import app.aaps.core.interfaces.notifications.NotificationHolder
@ -23,10 +22,11 @@ import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.rx.events.EventAppExit import app.aaps.core.interfaces.rx.events.EventAppExit
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.events.EventLocationChange
import com.google.android.gms.location.LocationServices import com.google.android.gms.location.LocationServices
import dagger.android.DaggerService import dagger.android.DaggerService
import info.nightscout.automation.R
import info.nightscout.automation.events.EventLocationChange
import io.reactivex.rxjava3.disposables.CompositeDisposable import io.reactivex.rxjava3.disposables.CompositeDisposable
import javax.inject.Inject import javax.inject.Inject

2
plugins/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/services/LocationServiceHelper.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.services package app.aaps.plugins.automation.services
import android.content.ComponentName import android.content.ComponentName
import android.content.Context import android.content.Context

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/Trigger.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/Trigger.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.content.Context import android.content.Context
import android.content.ContextWrapper import android.content.ContextWrapper
@ -18,16 +18,16 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.bus.RxBus import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.dialogs.ChooseTriggerDialog
import app.aaps.plugins.automation.events.EventTriggerChanged
import app.aaps.plugins.automation.events.EventTriggerClone
import app.aaps.plugins.automation.events.EventTriggerRemove
import app.aaps.plugins.automation.services.LastLocationDataContainer
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.dialogs.ChooseTriggerDialog
import info.nightscout.automation.events.EventTriggerChanged
import info.nightscout.automation.events.EventTriggerClone
import info.nightscout.automation.events.EventTriggerRemove
import info.nightscout.automation.services.LastLocationDataContainer
import info.nightscout.database.impl.AppRepository import info.nightscout.database.impl.AppRepository
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
import javax.inject.Inject import javax.inject.Inject
abstract class Trigger(val injector: HasAndroidInjector) { abstract class Trigger(val injector: HasAndroidInjector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerAutosensValue.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerAutosensValue.kt
View file

@ -1,19 +1,19 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.utils.JsonHelper.safeGetDouble import app.aaps.core.utils.JsonHelper.safeGetDouble
import app.aaps.core.utils.JsonHelper.safeGetString import app.aaps.core.utils.JsonHelper.safeGetString
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputDouble
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputDouble
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.Optional
class TriggerAutosensValue(injector: HasAndroidInjector) : Trigger(injector) { class TriggerAutosensValue(injector: HasAndroidInjector) : Trigger(injector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBTDevice.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerBTDevice.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.Manifest import android.Manifest
import android.bluetooth.BluetoothManager import android.bluetooth.BluetoothManager
@ -11,15 +11,15 @@ import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.rx.events.EventBTChange import app.aaps.core.interfaces.rx.events.EventBTChange
import app.aaps.core.ui.toast.ToastUtils import app.aaps.core.ui.toast.ToastUtils
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import com.google.common.base.Optional import app.aaps.plugins.automation.AutomationPlugin
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.ComparatorConnect
import app.aaps.plugins.automation.elements.InputDropdownMenu
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.AutomationPlugin
import info.nightscout.automation.R
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 org.json.JSONObject import org.json.JSONObject
import java.util.Optional
import javax.inject.Inject import javax.inject.Inject
class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) { class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBg.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerBg.kt
View file

@ -1,18 +1,18 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputBg
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputBg
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) { class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerBolusAgo.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerBolusAgo.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
@ -6,15 +6,15 @@ import app.aaps.core.utils.JsonHelper
import app.aaps.core.utils.JsonHelper.safeGetString import app.aaps.core.utils.JsonHelper.safeGetString
import app.aaps.database.ValueWrapper import app.aaps.database.ValueWrapper
import app.aaps.database.entities.Bolus import app.aaps.database.entities.Bolus
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputDuration
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputDuration
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) { class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerCOB.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerCOB.kt
View file

@ -1,19 +1,19 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import app.aaps.core.utils.JsonHelper.safeGetDouble import app.aaps.core.utils.JsonHelper.safeGetDouble
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputDouble
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputDouble
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.Optional
class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) { class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) {

12
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerConnector.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerConnector.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.content.Context import android.content.Context
import android.graphics.Typeface import android.graphics.Typeface
@ -11,12 +11,12 @@ import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.ui.elements.VerticalTextView import app.aaps.core.ui.elements.VerticalTextView
import app.aaps.core.utils.JsonHelper.safeGetString import app.aaps.core.utils.JsonHelper.safeGetString
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.dialogs.ChooseOperationDialog
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.dialogs.ChooseOperationDialog
import org.json.JSONArray import org.json.JSONArray
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) { class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
@ -72,7 +72,7 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
@Synchronized override fun shouldRun(): Boolean { @Synchronized override fun shouldRun(): Boolean {
var result = true var result = true
// check first trigger // check first trigger
if (list.size > 0) result = list[0].shouldRun() if (list.isNotEmpty()) result = list[0].shouldRun()
// check all others // check all others
for (i in 1 until list.size) { for (i in 1 until list.size) {
result = connectorType.apply(result, list[i].shouldRun()) result = connectorType.apply(result, list[i].shouldRun())
@ -114,7 +114,7 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
return result.toString() return result.toString()
} }
override fun icon(): Optional<Int> = Optional.absent() override fun icon(): Optional<Int> = Optional.empty()
override fun duplicate(): Trigger = TriggerConnector(injector, connectorType) override fun duplicate(): Trigger = TriggerConnector(injector, connectorType)

18
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDelta.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerDelta.kt
View file

@ -1,20 +1,20 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputDelta
import app.aaps.plugins.automation.elements.InputDelta.DeltaType
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputDelta
import info.nightscout.automation.elements.InputDelta.DeltaType
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.Optional
class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) { class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {

4
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerDummy.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerDummy.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import com.google.common.base.Optional
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
// Used for instantiation of other triggers only // Used for instantiation of other triggers only
class TriggerDummy(injector: HasAndroidInjector, val shouldRun: Boolean = false) : Trigger(injector) { class TriggerDummy(injector: HasAndroidInjector, val shouldRun: Boolean = false) : Trigger(injector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerHeartRate.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerHeartRate.kt
View file

@ -1,19 +1,19 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputDouble
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputDouble
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.Optional
class TriggerHeartRate(injector: HasAndroidInjector) : Trigger(injector) { class TriggerHeartRate(injector: HasAndroidInjector) : Trigger(injector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerIob.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerIob.kt
View file

@ -1,17 +1,17 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputInsulin
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputInsulin
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
class TriggerIob(injector: HasAndroidInjector) : Trigger(injector) { class TriggerIob(injector: HasAndroidInjector) : Trigger(injector) {

20
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerLocation.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerLocation.kt
View file

@ -1,21 +1,21 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.location.Location import android.location.Location
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.InputButton
import app.aaps.plugins.automation.elements.InputDouble
import app.aaps.plugins.automation.elements.InputLocationMode
import app.aaps.plugins.automation.elements.InputString
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputButton
import info.nightscout.automation.elements.InputDouble
import info.nightscout.automation.elements.InputLocationMode
import info.nightscout.automation.elements.InputString
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.text.DecimalFormat import java.text.DecimalFormat
import java.util.Optional
class TriggerLocation(injector: HasAndroidInjector) : Trigger(injector) { class TriggerLocation(injector: HasAndroidInjector) : Trigger(injector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerProfilePercent.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerProfilePercent.kt
View file

@ -1,18 +1,18 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.main.profile.ProfileSealed import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputPercent
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputPercent
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) { class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerPumpLastConnection.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerPumpLastConnection.kt
View file

@ -1,18 +1,18 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.utils.JsonHelper.safeGetInt import app.aaps.core.utils.JsonHelper.safeGetInt
import app.aaps.core.utils.JsonHelper.safeGetString import app.aaps.core.utils.JsonHelper.safeGetString
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputDuration
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputDuration
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector) { class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector) {

14
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerRecurringTime.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerRecurringTime.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
@ -6,16 +6,16 @@ import app.aaps.core.interfaces.utils.MidnightTime
import app.aaps.core.ui.elements.WeekDay import app.aaps.core.ui.elements.WeekDay
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import app.aaps.core.utils.MidnightUtils import app.aaps.core.utils.MidnightUtils
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.InputTime
import app.aaps.plugins.automation.elements.InputWeekDay
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
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 org.json.JSONObject import org.json.JSONObject
import java.util.Calendar import java.util.Calendar
import java.util.Objects import java.util.Objects
import java.util.Optional
class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) { class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {

12
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTarget.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerTempTarget.kt
View file

@ -1,16 +1,16 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import app.aaps.database.ValueWrapper import app.aaps.database.ValueWrapper
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.ComparatorExists
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.ComparatorExists
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
class TriggerTempTarget(injector: HasAndroidInjector) : Trigger(injector) { class TriggerTempTarget(injector: HasAndroidInjector) : Trigger(injector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTempTargetValue.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerTempTargetValue.kt
View file

@ -1,19 +1,19 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.db.GlucoseUnit
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import app.aaps.database.ValueWrapper import app.aaps.database.ValueWrapper
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputBg
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputBg
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
class TriggerTempTargetValue(injector: HasAndroidInjector) : Trigger(injector) { class TriggerTempTargetValue(injector: HasAndroidInjector) : Trigger(injector) {

12
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTime.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerTime.kt
View file

@ -1,16 +1,16 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.utils.T import app.aaps.core.interfaces.utils.T
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.InputDateTime
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputDateTime
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) { class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) {

12
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerTimeRange.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerTimeRange.kt
View file

@ -1,17 +1,17 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.utils.MidnightTime import app.aaps.core.interfaces.utils.MidnightTime
import app.aaps.core.utils.JsonHelper.safeGetInt import app.aaps.core.utils.JsonHelper.safeGetInt
import app.aaps.core.utils.MidnightUtils import app.aaps.core.utils.MidnightUtils
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.InputTimeRange
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputTimeRange
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
// Trigger for time range ( from 10:00AM till 13:00PM ) // Trigger for time range ( from 10:00AM till 13:00PM )
class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) { class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) {

16
plugins/automation/src/main/java/info/nightscout/automation/triggers/TriggerWifiSsid.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/triggers/TriggerWifiSsid.kt
View file

@ -1,18 +1,18 @@
package info.nightscout.automation.triggers package app.aaps.plugins.automation.triggers
import android.widget.LinearLayout import android.widget.LinearLayout
import app.aaps.core.interfaces.logging.LTag import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.receivers.ReceiverStatusStore import app.aaps.core.interfaces.receivers.ReceiverStatusStore
import app.aaps.core.utils.JsonHelper import app.aaps.core.utils.JsonHelper
import com.google.common.base.Optional import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.Comparator
import app.aaps.plugins.automation.elements.InputString
import app.aaps.plugins.automation.elements.LabelWithElement
import app.aaps.plugins.automation.elements.LayoutBuilder
import app.aaps.plugins.automation.elements.StaticLabel
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.Comparator
import info.nightscout.automation.elements.InputString
import info.nightscout.automation.elements.LabelWithElement
import info.nightscout.automation.elements.LayoutBuilder
import info.nightscout.automation.elements.StaticLabel
import org.json.JSONObject import org.json.JSONObject
import java.util.Optional
import javax.inject.Inject import javax.inject.Inject
class TriggerWifiSsid(injector: HasAndroidInjector) : Trigger(injector) { class TriggerWifiSsid(injector: HasAndroidInjector) : Trigger(injector) {

4
plugins/automation/src/main/java/info/nightscout/automation/ui/TimerUtil.kt → plugins/automation/src/main/kotlin/app/aaps/plugins/automation/ui/TimerUtil.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.automation.ui package app.aaps.plugins.automation.ui
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.provider.AlarmClock import android.provider.AlarmClock
import app.aaps.annotations.OpenForTesting import app.aaps.annotations.OpenForTesting
import info.nightscout.automation.R
import app.aaps.core.ui.toast.ToastUtils import app.aaps.core.ui.toast.ToastUtils
import app.aaps.plugins.automation.R
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton

2
plugins/automation/src/main/res/layout/automation_dialog_action.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
tools:context="info.nightscout.automation.dialogs.EditActionDialog"> tools:context=".dialogs.EditActionDialog">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
plugins/automation/src/main/res/layout/automation_dialog_choose_action.xml
View file

@ -5,7 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
tools:context="info.nightscout.automation.dialogs.EditEventDialog"> tools:context=".dialogs.EditEventDialog">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
plugins/automation/src/main/res/layout/automation_dialog_choose_operation.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
tools:context="info.nightscout.automation.dialogs.ChooseOperationDialog"> tools:context=".dialogs.ChooseOperationDialog">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
plugins/automation/src/main/res/layout/automation_dialog_choose_trigger.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
tools:context="info.nightscout.automation.dialogs.EditEventDialog"> tools:context=".dialogs.EditEventDialog">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
plugins/automation/src/main/res/layout/automation_dialog_edit_trigger.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
tools:context="info.nightscout.automation.dialogs.EditEventDialog"> tools:context=".dialogs.EditEventDialog">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
plugins/automation/src/main/res/layout/automation_dialog_event.xml
View file

@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
tools:context="info.nightscout.automation.dialogs.EditEventDialog"> tools:context=".dialogs.EditEventDialog">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

2
plugins/automation/src/main/res/layout/automation_fragment.xml
View file

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
tools:context="info.nightscout.automation.AutomationFragment"> tools:context=".AutomationFragment">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/eventListView" android:id="@+id/eventListView"

14
plugins/automation/src/test/java/info/nightscout/automation/AutomationEventTest.kt → plugins/automation/src/test/kotlin/app/aaps/plugins/automation/AutomationEventTest.kt
View file

@ -1,17 +1,17 @@
package info.nightscout.automation package app.aaps.plugins.automation
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.configuration.ConfigBuilder import app.aaps.core.interfaces.configuration.ConfigBuilder
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.plugins.automation.actions.Action
import app.aaps.plugins.automation.actions.ActionLoopEnable
import app.aaps.plugins.automation.actions.ActionStopProcessing
import app.aaps.plugins.automation.triggers.TriggerConnector
import app.aaps.plugins.automation.triggers.TriggerConnectorTest
import app.aaps.plugins.automation.triggers.TriggerDummy
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.actions.Action
import info.nightscout.automation.actions.ActionLoopEnable
import info.nightscout.automation.actions.ActionStopProcessing
import info.nightscout.automation.triggers.TriggerConnector
import info.nightscout.automation.triggers.TriggerConnectorTest
import info.nightscout.automation.triggers.TriggerDummy
import org.json.JSONObject import org.json.JSONObject
import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test

10
plugins/automation/src/test/java/info/nightscout/automation/BolusTimerImplTest.kt → plugins/automation/src/test/kotlin/app/aaps/plugins/automation/BolusTimerImplTest.kt
View file

@ -1,7 +1,6 @@
package info.nightscout.automation package app.aaps.plugins.automation
import android.content.Context import android.content.Context
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.constraints.ConstraintsChecker
@ -11,13 +10,14 @@ import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.automation.services.LocationServiceHelper
import app.aaps.plugins.automation.triggers.Trigger
import app.aaps.plugins.automation.ui.TimerUtil
import app.aaps.shared.impl.utils.DateUtilImpl import app.aaps.shared.impl.utils.DateUtilImpl
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.services.LocationServiceHelper
import info.nightscout.automation.triggers.Trigger
import info.nightscout.automation.ui.TimerUtil
import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test

10
plugins/automation/src/test/java/info/nightscout/automation/CarbTimerImplTest.kt → plugins/automation/src/test/kotlin/app/aaps/plugins/automation/CarbTimerImplTest.kt
View file

@ -1,7 +1,6 @@
package info.nightscout.automation package app.aaps.plugins.automation
import android.content.Context import android.content.Context
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.aps.Loop import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.constraints.ConstraintsChecker import app.aaps.core.interfaces.constraints.ConstraintsChecker
@ -11,13 +10,14 @@ import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.automation.services.LocationServiceHelper
import app.aaps.plugins.automation.triggers.Trigger
import app.aaps.plugins.automation.ui.TimerUtil
import app.aaps.shared.impl.utils.DateUtilImpl import app.aaps.shared.impl.utils.DateUtilImpl
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.services.LocationServiceHelper
import info.nightscout.automation.triggers.Trigger
import info.nightscout.automation.ui.TimerUtil
import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test

8
plugins/automation/src/test/java/info/nightscout/automation/ComposeTriggerTest.kt → plugins/automation/src/test/kotlin/app/aaps/plugins/automation/ComposeTriggerTest.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.automation package app.aaps.plugins.automation
import app.aaps.plugins.automation.triggers.Trigger
import app.aaps.plugins.automation.triggers.TriggerConnector
import app.aaps.plugins.automation.triggers.TriggerDummy
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.triggers.Trigger
import info.nightscout.automation.triggers.TriggerConnector
import info.nightscout.automation.triggers.TriggerDummy
import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test

8
plugins/automation/src/test/java/info/nightscout/automation/actions/ActionAlarmTest.kt → plugins/automation/src/test/kotlin/app/aaps/plugins/automation/actions/ActionAlarmTest.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.automation.actions package app.aaps.plugins.automation.actions
import android.content.Context import android.content.Context
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
@ -6,12 +6,12 @@ import app.aaps.core.interfaces.pump.PumpEnactResult
import app.aaps.core.interfaces.queue.Callback import app.aaps.core.interfaces.queue.Callback
import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.plugins.automation.R
import app.aaps.plugins.automation.elements.InputString
import app.aaps.plugins.automation.ui.TimerUtil
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.automation.R
import info.nightscout.automation.elements.InputString
import info.nightscout.automation.ui.TimerUtil
import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test

Some files were not shown because too many files have changed in this diff Show more