Merge pull request #2627 from Philoul/TempBasal_Icon_Switched
Temp Basal new icons for temp basal in overview
|
@ -671,7 +671,11 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
|
||||||
}
|
}
|
||||||
overview_basebasal?.setTextColor(activeTemp?.let { resourceHelper.gc(R.color.basal) }
|
overview_basebasal?.setTextColor(activeTemp?.let { resourceHelper.gc(R.color.basal) }
|
||||||
?: resourceHelper.gc(R.color.defaulttextcolor))
|
?: resourceHelper.gc(R.color.defaulttextcolor))
|
||||||
overview_basebasal_icon.setImageResource(if (activeTemp != null) R.drawable.icon_cp_basal_start else R.drawable.icon_cp_basal_end)
|
|
||||||
|
if (activeTemp != null)
|
||||||
|
overview_basebasal_icon.setImageResource(if (activeTemp.tempBasalConvertedToPercent(System.currentTimeMillis(), profile) > 100) R.drawable.icon_cp_basal_tbr_high else R.drawable.icon_cp_basal_tbr_low)
|
||||||
|
else
|
||||||
|
overview_basebasal_icon.setImageResource( R.drawable.icon_cp_basal_no_tbr )
|
||||||
|
|
||||||
// Extended bolus
|
// Extended bolus
|
||||||
val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
|
val extendedBolus = treatmentsPlugin.getExtendedBolusFromHistory(System.currentTimeMillis())
|
||||||
|
|
BIN
app/src/main/res/drawable-hdpi/icon_cp_basal_no_tbr.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_high.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable-hdpi/icon_cp_basal_tbr_low.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable-mdpi/icon_cp_basal_no_tbr.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_high.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable-mdpi/icon_cp_basal_tbr_low.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable-xhdpi/icon_cp_basal_no_tbr.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_high.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable-xhdpi/icon_cp_basal_tbr_low.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable-xxhdpi/icon_cp_basal_no_tbr.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_high.png
Normal file
After Width: | Height: | Size: 18 KiB |
BIN
app/src/main/res/drawable-xxhdpi/icon_cp_basal_tbr_low.png
Normal file
After Width: | Height: | Size: 18 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/icon_cp_basal_no_tbr.png
Normal file
After Width: | Height: | Size: 15 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_high.png
Normal file
After Width: | Height: | Size: 15 KiB |
BIN
app/src/main/res/drawable-xxxhdpi/icon_cp_basal_tbr_low.png
Normal file
After Width: | Height: | Size: 15 KiB |
BIN
app/src/main/res/drawable/icon_cp_basal_no_tbr.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable/icon_cp_basal_tbr_high.png
Normal file
After Width: | Height: | Size: 17 KiB |
BIN
app/src/main/res/drawable/icon_cp_basal_tbr_low.png
Normal file
After Width: | Height: | Size: 17 KiB |