caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1559 from osodebailar/fix/basal-color-and-widget-arrow-color

Browse source 
Fix basal color and widget arrow color
This commit is contained in:
Milos Kozak 2022-04-04 20:49:07 +02:00 committed by GitHub
commit 174856ac71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/info/nightscout/androidaps/Widget.kt
View file

@ -6,6 +6,7 @@ import android.appwidget.AppWidgetProvider
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.graphics.Color
import android.graphics.Paint
import android.view.View
import android.widget.RemoteViews
@ -105,7 +106,11 @@ class Widget : AppWidgetProvider() {
}
)
views.setImageViewResource(R.id.arrow, trendCalculator.getTrendArrow(overviewData.lastBg).directionToIcon())
//binding.infoLayout.arrow.setColorFilter(overviewData.lastBgColor(context))
views.setInt(R.id.arrow, "setColorFilter", when {
overviewData.isLow -> rh.gc(R.color.low)
overviewData.isHigh -> rh.gc(R.color.high)
else -> rh.gc(R.color.inrange)
})
val glucoseStatus = glucoseStatusProvider.glucoseStatusData
if (glucoseStatus != null) {

6
app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt
View file

@ -196,9 +196,13 @@ class OverviewData @Inject constructor(
}
} ?: R.drawable.ic_cp_basal_no_tbr
// will be removed if a solution of getting the right color for widget is solved
val temporaryBasalColor: Int
get() = iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())?.let { rh.gc(R.color.basal) }
?: rh.gc(R.color.defaulttextcolor)
?: rh.gc(R.color.textAppearancemediumDark)
fun temporaryBasalColor(context: Context?): Int = iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())?.let { rh.gac(context , R.attr.basal) }
?: rh.gac(context, R.attr.textAppearancemediumColor)
/*
* EXTENDED BOLUS

2
app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt
View file

@ -852,7 +852,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList
@Suppress("UNUSED_PARAMETER")
fun updateTemporaryBasal(from: String) {
binding.infoLayout.baseBasal.text = overviewData.temporaryBasalText
binding.infoLayout.baseBasal.setTextColor(overviewData.temporaryBasalColor)
binding.infoLayout.baseBasal.setTextColor(overviewData.temporaryBasalColor(context))
binding.infoLayout.baseBasalIcon.setImageResource(overviewData.temporaryBasalIcon)
binding.infoLayout.basalLayout.setOnClickListener {
activity?.let { OKDialog.show(it, rh.gs(R.string.basal), overviewData.temporaryBasalDialogText) }

3
core/src/main/res/values-night/colors.xml
View file

@ -234,6 +234,9 @@
<color name="mdtp_button_selected">#33969696</color>
<color name="plastic">#EBEBEA</color>
<color name="textAppearancemediumLight">#000000</color>
<color name="textAppearancemediumDark">#B3FFFFFF</color>
<!-- dash and eros colors -->
<color name="omni_yellow">#FFFF00</color>
<color name="omni_cyan">#00FFFF</color>

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

@ -225,6 +225,7 @@
<item name="activityColor">@color/activity</item>
<!-- CardView specific colors -->
<item name="strokeColor">@color/plastic_grey</item>
<item name="textAppearancemediumColor">@color/textAppearancemediumDark</item>
</style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>

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

@ -205,4 +205,5 @@
<attr name="activityColor" format="reference|color" />
<!-- CardView specific colors -->
<attr name="strokeColor" format="reference|color" />
<attr name="textAppearancemediumColor" format="reference|color" />
</resources>

3
core/src/main/res/values/colors.xml
View file

@ -238,6 +238,9 @@
<color name="mdtp_button_selected">#33969696</color>
<color name="plastic">#EBEBEA</color>
<color name="textAppearancemediumLight">#000000</color>
<color name="textAppearancemediumDark">#B3FFFFFF</color>
<!-- dash and eros colors -->
<color name="omni_yellow">#FFFF00</color>
<color name="omni_cyan">#00FFFF</color>

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

@ -53,7 +53,7 @@
<!-- BG source temp button -->
<item name="setTempButton">@color/colorSetTempButton</item>
<!-- Card Item-->
<item name="cardItemBackgroundColor">@color/cardColorBackground</item>
<item name="cardItemBackgroundColor">?attr/colorSurface</item>
<!-- Exercise -->
<item name="exerciseColor">@color/exercise</item>
<!-- BG low -->
@ -233,6 +233,7 @@
<item name="activityColor">@color/activity</item>
<!-- CardView specific colors -->
<item name="strokeColor">@color/plastic_grey</item>
<item name="textAppearancemediumColor">@color/textAppearancemediumLight</item>
</style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>