From 1831728d2b40a8e8e054b78823f7d6fdda8f5158 Mon Sep 17 00:00:00 2001 From: osodebailar Date: Sat, 9 Apr 2022 17:14:09 +0200 Subject: [PATCH] color and theme cleaning - working on light theme colors --- .../plugins/general/overview/OverviewData.kt | 2 +- app/src/main/res/layout/actions_fragment.xml | 1 - core/src/main/res/values-night/colors.xml | 2 - core/src/main/res/values-night/styles.xml | 28 ++++---- core/src/main/res/values/attrs.xml | 4 -- core/src/main/res/values/colors.xml | 72 +++++++++++++++---- core/src/main/res/values/styles.xml | 35 ++++----- 7 files changed, 85 insertions(+), 59 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt index c16b6e6273..deb355c24d 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewData.kt @@ -183,7 +183,7 @@ class OverviewData @Inject constructor( } ?: R.drawable.ic_cp_basal_no_tbr fun temporaryBasalColor(context: Context?, iobCobCalculator: IobCobCalculator): Int = iobCobCalculator.getTempBasalIncludingConvertedExtended(dateUtil.now())?.let { rh.gac(context , R.attr.basal) } - ?: rh.gac(context, R.attr.textAppearancemediumColor) + ?: rh.gac(context, R.attr.defaultTextColor) /* * EXTENDED BOLUS diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml index d7b04c933f..e8362b0524 100644 --- a/app/src/main/res/layout/actions_fragment.xml +++ b/app/src/main/res/layout/actions_fragment.xml @@ -3,7 +3,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/fragmentbackground" tools:context=".plugins.general.actions.ActionsFragment"> #96CAF2 #000000 #40bbaa - #ffffff #808080 #d8d8d8 #212121 @@ -166,7 +165,6 @@ #FFFFFF00 #FFFF00FF #FFFF00 - #FF666666 #FF0000 #7484E2 #2800FF00 diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml index 5528d9f13f..2bbe7bf680 100644 --- a/core/src/main/res/values-night/styles.xml +++ b/core/src/main/res/values-night/styles.xml @@ -4,25 +4,30 @@