From 6c9b2b972f26132249b93163f589e9df339188c1 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 22 Sep 2014 06:34:40 +1000
Subject: More UI, and get most of the UI working.

---
 res/layout/main.xml    | 29 +++++++++++++++++++++++++++++
 res/values/strings.xml | 31 ++++++++++++++++++++++---------
 2 files changed, 51 insertions(+), 9 deletions(-)

(limited to 'res')

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>
-- 
cgit v1.1