Remove SerializedName (all) and Text (Sources)
This commit is contained in:
Philoul
parent
9d4a1d5944
commit
74b911d875
|
|
@ -161,7 +161,7 @@ class TreatmentsUserEntryFragment : DaggerFragment() {
|
|||
-> valuesWithUnitString += DecimalFormatter.to2Decimal(v.dValue) + translator.translate(v.unit) + separator
|
||||
Units.G, Units.M, Units.H, Units.Percent
|
||||
-> valuesWithUnitString += v.iValue.toString() + translator.translate(v.unit) + separator
|
||||
Units.Source -> source = Sources.fromText(v.sValue) // = separator + translator.translate(v.sValue)
|
||||
Units.Source -> source = Sources.fromString(v.sValue) // = separator + translator.translate(v.sValue)
|
||||
else -> valuesWithUnitString += if (v.iValue != 0 || v.sValue != "") { v.value().toString() + separator } else ""
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,77 +20,77 @@ data class UserEntry(
|
|||
var values: MutableList<ValueWithUnit>
|
||||
) : DBEntry, DBEntryWithTime {
|
||||
enum class Action (val colorGroup: ColorGroup) {
|
||||
@SerializedName("BOLUS") BOLUS (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("SMB") SMB (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("BOLUS_ADVISOR") BOLUS_ADVISOR (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("EXTENDED_BOLUS") EXTENDED_BOLUS (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("SUPERBOLUS_TBR") SUPERBOLUS_TBR (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("CARBS") CARBS (ColorGroup.CarbTreatment),
|
||||
@SerializedName("EXTENDED_CARBS") EXTENDED_CARBS (ColorGroup.CarbTreatment),
|
||||
@SerializedName("TEMP_BASAL") TEMP_BASAL (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("TT") TT (ColorGroup.TT),
|
||||
@SerializedName("NEW_PROFILE") NEW_PROFILE (ColorGroup.Profile),
|
||||
@SerializedName("CLONE_PROFILE") CLONE_PROFILE (ColorGroup.Profile),
|
||||
@SerializedName("STORE_PROFILE") STORE_PROFILE (ColorGroup.Profile),
|
||||
@SerializedName("PROFILE_SWITCH") PROFILE_SWITCH (ColorGroup.Profile),
|
||||
@SerializedName("PROFILE_SWITCH_CLONED") PROFILE_SWITCH_CLONED (ColorGroup.Profile),
|
||||
@SerializedName("CLOSED_LOOP_MODE") CLOSED_LOOP_MODE (ColorGroup.Loop),
|
||||
@SerializedName("LGS_LOOP_MODE") LGS_LOOP_MODE (ColorGroup.Loop),
|
||||
@SerializedName("OPEN_LOOP_MODE") OPEN_LOOP_MODE (ColorGroup.Loop),
|
||||
@SerializedName("LOOP_DISABLED") LOOP_DISABLED (ColorGroup.Loop),
|
||||
@SerializedName("LOOP_ENABLED") LOOP_ENABLED (ColorGroup.Loop),
|
||||
@SerializedName("RECONNECT") RECONNECT (ColorGroup.Pump),
|
||||
@SerializedName("DISCONNECT") DISCONNECT (ColorGroup.Pump),
|
||||
@SerializedName("RESUME") RESUME (ColorGroup.Loop),
|
||||
@SerializedName("SUSPEND") SUSPEND (ColorGroup.Loop),
|
||||
@SerializedName("HW_PUMP_ALLOWED") HW_PUMP_ALLOWED (ColorGroup.Pump),
|
||||
@SerializedName("CLEAR_PAIRING_KEYS") CLEAR_PAIRING_KEYS (ColorGroup.Pump),
|
||||
@SerializedName("ACCEPTS_TEMP_BASAL") ACCEPTS_TEMP_BASAL (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("CANCEL_TEMP_BASAL") CANCEL_TEMP_BASAL (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("CANCEL_EXTENDED_BOLUS") CANCEL_EXTENDED_BOLUS (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("CANCEL_TT") CANCEL_TT (ColorGroup.TT),
|
||||
@SerializedName("CAREPORTAL") CAREPORTAL (ColorGroup.Careportal),
|
||||
@SerializedName("CALIBRATION") CALIBRATION (ColorGroup.Careportal),
|
||||
@SerializedName("PRIME_BOLUS") PRIME_BOLUS (ColorGroup.Careportal),
|
||||
@SerializedName("TREATMENT") TREATMENT (ColorGroup.InsulinTreatment),
|
||||
@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),
|
||||
@SerializedName("EXTENDED_BOLUS_REMOVED") EXTENDED_BOLUS_REMOVED (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("FOOD_REMOVED") FOOD_REMOVED (ColorGroup.Careportal),
|
||||
@SerializedName("PROFILE_REMOVED") PROFILE_REMOVED (ColorGroup.Profile),
|
||||
@SerializedName("PROFILE_SWITCH_REMOVED") PROFILE_SWITCH_REMOVED (ColorGroup.Profile),
|
||||
@SerializedName("RESTART_EVENTS_REMOVED") RESTART_EVENTS_REMOVED (ColorGroup.Aaps),
|
||||
@SerializedName("TREATMENT_REMOVED") TREATMENT_REMOVED (ColorGroup.InsulinTreatment),
|
||||
@SerializedName("TT_REMOVED") TT_REMOVED (ColorGroup.TT),
|
||||
@SerializedName("NS_PAUSED") NS_PAUSED (ColorGroup.Aaps),
|
||||
@SerializedName("NS_RESUME") NS_RESUME (ColorGroup.Aaps),
|
||||
@SerializedName("NS_QUEUE_CLEARED") NS_QUEUE_CLEARED (ColorGroup.Aaps),
|
||||
@SerializedName("NS_SETTINGS_COPIED") NS_SETTINGS_COPIED (ColorGroup.Aaps),
|
||||
@SerializedName("ERROR_DIALOG_OK") ERROR_DIALOG_OK (ColorGroup.Aaps),
|
||||
@SerializedName("ERROR_DIALOG_MUTE") ERROR_DIALOG_MUTE (ColorGroup.Aaps),
|
||||
@SerializedName("ERROR_DIALOG_MUTE_5MIN") ERROR_DIALOG_MUTE_5MIN (ColorGroup.Aaps),
|
||||
@SerializedName("OBJECTIVE_STARTED") OBJECTIVE_STARTED (ColorGroup.Aaps),
|
||||
@SerializedName("OBJECTIVE_UNSTARTED") OBJECTIVE_UNSTARTED (ColorGroup.Aaps),
|
||||
@SerializedName("OBJECTIVES_SKIPPED") OBJECTIVES_SKIPPED (ColorGroup.Aaps),
|
||||
@SerializedName("STAT_RESET") STAT_RESET (ColorGroup.Aaps),
|
||||
@SerializedName("DELETE_LOGS") DELETE_LOGS (ColorGroup.Aaps),
|
||||
@SerializedName("DELETE_FUTURE_TREATMENTS") DELETE_FUTURE_TREATMENTS (ColorGroup.Aaps),
|
||||
@SerializedName("EXPORT_SETTINGS") EXPORT_SETTINGS (ColorGroup.Aaps),
|
||||
@SerializedName("IMPORT_SETTINGS") IMPORT_SETTINGS (ColorGroup.Aaps),
|
||||
@SerializedName("RESET_DATABASES") RESET_DATABASES (ColorGroup.Aaps),
|
||||
@SerializedName("EXPORT_DATABASES") EXPORT_DATABASES (ColorGroup.Aaps),
|
||||
@SerializedName("IMPORT_DATABASES") IMPORT_DATABASES (ColorGroup.Aaps),
|
||||
@SerializedName("OTP_EXPORT") OTP_EXPORT (ColorGroup.Aaps),
|
||||
@SerializedName("OTP_RESET") OTP_RESET (ColorGroup.Aaps),
|
||||
@SerializedName("STOP_SMS") STOP_SMS (ColorGroup.Aaps),
|
||||
@SerializedName("FOOD") FOOD (ColorGroup.Careportal),
|
||||
@SerializedName("EXPORT_CSV") EXPORT_CSV (ColorGroup.Aaps),
|
||||
@SerializedName("UNKNOWN") UNKNOWN (ColorGroup.Aaps)
|
||||
BOLUS (ColorGroup.InsulinTreatment),
|
||||
SMB (ColorGroup.InsulinTreatment),
|
||||
BOLUS_ADVISOR (ColorGroup.InsulinTreatment),
|
||||
EXTENDED_BOLUS (ColorGroup.InsulinTreatment),
|
||||
SUPERBOLUS_TBR (ColorGroup.InsulinTreatment),
|
||||
CARBS (ColorGroup.CarbTreatment),
|
||||
EXTENDED_CARBS (ColorGroup.CarbTreatment),
|
||||
TEMP_BASAL (ColorGroup.InsulinTreatment),
|
||||
TT (ColorGroup.TT),
|
||||
NEW_PROFILE (ColorGroup.Profile),
|
||||
CLONE_PROFILE (ColorGroup.Profile),
|
||||
STORE_PROFILE (ColorGroup.Profile),
|
||||
PROFILE_SWITCH (ColorGroup.Profile),
|
||||
PROFILE_SWITCH_CLONED (ColorGroup.Profile),
|
||||
CLOSED_LOOP_MODE (ColorGroup.Loop),
|
||||
LGS_LOOP_MODE (ColorGroup.Loop),
|
||||
OPEN_LOOP_MODE (ColorGroup.Loop),
|
||||
LOOP_DISABLED (ColorGroup.Loop),
|
||||
LOOP_ENABLED (ColorGroup.Loop),
|
||||
RECONNECT (ColorGroup.Pump),
|
||||
DISCONNECT (ColorGroup.Pump),
|
||||
RESUME (ColorGroup.Loop),
|
||||
SUSPEND (ColorGroup.Loop),
|
||||
HW_PUMP_ALLOWED (ColorGroup.Pump),
|
||||
CLEAR_PAIRING_KEYS (ColorGroup.Pump),
|
||||
ACCEPTS_TEMP_BASAL (ColorGroup.InsulinTreatment),
|
||||
CANCEL_TEMP_BASAL (ColorGroup.InsulinTreatment),
|
||||
CANCEL_EXTENDED_BOLUS (ColorGroup.InsulinTreatment),
|
||||
CANCEL_TT (ColorGroup.TT),
|
||||
CAREPORTAL (ColorGroup.Careportal),
|
||||
CALIBRATION (ColorGroup.Careportal),
|
||||
PRIME_BOLUS (ColorGroup.Careportal),
|
||||
TREATMENT (ColorGroup.InsulinTreatment),
|
||||
CAREPORTAL_NS_REFRESH (ColorGroup.Aaps),
|
||||
PROFILE_SWITCH_NS_REFRESH (ColorGroup.Aaps),
|
||||
TREATMENTS_NS_REFRESH (ColorGroup.Aaps),
|
||||
TT_NS_REFRESH (ColorGroup.Aaps),
|
||||
AUTOMATION_REMOVED (ColorGroup.Aaps),
|
||||
BG_REMOVED (ColorGroup.Careportal),
|
||||
CAREPORTAL_REMOVED (ColorGroup.Careportal),
|
||||
EXTENDED_BOLUS_REMOVED (ColorGroup.InsulinTreatment),
|
||||
FOOD_REMOVED (ColorGroup.Careportal),
|
||||
PROFILE_REMOVED (ColorGroup.Profile),
|
||||
PROFILE_SWITCH_REMOVED (ColorGroup.Profile),
|
||||
RESTART_EVENTS_REMOVED (ColorGroup.Aaps),
|
||||
TREATMENT_REMOVED (ColorGroup.InsulinTreatment),
|
||||
TT_REMOVED (ColorGroup.TT),
|
||||
NS_PAUSED (ColorGroup.Aaps),
|
||||
NS_RESUME (ColorGroup.Aaps),
|
||||
NS_QUEUE_CLEARED (ColorGroup.Aaps),
|
||||
NS_SETTINGS_COPIED (ColorGroup.Aaps),
|
||||
ERROR_DIALOG_OK (ColorGroup.Aaps),
|
||||
ERROR_DIALOG_MUTE (ColorGroup.Aaps),
|
||||
ERROR_DIALOG_MUTE_5MIN (ColorGroup.Aaps),
|
||||
OBJECTIVE_STARTED (ColorGroup.Aaps),
|
||||
OBJECTIVE_UNSTARTED (ColorGroup.Aaps),
|
||||
OBJECTIVES_SKIPPED (ColorGroup.Aaps),
|
||||
STAT_RESET (ColorGroup.Aaps),
|
||||
DELETE_LOGS (ColorGroup.Aaps),
|
||||
DELETE_FUTURE_TREATMENTS (ColorGroup.Aaps),
|
||||
EXPORT_SETTINGS (ColorGroup.Aaps),
|
||||
IMPORT_SETTINGS (ColorGroup.Aaps),
|
||||
RESET_DATABASES (ColorGroup.Aaps),
|
||||
EXPORT_DATABASES (ColorGroup.Aaps),
|
||||
IMPORT_DATABASES (ColorGroup.Aaps),
|
||||
OTP_EXPORT (ColorGroup.Aaps),
|
||||
OTP_RESET (ColorGroup.Aaps),
|
||||
STOP_SMS (ColorGroup.Aaps),
|
||||
FOOD (ColorGroup.Careportal),
|
||||
EXPORT_CSV (ColorGroup.Aaps),
|
||||
UNKNOWN (ColorGroup.Aaps)
|
||||
;
|
||||
|
||||
companion object {
|
||||
|
|
@ -102,7 +102,7 @@ data class UserEntry(
|
|||
constructor(ivalue: Int, unit: Units, condition:Boolean = true) : this(0.0, ivalue, 0, "", unit, condition)
|
||||
constructor(lvalue: Long, unit: Units, condition:Boolean = true) : this(0.0,0, lvalue, "", unit, condition)
|
||||
constructor(svalue: String, unit:Units) : this(0.0,0, 0, svalue, unit, svalue != "")
|
||||
constructor(source: Sources) : this(0.0,0, 0, source.text, Units.Source, true)
|
||||
constructor(source: Sources) : this(0.0,0, 0, source.name, Units.Source, true)
|
||||
constructor(dvalue: Double, unit:String, condition:Boolean = true) : this(dvalue,0, 0, "", Units.fromText(unit), condition)
|
||||
constructor(rStringRef: Int, nbParam: Long) : this(0.0, rStringRef, nbParam, "", Units.R_String, !rStringRef.equals(0)) // additionnal constructors for formated strings with additional values as parameters (define number of parameters as long
|
||||
|
||||
|
|
@ -114,19 +114,20 @@ data class UserEntry(
|
|||
}
|
||||
}
|
||||
enum class Units(val text: String) {
|
||||
@SerializedName("None") None (""), //Int or String
|
||||
@SerializedName("Mg_Dl") Mg_Dl ("mg/dl"), //Double
|
||||
@SerializedName("Mmol_L") Mmol_L ("mmol"), //Double
|
||||
@SerializedName("Timestamp") Timestamp("Timestamp"), //long
|
||||
@SerializedName("U") U ("U"), //Double
|
||||
@SerializedName("U_H") U_H ("U/h"), //Double
|
||||
@SerializedName("G") G ("g"), //Int
|
||||
@SerializedName("M") M ("m"), //Int
|
||||
@SerializedName("H") H ("h"), //Int
|
||||
@SerializedName("Percent") Percent ("%"), //Int
|
||||
@SerializedName("TherapyEvent") TherapyEvent ("TherapyEvent"), //String (All enum key translated by Translator function, mainly TherapyEvent)
|
||||
@SerializedName("R_String") R_String ("R.string"), //Int
|
||||
@SerializedName("Source") Source ("Source") //String
|
||||
None (""), //Int or String
|
||||
Mg_Dl ("mg/dl"), //Double
|
||||
Mmol_L ("mmol"), //Double
|
||||
Timestamp("Timestamp"), //long
|
||||
U ("U"), //Double
|
||||
U_H ("U/h"), //Double
|
||||
G ("g"), //Int
|
||||
M ("m"), //Int
|
||||
H ("h"), //Int
|
||||
Percent ("%"), //Int
|
||||
TherapyEvent ("TherapyEvent"), //String (All enum key translated by Translator function, mainly The
|
||||
R_String ("R.string"), //Int
|
||||
Source ("Source") //String
|
||||
|
||||
;
|
||||
|
||||
companion object {
|
||||
|
|
@ -134,43 +135,42 @@ data class UserEntry(
|
|||
fun fromText(unit: String?) = values().firstOrNull { it.text == unit } ?: None
|
||||
}
|
||||
}
|
||||
enum class Sources(val text: String) {
|
||||
@SerializedName("TreatmentDialog") TreatmentDialog ("TreatmentDialog"),
|
||||
@SerializedName("InsulinDialog") InsulinDialog ("InsulinDialog"),
|
||||
@SerializedName("CarbDialog") CarbDialog ("CarbDialog"),
|
||||
@SerializedName("WizardDialog") WizardDialog ("WizardDialog"),
|
||||
@SerializedName("QuickWizard") QuickWizard ("QuickWizard"),
|
||||
@SerializedName("ExtendedBolusDialog") ExtendedBolusDialog ("ExtendedBolusDialog"),
|
||||
@SerializedName("TTDialog") TTDialog ("TTDialog"),
|
||||
@SerializedName("ProfileSwitchDialog") ProfileSwitchDialog ("ProfileSwitchDialog"),
|
||||
@SerializedName("LoopDialog") LoopDialog ("LoopDialog"),
|
||||
@SerializedName("TempBasalDialog") TempBasalDialog ("TempBasalDialog"),
|
||||
@SerializedName("CalibrationDialog") CalibrationDialog ("CalibrationDialog"),
|
||||
@SerializedName("FillDialog") FillDialog ("FillDialog"),
|
||||
@SerializedName("BgCheck") BgCheck ("BgCheck"),
|
||||
@SerializedName("SensorInsert") SensorInsert ("SensorInsert"),
|
||||
@SerializedName("BatteryChange") BatteryChange ("BatteryChange"),
|
||||
@SerializedName("Note") Note ("Note"),
|
||||
@SerializedName("Exercise") Exercise ("Exercise"),
|
||||
@SerializedName("Question") Question ("Question"),
|
||||
@SerializedName("Announcement") Announcement ("Announcement"),
|
||||
@SerializedName("Actions") Actions ("Actions"), //From Actions plugin
|
||||
@SerializedName("Automation") Automation ("Automation"), //From Automation plugin
|
||||
@SerializedName("LocalProfile") LocalProfile ("LocalProfile"), //From LocalProfile plugin
|
||||
@SerializedName("Loop") Loop ("Loop"), //From Loop plugin
|
||||
@SerializedName("Maintenance") Maintenance ("Maintenance"), //From Maintenance plugin
|
||||
@SerializedName("NSClient") NSClient ("NSClient"), //From NSClient plugin
|
||||
@SerializedName("Pump") Pump ("Pump"), //From Pump plugin (for example from pump history)
|
||||
@SerializedName("SMS") SMS ("SMS"), //From SMS plugin
|
||||
@SerializedName("Treatments") Treatments ("Treatments"), //From Treatments plugin
|
||||
@SerializedName("Wear") Wear ("Wear"), //From Wear plugin
|
||||
@SerializedName("Food") Food ("Food"), //From Food plugin
|
||||
@SerializedName("Unknown") Unknown ("Unknown") //if necessary
|
||||
enum class Sources() {
|
||||
TreatmentDialog,
|
||||
InsulinDialog,
|
||||
CarbDialog,
|
||||
WizardDialog,
|
||||
QuickWizard,
|
||||
ExtendedBolusDialog,
|
||||
TTDialog,
|
||||
ProfileSwitchDialog,
|
||||
LoopDialog,
|
||||
TempBasalDialog,
|
||||
CalibrationDialog,
|
||||
FillDialog,
|
||||
BgCheck,
|
||||
SensorInsert,
|
||||
BatteryChange,
|
||||
Note,
|
||||
Exercise,
|
||||
Question,
|
||||
Announcement,
|
||||
Actions, //From Actions plugin
|
||||
Automation, //From Automation plugin
|
||||
LocalProfile, //From LocalProfile plugin
|
||||
Loop, //From Loop plugin
|
||||
Maintenance, //From Maintenance plugin
|
||||
NSClient, //From NSClient plugin
|
||||
Pump, //From Pump plugin
|
||||
SMS, //From SMS plugin
|
||||
Treatments, //From Treatments plugin
|
||||
Wear, //From Wear plugin
|
||||
Food, //From Food plugin
|
||||
Unknown //if necessary
|
||||
;
|
||||
|
||||
companion object {
|
||||
fun fromString(source: String?) = values().firstOrNull { it.name == source } ?: Unknown
|
||||
fun fromText(source: String?) = values().firstOrNull { it.text == source } ?: Unknown
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -188,7 +188,7 @@ data class UserEntry(
|
|||
fun isLoop(): Boolean {
|
||||
var result = false
|
||||
for (v in values) {
|
||||
if (v.unit == Units.Source && Sources.fromText(v.sValue).equals(Sources.Loop)) result = true
|
||||
if (v.unit == Units.Source && Sources.fromString(v.sValue).equals(Sources.Loop)) result = true
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue