Skip to content

Commit

Permalink
Use a brighter grey
Browse files Browse the repository at this point in the history
Signed-off-by: mueller-ma <mueller-ma@users.noreply.github.com>
  • Loading branch information
mueller-ma committed Sep 30, 2019
1 parent 2567101 commit c2f5334
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class UpdateBroadcastReceiver : BroadcastReceiver() {

val accentColor = when (prefs.getString("default_openhab_theme")) {
"basicui", "basicuidark" -> ContextCompat.getColor(context, R.color.indigo_500)
"black", "dark" -> ContextCompat.getColor(context, R.color.blue_grey_800)
"black", "dark" -> ContextCompat.getColor(context, R.color.blue_grey_700)
else -> ContextCompat.getColor(context, R.color.openhab_orange)
}

Expand Down
2 changes: 1 addition & 1 deletion mobile/src/main/java/org/openhab/habdroid/util/Util.kt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ object Util {
fun getActivityThemeId(context: Context): Int {
return when (context.getPrefs().getInt(Constants.PREFERENCE_ACCENT_COLOR, 0)) {
ContextCompat.getColor(context, R.color.indigo_500) -> R.style.openHAB_DayNight_basicui
ContextCompat.getColor(context, R.color.blue_grey_800) -> R.style.openHAB_DayNight_grey
ContextCompat.getColor(context, R.color.blue_grey_700) -> R.style.openHAB_DayNight_grey
else -> R.style.openHAB_DayNight_orange
}
}
Expand Down
2 changes: 1 addition & 1 deletion mobile/src/main/res/values/arrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,6 @@
<array name="accentColors">
<item>@color/openhab_orange</item>
<item>@color/indigo_500</item>
<item>@color/blue_grey_800</item>
<item>@color/blue_grey_700</item>
</array>
</resources>
2 changes: 1 addition & 1 deletion mobile/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<color name="indigo_800">#283593</color>
<color name="pink_a200">#ff4081</color>
<color name="grey_300">#E0E0E0</color>
<color name="blue_grey_800">#37474F</color>
<color name="blue_grey_700">#455A64</color>
<color name="blue_grey_900">#263238</color>
<color name="empty_list_text_color">#b2b2b2</color>
<color name="pref_icon_red">#D32F2F</color>
Expand Down
4 changes: 2 additions & 2 deletions mobile/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</style>

<style name="openHAB.DayNight.grey" parent="openHAB.DayNight">
<item name="colorPrimary">@color/blue_grey_800</item>
<item name="colorAccent">@color/blue_grey_800</item>
<item name="colorPrimary">@color/blue_grey_700</item>
<item name="colorAccent">@color/blue_grey_700</item>
<item name="colorPrimaryDark">@color/blue_grey_900</item>
</style>

Expand Down

0 comments on commit c2f5334

Please sign in to comment.