From a6a5eff5b647ecffb62c09ad6980bbcf4211a1be Mon Sep 17 00:00:00 2001
From: Kevin Ruland <kruland@sunflower.com>
Date: Fri, 25 May 2012 20:45:13 +0000
Subject: [PATCH] Simplify the spinner styling.

---
 android/res/layout/simple_spinner_item.xml    | 26 -------------------
 android/res/values-v11/styles.xml             |  8 ++++++
 android/res/values/styles.xml                 | 12 +++++----
 .../rocket/MotorConfigSpinnerAdapter.java     |  2 +-
 .../simulation/SimulationSeriesDialog.java    |  4 +--
 5 files changed, 18 insertions(+), 34 deletions(-)
 delete mode 100644 android/res/layout/simple_spinner_item.xml
 create mode 100644 android/res/values-v11/styles.xml

diff --git a/android/res/layout/simple_spinner_item.xml b/android/res/layout/simple_spinner_item.xml
deleted file mode 100644
index 12ff153d7..000000000
--- a/android/res/layout/simple_spinner_item.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/common/assets/res/any/layout/simple_spinner_item.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
-    style="@style/spinnerStyle"
--->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android" 
-    style="@style/spinnerStyle"
-    android:id="@android:id/text1"
-    android:singleLine="true"
-    android:layout_width="match_parent"
-    android:ellipsize="marquee" />
diff --git a/android/res/values-v11/styles.xml b/android/res/values-v11/styles.xml
new file mode 100644
index 000000000..84fd2cc24
--- /dev/null
+++ b/android/res/values-v11/styles.xml
@@ -0,0 +1,8 @@
+
+<resources>
+
+    <style name="spinnerStyle" parent="Widget.Sherlock.TextView.SpinnerItem">
+        <item name="android:textSize">22dp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 49e3de998..438dddd8e 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -12,15 +12,17 @@
         <item name="android:gravity">right</item>
     </style>
 
-    <style name="AppTheme" parent="Theme.Sherlock"/>
-    
+    <style name="AppTheme" parent="Theme.Sherlock">
+        <item name="android:spinnerItemStyle">@style/spinnerStyle</item>
+    </style>
+
     <style name="AppTheme.NoActionBar" parent="AppTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
-    
-    <style name="spinnerStyle" parent="@android:style/Widget.TextView.SpinnerItem">
-        <item name="android:textSize">22dp</item>
+
+    <style name="spinnerStyle" parent="Widget.Sherlock.TextView.SpinnerItem">
+        <item name="android:textSize">26dp</item>
         <item name="android:textColor">#000000</item>
         <item name="android:layout_height">30dp</item>
     </style>
diff --git a/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java b/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java
index 8c7bdf4bb..41cbec11c 100644
--- a/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java
+++ b/android/src/net/sf/openrocket/android/rocket/MotorConfigSpinnerAdapter.java
@@ -8,7 +8,7 @@ import android.widget.ArrayAdapter;
 public class MotorConfigSpinnerAdapter extends ArrayAdapter<String> {
 
 	public MotorConfigSpinnerAdapter(Context context, Rocket rocket) {
-		super(context, R.layout.simple_spinner_item);
+		super(context, android.R.layout.simple_spinner_item);
 		
 		String[] motorConfigs = rocket.getMotorConfigurationIDs();
 
diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java b/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java
index bdcb4d44e..f3622c534 100644
--- a/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java
+++ b/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java
@@ -88,14 +88,14 @@ public class SimulationSeriesDialog extends DialogFragment {
 				selectableSeries.add(fdt);
 			}
 		}
-		ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),R.layout.simple_spinner_item,selectableSeries) {
+		ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),android.R.layout.simple_spinner_item,selectableSeries) {
 
 			@Override
 			public View getView(int position, View convertView,	ViewGroup parent) {
 				View v = convertView;
 				if ( v == null ) {
 					LayoutInflater li = inflater;
-					v = li.inflate(R.layout.simple_spinner_item,null);
+					v = li.inflate(android.R.layout.simple_spinner_item,null);
 				}
 				FlightDataType fdt = this.getItem(position);
 				((TextView)v.findViewById(android.R.id.text1)).setText( fdt.toString() );