Theme attributes removed

This commit is contained in:
serso 2015-01-28 11:41:43 +01:00
parent 9181e531fb
commit c151b6573d
11 changed files with 9 additions and 29 deletions

View File

@ -60,6 +60,6 @@
</LinearLayout> </LinearLayout>
<ListView style="?cpp_fragment_list_view_style"/> <ListView style="@style/ListView"/>
</LinearLayout> </LinearLayout>

View File

@ -41,7 +41,7 @@
a:layout_width="match_parent" a:layout_width="match_parent"
a:layout_height="match_parent"> a:layout_height="match_parent">
<ListView style="?cpp_fragment_list_view_style" /> <ListView style="@style/ListView" />
<com.melnykov.fab.FloatingActionButton <com.melnykov.fab.FloatingActionButton
a:id="@+id/fab" a:id="@+id/fab"

View File

@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="horizontal" a:orientation="horizontal"
style="?cpp_fragment_list_view_item_style"> style="@style/ListViewItem">
<LinearLayout <LinearLayout

View File

@ -36,6 +36,6 @@
<include layout="@layout/ad"/> <include layout="@layout/ad"/>
<ListView style="?cpp_fragment_list_view_style"/> <ListView style="@style/ListView"/>
</LinearLayout> </LinearLayout>

View File

@ -25,8 +25,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_height="wrap_content" a:layout_height="wrap_content"
a:layout_width="match_parent" a:layout_width="match_parent"
style="?cpp_fragment_list_view_item_style" style="@style/ListViewItem"
a:padding="@dimen/cpp_pane_padding"
a:orientation="horizontal"> a:orientation="horizontal">
<LinearLayout <LinearLayout

View File

@ -24,7 +24,7 @@
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical" a:orientation="vertical"
style="?cpp_fragment_list_view_item_style"> style="@style/ListViewItem">
<TextView <TextView
a:id="@+id/history_item" a:id="@+id/history_item"

View File

@ -36,6 +36,6 @@
<include layout="@layout/ad"/> <include layout="@layout/ad"/>
<ListView style="?cpp_fragment_list_view_style"/> <ListView style="@style/ListView"/>
</LinearLayout> </LinearLayout>

View File

@ -29,8 +29,6 @@
<attr name="cpp_operation_button_style" format="reference"/> <attr name="cpp_operation_button_style" format="reference"/>
<attr name="cpp_fragment_layout_style" format="reference"/> <attr name="cpp_fragment_layout_style" format="reference"/>
<attr name="cpp_fragment_title_style" format="reference"/> <attr name="cpp_fragment_title_style" format="reference"/>
<attr name="cpp_fragment_list_view_style" format="reference"/>
<attr name="cpp_fragment_list_view_item_style" format="reference"/>
<attr name="cpp_button_style" format="reference"/> <attr name="cpp_button_style" format="reference"/>
<attr name="cpp_pane_style" format="reference"/> <attr name="cpp_pane_style" format="reference"/>
<attr name="cpp_pane_style_transparent" format="reference"/> <attr name="cpp_pane_style_transparent" format="reference"/>

View File

@ -47,7 +47,7 @@
<item name="android:padding">6dp</item> <item name="android:padding">6dp</item>
</style> </style>
<style name="cpp_default_fragment_list_view_item_style"> <style name="ListViewItem">
<item name="android:paddingLeft">16dp</item> <item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item> <item name="android:paddingRight">16dp</item>
<item name="android:paddingBottom">20dp</item> <item name="android:paddingBottom">20dp</item>
@ -58,7 +58,7 @@
<item name="android:gravity">center_vertical|left</item> <item name="android:gravity">center_vertical|left</item>
</style> </style>
<style name="cpp_default_fragment_list_view_style"> <style name="ListView">
<item name="android:id">@android:id/list</item> <item name="android:id">@android:id/list</item>
<item name="android:dividerHeight">1px</item> <item name="android:dividerHeight">1px</item>
<item name="android:divider">@color/cpp_list_divider</item> <item name="android:divider">@color/cpp_list_divider</item>
@ -126,8 +126,6 @@
<!-- other --> <!-- other -->
<item name="cpp_fragment_title_style">@style/cpp_default_fragment_title_style</item> <item name="cpp_fragment_title_style">@style/cpp_default_fragment_title_style</item>
<item name="cpp_fragment_list_view_style">@style/cpp_default_fragment_list_view_style</item>
<item name="cpp_fragment_list_view_item_style">@style/cpp_default_fragment_list_view_item_style</item>
<item name="cpp_button_style">@style/cpp_default_button_style</item> <item name="cpp_button_style">@style/cpp_default_button_style</item>
<item name="cpp_main_layout_style">@style/cpp_default_main_layout_style</item> <item name="cpp_main_layout_style">@style/cpp_default_main_layout_style</item>
@ -149,8 +147,6 @@
<!-- other --> <!-- other -->
<item name="cpp_fragment_title_style">@style/cpp_default_fragment_title_style</item> <item name="cpp_fragment_title_style">@style/cpp_default_fragment_title_style</item>
<item name="cpp_fragment_list_view_style">@style/cpp_default_fragment_list_view_style</item>
<item name="cpp_fragment_list_view_item_style">@style/cpp_default_fragment_list_view_item_style</item>
<item name="cpp_button_style">@style/cpp_default_button_style</item> <item name="cpp_button_style">@style/cpp_default_button_style</item>
<item name="cpp_main_layout_style">@style/cpp_default_main_layout_style</item> <item name="cpp_main_layout_style">@style/cpp_default_main_layout_style</item>

View File

@ -26,14 +26,8 @@
<item name="android:background">@drawable/metro_button_green</item> <item name="android:background">@drawable/metro_button_green</item>
</style> </style>
<style name="metro_green_fragment_list_view_item_style" parent="cpp_default_fragment_list_view_item_style">
<item name="background">@drawable/metro_green_list_item</item>
<item name="android:background">@drawable/metro_green_list_item</item>
</style>
<style name="cpp_metro_green_theme" parent="cpp_metro_blue_theme"> <style name="cpp_metro_green_theme" parent="cpp_metro_blue_theme">
<item name="cpp_operation_button_style">@style/metro_green_operation_button_style</item> <item name="cpp_operation_button_style">@style/metro_green_operation_button_style</item>
<item name="cpp_fragment_list_view_item_style">@style/metro_green_fragment_list_view_item_style</item>
</style> </style>
</resources> </resources>

View File

@ -26,15 +26,8 @@
<item name="android:background">@drawable/metro_button_purple</item> <item name="android:background">@drawable/metro_button_purple</item>
</style> </style>
<style name="metro_purple_fragment_list_view_item_style" parent="cpp_default_fragment_list_view_item_style">
<item name="background">@drawable/metro_purple_list_item</item>
<item name="android:background">@drawable/metro_purple_list_item</item>
</style>
<style name="cpp_metro_purple_theme" parent="cpp_metro_blue_theme"> <style name="cpp_metro_purple_theme" parent="cpp_metro_blue_theme">
<item name="cpp_operation_button_style">@style/metro_purple_operation_button_style</item> <item name="cpp_operation_button_style">@style/metro_purple_operation_button_style</item>
<item name="cpp_fragment_list_view_item_style">@style/metro_purple_fragment_list_view_item_style</item>
</style> </style>
</resources> </resources>