diff options
| author | Andrew Dolgov <[email protected]> | 2014-11-13 16:33:16 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-11-13 16:33:16 +0300 |
| commit | b6e132c65faffe5397a46af76097f6b338e68ae1 (patch) | |
| tree | f36156b3ce08778db336f9082db58b582b04419b /org.fox.ttrss/src/main | |
| parent | 25622e276128efb21ade7d436eeb591f65556b8a (diff) | |
set all cards to same elevation
fix headline footer being invisible in amber theme
Diffstat (limited to 'org.fox.ttrss/src/main')
5 files changed, 9 insertions, 4 deletions
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_footer.xml b/org.fox.ttrss/src/main/res/layout/headlines_footer.xml index 332c9882..ca5c6546 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_footer.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_footer.xml @@ -10,6 +10,6 @@ android:layout_marginTop="10dp" android:layout_width="128dp" android:layout_height="1dp" - android:background="?feedsSelectedBackground"/> + android:background="?headlineFooterColor"/> </FrameLayout>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 681c024c..597744e8 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -6,7 +6,7 @@ android:id="@+id/headlines_row" android:layout_width="fill_parent" android:layout_height="wrap_content" - card_view:cardElevation="2dp" + card_view:cardElevation="4dp" card_view:cardUseCompatPadding="true" card_view:cardBackgroundColor="?headlineNormalBackground" tools:ignore="HardcodedText" > diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml index 6a66b3ad..f2d08d77 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml @@ -6,7 +6,7 @@ android:id="@+id/headlines_row" android:layout_width="fill_parent" android:layout_height="wrap_content" - card_view:cardElevation="2dp" + card_view:cardElevation="4dp" card_view:cardUseCompatPadding="true" card_view:cardBackgroundColor="?headlineSelectedBackground" tools:ignore="HardcodedText" > diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 2aeb90a8..8fc10555 100644 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -11,7 +11,7 @@ <attr name="feedsSelectedBackground" format="reference|color" /> <attr name="feedlistTextColor" format="reference|color" /> <attr name="feedlistSelectedTextColor" format="reference|color" /> - <attr name="headlineTextColor" format="reference|color" /> + <!-- <attr name="headlineTextColor" format="reference|color" /> --> <attr name="headlineUnreadTextColor" format="reference|color" /> <attr name="headlineSelectedTextColor" format="reference|color" /> <attr name="headlineExcerptTextColor" format="reference|color" /> @@ -28,4 +28,5 @@ <attr name="articleHeader" format="reference|color" /> <attr name="articleHeaderTextColor" format="reference|color" /> <attr name="articleTextColor" format="reference|color" /> + <attr name="headlineFooterColor" format="reference|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 719d7958..d4b7dc23 100644 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -29,6 +29,7 @@ <item name="articleHeaderTextColor">@android:color/white</item> <item name="articleTextColor">@android:color/black</item> <item name="floatingActionButtonStyle">@style/FabTheme</item> + <item name="headlineFooterColor">?colorPrimary</item> <item name="colorPrimary">#6482af</item> <item name="colorPrimaryDark">#526A8E</item> @@ -73,6 +74,8 @@ <item name="headlineUnreadBackground">@android:color/black</item> <item name="headlineSelectedBackground">#635200</item> + <item name="headlineFooterColor">?colorAccent</item> + <item name="colorPrimary">@android:color/black</item> <item name="colorPrimaryDark">@android:color/black</item> <item name="colorAccent">#EACF4C</item> @@ -107,6 +110,7 @@ <item name="articleHeaderTextColor">@android:color/white</item> <item name="floatingActionButtonStyle">@style/FabTheme</item> <item name="articleTextColor">#e0e0e0</item> + <item name="headlineFooterColor">?colorPrimary</item> <item name="colorPrimary">#51698E</item> <item name="colorPrimaryDark">#445877</item> |