caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1647 from Andries-Smit/chore/rename-styles

Browse source 
chore: rename using camelCase style attribute
This commit is contained in:
Milos Kozak 2022-04-19 17:38:10 +02:00 committed by GitHub
parent 25a108db1c 992884fe79
commit a49ed949fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 144 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt
View file

@ -170,7 +170,7 @@ class HistoryBrowseActivity : NoSplashAppCompatActivity() {
windowManager.defaultDisplay.getMetrics(dm)
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
@ -243,12 +243,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)

4
app/src/main/java/info/nightscout/androidaps/activities/ProfileHelperActivity.kt
View file

@ -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))
}
}

3
app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt
View file

@ -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)
}
}

6
app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/data/NSDeviceStatus.kt
View file

@ -157,7 +157,7 @@ class NSDeviceStatus @Inject constructor(
//String[] ALL_STATUS_FIELDS = {"reservoir", "battery", "clock", "status", "device"};
val string = StringBuilder()
.append("<span style=\"color:${rh.gcs(R.color.defaulttext)}\">")
.append("<span style=\"color:${rh.gcs(R.color.defaultText)}\">")
.append(rh.gs(R.string.pump))
.append(": </span>")
@ -248,7 +248,7 @@ class NSDeviceStatus @Inject constructor(
val openApsStatus: Spanned
get() {
val string = StringBuilder()
.append("<span style=\"color:${rh.gcs(R.color.defaulttext)}\">")
.append("<span style=\"color:${rh.gcs(R.color.defaultText)}\">")
.append(rh.gs(R.string.openaps_short))
.append(": </span>")
@ -321,7 +321,7 @@ class NSDeviceStatus @Inject constructor(
val uploaderStatusSpanned: Spanned
get() {
val string = StringBuilder()
string.append("<span style=\"color:${rh.gcs(R.color.defaulttext)}\">")
string.append("<span style=\"color:${rh.gcs(R.color.defaultText)}\">")
string.append(rh.gs(R.string.uploader_short))
string.append(": </span>")
val iterator: Iterator<*> = deviceStatusData.uploaderMap.entries.iterator()

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

@ -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)
@ -548,16 +548,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()
@ -713,12 +713,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)

3
app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
View file

@ -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 {

3
app/src/main/java/info/nightscout/androidaps/plugins/general/overview/graphData/GraphData.kt
View file

@ -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)
})
}

3
app/src/main/java/info/nightscout/androidaps/workflow/PrepareBasalDataWorker.kt
View file

@ -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 {

15
app/src/main/java/info/nightscout/androidaps/workflow/PrepareIobAutosensGraphDataWorker.kt
View file

@ -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))

2
app/src/main/res/drawable/ic_byoda.xml
View file

@ -5,5 +5,5 @@
android:viewportHeight="24">
<path
android:pathData="M12.107,3.666c-4.603,0 -8.335,3.732 -8.335,8.335s3.732,8.335 8.335,8.335s8.335,-3.731 8.335,-8.335V3.666H12.107zM12.107,18.335c-3.498,0 -6.334,-2.836 -6.334,-6.334c0,-3.498 2.836,-6.334 6.334,-6.334c3.498,0 6.334,2.836 6.334,6.334C18.442,15.499 15.606,18.335 12.107,18.335z"
android:fillColor="@color/byodagray"/>
android:fillColor="@color/byodaGray"/>
</vector>

2
app/src/main/res/drawable/ic_cp_basal_start.xml
View file

@ -5,5 +5,5 @@
android:viewportHeight="24">
<path
android:pathData="M16.578,18.033l0,-11.043l-3.698,0l0,11.043l-9.363,0l0,-1.01l8.354,0l0,-11.041l5.717,0l0,11.041l1.645,0l0,1.01z"
android:fillColor="?attr/basalstartColor"/>
android:fillColor="?attr/basalStartColor"/>
</vector>

2
app/src/main/res/drawable/ic_target_manual.xml
View file

@ -8,7 +8,7 @@
android:fillColor="@color/tempTargetConfirmation"/>
<path
android:pathData="M5.453,9.325c-0.003,0 -0.006,0 -0.01,0C5.031,9.317 4.661,8.827 4.43,7.979C4.261,7.361 4.108,6.716 3.96,6.092C3.867,5.701 3.774,5.31 3.677,4.924l-0.064,-0.26C3.394,3.77 3.168,2.847 2.577,2.743C2.509,2.731 2.463,2.665 2.475,2.595c0.012,-0.07 0.077,-0.114 0.146,-0.104c0.752,0.133 0.999,1.138 1.237,2.11l0.064,0.259c0.097,0.388 0.19,0.78 0.283,1.172c0.147,0.622 0.3,1.264 0.468,1.878C4.864,8.61 5.168,9.064 5.448,9.069c0.001,0 0.003,0 0.005,0c0.263,0 0.537,-0.394 0.753,-1.083C6.317,7.63 6.413,7.247 6.505,6.877l0.074,-0.293C6.66,6.262 6.737,5.935 6.815,5.609C6.973,4.94 7.137,4.248 7.336,3.608c0.221,-0.71 0.551,-1.103 0.928,-1.106c0.002,0 0.003,0 0.005,0c0.379,0 0.717,0.39 0.951,1.1c0.165,0.5 0.305,1.039 0.439,1.56l0.105,0.403c0.087,0.332 0.171,0.668 0.255,1.004c0.143,0.574 0.29,1.169 0.456,1.729c0.136,0.462 0.367,0.757 0.603,0.769c0.211,0.026 0.432,-0.218 0.6,-0.625c0.161,-0.391 0.309,-0.847 0.451,-1.393c0.198,-0.76 0.385,-1.53 0.572,-2.3c0.086,-0.355 0.173,-0.711 0.26,-1.065c0.167,-0.676 0.481,-1.066 0.961,-1.191c0.066,-0.017 0.136,0.024 0.154,0.092c0.017,0.068 -0.023,0.138 -0.091,0.156c-0.387,0.101 -0.634,0.421 -0.779,1.005c-0.087,0.354 -0.174,0.709 -0.26,1.064c-0.188,0.771 -0.375,1.543 -0.573,2.304c-0.145,0.557 -0.297,1.024 -0.462,1.426c-0.289,0.703 -0.651,0.793 -0.846,0.782c-0.35,-0.018 -0.661,-0.374 -0.832,-0.951c-0.167,-0.565 -0.315,-1.163 -0.459,-1.74c-0.083,-0.335 -0.166,-0.67 -0.253,-1.001L9.415,5.226C9.282,4.709 9.143,4.174 8.981,3.682c-0.192,-0.58 -0.458,-0.926 -0.712,-0.926c-0.001,0 -0.001,0 -0.002,0c-0.252,0.002 -0.51,0.349 -0.69,0.928C7.38,4.316 7.217,5.004 7.06,5.668C6.982,5.996 6.905,6.324 6.823,6.647L6.75,6.939C6.656,7.314 6.56,7.701 6.446,8.063C6.121,9.103 5.728,9.325 5.453,9.325z"
android:fillColor="@color/inrange"/>
android:fillColor="@color/inRange"/>
<path
android:pathData="M13.949,6.338h-2.831c-0.232,0 -0.421,-0.193 -0.421,-0.431V4.19H5.856l0,1.717c0,0.238 -0.188,0.431 -0.42,0.431h-2.84c-0.232,0 -0.42,-0.193 -0.42,-0.431c0,-0.238 0.188,-0.431 0.42,-0.431h2.42l0,-1.717c0,-0.238 0.188,-0.431 0.42,-0.431h5.682c0.232,0 0.421,0.193 0.421,0.431v1.717h2.411c0.232,0 0.421,0.193 0.421,0.431C14.37,6.145 14.181,6.338 13.949,6.338z"
android:fillColor="@color/tempTargetConfirmation"/>

