diff options
Diffstat (limited to 'org.fox.ttrss/src/main/res/values')
| -rw-r--r-- | org.fox.ttrss/src/main/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/values/resources.xml | 4 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/res/values/style.xml | 28 |
3 files changed, 12 insertions, 22 deletions
diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index fcf4ee30..a926e83f 100644 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -2,10 +2,8 @@ <resources> <attr name="ttrssHorizontalDivider" format="reference|color" /> <attr name="feedlistBackground" format="reference|color" /> - <attr name="smallScreenBackground" format="reference|color" /> <attr name="unreadCounterColor" format="reference|color" /> <attr name="headlinesBackground" format="reference|color" /> - <attr name="headlinesBackgroundSolid" format="reference|color" /> <attr name="articleBackground" format="reference|color" /> <attr name="headlineSelectedBackground" format="reference|color" /> <attr name="headlineUnreadBackground" format="reference|color" /> diff --git a/org.fox.ttrss/src/main/res/values/resources.xml b/org.fox.ttrss/src/main/res/values/resources.xml index 9a2c3a63..daebd5cb 100644 --- a/org.fox.ttrss/src/main/res/values/resources.xml +++ b/org.fox.ttrss/src/main/res/values/resources.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="feeds_light">#e0e0e0</color> + <!-- <color name="feeds_light">#e0e0e0</color> <color name="headlines_light">#ffffff</color> <color name="headlines_sepia">#EAE2DC</color> <color name="feeds_sepia">#D3C6BA</color> @@ -9,5 +9,5 @@ <color name="unread_counter_background_dark">#63758E</color> <color name="unread_counter_background_sepia">#C46262</color> <color name="unread_counter_background_selected_light">#4684ff</color> - <color name="feeds_dark_gray">#1c1d1e</color> + <color name="feeds_dark_gray">#1c1d1e</color> --> </resources>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index fddc4ce0..8eb6229e 100644 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -2,12 +2,10 @@ <style name="LightTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <item name="statusBarHintColor">?colorPrimary</item> - <item name="smallScreenBackground">#eeeeee</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_bright</item> - <item name="feedlistBackground"><!-- #e0e0e0 -->@drawable/shadow_feeds</item> + <item name="feedlistBackground">#e0e0e0</item> <item name="unreadCounterColor">#909090</item> - <item name="headlinesBackground"><!-- #f0f0f0 -->@drawable/shadow_headlines</item> - <item name="headlinesBackgroundSolid">#f0f0f0</item> + <item name="headlinesBackground">#f0f0f0</item> <item name="articleBackground">@android:color/white</item> <item name="headlineSelectedBackground">?colorAccent</item> <item name="headlineUnreadBackground">@android:color/white</item> @@ -39,10 +37,8 @@ </style> <style name="SepiaTheme" parent="LightTheme"> - <item name="smallScreenBackground">@drawable/paper_sepia</item> - <item name="feedlistBackground">@drawable/shadow_feeds_sepia</item> - <item name="headlinesBackground">@drawable/shadow_headlines_sepia</item> - <item name="headlinesBackgroundSolid">@drawable/paper_sepia</item> + <item name="feedlistBackground">#EAE2DC</item> + <item name="headlinesBackground">#EAE2DC</item> <item name="feedlistTextColor">#35281C</item> <item name="linkColor">?colorPrimary</item> @@ -57,15 +53,13 @@ <item name="articleNoteBackground">#543800</item> <item name="headlineNormalBackground">@android:color/black</item> - <item name="smallScreenBackground">@android:color/black</item> <item name="feedlistBackground">?colorPrimaryDark</item> <item name="headlinesBackground">@android:color/black</item> - <item name="headlinesBackgroundSolid">@android:color/black</item> <item name="articleBackground">@android:color/black</item> <item name="articleHeaderTextColor">?linkColor</item> - <item name="articleTextColor">?colorPrimary</item> + <item name="articleTextColor">#D2B944</item> <item name="linkColor">?colorAccent</item> <item name="feedlistTextColor">?linkColor</item> @@ -83,9 +77,9 @@ <item name="iconTintColor">?linkColor</item> - <item name="colorPrimary">#CC9500</item> + <item name="colorPrimary">@android:color/black</item> <item name="colorPrimaryDark">#A57100</item> - <item name="colorAccent">#FFBF00</item> + <item name="colorAccent">#EACF4C</item> </style> <style name="DarkTheme" parent="Theme.AppCompat"> @@ -107,12 +101,10 @@ <item name="articleNoteTextColor">@android:color/secondary_text_dark</item> <item name="articleNoteBackground">#303030</item> <item name="parentBtnBackground">#101010</item> - <item name="smallScreenBackground">@color/feeds_dark_gray</item> <item name="ttrssHorizontalDivider">@android:drawable/divider_horizontal_dark</item> - <item name="feedlistBackground">@drawable/shadow_feeds_gray</item> - <item name="headlinesBackground">@drawable/shadow_headlines_gray</item> - <item name="headlinesBackgroundSolid">@color/feeds_dark_gray</item> - <item name="articleBackground">@color/feeds_dark_gray</item> + <item name="feedlistBackground">#1c1d1e</item> + <item name="headlinesBackground">#1c1d1e</item> + <item name="articleBackground">#1c1d1e</item> <item name="feedsSelectedBackground">?colorPrimaryDark</item> <item name="feedlistSelectedTextColor">@android:color/primary_text_dark</item> <item name="articleHeader">?colorPrimaryDark</item> |