From 2cd1be791a03fe92753b0913c4cffd336c591945 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sat, 29 Aug 2015 10:10:12 -0700
Subject: [PATCH] FTUE: add a button to load disk image on splash screen

---
 .../deadc0de/apple2ix/Apple2SplashScreen.java | 10 +++
 .../res/layout/activity_splash_screen.xml     | 64 +++++++++++--------
 Android/app/src/main/res/values/strings.xml   |  1 +
 3 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
index 48493ed7..d8dac372 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java
@@ -51,6 +51,16 @@ public class Apple2SplashScreen implements Apple2MenuView {
                 Apple2SplashScreen.this.dismiss();
             }
         });
+
+        Button disksButton = (Button) mSettingsView.findViewById(R.id.disksButton);
+        disksButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Apple2DisksMenu disksMenu = mActivity.getMainMenu().getDisksMenu();
+                disksMenu.show();
+                Apple2SplashScreen.this.dismiss();
+            }
+        });
     }
 
     public final boolean isCalibrating() {
diff --git a/Android/app/src/main/res/layout/activity_splash_screen.xml b/Android/app/src/main/res/layout/activity_splash_screen.xml
index b0cdbc12..d968ba24 100644
--- a/Android/app/src/main/res/layout/activity_splash_screen.xml
+++ b/Android/app/src/main/res/layout/activity_splash_screen.xml
@@ -18,30 +18,6 @@
         android:src="@drawable/apple_iie"
         android:id="@+id/splashView" />
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/emulation_continue"
-        android:id="@+id/startButton"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:layout_marginRight="18dp"
-        android:layout_marginEnd="18dp"
-        android:layout_marginTop="18dp" />
-
-    <Button
-        android:layout_height="wrap_content"
-        android:layout_width="0dp"
-        android:text="@string/emulation_settings"
-        android:id="@+id/prefsButton"
-        android:layout_marginTop="18dp"
-        android:layout_below="@+id/startButton"
-        android:layout_alignRight="@+id/startButton"
-        android:layout_alignEnd="@+id/startButton"
-        android:layout_alignLeft="@+id/startButton"
-        android:layout_alignStart="@+id/startButton" />
-
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -50,7 +26,43 @@
         android:layout_alignTop="@+id/startButton"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_marginLeft="18dp"
-        android:layout_marginStart="18dp" />
+        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/emulation_continue"
+        android:id="@+id/startButton"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginRight="10dp"
+        android:layout_marginEnd="10dp"
+        android:layout_marginTop="10dp" />
+
+    <Button
+        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:text="@string/emulation_settings"
+        android:id="@+id/prefsButton"
+        android:layout_marginTop="10dp"
+        android:layout_below="@+id/startButton"
+        android:layout_alignRight="@+id/startButton"
+        android:layout_alignEnd="@+id/startButton"
+        android:layout_alignLeft="@+id/startButton"
+        android:layout_alignStart="@+id/startButton" />
+
+    <Button
+        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:text="@string/emulation_disks"
+        android:id="@+id/disksButton"
+        android:layout_marginTop="10dp"
+        android:layout_below="@+id/prefsButton"
+        android:layout_alignRight="@+id/startButton"
+        android:layout_alignEnd="@+id/startButton"
+        android:layout_alignLeft="@+id/startButton"
+        android:layout_alignStart="@+id/startButton" />
 
 </RelativeLayout>
diff --git a/Android/app/src/main/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml
index c192484e..6596f1f2 100644
--- a/Android/app/src/main/res/values/strings.xml
+++ b/Android/app/src/main/res/values/strings.xml
@@ -25,6 +25,7 @@
     <string name="disk_read_write">Read/write</string>
     <string name="emulation_continue">Continue…</string>
     <string name="emulation_settings">Settings…</string>
+    <string name="emulation_disks">Load disk image…</string>
     <string name="header_disks">Insert disk:</string>
     <string name="input_configure">Configure input devices…</string>
     <string name="input_configure_summary">Keyboard, joystick, etc</string>