Simplify the spinner styling.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@725 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/res/layout/simple_spinner_item.xml b/android/res/layout/simple_spinner_item.xml
deleted file mode 100644 (file)
index 12ff153..0000000
--- 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 (file)
index 0000000..84fd2cc
--- /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 49e3de998423d13543e3ddc43e508fc88b684401..438dddd8e84a1d721387ef358a8d77b3661b6405 100644 (file)
--- 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 8c7bdf4bbfdfe34b8cdeddf65bd8e470b8999049..41cbec11cd4afb7fb58255862dda573a22b891ea 100644 (file)
--- 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> {\r
 \r
        public MotorConfigSpinnerAdapter(Context context, Rocket rocket) {\r
-               super(context, R.layout.simple_spinner_item);\r
+               super(context, android.R.layout.simple_spinner_item);\r
                \r
                String[] motorConfigs = rocket.getMotorConfigurationIDs();\r
 \r

diff --git a/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java b/android/src/net/sf/openrocket/android/simulation/SimulationSeriesDialog.java
index bdcb4d44e9b82af2fe2d00d5ec2cca1d0647cfc1..f3622c534ed145fb52dd1066e3073a789106735b 100644 (file)
--- 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);\r
                        }\r
                }\r
-               ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),R.layout.simple_spinner_item,selectableSeries) {\r
+               ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),android.R.layout.simple_spinner_item,selectableSeries) {\r
 \r
                        @Override\r
                        public View getView(int position, View convertView,     ViewGroup parent) {\r
                                View v = convertView;\r
                                if ( v == null ) {\r
                                        LayoutInflater li = inflater;\r
-                                       v = li.inflate(R.layout.simple_spinner_item,null);\r
+                                       v = li.inflate(android.R.layout.simple_spinner_item,null);\r
                                }\r
                                FlightDataType fdt = this.getItem(position);\r
                                ((TextView)v.findViewById(android.R.id.text1)).setText( fdt.toString() );\r