klint
This commit is contained in:
parent
b645185005
commit
d966254815
1 changed files with 32 additions and 25 deletions
|
@ -97,6 +97,7 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
|
|||
PumpHistoryEntryGroup.Unknown
|
||||
}
|
||||
}
|
||||
|
||||
private fun filterHistory(group: PumpHistoryEntryGroup) {
|
||||
filteredHistoryList.clear()
|
||||
aapsLogger.debug(LTag.PUMP, "Items on full list: {}", fullHistoryList.size)
|
||||
|
@ -241,6 +242,7 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
|
|||
OmnipodCommandType.SET_TEMPORARY_BASAL -> {
|
||||
android.graphics.Color.WHITE
|
||||
}
|
||||
|
||||
else ->
|
||||
// Other
|
||||
android.graphics.Color.LTGRAY
|
||||
|
@ -251,7 +253,7 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
|
|||
private fun setType(record: HistoryRecord, typeView: TextView) {
|
||||
typeView.text = resourceHelper.gs(record.commandType.resourceId)
|
||||
// Set some color, include result
|
||||
setTextViewColor(check_result=true, typeView, record)
|
||||
setTextViewColor(check_result = true, typeView, record)
|
||||
}
|
||||
|
||||
private fun setValue(historyEntry: HistoryRecord, valueView: TextView) {
|
||||
|
@ -268,12 +270,14 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
|
|||
resourceHelper.gs(R.string.omnipod_common_history_tbr_value, it.rate, it.duration)
|
||||
} ?: "n/a"
|
||||
}
|
||||
|
||||
OmnipodCommandType.SET_BOLUS -> {
|
||||
val bolus = historyEntry.record as BolusRecord
|
||||
bolus?.let {
|
||||
resourceHelper.gs(R.string.omnipod_common_history_bolus_value, it.amout)
|
||||
} ?: "n/a"
|
||||
}
|
||||
|
||||
OmnipodCommandType.SET_BASAL_PROFILE,
|
||||
OmnipodCommandType.SET_TIME,
|
||||
OmnipodCommandType.INSERT_CANNULA,
|
||||
|
@ -281,11 +285,12 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
|
|||
val basal = historyEntry.record as BasalValuesRecord
|
||||
ProfileUtil.getBasalProfilesDisplayable(basal.segments.toTypedArray(), PumpType.OMNIPOD_DASH)
|
||||
}
|
||||
|
||||
else ->
|
||||
""
|
||||
}
|
||||
// Set some color
|
||||
setTextViewColor(check_result=false, valueView, historyEntry)
|
||||
setTextViewColor(check_result = false, valueView, historyEntry)
|
||||
}
|
||||
|
||||
override fun getItemCount(): Int {
|
||||
|
@ -293,6 +298,7 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
|
|||
}
|
||||
|
||||
inner class HistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
|
||||
|
||||
val timeView: TextView = itemView.findViewById(R.id.omnipod_history_time)
|
||||
val typeView: TextView = itemView.findViewById(R.id.omnipod_history_source)
|
||||
val valueView: TextView = itemView.findViewById(R.id.omnipod_history_description)
|
||||
|
@ -314,6 +320,7 @@ class DashPodHistoryActivity : NoSplashAppCompatActivity() {
|
|||
}
|
||||
|
||||
companion object {
|
||||
|
||||
private var selectedGroup: PumpHistoryEntryGroup = PumpHistoryEntryGroup.All
|
||||
const val DAYS_TO_DISPLAY = 5
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue