Use our own simple_spinner_item layout so we can style it more easily.

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

diff --git a/android/res/layout/simple_spinner_item.xml b/android/res/layout/simple_spinner_item.xml
new file mode 100644 (file)
index 0000000..12ff153
--- /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 3888fc5bdfa2b45d5018ce3a66bbb60442311093..1da23b82fd8e706e256c7dc1968af8bfd29fd28c 100644 (file)
--- 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 761a4e1fb003f4aa955aa4ec2fb155fbbde27f6e..316c9fe8e5daaeb512bd32f1b2cdf355a99996e0 100644 (file)
--- 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 d287a8165051518157ceec473562a1e6cd59b829..8692abf5a84746802ab2c237deee372d4920d88d 100644 (file)
--- 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();\r
 \r
                String[] motorConfigs = rocket.getMotorConfigurationIDs();\r
-               ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(getActivity(),android.R.layout.simple_spinner_item);\r
+               ArrayAdapter<String> spinnerAdapter = new ArrayAdapter<String>(getActivity(),R.layout.simple_spinner_item);\r
                for( String config: motorConfigs ) {\r
                        spinnerAdapter.add(rocket.getMotorConfigurationNameOrDescription(config));\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 f3622c534ed145fb52dd1066e3073a789106735b..bdcb4d44e9b82af2fe2d00d5ec2cca1d0647cfc1 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(),android.R.layout.simple_spinner_item,selectableSeries) {\r
+               ArrayAdapter<FlightDataType> serieses = new ArrayAdapter<FlightDataType>(getActivity(),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(android.R.layout.simple_spinner_item,null);\r
+                                       v = li.inflate(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