2
app/src/main/res/drawable/ic_temptarget_flat.xml
View file

@ -5,7 +5,7 @@
android:viewportHeight="24">
<path
android:pathData="M7.242,17.689c-0.005,0 -0.011,0 -0.017,0c-0.695,-0.013 -1.318,-0.829 -1.709,-2.24c-0.285,-1.029 -0.542,-2.103 -0.792,-3.141c-0.156,-0.65 -0.313,-1.301 -0.476,-1.945L4.14,9.929c-0.369,-1.486 -0.75,-3.024 -1.746,-3.197c-0.116,-0.02 -0.193,-0.13 -0.173,-0.246s0.129,-0.189 0.246,-0.173C3.735,6.534 4.15,8.208 4.552,9.827l0.108,0.432c0.164,0.646 0.321,1.298 0.478,1.951c0.249,1.035 0.506,2.104 0.789,3.127c0.322,1.163 0.834,1.92 1.307,1.929c0.002,0 0.005,0 0.008,0c0.443,0 0.905,-0.656 1.269,-1.804c0.188,-0.592 0.349,-1.229 0.504,-1.847l0.124,-0.487c0.138,-0.536 0.268,-1.08 0.398,-1.624c0.267,-1.114 0.542,-2.265 0.878,-3.332c0.373,-1.182 0.928,-1.836 1.565,-1.842c0.003,0 0.005,0 0.008,0c0.639,0 1.208,0.65 1.603,1.832c0.278,0.833 0.514,1.729 0.74,2.598l0.177,0.671c0.147,0.553 0.288,1.112 0.43,1.672c0.24,0.956 0.489,1.945 0.769,2.879c0.229,0.77 0.619,1.26 1.017,1.28c0.356,0.043 0.729,-0.362 1.011,-1.041c0.271,-0.651 0.521,-1.41 0.761,-2.318c0.333,-1.265 0.648,-2.547 0.964,-3.829c0.146,-0.592 0.291,-1.184 0.438,-1.773c0.281,-1.125 0.812,-1.774 1.62,-1.983c0.111,-0.028 0.229,0.04 0.259,0.153c0.029,0.114 -0.039,0.229 -0.153,0.259c-0.652,0.168 -1.069,0.7 -1.313,1.674c-0.147,0.589 -0.293,1.181 -0.438,1.772c-0.316,1.284 -0.633,2.568 -0.966,3.836c-0.245,0.928 -0.5,1.704 -0.779,2.374c-0.487,1.17 -1.097,1.32 -1.426,1.302c-0.59,-0.03 -1.114,-0.622 -1.402,-1.584c-0.281,-0.941 -0.531,-1.936 -0.773,-2.896c-0.14,-0.558 -0.28,-1.115 -0.427,-1.666l-0.178,-0.673c-0.225,-0.861 -0.458,-1.751 -0.731,-2.57c-0.323,-0.966 -0.772,-1.541 -1.201,-1.541c-0.001,0 -0.002,0 -0.004,0c-0.425,0.003 -0.86,0.581 -1.164,1.544c-0.331,1.052 -0.605,2.196 -0.87,3.303c-0.131,0.546 -0.262,1.092 -0.399,1.63l-0.124,0.486c-0.158,0.623 -0.32,1.268 -0.512,1.871C8.367,17.32 7.706,17.689 7.242,17.689z"
android:fillColor="@color/inrange"/>
android:fillColor="@color/inRange"/>
<path
android:pathData="M21.563,12.709H2.424c-0.392,0 -0.708,-0.317 -0.708,-0.709s0.317,-0.708 0.708,-0.708h19.139c0.392,0 0.709,0.317 0.709,0.708S21.954,12.709 21.563,12.709z"
android:fillColor="@color/tempTargetConfirmation"/>

2
app/src/main/res/drawable/ic_temptarget_low.xml
View file

