From 14a17efecc420361e92abf004cda8fe78e732e14 Mon Sep 17 00:00:00 2001 From: Nico Schmitz Date: Fri, 15 Jun 2018 19:36:49 +0200 Subject: [PATCH] Update colors --- .../androidaps/plugins/Overview/OverviewFragment.java | 8 ++++---- app/src/main/res/values/colors.xml | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java index 4127ce49a0..6a1812b228 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java +++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java @@ -1068,9 +1068,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, apsModeView.setText(String.format(MainApp.gs(R.string.loopsuperbolusfor), loopPlugin.minutesToEndOfSuspend())); apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextWarning)); } else if (loopPlugin.isEnabled(PluginType.LOOP) && loopPlugin.isDisconnected()) { - apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonBgWarning)); + apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonBgCritical)); apsModeView.setText(String.format(MainApp.gs(R.string.loopdisconnectedfor), loopPlugin.minutesToEndOfSuspend())); - apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextWarning)); + apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextCritical)); } else if (loopPlugin.isEnabled(PluginType.LOOP) && loopPlugin.isSuspended()) { apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonBgWarning)); apsModeView.setText(String.format(MainApp.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend())); @@ -1552,8 +1552,8 @@ public class OverviewFragment extends Fragment implements View.OnClickListener, view.setTextColor(MainApp.gc(R.color.ribbonTextWarning)); view.setBackgroundColor(MainApp.gc(R.color.ribbonBgWarning)); } else { - view.setTextColor(MainApp.gc(R.color.ribbonTextDefault)); - view.setBackgroundColor(MainApp.gc(R.color.ribbonBgDefault)); + view.setTextColor(MainApp.gc(R.color.ribbonTextDisabled)); + view.setBackgroundColor(MainApp.gc(R.color.ribbonBgDisabled)); } view.setVisibility(View.VISIBLE); } else { diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9811aff465..37c11857e9 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -71,11 +71,13 @@ #72FF0000 #72000000 - #424242 + #5a595b #f4d700 #ff0400 #FFFFFF #303030 #FFFFFF + #424242 + #333333