From 992884fe79c7b59755902e7e96463eea26f40f8a Mon Sep 17 00:00:00 2001 From: Andries Smit Date: Tue, 19 Apr 2022 15:50:46 +0200 Subject: [PATCH] chore: rename use camelCaseStyle attribute --- .../activities/HistoryBrowseActivity.kt | 6 +-- .../activities/ProfileHelperActivity.kt | 4 +- .../objectives/ObjectivesFragment.kt | 3 +- .../general/nsclient/data/NSDeviceStatus.kt | 6 +-- .../general/overview/OverviewFragment.kt | 14 +++--- .../plugins/general/overview/OverviewMenus.kt | 3 +- .../general/overview/graphData/GraphData.kt | 3 +- .../workflow/PrepareBasalDataWorker.kt | 3 +- .../PrepareIobAutosensGraphDataWorker.kt | 15 +++---- app/src/main/res/drawable/ic_byoda.xml | 2 +- .../main/res/drawable/ic_cp_basal_start.xml | 2 +- .../main/res/drawable/ic_target_manual.xml | 2 +- .../main/res/drawable/ic_temptarget_flat.xml | 2 +- .../main/res/drawable/ic_temptarget_low.xml | 2 +- .../main/res/drawable/ic_trash_outline.xml | 2 +- .../res/layout/activity_profilehelper.xml | 2 +- .../androidaps/extensions/UserEntryExt.kt | 4 +- .../userEntry/UserEntryPresentationHelper.kt | 4 +- .../main/res/drawable/ic_cp_pump_canula.xml | 2 +- .../main/res/drawable/ic_temptarget_high.xml | 2 +- core/src/main/res/values-night/colors.xml | 44 +++++++++---------- core/src/main/res/values-night/styles.xml | 44 +++++++++---------- core/src/main/res/values/attrs.xml | 39 ++++++++-------- core/src/main/res/values/colors.xml | 42 +++++++++--------- core/src/main/res/values/styles.xml | 42 +++++++++--------- 25 files changed, 144 insertions(+), 150 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt index 8abf3ff860..c167cdac8d 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt @@ -171,7 +171,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() { axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80 - binding.bgGraph.gridLabelRenderer?.gridColor = rh.gac(this, R.attr.graphgrid) + binding.bgGraph.gridLabelRenderer?.gridColor = rh.gac(this, R.attr.graphGrid) binding.bgGraph.gridLabelRenderer?.reloadStyles() binding.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth @@ -244,12 +244,12 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() { val graph = GraphView(this) graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, rh.dpToPx(100)).also { it.setMargins(0, rh.dpToPx(15), 0, rh.dpToPx(10)) } - graph.gridLabelRenderer?.gridColor = rh.gac(R.attr.graphgrid) + graph.gridLabelRenderer?.gridColor = rh.gac(R.attr.graphGrid) graph.gridLabelRenderer?.reloadStyles() graph.gridLabelRenderer?.isHorizontalLabelsVisible = false graph.gridLabelRenderer?.labelVerticalWidth = axisWidth graph.gridLabelRenderer?.numVerticalLabels = 3 - graph.viewport.backgroundColor = rh.gac(this, R.attr.viewPortbackgroundColor) + graph.viewport.backgroundColor = rh.gac(this, R.attr.viewPortBackgroundColor) relativeLayout.addView(graph) val label = TextView(this) diff --git a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt index 36a548d0f2..81563f0944 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt @@ -316,7 +316,7 @@ class ProfileHelperActivity : NoSplashAppCompatActivity() { } private fun setBackgroundColorOnSelected(tab: Int) { - binding.menu1.setBackgroundColor(rh.gac(this, if (tab == 1) R.attr.defaultbackground else R.attr.helperProfileColor)) - binding.menu2.setBackgroundColor(rh.gac(this, if (tab == 0) R.attr.defaultbackground else R.attr.examinedProfileColor)) + binding.menu1.setBackgroundColor(rh.gac(this, if (tab == 1) R.attr.defaultBackground else R.attr.helperProfileColor)) + binding.menu2.setBackgroundColor(rh.gac(this, if (tab == 0) R.attr.defaultBackground else R.attr.examinedProfileColor)) } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt index 7b254e4f72..84cd7eebba 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt @@ -1,7 +1,6 @@ package info.nightscout.androidaps.plugins.constraints.objectives import android.annotation.SuppressLint -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.HandlerThread @@ -230,7 +229,7 @@ class ObjectivesFragment : DaggerFragment() { } // horizontal line val separator = View(holder.binding.progress.context) - separator.setBackgroundColor(rh.gac(context, R.attr.seperatorColor)) + separator.setBackgroundColor(rh.gac(context, R.attr.separatorColor)) holder.binding.progress.addView(separator, LinearLayout.LayoutParams.MATCH_PARENT, 2) } } diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt index b7435e3916..c0a7e3a9b5 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt @@ -157,7 +157,7 @@ class NSDeviceStatus @Inject constructor( //String[] ALL_STATUS_FIELDS = {"reservoir", "battery", "clock", "status", "device"}; val string = StringBuilder() - .append("") + .append("") .append(rh.gs(R.string.pump)) .append(": ") @@ -248,7 +248,7 @@ class NSDeviceStatus @Inject constructor( val openApsStatus: Spanned get() { val string = StringBuilder() - .append("") + .append("") .append(rh.gs(R.string.openaps_short)) .append(": ") @@ -321,7 +321,7 @@ class NSDeviceStatus @Inject constructor( val uploaderStatusSpanned: Spanned get() { val string = StringBuilder() - string.append("") + string.append("") string.append(rh.gs(R.string.uploader_short)) string.append(": ") val iterator: Iterator<*> = deviceStatusData.uploaderMap.entries.iterator() diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 7244b943f5..be0149fa5b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -170,7 +170,7 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList binding.notifications.setHasFixedSize(false) binding.notifications.layoutManager = LinearLayoutManager(view.context) axisWidth = if (dm.densityDpi <= 120) 3 else if (dm.densityDpi <= 160) 10 else if (dm.densityDpi <= 320) 35 else if (dm.densityDpi <= 420) 50 else if (dm.densityDpi <= 560) 70 else 80 - binding.graphsLayout.bgGraph.gridLabelRenderer?.gridColor = rh.gac(context, R.attr.graphgrid) + binding.graphsLayout.bgGraph.gridLabelRenderer?.gridColor = rh.gac(context, R.attr.graphGrid) binding.graphsLayout.bgGraph.gridLabelRenderer?.reloadStyles() binding.graphsLayout.bgGraph.gridLabelRenderer?.labelVerticalWidth = axisWidth binding.graphsLayout.bgGraph.layoutParams?.height = rh.dpToPx(skinProvider.activeSkin().mainGraphHeight) @@ -549,16 +549,16 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_byoda), null, null) for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) { drawable?.mutate() - drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmdexColor), PorterDuff.Mode.SRC_IN) + drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmDexColor), PorterDuff.Mode.SRC_IN) } - binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmdexColor)) + binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmDexColor)) } else if (xDripIsBgSource) { binding.buttonsLayout.cgmButton.setCompoundDrawablesWithIntrinsicBounds(null, rh.gd(R.drawable.ic_xdrip), null, null) for (drawable in binding.buttonsLayout.cgmButton.compoundDrawables) { drawable?.mutate() - drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmxdripColor), PorterDuff.Mode.SRC_IN) + drawable?.colorFilter = PorterDuffColorFilter(rh.gac(context, R.attr.cgmXdripColor), PorterDuff.Mode.SRC_IN) } - binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmxdripColor)) + binding.buttonsLayout.cgmButton.setTextColor(rh.gac(context, R.attr.cgmXdripColor)) } binding.buttonsLayout.cgmButton.visibility = (sp.getBoolean(R.string.key_show_cgm_button, false) && (xDripIsBgSource || dexcomIsSource)).toVisibility() @@ -714,12 +714,12 @@ class OverviewFragment : DaggerFragment(), View.OnClickListener, OnLongClickList val graph = GraphView(context) graph.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, rh.dpToPx(skinProvider.activeSkin().secondaryGraphHeight)).also { it.setMargins(0, rh.dpToPx(15), 0, rh.dpToPx(10)) } - graph.gridLabelRenderer?.gridColor = rh.gac(context, R.attr.graphgrid) + graph.gridLabelRenderer?.gridColor = rh.gac(context, R.attr.graphGrid) graph.gridLabelRenderer?.reloadStyles() graph.gridLabelRenderer?.isHorizontalLabelsVisible = false graph.gridLabelRenderer?.labelVerticalWidth = axisWidth graph.gridLabelRenderer?.numVerticalLabels = 3 - graph.viewport.backgroundColor = rh.gac(context, R.attr.viewPortbackgroundColor) + graph.viewport.backgroundColor = rh.gac(context, R.attr.viewPortBackgroundColor) relativeLayout.addView(graph) val label = TextView(context) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt index 78990dce99..b055d92501 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt @@ -8,7 +8,6 @@ import android.view.Menu import android.view.View import android.widget.ImageButton import androidx.annotation.AttrRes -import androidx.annotation.ColorRes import androidx.annotation.StringRes import androidx.appcompat.widget.PopupMenu import com.google.gson.Gson @@ -45,7 +44,7 @@ class OverviewMenus @Inject constructor( BGI(R.string.overview_show_bgi, R.attr.bgiColor, R.attr.menuTextColor, primary = false, secondary = true,shortnameId = R.string.bgi_shortname), SEN(R.string.overview_show_sensitivity, R.attr.ratioColor, R.attr.menuTextColorInverse, primary = false, secondary = true,shortnameId = R.string.sensitivity_shortname), ACT(R.string.overview_show_activity, R.attr.activityColor, R.attr.menuTextColor, primary = true, secondary = false,shortnameId = R.string.activity_shortname), - DEVSLOPE(R.string.overview_show_deviationslope, R.attr.devslopeposColor, R.attr.menuTextColor, primary = false, secondary = true,shortnameId = R.string.devslope_shortname) + DEVSLOPE(R.string.overview_show_deviationslope, R.attr.devSlopePosColor, R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.devslope_shortname) } companion object { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt index a3475cfb41..9b21d70219 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt @@ -1,6 +1,5 @@ package info.nightscout.androidaps.plugins.general.overview.graphData -import android.graphics.Color import android.graphics.DashPathEffect import android.graphics.Paint import com.jjoe64.graphview.GraphView @@ -66,7 +65,7 @@ class GraphData( addSeries(AreaGraphSeries(inRangeAreaDataPoints).also { it.color = 0 it.isDrawBackground = true - it.backgroundColor = rh.gac(graph.context,R.attr.inrangeBackground) + it.backgroundColor = rh.gac(graph.context,R.attr.inRangeBackground) }) } diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt index d69bde9668..3310638636 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt @@ -3,7 +3,6 @@ package info.nightscout.androidaps.workflow import android.content.Context import android.graphics.DashPathEffect import android.graphics.Paint -import androidx.core.content.ContextCompat import androidx.work.Worker import androidx.work.WorkerParameters import androidx.work.workDataOf @@ -118,7 +117,7 @@ class PrepareBasalDataWorker( // create series data.overviewData.baseBasalGraphSeries = LineGraphSeries(Array(baseBasalArray.size) { i -> baseBasalArray[i] }).also { it.isDrawBackground = true - it.backgroundColor = rh.gac(ctx, R.attr.basebasalColor ) + it.backgroundColor = rh.gac(ctx, R.attr.baseBasalColor ) it.thickness = 0 } data.overviewData.tempBasalGraphSeries = LineGraphSeries(Array(tempBasalArray.size) { i -> tempBasalArray[i] }).also { diff --git a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt index cc81bf3593..35046e295b 100644 --- a/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt @@ -30,7 +30,6 @@ import info.nightscout.androidaps.receivers.DataWorker import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.androidaps.utils.resources.ResourceHelper -import info.nightscout.androidaps.utils.resources.getThemeColor import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag import java.util.ArrayList @@ -159,15 +158,15 @@ class PrepareIobAutosensGraphDataWorker( // DEVIATIONS if (autosensData != null) { - var color = rh.gac( ctx, R.attr.deviationblackColor) // "=" + var color = rh.gac( ctx, R.attr.deviationBlackColor) // "=" if (autosensData.type == "" || autosensData.type == "non-meal") { - if (autosensData.pastSensitivity == "C") color = rh.gac( ctx, R.attr.deviationgreyColor) - if (autosensData.pastSensitivity == "+") color = rh.gac( ctx, R.attr.deviationgreenColor) - if (autosensData.pastSensitivity == "-") color = rh.gac( ctx, R.attr.deviationredColor) + if (autosensData.pastSensitivity == "C") color = rh.gac( ctx, R.attr.deviationGreyColor) + if (autosensData.pastSensitivity == "+") color = rh.gac( ctx, R.attr.deviationGreenColor) + if (autosensData.pastSensitivity == "-") color = rh.gac( ctx, R.attr.deviationRedColor) } else if (autosensData.type == "uam") { color = rh.gac( ctx, R.attr.uamColor) } else if (autosensData.type == "csf") { - color = rh.gac( ctx, R.attr.deviationgreyColor) + color = rh.gac( ctx, R.attr.deviationGreyColor) } devArray.add(OverviewPlugin.DeviationDataPoint(time.toDouble(), autosensData.deviation, color, data.overviewData.devScale)) data.overviewData.maxDevValueFound = maxOf(data.overviewData.maxDevValueFound, abs(autosensData.deviation), abs(bgi)) @@ -272,11 +271,11 @@ class PrepareIobAutosensGraphDataWorker( // DEV SLOPE data.overviewData.dsMaxSeries = LineGraphSeries(Array(dsMaxArray.size) { i -> dsMaxArray[i] }).also { - it.color = rh.gac( ctx, R.attr.devslopeposColor) + it.color = rh.gac( ctx, R.attr.devSlopePosColor) it.thickness = 3 } data.overviewData.dsMinSeries = LineGraphSeries(Array(dsMinArray.size) { i -> dsMinArray[i] }).also { - it.color = rh.gac( ctx, R.attr.devslopenegColor) + it.color = rh.gac( ctx, R.attr.devSlopeNegColor) it.thickness = 3 } rxBus.send(EventIobCalculationProgress(CalculationWorkflow.ProgressData.PREPARE_IOB_AUTOSENS_DATA, 100, null)) diff --git a/app/src/main/res/drawable/ic_byoda.xml b/app/src/main/res/drawable/ic_byoda.xml index da63bef0df..8a3de6c453 100644 --- a/app/src/main/res/drawable/ic_byoda.xml +++ b/app/src/main/res/drawable/ic_byoda.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@color/byodaGray"/> diff --git a/app/src/main/res/drawable/ic_cp_basal_start.xml b/app/src/main/res/drawable/ic_cp_basal_start.xml index d8b927366e..22ba9382ec 100644 --- a/app/src/main/res/drawable/ic_cp_basal_start.xml +++ b/app/src/main/res/drawable/ic_cp_basal_start.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/basalStartColor"/> diff --git a/app/src/main/res/drawable/ic_target_manual.xml b/app/src/main/res/drawable/ic_target_manual.xml index fc41c52757..086076077e 100644 --- a/app/src/main/res/drawable/ic_target_manual.xml +++ b/app/src/main/res/drawable/ic_target_manual.xml @@ -8,7 +8,7 @@ android:fillColor="@color/tempTargetConfirmation"/> + android:fillColor="@color/inRange"/> diff --git a/app/src/main/res/drawable/ic_temptarget_flat.xml b/app/src/main/res/drawable/ic_temptarget_flat.xml index bf1a2492a1..dff5ff88e4 100644 --- a/app/src/main/res/drawable/ic_temptarget_flat.xml +++ b/app/src/main/res/drawable/ic_temptarget_flat.xml @@ -5,7 +5,7 @@ android:viewportHeight="24"> + android:fillColor="@color/inRange"/> diff --git a/app/src/main/res/drawable/ic_temptarget_low.xml b/app/src/main/res/drawable/ic_temptarget_low.xml index a161fd12f4..b91b1dac51 100644 --- a/app/src/main/res/drawable/ic_temptarget_low.xml +++ b/app/src/main/res/drawable/ic_temptarget_low.xml @@ -5,7 +5,7 @@ android:viewportHeight="24"> + android:fillColor="@color/inRange"/> diff --git a/app/src/main/res/drawable/ic_trash_outline.xml b/app/src/main/res/drawable/ic_trash_outline.xml index a411c394e0..296cdd090a 100644 --- a/app/src/main/res/drawable/ic_trash_outline.xml +++ b/app/src/main/res/drawable/ic_trash_outline.xml @@ -3,5 +3,5 @@ android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_profilehelper.xml b/app/src/main/res/layout/activity_profilehelper.xml index 509d23b6b8..b9e2aaf3b5 100644 --- a/app/src/main/res/layout/activity_profilehelper.xml +++ b/app/src/main/res/layout/activity_profilehelper.xml @@ -15,7 +15,7 @@ diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt b/core/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt index f38e9f384d..2e5c75787f 100644 --- a/core/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt +++ b/core/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt @@ -12,8 +12,8 @@ fun ColorGroup.colorId(): Int { ColorGroup.Loop -> R.color.loopClosed ColorGroup.Careportal -> R.color.high ColorGroup.Pump -> R.color.iob - ColorGroup.Aaps -> R.color.defaulttext - else -> R.color.defaulttext + ColorGroup.Aaps -> R.color.defaultText + else -> R.color.defaultText } } diff --git a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt b/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt index f21deec9d1..f462c0f209 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt +++ b/core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt @@ -36,8 +36,8 @@ class UserEntryPresentationHelper @Inject constructor( ColorGroup.Loop -> R.color.loopClosed ColorGroup.Careportal -> R.color.high ColorGroup.Pump -> R.color.loopDisconnected - ColorGroup.Aaps -> R.color.defaulttext - else -> R.color.defaulttext + ColorGroup.Aaps -> R.color.defaultText + else -> R.color.defaultText } fun iconId(source: Sources): Int = when (source) { diff --git a/core/src/main/res/drawable/ic_cp_pump_canula.xml b/core/src/main/res/drawable/ic_cp_pump_canula.xml index 7e8bce4d17..b37a3c6903 100644 --- a/core/src/main/res/drawable/ic_cp_pump_canula.xml +++ b/core/src/main/res/drawable/ic_cp_pump_canula.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="?attr/pumpCannulaColor"/> diff --git a/core/src/main/res/drawable/ic_temptarget_high.xml b/core/src/main/res/drawable/ic_temptarget_high.xml index 38c1f04bb7..8f0cbfc254 100644 --- a/core/src/main/res/drawable/ic_temptarget_high.xml +++ b/core/src/main/res/drawable/ic_temptarget_high.xml @@ -5,7 +5,7 @@ android:viewportHeight="24"> + android:fillColor="?attr/tempTargetBgInRange"/> diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/colors.xml index ff02e8002f..b3ad618663 100644 --- a/core/src/main/res/values-night/colors.xml +++ b/core/src/main/res/values-night/colors.xml @@ -23,8 +23,8 @@ #1c171c #FFFFFF - #000000 - #B3FFFFFF + #000000 + #B3FFFFFF #262626 @@ -60,9 +60,9 @@ #FF000000 #C803A9F4 #FFFF5555 - #BBBBBB + #BBBBBB - + @color/buttonBackground @@ -79,7 +79,7 @@ #FF1313 - #00FF00 + #00FF00 #FF0000 #FFFF00 #1e88e5 @@ -163,14 +163,14 @@ #FFFFFF #d3f166 #00EEEE - #FFFFFF00 - #FFFF00FF + #FFFFFF00 + #FFFF00FF #FFFF00 #FF0000 #7484E2 - #4000FF00 - #C83F51B5 - #757575 + #4000FF00 + #C83F51B5 + #757575 #ff1a1a #77dd77 #66FC0000 @@ -203,16 +203,16 @@ #de7550 #25912e - #c8666666 - #7200FF00 - #72FF0000 - #72000000 + #c8666666 + #7200FF00 + #72FF0000 + #72000000 #000000 #FEAF05 #CF8BFE - #67dfe8 + #67dfe8 #67dfe8 #36FF00 #FEAF05 @@ -223,21 +223,21 @@ #FEAF05 - #323232 - #424242 + #323232 + #424242 #3C3C3C #666666 - #999999 + #999999 #8c8c8c #72000000 #c8666666 - #B2B2B2 - #4dB1B1B1 + #B2B2B2 + #4dB1B1B1 #33969696 #EBEBEA - #000000 - #B3FFFFFF + #000000 + #B3FFFFFF #FFFF00 diff --git a/core/src/main/res/values-night/styles.xml b/core/src/main/res/values-night/styles.xml index 153b751a42..bc48e54e08 100644 --- a/core/src/main/res/values-night/styles.xml +++ b/core/src/main/res/values-night/styles.xml @@ -95,7 +95,7 @@ @color/tabSelectedText @color/tabText - @color/defaultbackground + @color/defaultBackground @color/toastBase @@ -106,19 +106,19 @@ @style/DialogTheme @color/sandGray - + 12dp - - @color/graphgrid - @color/transparent + + @color/graphGrid + @color/transparent @color/tempTargetBackground - @color/byodagray - @color/colorCalibrationButton + @color/byodaGray + @color/colorCalibrationButton @color/low @color/high - @color/inrange + @color/inRange @color/helperProfile @color/examinedProfile @@ -139,7 +139,7 @@ @color/omni_yellow @color/omni_cyan @color/omni_green - @color/midgray + @color/midGray @color/omnipod_wizard_finish_button @color/omni_yellow @@ -172,7 +172,7 @@ @color/carbs @color/tempTargetConfirmation - @color/tempTargetConfirmation + @color/tempTargetConfirmation @color/loopSuspended @@ -189,12 +189,12 @@ @color/extendedBolus @color/extBolusStop - @color/actionBasal + @color/actionBasal @color/actionBasal @color/actionBasal @color/actionBasal @color/actionBasal - @color/pumpCanula + @color/pumpCannula @color/cgmInsert @color/pumpBattery @color/note @@ -217,31 +217,31 @@ @color/mdtp_line_dark @color/mdtp_line_dark - @color/inrangebackground - @color/devslopepos - @color/devslopeneg - @color/deviationgrey - @color/deviationblack - @color/deviationgreen - @color/deviationred + @color/inRangeBackground + @color/devSlopePos + @color/devSlopeNeg + @color/deviationGrey + @color/deviationBlack + @color/deviationGreen + @color/deviationRed @color/prediction @color/iobPredAS @color/bgi @color/ratio @color/activity - @color/basebasal + @color/baseBasal @color/white @color/black @color/black @color/plastic_grey - @color/textAppearancemediumDark + @color/textAppearanceMediumDark @style/Aaps_ActionBarStyle @color/isAccomplished - @color/sphere_plastic_grey + @color/sphere_plastic_grey @color/isCompleted @color/isNotCompleted diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index a772a00101..0f5f4d2b5d 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -17,7 +17,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -83,13 +83,13 @@ - - - + + + - - + + @@ -163,12 +163,12 @@ - + - + @@ -193,30 +193,29 @@ - - - - - - - - + + + + + + + - + - + - + \ No newline at end of file diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index 400d3af6df..288d8aa292 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -23,8 +23,8 @@ #1c171c #FFFFFF - #FFFFFF - #000000 + #FFFFFF + #000000 #262626 @@ -61,7 +61,7 @@ #FF000000 #C803A9F4 #FFFF5555 - #BBBBBB + #BBBBBB @color/white @@ -80,7 +80,7 @@ #FF1313 - #00FF00 + #00FF00 #FF0000 #FFFB8C00 #1e88e5 @@ -166,14 +166,14 @@ #000000 #d3f166 #00EEEE - #FFFFFF00 - #FFFF00FF + #FFFFFF00 + #FFFF00FF #F6CE22 #FF0000 #7484E2 - #2800FF00 - #C83F51B5 - #757575 + #2800FF00 + #C83F51B5 + #757575 #ff1a1a #77dd77 #66FC0000 @@ -206,16 +206,16 @@ #de7550 #25912e - #c8666666 - #7200FF00 - #72FF0000 - #72000000 + #c8666666 + #7200FF00 + #72FF0000 + #72000000 #FFFFFF #FEAF05 #CF8BFE - #42A5F5 + #42A5F5 #42A5F5 #66BB6A #FEAF05 @@ -226,22 +226,22 @@ #FEAF05 - #323232 - #424242 + #323232 + #424242 #8C8C8C #666666 - #777777 + #777777 #8c8c8c #72000000 #c8666666 - #B2B2B2 + #B2B2B2 #D6D7D7 - #4dB1B1B1 + #4dB1B1B1 #33969696 #EBEBEA - #000000 - #B3FFFFFF + #000000 + #B3FFFFFF #FFFF00 diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index b0d4533c8b..0d8a1f1796 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -100,7 +100,7 @@ @color/tabSelectedText @color/tabText - @color/white + @color/white @color/toastBase @@ -109,15 +109,15 @@ @style/DialogTheme @style/DialogTheme @style/DialogTheme - + 12dp - - @color/graphgrid - @color/transparent + + @color/graphGrid + @color/transparent @color/tempTargetBackground - @color/byodagray - @color/colorCalibrationButton + @color/byodaGray + @color/colorCalibrationButton @color/low @color/high @@ -142,7 +142,7 @@ @color/omni_yellow @color/omni_cyan @color/omni_green - @color/midgray + @color/midGray @color/omnipod_wizard_finish_button @color/high @@ -175,7 +175,7 @@ @color/carbs @color/tempTargetConfirmation - @color/tempTargetConfirmation + @color/tempTargetConfirmation @color/loopSuspended @@ -192,12 +192,12 @@ @color/extendedBolus @color/extBolusStop - @color/actionBasal + @color/actionBasal @color/actionBasal @color/actionBasal @color/actionBasal @color/actionBasal - @color/pumpCanula + @color/pumpCannula @color/cgmInsert @color/pumpBattery @color/note @@ -220,31 +220,31 @@ @color/mdtp_line_dark @color/mdtp_line_dark - @color/inrangebackground - @color/devslopepos - @color/devslopeneg - @color/deviationgrey - @color/deviationblack - @color/deviationgreen - @color/deviationred + @color/inRangeBackground + @color/devSlopePos + @color/devSlopeNeg + @color/deviationGrey + @color/deviationBlack + @color/deviationGreen + @color/deviationRed @color/prediction @color/iobPredAS @color/bgi @color/ratio @color/activity - @color/basebasal + @color/baseBasal @color/black @color/black @color/white @color/plastic_grey - @color/textAppearancemediumLight + @color/textAppearanceMediumLight @style/Aaps_ActionBarStyle @color/isAccomplished - @color/sphere_plastic_grey + @color/sphere_plastic_grey @color/isCompleted @color/isNotCompleted