@ -5,7 +5,7 @@
android:viewportHeight="24">
<path
android:pathData="M7.242,17.689c-0.005,0 -0.011,0 -0.017,0c-0.695,-0.013 -1.318,-0.829 -1.709,-2.24c-0.285,-1.029 -0.542,-2.103 -0.792,-3.141c-0.156,-0.65 -0.313,-1.301 -0.476,-1.945L4.14,9.929c-0.369,-1.486 -0.75,-3.024 -1.746,-3.197c-0.116,-0.02 -0.193,-0.13 -0.173,-0.246s0.129,-0.189 0.246,-0.173C3.735,6.534 4.15,8.208 4.552,9.827l0.108,0.432c0.164,0.646 0.321,1.298 0.478,1.951c0.249,1.035 0.506,2.104 0.789,3.127c0.322,1.163 0.834,1.92 1.307,1.929c0.002,0 0.005,0 0.008,0c0.443,0 0.905,-0.656 1.269,-1.804c0.188,-0.592 0.349,-1.229 0.504,-1.847l0.124,-0.487c0.138,-0.536 0.268,-1.08 0.398,-1.624c0.267,-1.114 0.542,-2.265 0.878,-3.332c0.373,-1.182 0.928,-1.836 1.565,-1.842c0.003,0 0.005,0 0.008,0c0.639,0 1.208,0.65 1.603,1.832c0.278,0.833 0.514,1.729 0.74,2.598l0.177,0.671c0.147,0.553 0.288,1.112 0.43,1.672c0.24,0.956 0.489,1.945 0.769,2.879c0.229,0.77 0.619,1.26 1.017,1.28c0.356,0.043 0.729,-0.362 1.011,-1.041c0.271,-0.651 0.521,-1.41 0.761,-2.318c0.333,-1.265 0.648,-2.547 0.964,-3.829c0.146,-0.592 0.291,-1.184 0.438,-1.773c0.281,-1.125 0.812,-1.774 1.62,-1.983c0.111,-0.028 0.229,0.04 0.259,0.153c0.029,0.114 -0.039,0.229 -0.153,0.259c-0.652,0.168 -1.069,0.7 -1.313,1.674c-0.147,0.589 -0.293,1.181 -0.438,1.772c-0.316,1.284 -0.633,2.568 -0.966,3.836c-0.245,0.928 -0.5,1.704 -0.779,2.374c-0.487,1.17 -1.097,1.32 -1.426,1.302c-0.59,-0.03 -1.114,-0.622 -1.402,-1.584c-0.281,-0.941 -0.531,-1.936 -0.773,-2.896c-0.14,-0.558 -0.28,-1.115 -0.427,-1.666l-0.178,-0.673c-0.225,-0.861 -0.458,-1.751 -0.731,-2.57c-0.323,-0.966 -0.772,-1.541 -1.201,-1.541c-0.001,0 -0.002,0 -0.004,0c-0.425,0.003 -0.86,0.581 -1.164,1.544c-0.331,1.052 -0.605,2.196 -0.87,3.303c-0.131,0.546 -0.262,1.092 -0.399,1.63l-0.124,0.486c-0.158,0.623 -0.32,1.268 -0.512,1.871C8.367,17.32 7.706,17.689 7.242,17.689z"
android:fillColor="@color/inrange"/>
android:fillColor="@color/inRange"/>
<path
android:pathData="M16.797,16.24H7.212c-0.391,0 -0.708,-0.317 -0.708,-0.709l0,-2.822H2.424c-0.392,0 -0.708,-0.317 -0.708,-0.709s0.317,-0.708 0.708,-0.708h4.788c0.391,0 0.708,0.317 0.708,0.708l0,2.822h8.167V12c0,-0.392 0.317,-0.708 0.709,-0.708h4.766c0.392,0 0.709,0.317 0.709,0.708s-0.317,0.709 -0.709,0.709h-4.057v2.822C17.506,15.923 17.188,16.24 16.797,16.24z"
android:fillColor="@color/tempTargetConfirmation"/>

2
app/src/main/res/drawable/ic_trash_outline.xml
View file

@ -3,5 +3,5 @@
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="@color/defaulttext" android:pathData="M9,3V4H4V6H5V19A2,2 0 0,0 7,21H17A2,2 0 0,0 19,19V6H20V4H15V3H9M7,6H17V19H7V6M9,8V17H11V8H9M13,8V17H15V8H13Z" />
<path android:fillColor="@color/defaultText" android:pathData="M9,3V4H4V6H5V19A2,2 0 0,0 7,21H17A2,2 0 0,0 19,19V6H20V4H15V3H9M7,6H17V19H7V6M9,8V17H11V8H9M13,8V17H15V8H13Z" />
</vector>

2
app/src/main/res/layout/activity_profilehelper.xml
View file

@ -15,7 +15,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/defaultbackground"
android:background="?attr/defaultBackground"
android:orientation="horizontal"
android:paddingBottom="10dp">

4
core/src/main/java/info/nightscout/androidaps/extensions/UserEntryExt.kt
View file

@ -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
}
}

4
core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt
View file

