caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

ProfileViewer Compare icon and colors

Browse source 
Icon : change white single star with double blue and red stars
Profile names colored according to profiles (blue and red)
This commit is contained in:
Philoul 2020-07-17 01:07:16 +02:00
parent 9fe4b7682f
commit fc859acc66
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/info/nightscout/androidaps/dialogs/ProfileViewerDialog.kt
View file

@ -97,6 +97,7 @@ class ProfileViewerDialog : DaggerDialogFragment() {
profile = Profile(injector, JSONObject(customProfileJson), customProfileUnits)
profile2 = Profile(injector, JSONObject(customProfileJson2), customProfileUnits)
profileName = customProfileName
header_icon.setImageResource(R.drawable.ic_compare_profiles)
date = ""
profileview_datelayout.visibility = View.GONE
}
@ -117,7 +118,8 @@ class ProfileViewerDialog : DaggerDialogFragment() {
profile2?.let { profile2 ->
profileview_units.text = profile1.units
profileview_dia.text = HtmlHelper.fromHtml(formatColors("", profile1.dia, profile1.dia, DecimalFormat("0.00"), resourceHelper.gs(R.string.shorthour)))
profileview_activeprofile.text = profileName
val profileNames =profileName!!.split("\n").toTypedArray()
profileview_activeprofile.text = HtmlHelper.fromHtml(formatColors(profileNames[0], profileNames[1]))
profileview_date.text = date
profileview_ic.text = ics(profile1, profile2)
profileview_isf.text = isfs(profile1, profile2)
@ -177,6 +179,13 @@ class ProfileViewerDialog : DaggerDialogFragment() {
return s
}
private fun formatColors(text1: String, text2: String): String {
var s = "<font color='${resourceHelper.gc(R.color.tempbasal)}'>$text1</font>"
s += "<BR/>"
s += "<font color='${resourceHelper.gc(R.color.examinedProfile)}'>$text2</font>"
return s
}
private fun basals(profile1: Profile, profile2: Profile): Spanned {
var prev1 = 0.0
var prev2 = 0.0