From 844f2de727011350e1418739a9241ba951903046 Mon Sep 17 00:00:00 2001
From: Kevin Ruland <kruland@sunflower.com>
Date: Sun, 12 Feb 2012 16:29:48 +0000
Subject: [PATCH] Use our own simple_spinner_item layout so we can style it
 more easily.

---
 android/res/layout/simple_spinner_item.xml    | 26 +++++++++++++++++++
 android/res/values-v11/styles.xml             |  5 ++++
 android/res/values/styles.xml                 | 10 ++++++-
 .../openrocket/android/rocket/Overview.java   |  2 +-
 .../simulation/SimulationSeriesDialog.java    |  4 +--
 5 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 android/res/layout/simple_spinner_item.xml

diff --git a/android/res/layout/simple_spinner_item.xml b/android/res/layout/simple_spinner_item.xml
new file mode 100644
index 000000000..12ff153d7
--- /dev/null
+++ b/android/res/layout/simple_spinner_item.xml
@@ -0,0 +1,26 @@
+<?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
index 3888fc5bd..1da23b82f 100644
--- a/android/res/values-v11/styles.xml
+++ b/android/res/values-v11/styles.xml
@@ -31,4 +31,9 @@
         <item name="android:textColor">@color/actionbar_title_color</item>
     </style>
 
+    <style name="spinnerStyle" parent="@android:style/Widget.Holo.TextView.SpinnerItem">
+        <item name="android:textSize">22dp</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 761a4e1fb..316c9fe8e 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -8,10 +8,18 @@
 
     <style name="labelTextStyle" parent="@android:style/TextAppearance.Medium" />
 
-    <style name="valueTextStyle" parent="@android:style/TextAppearance.Large" />
+    <style name="valueTextStyle" parent="@android:style/TextAppearance.Large">
+        <item name="android:gravity">right</item>
+    </style>
 
     <style name="AppTheme.NoTitleBar" parent="@style/AppTheme">
         <item name="android:windowNoTitle">true</item>
     </style>
 
+    <style name="spinnerStyle" parent="@android:style/Widget.TextView.SpinnerItem">
+        <item name="android:textSize">22dp</item>
+        <item name="android:textColor">#000000</item>
+        <item name="android:layout_height">30dp</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/android/src/net/sf/openrocket/android/rocket/Overview.java b/android/src/net/sf/openrocket/android/rocket/Overview.java
index d287a8165..8692abf5a 100644
--- a/android/src/net/sf/openrocket/android/rocket/Overview.java
+++ b/android/src/net/sf/openrocket/android/rocket/Overview.java
@@ -82,7 +82,7 @@ implements SharedPreferences.OnSharedPreferenceChangeListener
 		Rocket rocket = rocketDocument.getRocket();
 
 		String[] motorConfigs = rocket.getMotorConfigurationIDs();
-		ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_spinner_item);
+		ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(getActivity(),R.layout.simple_spinner_item);
 		for( String config: motorConfigs ) {
 			spinnerAdapter.add(rocket.getMotorConfigurationNameOrDescription(config));
 		}
diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java b/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java
index f3622c534..bdcb4d44e 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(),android.R.layout.simple_spinner_item,selectableSeries) {
+		ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),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(android.R.layout.simple_spinner_item,null);
+					v = li.inflate(R.layout.simple_spinner_item,null);
 				}
 				FlightDataType fdt = this.getItem(position);
 				((TextView)v.findViewById(android.R.id.text1)).setText( fdt.toString() );