More UI, and get most of the UI working.

3 files changed, 103 insertions, 12 deletions

diff --git a/res/layout/main.xml b/res/layout/main.xml
index 7136eb1..18c9ec9 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -15,6 +15,16 @@
         android:layout_height="wrap_content"
         android:text="@string/version" />
 
+                <TextView android:id="@+id/versionsPrompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/versionsPrompt" />
+
+                <Spinner android:id="@+id/versions"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:prompt="@+id/versionsPrompt" />
+
     <TextView android:id="@+id/cpu"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -25,6 +35,16 @@
         android:layout_height="wrap_content"
         android:text="@string/path" />
 
+                <TextView android:id="@+id/pathsPrompt"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/pathsPrompt" />
+
+                <Spinner android:id="@+id/paths"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:prompt="@+id/pathsPrompt" />
+
     <TextView android:id="@+id/folder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -36,4 +56,13 @@
         android:text="@string/button_install"
         android:onClick="installToybox" />
 
+                <TextView android:id="@+id/source"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/source" />
+
+                <TextView android:id="@+id/destination"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/destination" />
 </LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bd2d3af..517af71 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,15 +3,28 @@
 
     <string name="app_name">toyboxInstaller</string>
     <string name="hello">
-This app is used for installing Rob Landley\'s toybox.  
-Toybox combines common Linux command line utilities together 
-into a single BSD-licensed executable that\'s simple, small, fast, 
-reasonably standards-compliant, and powerful enough to turn 
-Android into a development environment.\n\n</string>
+This app is used for installing Rob Landley\'s toybox.\n\n\"Toybox combines common Linux command line utilities together into a single BSD-licensed executable that\'s simple, small, fast, reasonably standards-compliant, and powerful enough to turn Android into a development environment.\"\n\nAt least that\'s Rob\'s plan, toybox is not yet feature complete.\n\n</string>
     <string name="version">The currently installed toybox version is</string>
-    <string name="cpu">The CPU type here is</string>
-    <string name="path">Select where you want to install toybox\n\nfrom the PATH -\n</string>
-    <string name="folder">or into a folder -\n</string>
+                <string name="versionsPrompt">Select a version to install:-</string>
+                <string-array name="versions">
+                                <item>latest</item>
+                                <item>0.3.0</item>
+                                <item>0.3.1</item>
+                                <item>0.4.0</item>
+                                <item>0.4.1</item>
+                                <item>0.4.2</item>
+                                <item>0.4.3</item>
+                                <item>0.4.5</item>
+                                <item>0.4.6</item>
+                                <item>0.4.7</item>
+                                <item>0.4.8</item>
+                                <item>0.4.9</item>
+                </string-array>
+                <string name="cpu">The CPU type here is</string>
+    <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>
     <string name="button_install">Install toybox.</string>
-
+    <string name="source">Install from</string>
+                <string name="destination">Install to</string>
 </resources>
diff --git a/src/net/onefang/toyboxInstaller/MainActivity.java b/src/net/onefang/toyboxInstaller/MainActivity.java
index e6c690f..4186c2b 100644
--- a/src/net/onefang/toyboxInstaller/MainActivity.java
+++ b/src/net/onefang/toyboxInstaller/MainActivity.java
@@ -5,8 +5,9 @@ import android.os.*;
 import android.view.*;
 import android.widget.*;
 import java.lang.System.*;
+import android.speech.*;
 
-public class MainActivity extends Activity
+public class MainActivity extends Activity implements AdapterView.OnItemSelectedListener
 {
     /** Called when the activity is first created. */
     @Override
@@ -17,20 +18,68 @@ public class MainActivity extends Activity
 
         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 path = (TextView) findViewById(R.id.path);
         String   PATH = getString(R.string.path);
+        Spinner  paths = (Spinner) findViewById(R.id.paths);
+        ArrayAdapter<String> PATHS;
         String   pathSep = java.lang.System.getProperty("path.separator");
         TextView folder = (TextView) findViewById(R.id.folder);
         String   FOLDER = getString(R.string.folder);
-
+        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);
+                                
         version.setText(VERSION + " " + "unknown" + ".\n");
+        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");
-        path.setText(PATH + " " + java.lang.System.getenv("PATH") + "\n");
+        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);
         folder.setText(FOLDER + " " + "" + "\n");
+        source.setText(SOURCE + " " + ""  + "\n");
+        destination.setText(DESTINATION + " " + ""  + "\n");
     }
 
+                @Override
+                public void onItemSelected(AdapterView<?> parent, View view, int pos, long id)
+                {
+                                String s = (String) parent.getItemAtPosition(pos);
+
+                                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");
+                                                        break;
+                                                }
+                                                case R.id.paths:
+                                                {
+                                                                TextView destination = (TextView) findViewById(R.id.destination);
+                                                                String   DESTINATION = getString(R.string.destination);
+
+                                                                destination.setText(DESTINATION + " " + s + "\n");
+                                                }
+                                }
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> parent)
+                {
+                                // TODO: Nothing to do here, maybe?
+                }
+
     public void installToybox(View view)
     {
     }