From b6e132c65faffe5397a46af76097f6b338e68ae1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 13 Nov 2014 16:33:16 +0300 Subject: [PATCH] set all cards to same elevation fix headline footer being invisible in amber theme --- org.fox.ttrss/src/main/res/layout/headlines_footer.xml | 2 +- org.fox.ttrss/src/main/res/layout/headlines_row.xml | 2 +- org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml | 2 +- org.fox.ttrss/src/main/res/values/attrs.xml | 3 ++- org.fox.ttrss/src/main/res/values/style.xml | 4 ++++ 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"/> \ 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 @@ - + @@ -28,4 +28,5 @@ + \ 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 @@ @android:color/white @android:color/black @style/FabTheme + ?colorPrimary #6482af #526A8E @@ -73,6 +74,8 @@ @android:color/black #635200 + ?colorAccent + @android:color/black @android:color/black #EACF4C @@ -107,6 +110,7 @@ @android:color/white @style/FabTheme #e0e0e0 + ?colorPrimary #51698E #445877