caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Remove Action.colorID, and modify Group for NS REFRESH

Browse source
This commit is contained in:
Philoul 2021-03-07 15:11:36 +01:00
parent c931c8d25a
commit cc889cfa0a
2 changed files with 4 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
core/src/main/java/info/nightscout/androidaps/utils/extensions/UserEntryExt.kt
View file

@ -105,101 +105,6 @@ fun Action.stringId(): Int {
}
}
fun Action.colorId(): Int {
return when (this) {
Action.EXTENDED_CARBS -> R.color.carbs
Action.TEMP_BASAL -> R.color.basal
Action.TT -> R.color.tempTargetConfirmation
Action.TT_ACTIVITY -> R.color.tempTargetConfirmation
Action.TT_EATING_SOON -> R.color.tempTargetConfirmation
Action.TT_HYPO -> R.color.tempTargetConfirmation
Action.NEW_PROFILE -> R.color.white
Action.CLONE_PROFILE -> R.color.white
Action.STORE_PROFILE -> R.color.white
Action.PROFILE_SWITCH -> R.color.white
Action.PROFILE_SWITCH_CLONED -> R.color.white
Action.CLOSED_LOOP_MODE -> R.color.loopClosed
Action.LGS_LOOP_MODE -> R.color.loopClosed
Action.OPEN_LOOP_MODE -> R.color.loopOpened
Action.LOOP_DISABLED -> R.color.loopDisabled
Action.LOOP_ENABLED -> R.color.loopClosed
Action.RECONNECT -> R.color.loopDisconnected
Action.DISCONNECT_15M -> R.color.loopDisconnected
Action.DISCONNECT_30M -> R.color.loopDisconnected
Action.DISCONNECT_1H -> R.color.loopDisconnected
Action.DISCONNECT_2H -> R.color.loopDisconnected
Action.DISCONNECT_3H -> R.color.loopDisconnected
Action.RESUME -> R.color.loopClosed
Action.SUSPEND_1H -> R.color.loopSuspended
Action.SUSPEND_2H -> R.color.loopSuspended
Action.SUSPEND_3H -> R.color.loopSuspended
Action.SUSPEND_10H -> R.color.loopSuspended
Action.HW_PUMP_ALLOWED -> R.color.defaulttext
Action.CLEAR_PAIRING_KEYS -> R.color.defaulttext
Action.ACCEPTS_TEMP_BASAL -> R.color.basal
Action.CANCEL_TEMP_BASAL -> R.color.basal
Action.CANCEL_EXTENDED_BOLUS -> R.color.extendedBolus
Action.CANCEL_TT -> R.color.tempTargetConfirmation
Action.CAREPORTAL -> R.color.notificationAnnouncement
Action.CALIBRATION -> R.color.calibration
Action.INSULIN_CHANGE -> R.color.iob
Action.PRIME_BOLUS -> R.color.defaulttext
Action.SITE_CHANGE -> R.color.defaulttext
Action.TREATMENT -> R.color.defaulttext
Action.CAREPORTAL_NS_REFRESH -> R.color.notificationAnnouncement
Action.PROFILE_SWITCH_NS_REFRESH -> R.color.white
Action.TREATMENTS_NS_REFRESH -> R.color.defaulttext
Action.TT_NS_REFRESH -> R.color.tempTargetConfirmation
Action.AUTOMATION_REMOVED -> R.color.defaulttext
Action.BG_REMOVED -> R.color.calibration
Action.CAREPORTAL_REMOVED -> R.color.notificationAnnouncement
Action.EXTENDED_BOLUS_REMOVED -> R.color.extendedBolus
Action.FOOD_REMOVED -> R.color.carbs
Action.PROFILE_REMOVED -> R.color.white
Action.PROFILE_SWITCH_REMOVED -> R.color.white
Action.RESTART_EVENTS_REMOVED -> R.color.defaulttext
Action.TREATMENT_REMOVED -> R.color.defaulttext
Action.TT_REMOVED -> R.color.tempTargetConfirmation
Action.NS_PAUSED -> R.color.defaulttext
Action.NS_QUEUE_CLEARED -> R.color.defaulttext
Action.NS_SETTINGS_COPIED -> R.color.defaulttext
Action.ERROR_DIALOG_OK -> R.color.defaulttext
Action.ERROR_DIALOG_MUTE -> R.color.defaulttext
Action.ERROR_DIALOG_MUTE_5MIN -> R.color.defaulttext
Action.OBJECTIVE_STARTED -> R.color.defaulttext
Action.OBJECTIVE_UNSTARTED -> R.color.defaulttext
Action.OBJECTIVES_SKIPPED -> R.color.defaulttext
Action.STAT_RESET -> R.color.defaulttext
Action.DELETE_LOGS -> R.color.defaulttext
Action.DELETE_FUTURE_TREATMENTS -> R.color.defaulttext
Action.EXPORT_SETTINGS -> R.color.defaulttext
Action.IMPORT_SETTINGS -> R.color.defaulttext
Action.RESET_DATABASES -> R.color.defaulttext
Action.EXPORT_DATABASES -> R.color.defaulttext
Action.IMPORT_DATABASES -> R.color.defaulttext
Action.OTP_EXPORT -> R.color.defaulttext
Action.OTP_RESET -> R.color.defaulttext
Action.SMS_BASAL -> R.color.basal
Action.SMS_BOLUS -> R.color.iob
Action.SMS_CAL -> R.color.calibration
Action.SMS_CARBS -> R.color.carbs
Action.SMS_EXTENDED_BOLUS -> R.color.extendedBolus
Action.SMS_LOOP_DISABLED -> R.color.loopDisabled
Action.SMS_LOOP_ENABLED -> R.color.loopClosed
Action.SMS_LOOP_RESUME -> R.color.loopClosed
Action.SMS_LOOP_SUSPEND -> R.color.loopSuspended
Action.SMS_PROFILE -> R.color.white
Action.SMS_PUMP_CONNECT -> R.color.loopDisconnected
Action.SMS_PUMP_DISCONNECT -> R.color.loopDisconnected
Action.SMS_SMS -> R.color.defaulttext
Action.SMS_TT -> R.color.tempTargetConfirmation
Action.TT_DELETED_FROM_NS -> R.color.tempTargetConfirmation
Action.TT_FROM_NS -> R.color.tempTargetConfirmation
Action.TT_CANCELED_FROM_NS -> R.color.tempTargetConfirmation
else -> R.color.defaulttext
}
}
fun ColorGroup.colorId(): Int {
return when (this) {
ColorGroup.InsulinTreatment -> R.color.basal

8
database/src/main/java/info/nightscout/androidaps/database/entities/UserEntry.kt
View file

@ -65,10 +65,10 @@ data class UserEntry(
@SerializedName("PRIME_BOLUS") PRIME_BOLUS (ColorGroup.Careportal),
@SerializedName("SITE_CHANGE") SITE_CHANGE (ColorGroup.Careportal),
@SerializedName("TREATMENT") TREATMENT (ColorGroup.InsulinTreatment),
@SerializedName("CAREPORTAL_NS_REFRESH") CAREPORTAL_NS_REFRESH (ColorGroup.Careportal),
@SerializedName("PROFILE_SWITCH_NS_REFRESH") PROFILE_SWITCH_NS_REFRESH (ColorGroup.Profile),
@SerializedName("TREATMENTS_NS_REFRESH") TREATMENTS_NS_REFRESH (ColorGroup.InsulinTreatment),
@SerializedName("TT_NS_REFRESH") TT_NS_REFRESH (ColorGroup.TT),
@SerializedName("CAREPORTAL_NS_REFRESH") CAREPORTAL_NS_REFRESH (ColorGroup.Aaps),
@SerializedName("PROFILE_SWITCH_NS_REFRESH") PROFILE_SWITCH_NS_REFRESH (ColorGroup.Aaps),
@SerializedName("TREATMENTS_NS_REFRESH") TREATMENTS_NS_REFRESH (ColorGroup.Aaps),
@SerializedName("TT_NS_REFRESH") TT_NS_REFRESH (ColorGroup.Aaps),
@SerializedName("AUTOMATION_REMOVED") AUTOMATION_REMOVED (ColorGroup.Aaps),
@SerializedName("BG_REMOVED") BG_REMOVED (ColorGroup.Careportal),
@SerializedName("CAREPORTAL_REMOVED") CAREPORTAL_REMOVED (ColorGroup.Careportal),