@ -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) {

2
core/src/main/res/drawable/ic_cp_pump_canula.xml
View file

@ -5,5 +5,5 @@
android:viewportHeight="24">
<path
android:pathData="M23.706,7.373c-0.149,-0.541 -0.728,-0.854 -1.294,-0.699L19.87,7.373c-0.325,-0.913 -1.301,-1.438 -2.255,-1.175l-3.008,0.826c-0.954,0.262 -1.525,1.212 -1.338,2.163l-2.542,0.698c-0.499,0.137 -0.799,0.593 -0.767,1.07c-1.696,0.439 -3.037,0.067 -4.101,-0.248c-1.047,-0.309 -1.951,-0.578 -2.713,0.152c-1.307,1.253 -0.369,2.87 0.384,4.17c0.501,0.863 1.019,1.757 0.766,2.3c-0.519,1.124 -2.729,1.128 -3.537,1.033c-0.203,-0.022 -0.392,0.122 -0.417,0.328c-0.024,0.206 0.123,0.391 0.329,0.414c0.086,0.01 1.376,0.152 2.554,-0.172c0.734,-0.202 1.424,-0.585 1.753,-1.292c0.416,-0.896 -0.173,-1.912 -0.797,-2.987c-0.844,-1.456 -1.336,-2.47 -0.515,-3.257c0.426,-0.409 0.972,-0.272 1.977,0.026c1.128,0.334 2.648,0.808 4.674,0.215c0.255,0.206 0.598,0.304 0.949,0.207l5.63,-1.547l2.016,7.338l0.127,-1.203l-1.718,-6.252l5.63,-1.547C23.517,8.479 23.855,7.914 23.706,7.373z"
android:fillColor="?attr/pumpCanulaColor"/>
android:fillColor="?attr/pumpCannulaColor"/>
</vector>

2
core/src/main/res/drawable/ic_temptarget_high.xml
View file

@ -5,7 +5,7 @@
android:viewportHeight="24">
<path
android:pathData="M7.242,17.689c-0.005,0 -0.011,0 -0.017,0c-0.695,-0.013 -1.318,-0.829 -1.709,-2.24c-0.285,-1.029 -0.542,-2.103 -0.792,-3.141c-0.156,-0.65 -0.313,-1.301 -0.476,-1.945L4.14,9.929c-0.369,-1.486 -0.75,-3.024 -1.746,-3.197c-0.116,-0.02 -0.193,-0.13 -0.173,-0.246s0.129,-0.189 0.246,-0.173C3.735,6.534 4.15,8.208 4.552,9.827l0.108,0.432c0.164,0.646 0.321,1.298 0.478,1.951c0.249,1.035 0.506,2.104 0.789,3.127c0.322,1.163 0.834,1.92 1.307,1.929c0.002,0 0.005,0 0.008,0c0.443,0 0.905,-0.656 1.269,-1.804c0.188,-0.592 0.349,-1.229 0.504,-1.847l0.124,-0.487c0.138,-0.536 0.268,-1.08 0.398,-1.624c0.267,-1.114 0.542,-2.265 0.878,-3.332c0.373,-1.182 0.928,-1.836 1.565,-1.842c0.003,0 0.005,0 0.008,0c0.639,0 1.208,0.65 1.603,1.832c0.278,0.833 0.514,1.729 0.74,2.598l0.177,0.671c0.147,0.553 0.288,1.112 0.43,1.672c0.24,0.956 0.489,1.945 0.769,2.879c0.229,0.77 0.619,1.26 1.017,1.28c0.356,0.043 0.729,-0.362 1.011,-1.041c0.271,-0.651 0.521,-1.41 0.761,-2.318c0.333,-1.265 0.648,-2.547 0.964,-3.829c0.146,-0.592 0.291,-1.184 0.438,-1.773c0.281,-1.125 0.812,-1.774 1.62,-1.983c0.111,-0.028 0.229,0.04 0.259,0.153c0.029,0.114 -0.039,0.229 -0.153,0.259c-0.652,0.168 -1.069,0.7 -1.313,1.674c-0.147,0.589 -0.293,1.181 -0.438,1.772c-0.316,1.284 -0.633,2.568 -0.966,3.836c-0.245,0.928 -0.5,1.704 -0.779,2.374c-0.487,1.17 -1.097,1.32 -1.426,1.302c-0.59,-0.03 -1.114,-0.622 -1.402,-1.584c-0.281,-0.941 -0.531,-1.936 -0.773,-2.896c-0.14,-0.558 -0.28,-1.115 -0.427,-1.666l-0.178,-0.673c-0.225,-0.861 -0.458,-1.751 -0.731,-2.57c-0.323,-0.966 -0.772,-1.541 -1.201,-1.541c-0.001,0 -0.002,0 -0.004,0c-0.425,0.003 -0.86,0.581 -1.164,1.544c-0.331,1.052 -0.605,2.196 -0.87,3.303c-0.131,0.546 -0.262,1.092 -0.399,1.63l-0.124,0.486c-0.158,0.623 -0.32,1.268 -0.512,1.871C8.367,17.32 7.706,17.689 7.242,17.689z"
android:fillColor="?attr/tempTargetbgInRange"/>
android:fillColor="?attr/tempTargetBgInRange"/>
<path
android:pathData="M21.569,12.709h-4.772c-0.392,0 -0.709,-0.317 -0.709,-0.709V9.177H7.927l0,2.823c0,0.392 -0.317,0.709 -0.708,0.709H2.431c-0.392,0 -0.708,-0.317 -0.708,-0.709s0.317,-0.708 0.708,-0.708H6.51l0,-2.823c0,-0.392 0.317,-0.708 0.708,-0.708h9.578c0.392,0 0.709,0.317 0.709,0.708v2.823h4.063c0.392,0 0.709,0.317 0.709,0.708S21.961,12.709 21.569,12.709z"
android:fillColor="?attr/tempTargetConfirmation"/>

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

@ -23,8 +23,8 @@
<color name="overviewPillColorDefault">#1c171c</color>
<color name="colorOnPrimaryDefault">#FFFFFF</color>
<color name="defaultbackground">#000000</color>
<color name="defaulttextcolor">#B3FFFFFF</color>
<color name="defaultBackground">#000000</color>
<color name="defaultTextColor">#B3FFFFFF</color>
<!---Android Dark ans Light Theme Base colors-->
<color name="background_dark">#262626</color>
@ -60,9 +60,9 @@
<color name="errorAlertHeaderText">#FF000000</color>
<color name="helperProfile">#C803A9F4</color>
<color name="examinedProfile">#FFFF5555</color>
<color name="defaulttext">#BBBBBB</color>
<color name="defaultText">#BBBBBB</color>
<!-- Datepicker-->
<!-- Date picker-->
<color name="dateTimePickerBackground">@color/buttonBackground</color>
<!-- Treatment-->
@ -78,7 +78,7 @@
<color name="loopDisabled">#FF1313</color>
<!-- BgReading-->
<color name="inrange">#00FF00</color>
<color name="inRange">#00FF00</color>
<color name="low">#FF0000</color>
<color name="high">#FFFF00</color>
<color name="iob">#1e88e5</color>
@ -162,14 +162,14 @@
<color name="ratio">#FFFFFF</color>
<color name="activity">#d3f166</color>
<color name="bgi">#00EEEE</color>
<color name="devslopepos">#FFFFFF00</color>
<color name="devslopeneg">#FFFF00FF</color>
<color name="devSlopePos">#FFFFFF00</color>
<color name="devSlopeNeg">#FFFF00FF</color>
<color name="actionsConfirm">#FFFF00</color>
<color name="deviations">#FF0000</color>
<color name="cobAlert">#7484E2</color>
<color name="inrangebackground">#4000FF00</color>
<color name="basebasal">#C83F51B5</color>
<color name="graphgrid">#757575</color>
<color name="inRangeBackground">#4000FF00</color>
<color name="baseBasal">#C83F51B5</color>
<color name="graphGrid">#757575</color>
<color name="warning">#ff1a1a</color>
<color name="info">#77dd77</color>
<color name="error_background">#66FC0000</color>
@ -202,16 +202,16 @@
<color name="colorScheduled">#de7550</color>
<color name="colorActive">#25912e</color>
<color name="deviationgrey">#c8666666</color>
<color name="deviationgreen">#7200FF00</color>
<color name="deviationred">#72FF0000</color>
<color name="deviationblack">#72000000</color>
<color name="deviationGrey">#c8666666</color>
<color name="deviationGreen">#7200FF00</color>
<color name="deviationRed">#72FF0000</color>
<color name="deviationBlack">#72000000</color>
<color name="splashBackground">#000000</color>
<color name="extBolusStop">#FEAF05</color>
<color name="actionBasal">#CF8BFE</color>
<color name="pumpCanula">#67dfe8</color>
<color name="pumpCannula">#67dfe8</color>
<color name="cgmInsert">#67dfe8</color>
<color name="pumpBattery">#36FF00</color>
<color name="note">#FEAF05</color>
@ -222,21 +222,21 @@
<color name="stats">#FEAF05</color>
<!-- Gray colors -->
<color name="darkgray">#323232</color>
<color name="darkgrayVariant">#424242</color>
<color name="darkGray">#323232</color>
<color name="darkGrayVariant">#424242</color>
<color name="objectivesBackground">#3C3C3C</color>
<color name="plastic_grey">#666666</color>
<color name="byodagray">#999999</color>
<color name="byodaGray">#999999</color>
<color name="sphere_plastic_grey">#8c8c8c</color>
<color name="lightSandGray">#72000000</color>
<color name="sandGray">#c8666666</color>
<color name="midgray">#B2B2B2</color>
<color name="lightgray">#4dB1B1B1</color>
<color name="midGray">#B2B2B2</color>
<color name="lightGray">#4dB1B1B1</color>
<color name="mdtp_button_selected">#33969696</color>
<color name="plastic">#EBEBEA</color>
<color name="textAppearancemediumLight">#000000</color>
<color name="textAppearancemediumDark">#B3FFFFFF</color>
<color name="textAppearanceMediumLight">#000000</color>
<color name="textAppearanceMediumDark">#B3FFFFFF</color>
<!-- dash and eros colors -->
<color name="omni_yellow">#FFFF00</color>

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

@ -92,7 +92,7 @@
<item name="ribbonTextDefaultColor">@color/ribbonTextDefault</item>
<item name="ribbonTextWarningColor">@color/ribbonTextWarning</item>
<!---Background -->
<item name="defaultbackground">@color/defaultbackground</item>
<item name="defaultBackground">@color/defaultBackground</item>
<!---Toast -->
<item name="toastBaseTextColor">@color/toastBase</item>
<!---Dialog Helper -->
@ -101,19 +101,19 @@
<item name="alertDialogTheme">@style/DialogTheme</item>
<!---Disabled Text Color -->
<item name="disabledTextColor">@color/sandGray</item>
<!---Dialogfragment Background Color -->
<!---Dialog fragment Background Color -->
<item name="android:dialogCornerRadius">12dp</item>
<!---Overview and Historybrowser -->
<item name="graphgrid">@color/graphgrid</item>
<item name="viewPortbackgroundColor">@color/transparent</item>
<!---Overview and History browser -->
<item name="graphGrid">@color/graphGrid</item>
<item name="viewPortBackgroundColor">@color/transparent</item>
<item name="tempTargetBackgroundColor">@color/tempTargetBackground</item>
<!---CGM source-->
<item name="cgmdexColor">@color/byodagray</item>
<item name="cgmxdripColor">@color/colorCalibrationButton</item>
<item name="cgmDexColor">@color/byodaGray</item>
<item name="cgmXdripColor">@color/colorCalibrationButton</item>
<!---BG color-->
<item name="bgLow">@color/low</item>
<item name="highColor">@color/high</item>
<item name="bgInRange">@color/inrange</item>
<item name="bgInRange">@color/inRange</item>
<!---Profile Helper -->
<item name="helperProfileColor">@color/helperProfile</item>
<item name="examinedProfileColor">@color/examinedProfile</item>
@ -134,7 +134,7 @@
<item name="omniYellowColor">@color/omni_yellow</item>
<item name="omniCyanColor">@color/omni_cyan</item>
<item name="omniGreenColor">@color/omni_green</item>
<item name="omniGrayColor">@color/midgray</item>
<item name="omniGrayColor">@color/midGray</item>
<item name="omniWizardFinishButtonColor">@color/omnipod_wizard_finish_button</item>
<!---Warning Colors : WarnColors.kt-->
<item name="warnColor">@color/omni_yellow</item>
@ -167,7 +167,7 @@
<item name="carbsColor">@color/carbs</item>
<!-- Temp Target -->
<item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
<item name="tempTargetbgInRange">@color/tempTargetConfirmation</item>
<item name="tempTargetBgInRange">@color/tempTargetConfirmation</item>
<!---Loop Icon-->
<!---Loop Paused Icon Color-->
<item name="loopPaused">@color/loopSuspended</item>
@ -184,12 +184,12 @@
<!---Action Icons Color-->
<item name="extBolusColor">@color/extendedBolus</item>
<item name="extBolusStopColor">@color/extBolusStop</item>
<item name="basalstartColor">@color/actionBasal</item>
<item name="basalStartColor">@color/actionBasal</item>
<item name="basalCancelColor">@color/actionBasal</item>
<item name="basalNoTbrColor">@color/actionBasal</item>
<item name="basalHighColor">@color/actionBasal</item>
<item name="basalLowColor">@color/actionBasal</item>
<item name="pumpCanulaColor">@color/pumpCanula</item>
<item name="pumpCannulaColor">@color/pumpCannula</item>
<item name="cgmInsertColor">@color/cgmInsert</item>
<item name="pumpBatteryColor">@color/pumpBattery</item>
<item name="noteColor">@color/note</item>
@ -212,31 +212,31 @@
<item name="therapyEvent_APS_OFFLINE">@color/mdtp_line_dark</item>
<item name="therapyEvent_Default">@color/mdtp_line_dark</item>
<!-- Graph specific colors -->
<item name="inrangeBackground">@color/inrangebackground</item>
<item name="devslopeposColor">@color/devslopepos</item>
<item name="devslopenegColor">@color/devslopeneg</item>
<item name="deviationgreyColor">@color/deviationgrey</item>
<item name="deviationblackColor">@color/deviationblack</item>
<item name="deviationgreenColor">@color/deviationgreen</item>
<item name="deviationredColor">@color/deviationred</item>
<item name="inRangeBackground">@color/inRangeBackground</item>
<item name="devSlopePosColor">@color/devSlopePos</item>
<item name="devSlopeNegColor">@color/devSlopeNeg</item>
<item name="deviationGreyColor">@color/deviationGrey</item>
<item name="deviationBlackColor">@color/deviationBlack</item>
<item name="deviationGreenColor">@color/deviationGreen</item>
<item name="deviationRedColor">@color/deviationRed</item>
<item name="predictionColor">@color/prediction</item>
<item name="iobPredASColor">@color/iobPredAS</item>
<item name="bgiColor">@color/bgi</item>
<item name="ratioColor">@color/ratio</item>
<item name="activityColor">@color/activity</item>
<item name="basebasalColor">@color/basebasal</item>
<item name="baseBasalColor">@color/baseBasal</item>
<item name="dotLineColor">@color/white</item>
<!---Popupmenu TextColor -->
<item name="menuTextColor">@color/black</item>
<item name="menuTextColorInverse">@color/black</item>
<!-- CardView specific colors -->
<item name="strokeColor">@color/plastic_grey</item>
<item name="textAppearancemediumColor">@color/textAppearancemediumDark</item>
<item name="textAppearanceMediumColor">@color/textAppearanceMediumDark</item>
<!-- Actionbar -->
<item name="actionBarStyle">@style/Aaps_ActionBarStyle</item>
<!-- Objectives specific colors -->
<item name="isAccomplishedColor">@color/isAccomplished</item>
<item name="seperatorColor">@color/sphere_plastic_grey</item>
<item name="separatorColor">@color/sphere_plastic_grey</item>
<item name="isCompletedColor">@color/isCompleted</item>
<item name="isNotCompletedColor">@color/isNotCompleted</item>
</style>

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

@ -17,7 +17,7 @@
<attr name="lowColor" format="reference|color" />
<!-- Temp Target -->
<attr name="tempTargetConfirmation" format="reference|color" />
<attr name="tempTargetbgInRange" format="reference|color" />
<attr name="tempTargetBgInRange" format="reference|color" />
<!-- Treatments -->
<attr name="setExtendedButtonColor" format="reference|color" />
<!-- Carbs Button -->
@ -62,7 +62,7 @@
<attr name="ribbonTextDefaultColor" format="reference|color" />
<attr name="ribbonTextWarningColor" format="reference|color" />
<!---Background -->
<attr name="defaultbackground" format="reference|color" />
<attr name="defaultBackground" format="reference|color" />
<!---Toast -->
<attr name="toastBaseTextColor" format="reference|color" />
<declare-styleable name="NumberPicker">
@ -78,13 +78,13 @@
<attr name="splashBackgroundColor" format="reference|color" />
<!---Disabled Text Color -->
<attr name="disabledTextColor" format="reference|color" />
<!---Overview and Historybrowser -->
<attr name="graphgrid" format="reference|color" />
<attr name="viewPortbackgroundColor" format="reference|color" />
<!---Overview and History browser -->
<attr name="graphGrid" format="reference|color" />
<attr name="viewPortBackgroundColor" format="reference|color" />
<attr name="tempTargetBackgroundColor" format="reference|color" />
<!---CGM source-->
<attr name="cgmdexColor" format="reference|color" />
<attr name="cgmxdripColor" format="reference|color" />
<attr name="cgmDexColor" format="reference|color" />
<attr name="cgmXdripColor" format="reference|color" />
<!---BG color-->
<attr name="bgLow" format="reference|color" />
<attr name="highColor" format="reference|color" />
@ -158,12 +158,12 @@
<!---Extended Bolus Icon Color-->
<attr name="extBolusColor" format="reference|color" />
<attr name="extBolusStopColor" format="reference|color" />
<attr name="basalstartColor" format="reference|color" />
<attr name="basalStartColor" format="reference|color" />
<attr name="basalCancelColor" format="reference|color" />
<attr name="basalNoTbrColor" format="reference|color" />
<attr name="basalHighColor" format="reference|color" />
<attr name="basalLowColor" format="reference|color" />
<attr name="pumpCanulaColor" format="reference|color" />
<attr name="pumpCannulaColor" format="reference|color" />
<attr name="cgmInsertColor" format="reference|color" />
<attr name="pumpBatteryColor" format="reference|color" />
<attr name="noteColor" format="reference|color" />
@ -188,30 +188,29 @@
<!-- Graph specific colors -->
<attr name="graphHorizontalLabelText" format="reference|color" />
<attr name="graphVerticalLabelText" format="reference|color" />
<attr name="inrangeBackground" format="reference|color" />
<attr name="graphGrid" format="reference|color" />
<attr name="devslopeposColor" format="reference|color" />
<attr name="devslopenegColor" format="reference|color" />
<attr name="deviationgreyColor" format="reference|color" />
<attr name="deviationblackColor" format="reference|color" />
<attr name="deviationgreenColor" format="reference|color" />
<attr name="deviationredColor" format="reference|color" />
<attr name="inRangeBackground" format="reference|color" />
<attr name="devSlopePosColor" format="reference|color" />
<attr name="devSlopeNegColor" format="reference|color" />
<attr name="deviationGreyColor" format="reference|color" />
<attr name="deviationBlackColor" format="reference|color" />
<attr name="deviationGreenColor" format="reference|color" />
<attr name="deviationRedColor" format="reference|color" />
<attr name="predictionColor" format="reference|color" />
<attr name="iobPredASColor" format="reference|color" />
<attr name="bgiColor" format="reference|color" />
<attr name="ratioColor" format="reference|color" />
<attr name="activityColor" format="reference|color" />
<attr name="basebasalColor" format="reference|color" />
<attr name="baseBasalColor" format="reference|color" />
<attr name="dotLineColor" format="reference|color" />
<!---Popupmenu TextColor -->
<attr name="menuTextColor" format="reference|color" />
<attr name="menuTextColorInverse" format="reference|color" />
<!-- CardView specific colors -->
<attr name="strokeColor" format="reference|color" />
<attr name="textAppearancemediumColor" format="reference|color" />
<attr name="textAppearanceMediumColor" format="reference|color" />
<!-- Objectives specific colors -->
<attr name="isAccomplishedColor" format="reference|color" />
<attr name="seperatorColor" format="reference|color" />
<attr name="separatorColor" format="reference|color" />
<attr name="isCompletedColor" format="reference|color" />
<attr name="isNotCompletedColor" format="reference|color" />
</resources>

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

@ -23,8 +23,8 @@
<color name="overviewPillColorDefault">#1c171c</color>
<color name="colorOnPrimaryDefault">#FFFFFF</color>
<color name="defaultbackground">#FFFFFF</color>
<color name="defaulttextcolor">#000000</color>
<color name="defaultBackground">#FFFFFF</color>
<color name="defaultTextColor">#000000</color>
<!---Android Dark ans Light Theme Base colors-->
<color name="background_dark">#262626</color>
@ -60,7 +60,7 @@
<color name="errorAlertHeaderText">#FF000000</color>
<color name="helperProfile">#C803A9F4</color>
<color name="examinedProfile">#FFFF5555</color>
<color name="defaulttext">#BBBBBB</color>
<color name="defaultText">#BBBBBB</color>
<!-- Datepicker-->
<color name="dateTimePickerBackground">@color/white</color>
@ -78,7 +78,7 @@
<color name="loopDisabled">#FF1313</color>
<!-- BgReading-->
<color name="inrange">#00FF00</color>
<color name="inRange">#00FF00</color>
<color name="low">#FF0000</color>
<color name="high">#FFFB8C00</color>
<color name="iob">#1e88e5</color>
@ -164,14 +164,14 @@
<color name="ratio">#000000</color>
<color name="activity">#d3f166</color>
<color name="bgi">#00EEEE</color>
<color name="devslopepos">#FFFFFF00</color>
<color name="devslopeneg">#FFFF00FF</color>
<color name="devSlopePos">#FFFFFF00</color>
<color name="devSlopeNeg">#FFFF00FF</color>
<color name="actionsConfirm">#F6CE22</color>
<color name="deviations">#FF0000</color>
<color name="cobAlert">#7484E2</color>
<color name="inrangebackground">#2800FF00</color>
<color name="basebasal">#C83F51B5</color>
<color name="graphgrid">#757575</color>
<color name="inRangeBackground">#2800FF00</color>
<color name="baseBasal">#C83F51B5</color>
<color name="graphGrid">#757575</color>
<color name="warning">#ff1a1a</color>
<color name="info">#77dd77</color>
<color name="error_background">#66FC0000</color>
@ -204,16 +204,16 @@
<color name="colorScheduled">#de7550</color>
<color name="colorActive">#25912e</color>
<color name="deviationgrey">#c8666666</color>
<color name="deviationgreen">#7200FF00</color>
<color name="deviationred">#72FF0000</color>
<color name="deviationblack">#72000000</color>
<color name="deviationGrey">#c8666666</color>
<color name="deviationGreen">#7200FF00</color>
<color name="deviationRed">#72FF0000</color>
<color name="deviationBlack">#72000000</color>
<color name="splashBackground">#FFFFFF</color>
<color name="extBolusStop">#FEAF05</color>
<color name="actionBasal">#CF8BFE</color>
<color name="pumpCanula">#42A5F5</color>
<color name="pumpCannula">#42A5F5</color>
<color name="cgmInsert">#42A5F5</color>
<color name="pumpBattery">#66BB6A</color>
<color name="note">#FEAF05</color>
@ -224,22 +224,22 @@
<color name="stats">#FEAF05</color>
<!-- Gray colors -->
<color name="darkgray">#323232</color>
<color name="darkgrayVariant">#424242</color>
<color name="darkGray">#323232</color>
<color name="darkGrayVariant">#424242</color>
<color name="objectivesBackground">#8C8C8C</color>
<color name="plastic_grey">#666666</color>
<color name="byodagray">#777777</color>
<color name="byodaGray">#777777</color>
<color name="sphere_plastic_grey">#8c8c8c</color>
<color name="lightSandGray">#72000000</color>
<color name="sandGray">#c8666666</color>
<color name="midgray">#B2B2B2</color>
<color name="midGray">#B2B2B2</color>
<color name="midlightgray">#D6D7D7</color>
<color name="lightgray">#4dB1B1B1</color>
<color name="lightGray">#4dB1B1B1</color>
<color name="mdtp_button_selected">#33969696</color>
<color name="plastic">#EBEBEA</color>
<color name="textAppearancemediumLight">#000000</color>
<color name="textAppearancemediumDark">#B3FFFFFF</color>
<color name="textAppearanceMediumLight">#000000</color>
<color name="textAppearanceMediumDark">#B3FFFFFF</color>
<!-- dash and eros colors -->
<color name="omni_yellow">#FFFF00</color>

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

@ -97,22 +97,22 @@
<item name="ribbonTextDefaultColor">@color/ribbonTextDefault</item>
<item name="ribbonTextWarningColor">@color/ribbonTextWarning</item>
<!---Background -->
<item name="defaultbackground">@color/white</item>
<item name="defaultBackground">@color/white</item>
<!---Toast -->
<item name="toastBaseTextColor">@color/toastBase</item>
<!---Dialog Helper -->
<item name="materialAlertDialogTheme">@style/DialogTheme</item>
<item name="android:alertDialogTheme">@style/DialogTheme</item>
<item name="alertDialogTheme">@style/DialogTheme</item>
<!---Dialogfragment Background Color -->
<!---Dialog fragment Background Color -->
<item name="android:dialogCornerRadius">12dp</item>
<!---Overview and Historybrowser -->
<item name="graphgrid">@color/graphgrid</item>
<item name="viewPortbackgroundColor">@color/transparent</item>
<!---Overview and History browser -->
<item name="graphGrid">@color/graphGrid</item>
<item name="viewPortBackgroundColor">@color/transparent</item>
<item name="tempTargetBackgroundColor">@color/tempTargetBackground</item>
<!---CGM source-->
<item name="cgmdexColor">@color/byodagray</item>
<item name="cgmxdripColor">@color/colorCalibrationButton</item>
<item name="cgmDexColor">@color/byodaGray</item>
<item name="cgmXdripColor">@color/colorCalibrationButton</item>
<!---BG color-->
<item name="bgLow">@color/low</item>
<item name="highColor">@color/high</item>
@ -137,7 +137,7 @@
<item name="omniYellowColor">@color/omni_yellow</item>
<item name="omniCyanColor">@color/omni_cyan</item>
<item name="omniGreenColor">@color/omni_green</item>
<item name="omniGrayColor">@color/midgray</item>
<item name="omniGrayColor">@color/midGray</item>
<item name="omniWizardFinishButtonColor">@color/omnipod_wizard_finish_button</item>
<!---Warning Colors : WarnColors.kt-->
<item name="warnColor">@color/high</item>
@ -170,7 +170,7 @@
<item name="carbsColor">@color/carbs</item>
<!-- Temp Target -->
<item name="tempTargetConfirmation">@color/tempTargetConfirmation</item>
<item name="tempTargetbgInRange">@color/tempTargetConfirmation</item>
<item name="tempTargetBgInRange">@color/tempTargetConfirmation</item>
<!---Loop Icon-->
<!---Loop Paused Icon Color-->
<item name="loopPaused">@color/loopSuspended</item>
@ -187,12 +187,12 @@
<!---Action Icons Color-->
<item name="extBolusColor">@color/extendedBolus</item>
<item name="extBolusStopColor">@color/extBolusStop</item>
<item name="basalstartColor">@color/actionBasal</item>
<item name="basalStartColor">@color/actionBasal</item>
<item name="basalCancelColor">@color/actionBasal</item>
<item name="basalNoTbrColor">@color/actionBasal</item>
<item name="basalHighColor">@color/actionBasal</item>
<item name="basalLowColor">@color/actionBasal</item>
<item name="pumpCanulaColor">@color/pumpCanula</item>
<item name="pumpCannulaColor">@color/pumpCannula</item>
<item name="cgmInsertColor">@color/cgmInsert</item>
<item name="pumpBatteryColor">@color/pumpBattery</item>
<item name="noteColor">@color/note</item>
@ -215,31 +215,31 @@
<item name="therapyEvent_APS_OFFLINE">@color/mdtp_line_dark</item>
<item name="therapyEvent_Default">@color/mdtp_line_dark</item>
<!-- Graph specific colors -->
<item name="inrangeBackground">@color/inrangebackground</item>
<item name="devslopeposColor">@color/devslopepos</item>
<item name="devslopenegColor">@color/devslopeneg</item>
<item name="deviationgreyColor">@color/deviationgrey</item>
<item name="deviationblackColor">@color/deviationblack</item>
<item name="deviationgreenColor">@color/deviationgreen</item>
<item name="deviationredColor">@color/deviationred</item>
<item name="inRangeBackground">@color/inRangeBackground</item>
<item name="devSlopePosColor">@color/devSlopePos</item>
<item name="devSlopeNegColor">@color/devSlopeNeg</item>
<item name="deviationGreyColor">@color/deviationGrey</item>
<item name="deviationBlackColor">@color/deviationBlack</item>
<item name="deviationGreenColor">@color/deviationGreen</item>
<item name="deviationRedColor">@color/deviationRed</item>
<item name="predictionColor">@color/prediction</item>
<item name="iobPredASColor">@color/iobPredAS</item>
<item name="bgiColor">@color/bgi</item>
<item name="ratioColor">@color/ratio</item>
<item name="activityColor">@color/activity</item>
<item name="basebasalColor">@color/basebasal</item>
<item name="baseBasalColor">@color/baseBasal</item>
<item name="dotLineColor">@color/black</item>
<!---Popupmenu TextColor -->
<item name="menuTextColor">@color/black</item>
<item name="menuTextColorInverse">@color/white</item>
<!-- CardView specific colors -->
<item name="strokeColor">@color/plastic_grey</item>
<item name="textAppearancemediumColor">@color/textAppearancemediumLight</item>
<item name="textAppearanceMediumColor">@color/textAppearanceMediumLight</item>
<!-- Actionbar -->
<item name="actionBarStyle">@style/Aaps_ActionBarStyle</item>
<!-- Objectives specific colors -->
<item name="isAccomplishedColor">@color/isAccomplished</item>
<item name="seperatorColor">@color/sphere_plastic_grey</item>
<item name="separatorColor">@color/sphere_plastic_grey</item>
<item name="isCompletedColor">@color/isCompleted</item>
<item name="isNotCompletedColor">@color/isNotCompleted</item>
</style>