caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Theme switcher preparation: gac for carbs, extbolus, boluswizard, profileviewer

Browse source
This commit is contained in:
osodebailar 2022-03-29 13:14:05 +02:00
parent 1e0d1edfb5
commit 45c34c2677
8 changed files with 59 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt
View file

@ -234,8 +234,9 @@ class CarbsDialog : DialogFragmentWithDate() {
if (activitySelected) if (activitySelected)
actions.add( actions.add(
rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, activityTTDuration) + ")").formatColor( rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(activityTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, activityTTDuration) + ")").formatColor(
context,
rh, rh,
R.color.tempTargetConfirmation R.attr.tempTargetConfirmation
) )
) )
val eatingSoonSelected = binding.eatingSoonTt.isChecked val eatingSoonSelected = binding.eatingSoonTt.isChecked
@ -244,27 +245,27 @@ class CarbsDialog : DialogFragmentWithDate() {
rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + rh.gs( rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(eatingSoonTT) + " " + unitLabel + " (" + rh.gs(
R.string.format_mins, R.string.format_mins,
eatingSoonTTDuration eatingSoonTTDuration
) + ")").formatColor(rh, R.color.tempTargetConfirmation) ) + ")").formatColor(context, rh, R.attr.tempTargetConfirmation)
) )
val hypoSelected = binding.hypoTt.isChecked val hypoSelected = binding.hypoTt.isChecked
if (hypoSelected) if (hypoSelected)
actions.add( actions.add(
rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(hypoTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, hypoTTDuration) + ")").formatColor( rh.gs(R.string.temptargetshort) + ": " + (DecimalFormatter.to1Decimal(hypoTT) + " " + unitLabel + " (" + rh.gs(R.string.format_mins, hypoTTDuration) + ")").formatColor( context,
rh, rh,
R.color.tempTargetConfirmation R.attr.tempTargetConfirmation
) )
) )
val timeOffset = binding.time.value.toInt() val timeOffset = binding.time.value.toInt()
if (useAlarm && carbs > 0 && timeOffset > 0) if (useAlarm && carbs > 0 && timeOffset > 0)
actions.add(rh.gs(R.string.alarminxmin, timeOffset).formatColor(rh, R.color.info)) actions.add(rh.gs(R.string.alarminxmin, timeOffset).formatColor(context , rh, R.attr.infoColor))
val duration = binding.duration.value.toInt() val duration = binding.duration.value.toInt()
if (duration > 0) if (duration > 0)
actions.add(rh.gs(R.string.duration) + ": " + duration + rh.gs(R.string.shorthour)) actions.add(rh.gs(R.string.duration) + ": " + duration + rh.gs(R.string.shorthour))
if (carbsAfterConstraints > 0) { if (carbsAfterConstraints > 0) {
actions.add(rh.gs(R.string.carbs) + ": " + "<font color='" + rh.gc(R.color.carbs) + "'>" + rh.gs(R.string.format_carbs, carbsAfterConstraints) + "</font>") actions.add(rh.gs(R.string.carbs) + ": " + "<font color='" + rh.gac(context, R.attr.carbsColor) + "'>" + rh.gs(R.string.format_carbs, carbsAfterConstraints) + "</font>")
if (carbsAfterConstraints != carbs) if (carbsAfterConstraints != carbs)
actions.add("<font color='" + rh.gc(R.color.warning) + "'>" + rh.gs(R.string.carbsconstraintapplied) + "</font>") actions.add("<font color='" + rh.gac(context, R.attr.warningColor) + "'>" + rh.gs(R.string.carbsconstraintapplied) + "</font>")
} }
val notes = binding.notesLayout.notes.text.toString() val notes = binding.notesLayout.notes.text.toString()
if (notes.isNotEmpty()) if (notes.isNotEmpty())

2
app/src/main/java/info/nightscout/androidaps/dialogs/ExtendedBolusDialog.kt
View file

