Add a spinner for CPUs, plus some clean up.

3 files changed, 62 insertions, 18 deletions

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 18c9ec9..eec86f2 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -25,10 +25,15 @@
                                 android:layout_height="wrap_content"
                                 android:prompt="@+id/versionsPrompt" />
 
-    <TextView android:id="@+id/cpu"
+    <TextView android:id="@+id/cpusPrompt"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/cpu" />
+        android:text="@string/cpusPrompt" />
+
+    <Spinner android:id="@+id/cpus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+                                android:prompt="@+id/cpusPrompt" />
 
     <TextView android:id="@+id/path"
         android:layout_width="wrap_content"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 517af71..6502964 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,7 +20,28 @@ This app is used for installing Rob Landley\'s toybox.\n\n\"Toybox combines comm
                                 <item>0.4.8</item>
                                 <item>0.4.9</item>
                 </string-array>
-                <string name="cpu">The CPU type here is</string>
+                <string name="cpusPrompt">The CPU type here is</string>
+    <string name="cpusPrompt2">, but you may need to select a close match :-</string>
+    <string-array name="cpus">
+        <item>armv4eb</item>
+        <item>armv4l</item>
+        <item>armv4tl</item>
+        <item>armv5l</item>
+        <item>armv6l</item>
+        <item>armv7l</item>
+        <item>i486</item>
+        <item>i586</item>
+        <item>i686</item>
+        <item>m68k</item>
+        <item>mips</item>
+        <item>mips64</item>
+        <item>mipsel</item>
+        <item>powerpc</item>
+        <item>powerpc-440fp</item>
+        <item>sh4</item>
+        <item>sparc</item>
+        <item>x86_64</item>
+    </string-array>
     <string name="path">Select where you want to install toybox ...\n</string>
                 <string name="pathsPrompt">... into the $PATH :-\n</string>
     <string name="folder">... or into a folder :-\n</string>
diff --git a/src/net/onefang/toyboxInstaller/MainActivity.java b/src/net/onefang/toyboxInstaller/MainActivity.java
index 4186c2b..27051bf 100644
--- a/src/net/onefang/toyboxInstaller/MainActivity.java
+++ b/src/net/onefang/toyboxInstaller/MainActivity.java
@@ -9,19 +9,27 @@ import android.speech.*;
 
 public class MainActivity extends Activity implements AdapterView.OnItemSelectedListener
 {
+                private String requstedVersion = "latest";
+                private String requestedCPU = "";
+                private String requestedPath = "";
+
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
+                                requestedCPU = java.lang.System.getProperty("os.arch");
 
         TextView version = (TextView) findViewById(R.id.version);
         String   VERSION = getString(R.string.version);
         Spinner  versions = (Spinner) findViewById(R.id.versions);
         ArrayAdapter<CharSequence> VERSIONS = ArrayAdapter.createFromResource(this, R.array.versions, android.R.layout.simple_spinner_item);
-        TextView cpu = (TextView) findViewById(R.id.cpu);
-        String   CPU = getString(R.string.cpu);
+        TextView cpu = (TextView) findViewById(R.id.cpusPrompt);
+        String   CPU = getString(R.string.cpusPrompt);
+  String   CPU2 = getString(R.string.cpusPrompt2);
+  Spinner  cpus = (Spinner) findViewById(R.id.cpus);
+  ArrayAdapter<CharSequence> CPUS = ArrayAdapter.createFromResource(this, R.array.cpus, android.R.layout.simple_spinner_item);
         TextView path = (TextView) findViewById(R.id.path);
         String   PATH = getString(R.string.path);
         Spinner  paths = (Spinner) findViewById(R.id.paths);
@@ -38,9 +46,13 @@ public class MainActivity extends Activity implements AdapterView.OnItemSelected
         VERSIONS.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         versions.setAdapter(VERSIONS);
         versions.setOnItemSelectedListener(this);
-        cpu.setText(CPU + " " + java.lang.System.getProperty("os.arch") + ".\n");
-        PATHS = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item,
-                                java.lang.System.getenv("PATH").split("\\" + pathSep));
+        cpu.setText(CPU + " " + requestedCPU + " " + CPU2 + "\n");
+  CPUS.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+  cpus.setAdapter(CPUS);
+  cpus.setSelection(CPUS.getPosition(requestedCPU));
+  cpus.setOnItemSelectedListener(this);
+  PATHS = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item,
+                java.lang.System.getenv("PATH").split("\\" + pathSep));
         PATHS.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         paths.setAdapter(PATHS);
         paths.setOnItemSelectedListener(this);
@@ -53,25 +65,31 @@ public class MainActivity extends Activity implements AdapterView.OnItemSelected
                 public void onItemSelected(AdapterView<?> parent, View view, int pos, long id)
                 {
                                 String s = (String) parent.getItemAtPosition(pos);
-
+        TextView source = (TextView) findViewById(R.id.source);
+        String   SOURCE = getString(R.string.source);
+        TextView destination = (TextView) findViewById(R.id.destination);
+        String   DESTINATION = getString(R.string.destination);
+        
                                 switch (parent.getId())
                                 {
                                                 case R.id.versions :
                                                 {
-                                                        TextView source = (TextView) findViewById(R.id.source);
-                                                        String   SOURCE = getString(R.string.source);
-        
-                                                        source.setText(SOURCE + " http://landley.net/code/toybox/downloads/binaries/" + s + "/toybox-\n");
+                                                        requstedVersion = s;
                                                         break;
                                                 }
-                                                case R.id.paths:
+            case R.id.cpus :
+            {
+               requestedCPU = s;
+               break;
+            }
+            case R.id.paths:
                                                 {
-                                                                TextView destination = (TextView) findViewById(R.id.destination);
-                                                                String   DESTINATION = getString(R.string.destination);
-
-                                                                destination.setText(DESTINATION + " " + s + "\n");
+                                                                requestedPath = s;
+                break;
                                                 }
                                 }
+        source.setText(SOURCE + " http://landley.net/code/toybox/downloads/binaries/" + requstedVersion + "/toybox-" + requestedCPU + "\n");
+        destination.setText(DESTINATION + " " + requestedPath + "\n");
                 }
 
                 @Override