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

Fix tab text background issues

Browse Source
This commit is contained in:
serso 2016-02-22 12:46:05 +01:00
parent fa95368c11
commit 8658fd9fe5
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,12 +37,12 @@
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">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
style="?cpp_toolbar_style"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?actionBarSize" android:layout_height="?actionBarSize"
app:layout_scrollFlags="snap"> app:layout_scrollFlags="snap">

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

@ -26,12 +26,11 @@
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" style="?cpp_toolbar_style"
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,18 +37,19 @@
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">
<android.support.v7.widget.Toolbar <android.support.v7.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
style="?cpp_toolbar_style"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?actionBarSize" android:layout_height="?actionBarSize"
app:layout_scrollFlags="scroll|enterAlways" /> app:layout_scrollFlags="scroll|enterAlways" />
<android.support.design.widget.TabLayout <android.support.design.widget.TabLayout
android:id="@+id/tabs" android:id="@+id/tabs"
style="?cpp_toolbar_style"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:overScrollMode="never" android:overScrollMode="never"

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

@ -34,6 +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" /> <attr name="cpp_toolbar_style" format="reference" />
</resources> </resources>

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

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

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

@ -35,7 +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="cpp_toolbar_style">@style/CppToolbar</item>
<item name="android:listDivider">@drawable/divider_dark</item> <item name="android:listDivider">@drawable/divider_dark</item>
</style> </style>
@ -62,7 +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="cpp_toolbar_style">@style/CppToolbar</item>
<item name="android:listDivider">@drawable/divider_dark</item> <item name="android:listDivider">@drawable/divider_dark</item>
</style> </style>
@ -77,7 +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="cpp_toolbar_style">@style/CppToolbar</item>
<item name="android:listDivider">@drawable/divider_dark</item> <item name="android:listDivider">@drawable/divider_dark</item>
</style> </style>
@ -95,7 +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="cpp_toolbar_style">@style/CppToolbar.Light</item>
<item name="android:listDivider">@drawable/divider</item> <item name="android:listDivider">@drawable/divider</item>
</style> </style>
@ -115,7 +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="cpp_toolbar_style">@style/CppToolbar.Light</item>
<item name="android:listDivider">@drawable/divider</item> <item name="android:listDivider">@drawable/divider</item>
</style> </style>
@ -130,7 +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="cpp_toolbar_style">@style/CppToolbar.Light</item>
<item name="android:listDivider">@drawable/divider</item> <item name="android:listDivider">@drawable/divider</item>
</style> </style>