caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Update colors

Browse source
This commit is contained in:
Nico Schmitz 2018-06-15 19:36:49 +02:00
parent bf3ce735bc
commit 14a17efecc
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
View file

@ -1068,9 +1068,9 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
apsModeView.setText(String.format(MainApp.gs(R.string.loopsuperbolusfor), loopPlugin.minutesToEndOfSuspend())); apsModeView.setText(String.format(MainApp.gs(R.string.loopsuperbolusfor), loopPlugin.minutesToEndOfSuspend()));
apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextWarning)); apsModeView.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
} else if (loopPlugin.isEnabled(PluginType.LOOP) && loopPlugin.isDisconnected()) { } 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.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()) { } else if (loopPlugin.isEnabled(PluginType.LOOP) && loopPlugin.isSuspended()) {
apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonBgWarning)); apsModeView.setBackgroundColor(MainApp.gc(R.color.ribbonBgWarning));
apsModeView.setText(String.format(MainApp.gs(R.string.loopsuspendedfor), loopPlugin.minutesToEndOfSuspend())); 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.setTextColor(MainApp.gc(R.color.ribbonTextWarning));
view.setBackgroundColor(MainApp.gc(R.color.ribbonBgWarning)); view.setBackgroundColor(MainApp.gc(R.color.ribbonBgWarning));
} else { } else {
view.setTextColor(MainApp.gc(R.color.ribbonTextDefault)); view.setTextColor(MainApp.gc(R.color.ribbonTextDisabled));
view.setBackgroundColor(MainApp.gc(R.color.ribbonBgDefault)); view.setBackgroundColor(MainApp.gc(R.color.ribbonBgDisabled));
} }
view.setVisibility(View.VISIBLE); view.setVisibility(View.VISIBLE);
} else { } else {

4
app/src/main/res/values/colors.xml
View file

@ -71,11 +71,13 @@
<color name="deviationred">#72FF0000</color> <color name="deviationred">#72FF0000</color>
<color name="deviationblack">#72000000</color> <color name="deviationblack">#72000000</color>
<color name="ribbonBgDefault">#424242</color> <color name="ribbonBgDefault">#5a595b</color>
<color name="ribbonBgWarning">#f4d700</color> <color name="ribbonBgWarning">#f4d700</color>
<color name="ribbonBgCritical">#ff0400</color> <color name="ribbonBgCritical">#ff0400</color>
<color name="ribbonTextDefault">#FFFFFF</color> <color name="ribbonTextDefault">#FFFFFF</color>
<color name="ribbonTextWarning">#303030</color> <color name="ribbonTextWarning">#303030</color>
<color name="ribbonTextCritical">#FFFFFF</color> <color name="ribbonTextCritical">#FFFFFF</color>
<color name="ribbonBgDisabled">#424242</color>
<color name="ribbonTextDisabled">#333333</color>
</resources> </resources>