TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Toolbar themes

Browse Source
This commit is contained in:
serso 2016-02-22 11:57:22 +01:00
parent 81648f19c6
commit fe27c1b443
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout-land/activity_tabs.xml
View File

@ -37,6 +37,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior" /> app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
app:theme="?cpp_toolbar_theme"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">

4
app/src/main/res/layout/activity_empty.xml
View File

@ -26,10 +26,12 @@
android:id="@+id/main" android:id="@+id/main"
style="@style/CppMain" style="@style/CppMain"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"> android:orientation="vertical"
xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
app:theme="?cpp_toolbar_theme"
android:layout_height="?actionBarSize" android:layout_height="?actionBarSize"
android:layout_width="match_parent" /> android:layout_width="match_parent" />
</LinearLayout> </LinearLayout>

3
app/src/main/res/layout/activity_tabs.xml
View File

@ -37,6 +37,7 @@
app:layout_behavior="@string/appbar_scrolling_view_behavior" /> app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
app:theme="?cpp_toolbar_theme"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -60,6 +61,6 @@
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
app:layout_behavior="org.solovyev.android.calculator.view.PagerViewFabBehavior" app:layout_behavior="org.solovyev.android.calculator.view.PagerViewFabBehavior"
android:id="@+id/fab" android:id="@+id/fab"
style="@style/CppFab"/> style="@style/CppFab" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>

1
app/src/main/res/values/attributes.xml
View File

@ -34,5 +34,6 @@
<attr name="cpp_text_color" format="reference" /> <attr name="cpp_text_color" format="reference" />
<attr name="cpp_text_color_error" format="reference" /> <attr name="cpp_text_color_error" format="reference" />
<attr name="cpp_card_style" format="reference" /> <attr name="cpp_card_style" format="reference" />
<attr name="cpp_toolbar_theme" format="reference" />
</resources> </resources>

10
app/src/main/res/values/styles.xml
View File

@ -325,16 +325,12 @@
<item name="android:padding">0dp</item> <item name="android:padding">0dp</item>
</style> </style>
<style name="CppToolbar" parent="@style/Widget.AppCompat.Toolbar"> <style name="CppToolbar" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="background">@color/cpp_material_actionbar</item> <item name="android:background">@color/cpp_material_actionbar</item>
<item name="backgroundStacked">@color/cpp_material_actionbar</item>
<item name="backgroundSplit">@color/cpp_material_actionbar</item>
</style> </style>
<style name="CppToolbar.Light" parent="CppToolbar"> <style name="CppToolbar.Light" parent="CppToolbar">
<item name="background">@color/cpp_material_actionbar_light</item> <item name="android:background">@color/cpp_material_actionbar_light</item>
<item name="backgroundStacked">@color/cpp_material_actionbar_light</item>
<item name="backgroundSplit">@color/cpp_material_actionbar_light</item>
</style> </style>
<style name="CppAd"> <style name="CppAd">

6
app/src/main/res/values/theme.xml
View File

@ -35,6 +35,7 @@
<item name="cpp_text_color">@color/cpp_text</item> <item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item> <item name="cpp_text_color_error">@color/cpp_text_error</item>
<item name="cpp_card_style">@style/CardView.Dark</item> <item name="cpp_card_style">@style/CardView.Dark</item>
<item name="cpp_toolbar_theme">@style/CppToolbar</item>
<item name="android:listDivider">@drawable/divider_dark</item> <item name="android:listDivider">@drawable/divider_dark</item>
</style> </style>
@ -61,6 +62,7 @@
<item name="cpp_fab_bg">@color/grey_900</item> <item name="cpp_fab_bg">@color/grey_900</item>
<item name="cpp_text_color">@color/cpp_text</item> <item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item> <item name="cpp_text_color_error">@color/cpp_text_error</item>
<item name="cpp_toolbar_theme">@style/CppToolbar</item>
<item name="android:listDivider">@drawable/divider_dark</item> <item name="android:listDivider">@drawable/divider_dark</item>
</style> </style>
@ -75,6 +77,7 @@
<item name="cpp_fab_bg">@color/grey_900</item> <item name="cpp_fab_bg">@color/grey_900</item>
<item name="cpp_text_color">@color/cpp_text</item> <item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item> <item name="cpp_text_color_error">@color/cpp_text_error</item>
<item name="cpp_toolbar_theme">@style/CppToolbar</item>
<item name="android:listDivider">@drawable/divider_dark</item> <item name="android:listDivider">@drawable/divider_dark</item>
</style> </style>
@ -92,6 +95,7 @@
<item name="cpp_text_color">@color/cpp_text_inverse</item> <item name="cpp_text_color">@color/cpp_text_inverse</item>
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item> <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
<item name="cpp_card_style">@style/CardView.Light</item> <item name="cpp_card_style">@style/CardView.Light</item>
<item name="cpp_toolbar_theme">@style/CppToolbar.Light</item>
<item name="android:listDivider">@drawable/divider</item> <item name="android:listDivider">@drawable/divider</item>
</style> </style>
@ -111,6 +115,7 @@
<item name="cpp_fab_bg">@color/cpp_material_light</item> <item name="cpp_fab_bg">@color/cpp_material_light</item>
<item name="cpp_text_color">@color/cpp_text_inverse</item> <item name="cpp_text_color">@color/cpp_text_inverse</item>
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item> <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
<item name="cpp_toolbar_theme">@style/CppToolbar.Light</item>
<item name="android:listDivider">@drawable/divider</item> <item name="android:listDivider">@drawable/divider</item>
</style> </style>
@ -125,6 +130,7 @@
<item name="cpp_fab_bg">@color/cpp_material_light</item> <item name="cpp_fab_bg">@color/cpp_material_light</item>
<item name="cpp_text_color">@color/cpp_text_inverse</item> <item name="cpp_text_color">@color/cpp_text_inverse</item>
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item> <item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
<item name="cpp_toolbar_theme">@style/CppToolbar.Light</item>
<item name="android:listDivider">@drawable/divider</item> <item name="android:listDivider">@drawable/divider</item>
</style> </style>