2 files changed, 51 insertions, 9 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.  
+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>
-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>
    <string name="version">The currently installed toybox version is</string>
-    <string name="cpu">The CPU type here is</string>
+                <string name="versionsPrompt">Select a version to install:-</string>
-    <string name="path">Select where you want to install toybox\n\nfrom the PATH -\n</string>
+                <string-array name="versions">
-    <string name="folder">or into a folder -\n</string>
+                                <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/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 @@
15	android:layout_height="wrap_content"	15	android:layout_height="wrap_content"
16	android:text="@string/version" />	16	android:text="@string/version" />
17		17
		18	<TextView android:id="@+id/versionsPrompt"
		19	android:layout_width="wrap_content"
		20	android:layout_height="wrap_content"
		21	android:text="@string/versionsPrompt" />
		22
		23	<Spinner android:id="@+id/versions"
		24	android:layout_width="wrap_content"
		25	android:layout_height="wrap_content"
		26	android:prompt="@+id/versionsPrompt" />
		27
18	<TextView android:id="@+id/cpu"	28	<TextView android:id="@+id/cpu"
19	android:layout_width="wrap_content"	29	android:layout_width="wrap_content"
20	android:layout_height="wrap_content"	30	android:layout_height="wrap_content"
@@ -25,6 +35,16 @@
25	android:layout_height="wrap_content"	35	android:layout_height="wrap_content"
26	android:text="@string/path" />	36	android:text="@string/path" />
27		37
		38	<TextView android:id="@+id/pathsPrompt"
		39	android:layout_width="wrap_content"
		40	android:layout_height="wrap_content"
		41	android:text="@string/pathsPrompt" />
		42
		43	<Spinner android:id="@+id/paths"
		44	android:layout_width="wrap_content"
		45	android:layout_height="wrap_content"
		46	android:prompt="@+id/pathsPrompt" />
		47
28	<TextView android:id="@+id/folder"	48	<TextView android:id="@+id/folder"
29	android:layout_width="wrap_content"	49	android:layout_width="wrap_content"
30	android:layout_height="wrap_content"	50	android:layout_height="wrap_content"
@@ -36,4 +56,13 @@
36	android:text="@string/button_install"	56	android:text="@string/button_install"
37	android:onClick="installToybox" />	57	android:onClick="installToybox" />
38		58
		59	<TextView android:id="@+id/source"
		60	android:layout_width="wrap_content"
		61	android:layout_height="wrap_content"
		62	android:text="@string/source" />
		63
		64	<TextView android:id="@+id/destination"
		65	android:layout_width="wrap_content"
		66	android:layout_height="wrap_content"
		67	android:text="@string/destination" />
39	</LinearLayout>	68	</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 @@
3		3
4	<string name="app_name">toyboxInstaller</string>	4	<string name="app_name">toyboxInstaller</string>
5	<string name="hello">	5	<string name="hello">
6	This app is used for installing Rob Landley\'s toybox.	6	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>
7	Toybox combines common Linux command line utilities together
8	into a single BSD-licensed executable that\'s simple, small, fast,
9	reasonably standards-compliant, and powerful enough to turn
10	Android into a development environment.\n\n</string>
11	<string name="version">The currently installed toybox version is</string>	7	<string name="version">The currently installed toybox version is</string>
12	<string name="cpu">The CPU type here is</string>	8	<string name="versionsPrompt">Select a version to install:-</string>
13	<string name="path">Select where you want to install toybox\n\nfrom the PATH -\n</string>	9	<string-array name="versions">
14	<string name="folder">or into a folder -\n</string>	10	<item>latest</item>
		11	<item>0.3.0</item>
		12	<item>0.3.1</item>
		13	<item>0.4.0</item>
		14	<item>0.4.1</item>
		15	<item>0.4.2</item>
		16	<item>0.4.3</item>
		17	<item>0.4.5</item>
		18	<item>0.4.6</item>
		19	<item>0.4.7</item>
		20	<item>0.4.8</item>
		21	<item>0.4.9</item>
		22	</string-array>
		23	<string name="cpu">The CPU type here is</string>
		24	<string name="path">Select where you want to install toybox ...\n</string>
		25	<string name="pathsPrompt">... into the $PATH :-\n</string>
		26	<string name="folder">... or into a folder :-\n</string>
15	<string name="button_install">Install toybox.</string>	27	<string name="button_install">Install toybox.</string>
16		28	<string name="source">Install from</string>
		29	<string name="destination">Install to</string>
17	</resources>	30	</resources>