From c151b6573d0ffe3a707d00fbc20aeb602cc3e85e Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Wed, 28 Jan 2015 11:41:43 +0100
Subject: [PATCH] Theme attributes removed

---
 .../src/main/res/layout/cpp_plot_functions_fragment.xml   | 2 +-
 android-app/src/main/res/layout/history_fragment.xml      | 2 +-
 android-app/src/main/res/layout/history_item.xml          | 2 +-
 .../src/main/res/layout/math_entities_fragment.xml        | 2 +-
 android-app/src/main/res/layout/math_entity.xml           | 3 +--
 android-app/src/main/res/layout/saved_history_item.xml    | 2 +-
 android-app/src/main/res/layout/vars_fragment.xml         | 2 +-
 android-app/src/main/res/values/attributes.xml            | 2 --
 android-app/src/main/res/values/theme_gray.xml            | 8 ++------
 android-app/src/main/res/values/theme_metro_green.xml     | 6 ------
 android-app/src/main/res/values/theme_metro_purple.xml    | 7 -------
 11 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml b/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
index 266e3c83..470689ce 100644
--- a/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
+++ b/android-app/src/main/res/layout/cpp_plot_functions_fragment.xml
@@ -60,6 +60,6 @@
 
 	</LinearLayout>
 
-	<ListView style="?cpp_fragment_list_view_style"/>
+	<ListView style="@style/ListView"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/history_fragment.xml b/android-app/src/main/res/layout/history_fragment.xml
index c81825d1..ec7b786b 100644
--- a/android-app/src/main/res/layout/history_fragment.xml
+++ b/android-app/src/main/res/layout/history_fragment.xml
@@ -41,7 +41,7 @@
 		a:layout_width="match_parent"
 		a:layout_height="match_parent">
 
-		<ListView style="?cpp_fragment_list_view_style" />
+		<ListView style="@style/ListView" />
 
 		<com.melnykov.fab.FloatingActionButton
 			a:id="@+id/fab"
diff --git a/android-app/src/main/res/layout/history_item.xml b/android-app/src/main/res/layout/history_item.xml
index 4d7fb50d..f7cd030f 100644
--- a/android-app/src/main/res/layout/history_item.xml
+++ b/android-app/src/main/res/layout/history_item.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:orientation="horizontal"
-			  style="?cpp_fragment_list_view_item_style">
+			  style="@style/ListViewItem">
 
 
 	<LinearLayout
diff --git a/android-app/src/main/res/layout/math_entities_fragment.xml b/android-app/src/main/res/layout/math_entities_fragment.xml
index 523779ca..540d8c5a 100644
--- a/android-app/src/main/res/layout/math_entities_fragment.xml
+++ b/android-app/src/main/res/layout/math_entities_fragment.xml
@@ -36,6 +36,6 @@
 
 	<include layout="@layout/ad"/>
 
-	<ListView style="?cpp_fragment_list_view_style"/>
+	<ListView style="@style/ListView"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/layout/math_entity.xml b/android-app/src/main/res/layout/math_entity.xml
index c58b1378..f5398f84 100644
--- a/android-app/src/main/res/layout/math_entity.xml
+++ b/android-app/src/main/res/layout/math_entity.xml
@@ -25,8 +25,7 @@
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 			  a:layout_height="wrap_content"
 			  a:layout_width="match_parent"
-			  style="?cpp_fragment_list_view_item_style"
-			  a:padding="@dimen/cpp_pane_padding"
+			  style="@style/ListViewItem"
 			  a:orientation="horizontal">
 
 	<LinearLayout
diff --git a/android-app/src/main/res/layout/saved_history_item.xml b/android-app/src/main/res/layout/saved_history_item.xml
index aeace68d..237e5fa3 100644
--- a/android-app/src/main/res/layout/saved_history_item.xml
+++ b/android-app/src/main/res/layout/saved_history_item.xml
@@ -24,7 +24,7 @@
 
 <LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
 	a:orientation="vertical"
-	style="?cpp_fragment_list_view_item_style">
+	style="@style/ListViewItem">
 
 	<TextView
 		a:id="@+id/history_item"
diff --git a/android-app/src/main/res/layout/vars_fragment.xml b/android-app/src/main/res/layout/vars_fragment.xml
index 523779ca..540d8c5a 100644
--- a/android-app/src/main/res/layout/vars_fragment.xml
+++ b/android-app/src/main/res/layout/vars_fragment.xml
@@ -36,6 +36,6 @@
 
 	<include layout="@layout/ad"/>
 
-	<ListView style="?cpp_fragment_list_view_style"/>
+	<ListView style="@style/ListView"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/attributes.xml b/android-app/src/main/res/values/attributes.xml
index 343bf861..dfa0add9 100644
--- a/android-app/src/main/res/values/attributes.xml
+++ b/android-app/src/main/res/values/attributes.xml
@@ -29,8 +29,6 @@
 	<attr name="cpp_operation_button_style" format="reference"/>
 	<attr name="cpp_fragment_layout_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_pane_style" format="reference"/>
 	<attr name="cpp_pane_style_transparent" format="reference"/>
diff --git a/android-app/src/main/res/values/theme_gray.xml b/android-app/src/main/res/values/theme_gray.xml
index df637b03..52e704f6 100644
--- a/android-app/src/main/res/values/theme_gray.xml
+++ b/android-app/src/main/res/values/theme_gray.xml
@@ -47,7 +47,7 @@
 		<item name="android:padding">6dp</item>
 	</style>
 
-	<style name="cpp_default_fragment_list_view_item_style">
+	<style name="ListViewItem">
 		<item name="android:paddingLeft">16dp</item>
 		<item name="android:paddingRight">16dp</item>
 		<item name="android:paddingBottom">20dp</item>
@@ -58,7 +58,7 @@
 		<item name="android:gravity">center_vertical|left</item>
 	</style>
 
-	<style name="cpp_default_fragment_list_view_style">
+	<style name="ListView">
 		<item name="android:id">@android:id/list</item>
 		<item name="android:dividerHeight">1px</item>
 		<item name="android:divider">@color/cpp_list_divider</item>
@@ -126,8 +126,6 @@
 
 		<!-- other -->
 		<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_main_layout_style">@style/cpp_default_main_layout_style</item>
@@ -149,8 +147,6 @@
 
 		<!-- other -->
 		<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_main_layout_style">@style/cpp_default_main_layout_style</item>
diff --git a/android-app/src/main/res/values/theme_metro_green.xml b/android-app/src/main/res/values/theme_metro_green.xml
index 86479cbb..154451fb 100644
--- a/android-app/src/main/res/values/theme_metro_green.xml
+++ b/android-app/src/main/res/values/theme_metro_green.xml
@@ -26,14 +26,8 @@
 		<item name="android:background">@drawable/metro_button_green</item>
 	</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">
 		<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>
 
 </resources>
\ No newline at end of file
diff --git a/android-app/src/main/res/values/theme_metro_purple.xml b/android-app/src/main/res/values/theme_metro_purple.xml
index a84d13b1..9fbab8bc 100644
--- a/android-app/src/main/res/values/theme_metro_purple.xml
+++ b/android-app/src/main/res/values/theme_metro_purple.xml
@@ -26,15 +26,8 @@
 		<item name="android:background">@drawable/metro_button_purple</item>
 	</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">
 		<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>
 
 </resources>
\ No newline at end of file