caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'ns/dev' into wear

Browse source
This commit is contained in:
Milos Kozak 2022-04-23 16:02:58 +02:00
parent 76124ec11e 4a991e4f38
commit cc510da7b1
21 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationFragment.kt
View file

@ -149,7 +149,7 @@ class AutomationFragment : DaggerFragment(), OnStartDragListener {
} else {
val icon = t.icon()
if (icon.isPresent) {
set.add(icon.get()!!)
set.add(icon.get())
}
}
}

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/Trigger.kt
View file

@ -53,7 +53,7 @@ abstract class Trigger(val injector: HasAndroidInjector) {
abstract fun friendlyName(): Int
abstract fun friendlyDescription(): String
abstract fun icon(): Optional<Int?>
abstract fun icon(): Optional<Int>
abstract fun duplicate(): Trigger
fun scanForActivity(cont: Context?): AppCompatActivity? {

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerAutosensValue.kt
View file

@ -63,7 +63,7 @@ class TriggerAutosensValue(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.autosenscompared, rh.gs(comparator.value.stringRes), autosens.value)
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_as)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_as)
override fun duplicate(): Trigger = TriggerAutosensValue(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBTDevice.kt
View file

@ -57,7 +57,7 @@ class TriggerBTDevice(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.btdevicecompared, btDevice.value, rh.gs(comparator.value.stringRes))
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_bluetooth_white_48dp)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_bluetooth_white_48dp)
override fun duplicate(): Trigger = TriggerBTDevice(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBg.kt
View file

@ -87,7 +87,7 @@ class TriggerBg(injector: HasAndroidInjector) : Trigger(injector) {
rh.gs(if (bg.units == GlucoseUnit.MGDL) R.string.glucosecomparedmgdl else R.string.glucosecomparedmmol, rh.gs(comparator.value.stringRes), bg.value, bg.units)
}
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_cp_bgcheck)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_cp_bgcheck)
override fun duplicate(): Trigger = TriggerBg(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgo.kt
View file

@ -75,7 +75,7 @@ class TriggerBolusAgo(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.lastboluscompared, rh.gs(comparator.value.stringRes), minutesAgo.getMinutes())
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_bolus)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_bolus)
override fun duplicate(): Trigger = TriggerBolusAgo(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerCOB.kt
View file

@ -73,7 +73,7 @@ class TriggerCOB(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.cobcompared, rh.gs(comparator.value.stringRes), cob.value)
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_cp_bolus_carbs)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_cp_bolus_carbs)
override fun duplicate(): Trigger = TriggerCOB(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerConnector.kt
View file

@ -115,7 +115,7 @@ class TriggerConnector(injector: HasAndroidInjector) : Trigger(injector) {
return result.toString()
}
override fun icon(): Optional<Int?> = Optional.absent()
override fun icon(): Optional<Int> = Optional.absent()
override fun duplicate(): Trigger = TriggerConnector(injector, connectorType)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDelta.kt
View file

@ -110,7 +110,7 @@ class TriggerDelta(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.deltacompared, rh.gs(comparator.value.stringRes), delta.value, rh.gs(delta.deltaType.stringRes))
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_auto_delta)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_auto_delta)
override fun duplicate(): Trigger = TriggerDelta(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerDummy.kt
View file

@ -27,7 +27,7 @@ class TriggerDummy(injector: HasAndroidInjector, val shouldRun: Boolean = false)
return "TriggerDummy"
}
override fun icon(): Optional<Int?> {
override fun icon(): Optional<Int> {
throw NotImplementedError("An operation is not implemented")
}

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerIob.kt
View file

@ -60,7 +60,7 @@ class TriggerIob(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.iobcompared, rh.gs(comparator.value.stringRes), insulin.value)
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_keyboard_capslock)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_keyboard_capslock)
override fun duplicate(): Trigger = TriggerIob(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerLocation.kt
View file

@ -81,7 +81,7 @@ class TriggerLocation(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.locationis, rh.gs(modeSelected.value.stringRes), " " + name.value)
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_location_on)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_location_on)
override fun duplicate(): Trigger = TriggerLocation(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerProfilePercent.kt
View file

@ -86,7 +86,7 @@ class TriggerProfilePercent(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.percentagecompared, rh.gs(comparator.value.stringRes), pct.value.toInt())
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_actions_profileswitch)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_actions_profileswitch)
override fun duplicate(): Trigger = TriggerProfilePercent(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerPumpLastConnection.kt
View file

@ -73,7 +73,7 @@ class TriggerPumpLastConnection(injector: HasAndroidInjector) : Trigger(injector
override fun friendlyDescription(): String =
rh.gs(R.string.automation_trigger_pump_last_connection_compared, rh.gs(comparator.value.stringRes), minutesAgo.value)
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_remove)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_remove)
override fun duplicate(): Trigger = TriggerPumpLastConnection(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerRecurringTime.kt
View file

@ -84,7 +84,7 @@ class TriggerRecurringTime(injector: HasAndroidInjector) : Trigger(injector) {
return if (counter == 0) rh.gs(R.string.never) else sb.toString()
}
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_access_alarm_24dp)
override fun duplicate(): Trigger = TriggerRecurringTime(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTarget.kt
View file

@ -58,7 +58,7 @@ class TriggerTempTarget(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.temptargetcompared, rh.gs(comparator.value.stringRes))
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_keyboard_tab)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_keyboard_tab)
override fun duplicate(): Trigger = TriggerTempTarget(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValue.kt
View file

@ -84,7 +84,7 @@ class TriggerTempTargetValue(injector: HasAndroidInjector) : Trigger(injector) {
rh.gs(if (ttValue.units == GlucoseUnit.MGDL) R.string.temptargetcomparedmgdl else R.string.temptargetcomparedmmol, rh.gs(comparator.value.stringRes), ttValue.value, ttValue.units)
}
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_keyboard_tab)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_keyboard_tab)
override fun duplicate(): Trigger = TriggerTempTargetValue(injector, this)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTime.kt
View file