@ -93,7 +93,7 @@ class ExtendedBolusDialog : DialogFragmentWithDate() {
actions.add(rh.gs(R.string.formatinsulinunits, insulinAfterConstraint)) actions.add(rh.gs(R.string.formatinsulinunits, insulinAfterConstraint))
actions.add(rh.gs(R.string.duration) + ": " + rh.gs(R.string.format_mins, durationInMinutes)) actions.add(rh.gs(R.string.duration) + ": " + rh.gs(R.string.format_mins, durationInMinutes))
if (abs(insulinAfterConstraint - insulin) > 0.01) if (abs(insulinAfterConstraint - insulin) > 0.01)
actions.add(rh.gs(R.string.constraintapllied).formatColor(rh, R.color.warning)) actions.add(rh.gs(R.string.constraintapllied).formatColor(context, rh, R.attr.warningColor))
activity?.let { activity -> activity?.let { activity ->
OKDialog.showConfirmation(activity, rh.gs(R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), { OKDialog.showConfirmation(activity, rh.gs(R.string.extended_bolus), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {

23
app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt
View file

@ -300,12 +300,12 @@ class BolusWizard @Inject constructor(
) )
} }
private fun confirmMessageAfterConstraints(advisor: Boolean): Spanned { private fun confirmMessageAfterConstraints(context: Context, advisor: Boolean): Spanned {
val actions: LinkedList<String> = LinkedList() val actions: LinkedList<String> = LinkedList()
if (insulinAfterConstraints > 0) { if (insulinAfterConstraints > 0) {
val pct = if (percentageCorrection != 100) " ($percentageCorrection%)" else "" val pct = if (percentageCorrection != 100) " ($percentageCorrection%)" else ""
actions.add(rh.gs(R.string.bolus) + ": " + rh.gs(R.string.formatinsulinunits, insulinAfterConstraints).formatColor(rh, R.color.bolus) + pct) actions.add(rh.gs(R.string.bolus) + ": " + rh.gs(R.string.formatinsulinunits, insulinAfterConstraints).formatColor(context, rh, R.attr.bolusColor) + pct)
} }
if (carbs > 0 && !advisor) { if (carbs > 0 && !advisor) {
var timeShift = "" var timeShift = ""
@ -314,24 +314,25 @@ class BolusWizard @Inject constructor(
} else if (carbTime < 0) { } else if (carbTime < 0) {
timeShift += " (" + rh.gs(R.string.mins, carbTime) + ")" timeShift += " (" + rh.gs(R.string.mins, carbTime) + ")"
} }
actions.add(rh.gs(R.string.carbs) + ": " + rh.gs(R.string.format_carbs, carbs).formatColor(rh, R.color.carbs) + timeShift) actions.add(rh.gs(R.string.carbs) + ": " + rh.gs(R.string.format_carbs, carbs).formatColor(context, rh, R.attr.carbsColor) + timeShift)
} }
if (insulinFromCOB > 0) { if (insulinFromCOB > 0) {
actions.add( actions.add(
rh.gs(R.string.cobvsiob) + ": " + rh.gs(R.string.formatsignedinsulinunits, insulinFromBolusIOB + insulinFromBasalIOB + insulinFromCOB + insulinFromBG).formatColor(rh, R.color.cobAlert) rh.gs(R.string.cobvsiob) + ": " + rh.gs(R.string.formatsignedinsulinunits, insulinFromBolusIOB + insulinFromBasalIOB + insulinFromCOB + insulinFromBG).formatColor(context, rh, R.attr
.cobAlertColor)
) )
val absorptionRate = iobCobCalculator.ads.slowAbsorptionPercentage(60) val absorptionRate = iobCobCalculator.ads.slowAbsorptionPercentage(60)
if (absorptionRate > .25) if (absorptionRate > .25)
actions.add(rh.gs(R.string.slowabsorptiondetected, rh.gc(R.color.cobAlert), (absorptionRate * 100).toInt())) actions.add(rh.gs(R.string.slowabsorptiondetected, rh.gac(context, R.attr.cobAlertColor), (absorptionRate * 100).toInt()))
} }
if (abs(insulinAfterConstraints - calculatedTotalInsulin) > activePlugin.activePump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints)) if (abs(insulinAfterConstraints - calculatedTotalInsulin) > activePlugin.activePump.pumpDescription.pumpType.determineCorrectBolusStepSize(insulinAfterConstraints))
actions.add(rh.gs(R.string.bolusconstraintappliedwarn, calculatedTotalInsulin, insulinAfterConstraints).formatColor(rh, R.color.warning)) actions.add(rh.gs(R.string.bolusconstraintappliedwarn, calculatedTotalInsulin, insulinAfterConstraints).formatColor(context, rh, R.attr.warningColor))
if (config.NSCLIENT && insulinAfterConstraints > 0) if (config.NSCLIENT && insulinAfterConstraints > 0)
actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(rh, R.color.warning)) actions.add(rh.gs(R.string.bolusrecordedonly).formatColor(context, rh, R.attr.warningColor))
if (useAlarm && !advisor && carbs > 0 && carbTime > 0) if (useAlarm && !advisor && carbs > 0 && carbTime > 0)
actions.add(rh.gs(R.string.alarminxmin, carbTime).formatColor(rh, R.color.info)) actions.add(rh.gs(R.string.alarminxmin, carbTime).formatColor(context, rh, R.attr.infoColor))
if (advisor) if (advisor)
actions.add(rh.gs(R.string.advisoralarm).formatColor(rh, R.color.info)) actions.add(rh.gs(R.string.advisoralarm).formatColor(context, rh, R.attr.infoColor))
return HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)) return HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions))
} }
@ -360,7 +361,7 @@ class BolusWizard @Inject constructor(
} }
private fun bolusAdvisorProcessing(ctx: Context) { private fun bolusAdvisorProcessing(ctx: Context) {
val confirmMessage = confirmMessageAfterConstraints(advisor = true) val confirmMessage = confirmMessageAfterConstraints(ctx, advisor = true)
OKDialog.showConfirmation(ctx, rh.gs(R.string.boluswizard), confirmMessage, { OKDialog.showConfirmation(ctx, rh.gs(R.string.boluswizard), confirmMessage, {
DetailedBolusInfo().apply { DetailedBolusInfo().apply {
eventType = DetailedBolusInfo.EventType.CORRECTION_BOLUS eventType = DetailedBolusInfo.EventType.CORRECTION_BOLUS
@ -417,7 +418,7 @@ class BolusWizard @Inject constructor(
val profile = profileFunction.getProfile() ?: return val profile = profileFunction.getProfile() ?: return
val pump = activePlugin.activePump val pump = activePlugin.activePump
val confirmMessage = confirmMessageAfterConstraints(advisor = false) val confirmMessage = confirmMessageAfterConstraints(ctx, advisor = false)
OKDialog.showConfirmation(ctx, rh.gs(R.string.boluswizard), confirmMessage, { OKDialog.showConfirmation(ctx, rh.gs(R.string.boluswizard), confirmMessage, {
if (insulinAfterConstraints > 0 || carbs > 0) { if (insulinAfterConstraints > 0 || carbs > 0) {
if (useSuperBolus) { if (useSuperBolus) {

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

@ -206,20 +206,20 @@ class ProfileViewerDialog : DaggerDialogFragment() {
} }
private fun formatColors(label: String, text1: String, text2: String, units: String): String { private fun formatColors(label: String, text1: String, text2: String, units: String): String {
var s = "<font color='${rh.gc(R.color.white)}'>$label</font>" var s = "<font color='${rh.gac(context, R.attr.defaultTextColor)}'>$label</font>"
s += " " s += " "
s += "<font color='${rh.gc(R.color.tempbasal)}'>$text1</font>" s += "<font color='${rh.gac(context, R.attr.tempBasalColor)}'>$text1</font>"
s += " " s += " "
s += "<font color='${rh.gc(R.color.examinedProfile)}'>$text2</font>" s += "<font color='${rh.gac(context, R.attr.examinedProfileColor)}'>$text2</font>"
s += " " s += " "
s += "<font color='${rh.gc(R.color.white)}'>$units</font>" s += "<font color='${rh.gac(context, R.attr.defaultTextColor)}'>$units</font>"
return s return s
} }
private fun formatColors(text1: String, text2: String): String { private fun formatColors(text1: String, text2: String): String {
var s = "<font color='${rh.gc(R.color.tempbasal)}'>$text1</font>" var s = "<font color='${rh.gac(context, R.attr.tempBasalColor)}'>$text1</font>"
s += "<BR/>" s += "<BR/>"
s += "<font color='${rh.gc(R.color.examinedProfile)}'>$text2</font>" s += "<font color='${rh.gac(context, R.attr.examinedProfileColor)}'>$text2</font>"
return s return s
} }

5
core/src/main/java/info/nightscout/androidaps/extensions/HtmlString.kt
View file

@ -1,5 +1,7 @@
package info.nightscout.androidaps.extensions package info.nightscout.androidaps.extensions
import android.content.Context
import androidx.annotation.AttrRes
import androidx.annotation.ColorRes import androidx.annotation.ColorRes
import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.resources.ResourceHelper
@ -9,3 +11,6 @@ fun String.formatBold(): String =
fun String.formatColor(rh: ResourceHelper, @ColorRes colorId: Int): String = fun String.formatColor(rh: ResourceHelper, @ColorRes colorId: Int): String =
"<font color='" + rh.gc(colorId) + "'>" + this + "</font>" "<font color='" + rh.gc(colorId) + "'>" + this + "</font>"
fun String.formatColor(context: Context?, rh: ResourceHelper, @AttrRes attributeId: Int): String =
"<font color='" + rh.gac(context, attributeId) + "'>" + this + "</font>"

9
core/src/main/res/values-night/styles.xml
View file

@ -133,6 +133,15 @@
<!---Local profile --> <!---Local profile -->
<item name="okBackgroundColor">@color/ok_background</item> <item name="okBackgroundColor">@color/ok_background</item>
<item name="errorBackgroundColor">@color/error_background</item> <item name="errorBackgroundColor">@color/error_background</item>
<!---Warning -->
<item name="warningColor">@color/warning</item>
<!---TextColor -->
<item name="defaultTextColor">@color/white</item>
<!---TempBasal -->
<item name="tempBasalColor">@color/tempbasal</item>
<item name="infoColor">@color/info</item>
<!---Bolus wizard -->
<item name="cobAlertColor">@color/cobAlert</item>
</style> </style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/> <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>

9
core/src/main/res/values/attrs.xml
View file

@ -107,4 +107,13 @@
<!---Local profile --> <!---Local profile -->
<attr name="okBackgroundColor" format="reference|color" /> <attr name="okBackgroundColor" format="reference|color" />
<attr name="errorBackgroundColor" format="reference|color" /> <attr name="errorBackgroundColor" format="reference|color" />
<!---Warning -->
<attr name="warningColor" format="reference|color" />
<!---TextColor -->
<attr name="defaultTextColor" format="reference|color" />
<!---Profile viewer TempBasal -->
<attr name="tempBasalColor" format="reference|color" />
<attr name="infoColor" format="reference|color" />
<!---Bolus wizard -->
<attr name="cobAlertColor" format="reference|color" />
</resources> </resources>

9
core/src/main/res/values/styles.xml
View file

@ -132,6 +132,15 @@
<!---Local profile --> <!---Local profile -->
<item name="okBackgroundColor">@color/ok_background</item> <item name="okBackgroundColor">@color/ok_background</item>
<item name="errorBackgroundColor">@color/error_background</item> <item name="errorBackgroundColor">@color/error_background</item>
<!---Warning -->
<item name="warningColor">@color/warning</item>
<!---TextColor -->
<item name="defaultTextColor">@color/black</item>
<!---TempBasal -->
<item name="tempBasalColor">@color/tempbasal</item>
<item name="infoColor">@color/info</item>
<!---Bolus wizard -->
<item name="cobAlertColor">@color/cobAlert</item>
</style> </style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/> <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>