wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use material design color definitions / use color-def for day/night

Browse source
This commit is contained in:
David Luhmer 2018-11-04 09:21:22 +01:00
parent 6d8266c49c
commit 4c8903f358
3 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsActivity.java
View file

@ -145,14 +145,10 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
int backgroundColor = getResources().getColor(R.color.settingsWindowBackground);
getWindow().getDecorView().setBackgroundColor(backgroundColor);
// Set background of category pane on tablets
if(isXLargeTablet(this)) {
if(ThemeChooser.isDarkTheme(this)) {
backgroundColor = getResources().getColor(R.color.material_grey_900);
findViewById(android.R.id.list).setBackgroundColor(backgroundColor);
} else {
backgroundColor = getResources().getColor(R.color.settingsWindowBackground);
findViewById(android.R.id.list).setBackgroundColor(backgroundColor);
}
backgroundColor = getResources().getColor(R.color.settingsWindowCategoryPaneBackground);
findViewById(android.R.id.list).setBackgroundColor(backgroundColor);
}
}

5
News-Android-App/src/main/res/values-night/colors.xml
View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="app_drawer_feed_list_background_color">#383d43</color>
<color name="settingsWindowBackground">#222222</color>
<color name="settingsWindowBackground">@color/material_grey_900</color>
<color name="settingsWindowCategoryPaneBackground">@color/material_grey_800</color>
<color name="primaryTextColor">@android:color/white</color>
@ -15,7 +16,7 @@
<color name="slide_up_panel_slider_background_color">#ff343434</color>
<!-- see also assets/web.css -->
<color name="news_detail_background_color">#222222</color>
<color name="news_detail_background_color">@color/material_grey_900</color>
<color name="news_detail_background_color_oled">@android:color/black</color>
<color name="owncloudBlue">#1D2D44</color>

17
News-Android-App/src/main/res/values/colors.xml
View file

@ -3,6 +3,7 @@
<color name="app_drawer_feed_list_background_color">#ededed</color>
<color name="settingsWindowBackground">@android:color/white</color>
<color name="settingsWindowCategoryPaneBackground">@color/material_grey_100</color>
<color name="primaryTextColor">@android:color/black</color>
@ -15,11 +16,6 @@
<color name="options_menu_item_text">@color/options_menu_item</color>
<color name="material_grey_500" tools:override="true">#9E9E9E</color>
<color name="material_grey_600" tools:override="true">#757575</color>
<color name="material_grey_900" tools:override="true">#212121</color>
<color name="material_red_600" tools:override="true">#e53935</color>
<!-- see also assets/web.css -->
@ -44,4 +40,15 @@
<!-- override libs -->
<color name="chglib_background_default_divider_color">#00000000</color>
<color name="material_grey_50" tools:override="true">#fffafafa</color>
<color name="material_grey_100" tools:override="true">#fff5f5f5</color>
<color name="material_grey_300" tools:override="true">#ffeeeeee</color>
<color name="material_grey_500" tools:override="true">#9E9E9E</color>
<color name="material_grey_600" tools:override="true">#757575</color>
<color name="material_grey_700" tools:override="true">#ff717171</color>
<color name="material_grey_800" tools:override="true">#424242</color>
<color name="material_grey_900" tools:override="true">#212121</color>
</resources>