From fe27c1b4432239a3dd51199792e05eff2a8c6386 Mon Sep 17 00:00:00 2001 From: serso Date: Mon, 22 Feb 2016 11:57:22 +0100 Subject: [PATCH] Toolbar themes --- app/src/main/res/layout-land/activity_tabs.xml | 1 + app/src/main/res/layout/activity_empty.xml | 4 +++- app/src/main/res/layout/activity_tabs.xml | 3 ++- app/src/main/res/values/attributes.xml | 1 + app/src/main/res/values/styles.xml | 10 +++------- app/src/main/res/values/theme.xml | 6 ++++++ 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/layout-land/activity_tabs.xml b/app/src/main/res/layout-land/activity_tabs.xml index 5e89c09b..8669fff3 100644 --- a/app/src/main/res/layout-land/activity_tabs.xml +++ b/app/src/main/res/layout-land/activity_tabs.xml @@ -37,6 +37,7 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" /> diff --git a/app/src/main/res/layout/activity_empty.xml b/app/src/main/res/layout/activity_empty.xml index c3087597..78fefb6f 100644 --- a/app/src/main/res/layout/activity_empty.xml +++ b/app/src/main/res/layout/activity_empty.xml @@ -26,10 +26,12 @@ android:id="@+id/main" style="@style/CppMain" xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical"> + android:orientation="vertical" + xmlns:app="http://schemas.android.com/apk/res-auto"> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_tabs.xml b/app/src/main/res/layout/activity_tabs.xml index 53564df5..71d32052 100644 --- a/app/src/main/res/layout/activity_tabs.xml +++ b/app/src/main/res/layout/activity_tabs.xml @@ -37,6 +37,7 @@ app:layout_behavior="@string/appbar_scrolling_view_behavior" /> @@ -60,6 +61,6 @@ + style="@style/CppFab" /> \ No newline at end of file diff --git a/app/src/main/res/values/attributes.xml b/app/src/main/res/values/attributes.xml index 1432498d..a1a14f27 100644 --- a/app/src/main/res/values/attributes.xml +++ b/app/src/main/res/values/attributes.xml @@ -34,5 +34,6 @@ + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 694352f6..9f69cadf 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -325,16 +325,12 @@ 0dp - @@ -61,6 +62,7 @@ @color/grey_900 @color/cpp_text @color/cpp_text_error + @style/CppToolbar @drawable/divider_dark @@ -75,6 +77,7 @@ @color/grey_900 @color/cpp_text @color/cpp_text_error + @style/CppToolbar @drawable/divider_dark @@ -92,6 +95,7 @@ @color/cpp_text_inverse @color/cpp_text_inverse_error @style/CardView.Light + @style/CppToolbar.Light @drawable/divider @@ -111,6 +115,7 @@ @color/cpp_material_light @color/cpp_text_inverse @color/cpp_text_inverse_error + @style/CppToolbar.Light @drawable/divider @@ -125,6 +130,7 @@ @color/cpp_material_light @color/cpp_text_inverse @color/cpp_text_inverse_error + @style/CppToolbar.Light @drawable/divider