From 38aed7fbf5cd632d88fe8eaef0031bfeaa39bcba Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Sat, 25 Jul 2015 00:25:01 -0700
Subject: [PATCH] Add an about link and misc cleanup

---
 .../deadc0de/apple2ix/Apple2SettingsMenu.java | 26 +++++++++++++++----
 Android/app/src/main/res/values/strings.xml   | 12 +++++----
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
index 77f97f93..3ff95799 100644
--- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
+++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SettingsMenu.java
@@ -14,7 +14,9 @@ package org.deadc0de.apple2ix;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -42,10 +44,10 @@ public class Apple2SettingsMenu implements Apple2MenuView {
     enum SETTINGS {
         JOYSTICK_CONFIGURE {
             @Override public String getTitle(Apple2Activity activity) {
-                return activity.getResources().getString(R.string.configure_joystick);
+                return activity.getResources().getString(R.string.joystick_configure);
             }
             @Override public String getSummary(Apple2Activity activity) {
-                return activity.getResources().getString(R.string.configure_joystick_summary);
+                return activity.getResources().getString(R.string.joystick_configure_summary);
             }
             @Override public void handleSelection(Apple2Activity activity, Apple2SettingsMenu settingsMenu, boolean isChecked) {
                 //settingsMenu.mJoystickSettings.show();
@@ -64,10 +66,10 @@ public class Apple2SettingsMenu implements Apple2MenuView {
         },
         VIDEO_CONFIGURE {
             @Override public String getTitle(Apple2Activity activity) {
-                return activity.getResources().getString(R.string.configure_video);
+                return activity.getResources().getString(R.string.video_configure);
             }
             @Override public String getSummary(Apple2Activity activity) {
-                return activity.getResources().getString(R.string.configure_video_summary);
+                return activity.getResources().getString(R.string.video_configure_summary);
             }
             @Override public View getView(Apple2Activity activity, View convertView) {
                 convertView = _basicView(activity, this, convertView);
@@ -76,7 +78,7 @@ public class Apple2SettingsMenu implements Apple2MenuView {
             }
             @Override
             public void handleSelection(Apple2Activity activity, final Apple2SettingsMenu settingsMenu, boolean isChecked) {
-                AlertDialog.Builder builder = new AlertDialog.Builder(settingsMenu.mActivity).setIcon(R.drawable.ic_launcher).setCancelable(true).setTitle(R.string.configure_video);
+                AlertDialog.Builder builder = new AlertDialog.Builder(settingsMenu.mActivity).setIcon(R.drawable.ic_launcher).setCancelable(true).setTitle(R.string.video_configure);
                 builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -100,6 +102,20 @@ public class Apple2SettingsMenu implements Apple2MenuView {
                 });
                 builder.show();
             }
+        },
+        ABOUT {
+            @Override public String getTitle(Apple2Activity activity) {
+                return activity.getResources().getString(R.string.about_title);
+            }
+            @Override public String getSummary(Apple2Activity activity) {
+                return activity.getResources().getString(R.string.about_summary);
+            }
+            @Override
+            public void handleSelection(Apple2Activity activity, final Apple2SettingsMenu settingsMenu, boolean isChecked) {
+                String url = "http://github.com/mauiaaron/apple2";
+                Intent i = new Intent(Intent.ACTION_VIEW);
+                i.setData(Uri.parse(url));
+                activity.startActivity(i);            }
         };
 
         private static View _basicView(Apple2Activity activity, SETTINGS setting,  View convertView) {
diff --git a/Android/app/src/main/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml
index c9457653..aad258d6 100644
--- a/Android/app/src/main/res/values/strings.xml
+++ b/Android/app/src/main/res/values/strings.xml
@@ -4,6 +4,8 @@
     <color name="black">#000000</color>
     <color name="white">#ffffff</color>
 
+    <string name="about_title">About Apple2ix…</string>
+    <string name="about_summary">Various shout-outs and acknowledgements</string>
     <string name="action_settings">Settings</string>
     <string name="app_name">Apple2ix</string>
     <string name="audio_configure">Configure audio…</string>
@@ -12,18 +14,16 @@
     <string name="color_bw">Black/white</string>
     <string name="color_color">Color</string>
     <string name="color_interpolated">Interpolated color</string>
-    <string name="configure_joystick">Configure emulated joysticks…</string>
-    <string name="configure_joystick_summary">Touch/tilt, axis and buttons, etc</string>
-    <string name="configure_video">Configure video…</string>
-    <string name="configure_video_summary">Color settings</string>
     <string name="diskA">Drive 1</string>
     <string name="diskB">Drive 2</string>
     <string name="disk_read_write">Read/write</string>
     <string name="header_disks">Insert disk:</string>
     <string name="joystick">Joystick</string>
+    <string name="joystick_configure">Configure emulated joysticks…</string>
+    <string name="joystick_configure_summary">Touch/tilt, axis and buttons, etc</string>
+    <string name="joystick_enable">Enable emulated joystick</string>
     <string name="joystick_keyA">Key Joystick 1</string>
     <string name="joystick_keyB">Key Joystick 2</string>
-    <string name="joystick_enable">Enable emulated joystick</string>
     <string name="keyboard">Keyboard</string>
     <string name="keyboard_doubletap">Double-tap shows keyboard</string>
     <string name="keyboard_doubletap_summary">Uncheck to disable keyboard input</string>
@@ -66,5 +66,7 @@
     <string name="tab_general">General</string>
     <string name="tab_joystick">Joystick</string>
     <string name="title_activity_second">SecondActivity</string>
+    <string name="video_configure">Configure video…</string>
+    <string name="video_configure_summary">Color settings</string>
 
 </resources>