@ -55,7 +55,7 @@ class TriggerTime(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.atspecifiedtime, dateUtil.dateAndTimeString(time.value))
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_access_alarm_24dp)
override fun duplicate(): Trigger = TriggerTime(injector, time.value)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTimeRange.kt
View file

@ -66,7 +66,7 @@ class TriggerTimeRange(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.timerange_value, dateUtil.timeString(toMills(range.start)), dateUtil.timeString(toMills(range.end)))
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_access_alarm_24dp)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_access_alarm_24dp)
override fun duplicate(): Trigger = TriggerTimeRange(injector, range.start, range.end)

2
automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerWifiSsid.kt
View file

@ -74,7 +74,7 @@ class TriggerWifiSsid(injector: HasAndroidInjector) : Trigger(injector) {
override fun friendlyDescription(): String =
rh.gs(R.string.wifissidcompared, rh.gs(comparator.value.stringRes), ssid.value)
override fun icon(): Optional<Int?> = Optional.of(R.drawable.ic_network_wifi)
override fun icon(): Optional<Int> = Optional.of(R.drawable.ic_network_wifi)
override fun duplicate(): Trigger = TriggerWifiSsid(injector, this)

2
automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/DummyTrigger.kt
View file

@ -12,6 +12,6 @@ class DummyTrigger(var result: Boolean) : Trigger(HasAndroidInjector { AndroidIn
override fun fromJSON(data: String): Trigger = DummyTrigger(result)
override fun friendlyName(): Int = 0
override fun friendlyDescription(): String = " "
override fun icon(): Optional<Int?> = Optional.absent()
override fun icon(): Optional<Int> = Optional.absent()
override fun duplicate(): Trigger = DummyTrigger(result)
}