From: Cameron Wong <camtech075@gmail.com>
Date: Fri, 17 Feb 2017 02:03:37 +0000 (-0500)
Subject: Add preferences menu
X-Git-Tag: release-1.2~43
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=96979c633d2293998647d996c2e99e50584629b4;p=acmetensortoys-ctfws-android

Add preferences menu
---

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 50aa447..f61d74d 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -27,6 +27,7 @@
         <service android:name="org.eclipse.paho.android.service.MqttService" />
 
         <activity android:name=".AboutActivity" />
+        <activity android:name=".SettingsActivity" />
 
         <service
             android:name=".MainService"
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
index 1b6f84b..3d81b1a 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
@@ -154,18 +154,24 @@ public class MainActivity extends AppCompatActivity {
     }
 
     // TODO should we be using onClick instead for routing?
+    // Cam: According to official documentation, this is the preferred way to into menus, so
+    //      we're (overall) fine.
     @Override
     public boolean onOptionsItemSelected(MenuItem mi) {
         switch(mi.getItemId()) {
+            case R.id.menu_prf :
+                startActivity(new Intent(this, SettingsActivity.class));
+                return true;
+            case R.id.menu_about :
+                startActivity(new Intent(this, AboutActivity.class));
+                return true;
+            // Cam: Changing this doesn't appear to do anything? Leaving just in case.
             case R.id.menu_mqtt :
                 DialogFragment d =
                         StringSettingDialogFragment.newInstance(
                                 R.layout.server_dialog, R.id.server_text, "server", defserver);
                 d.show(getSupportFragmentManager(),"serverdialog");
                 return true;
-            case R.id.menu_about :
-                startActivity(new Intent(this, AboutActivity.class));
-                return true;
             default:
                 return super.onOptionsItemSelected(mi);
         }
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
index 096146d..507d840 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainService.java
@@ -10,6 +10,7 @@ import android.content.SharedPreferences;
 import android.os.Binder;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
@@ -136,7 +137,6 @@ public class MainService extends Service {
         @Override
         public void onSuccess(IMqttToken asyncActionToken) {
             Log.d("CtFwS", "Conn OK 1");
-
             IMqttAsyncClient c = asyncActionToken.getClient();
             if (c.equals(mMqc)) {
                 setMSE(MqttServerEvent.MSE_CONN);
@@ -264,6 +264,24 @@ public class MainService extends Service {
 
     // User-facing notification
     // TODO Move to its own display module?
+
+    // The pattern for notification vibration patterns. Maybe we could have multiple for different
+    // events, like flags/jailbreaks?
+    private long[] VIBRATE_PATTERN = {0, 300, 200, 300};
+
+    private void vibrate(long[] pattern) {
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getBaseContext());
+        // Cam: default value is "false" because we really don't want to be vibrating if we
+        //      accidentally lose our preferences somehow
+        if (sp.getBoolean("prf_vibr", false)) {
+            Vibrator v = (Vibrator) getSystemService(VIBRATOR_SERVICE);
+            v.vibrate(VIBRATE_PATTERN,-1);
+        }
+        else {
+            Log.d("vibrate", "off");
+        }
+    }
+
     private ServiceConnection userNoteSC;
     private void ensureNotification() {
         synchronized(this) {
@@ -278,6 +296,7 @@ public class MainService extends Service {
                     }
                 };
             }
+            // Cam: Do we need this?
             bindService(new Intent(MainService.this, MainService.class), userNoteSC,
                     Context.BIND_AUTO_CREATE);
             startForeground(NOTE_ID_USER, userNoteBuilder.build());
@@ -294,6 +313,8 @@ public class MainService extends Service {
     }
 
     private NotificationCompat.Builder userNoteBuilder;
+    // TODO (Cam): It'd be cool if we could make the notification say "you got a flag" or something
+    //             for a few seconds after we get messages
     private CtFwSGameState.Observer mCgsObserver = new CtFwSGameState.Observer() {
         @Override
         public void onCtFwSConfigure(CtFwSGameState game) { }
@@ -303,6 +324,7 @@ public class MainService extends Service {
             userNoteBuilder.setWhen((now.roundEnd+1)*1000);
             userNoteBuilder.setUsesChronometer(true);
             if (now.rationale == null || !now.stop) {
+                vibrate(VIBRATE_PATTERN);
                 // game is afoot!
                 userNoteBuilder.setContentTitle(
                         now.rationale == null ? "Game is afoot!" : now.rationale);
@@ -318,6 +340,7 @@ public class MainService extends Service {
         @Override
         public void onCtFwSFlags(CtFwSGameState game) { }
 
+        // Cam: Are we just explicitly no-op'ing this, or should we actually display messages?
         @Override
         public void onCtFwSMessage(CtFwSGameState game, List<CtFwSGameState.Msg> msgs) { }
     };
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/SettingsActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/SettingsActivity.java
new file mode 100644
index 0000000..d007765
--- /dev/null
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/SettingsActivity.java
@@ -0,0 +1,22 @@
+package com.acmetensortoys.ctfwstimer;
+
+import android.preference.PreferenceActivity;
+import android.preference.PreferenceFragment;
+import android.os.Bundle;
+
+// TODO (Cam): changing the server doesn't actually work yet
+public class SettingsActivity extends PreferenceActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getFragmentManager().beginTransaction().replace(android.R.id.content, new SettingsFragment()).commit();
+    }
+
+    public static class SettingsFragment extends PreferenceFragment {
+        @Override
+        public void onCreate(final Bundle savedInstanceBundle) {
+            super.onCreate(savedInstanceBundle);
+            addPreferencesFromResource(R.xml.preferences);
+        }
+    }
+}
diff --git a/mobile/src/main/res/menu/mainmenu.xml b/mobile/src/main/res/menu/mainmenu.xml
index 0c6a9f0..e4686b2 100644
--- a/mobile/src/main/res/menu/mainmenu.xml
+++ b/mobile/src/main/res/menu/mainmenu.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <item
+        android:visible="true"
+        android:enabled="true"
+        android:title="@string/menutext_prf"
+        android:id="@+id/menu_prf"
+        android:icon="@android:drawable/ic_menu_manage"
+        android:checkable="false"/>
     <item
         android:visible="true"
         android:enabled="true"
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 42ca20b..2321331 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
     <string name="menutext_about">About</string>
     <string name="menutext_mqtt">Set MQTT Server</string>
     <string name="menutext_mqtt_label">Server URI:</string>
+    <string name="menutext_prf">Settings</string>
 
     <string name="mqtt_header">Connection Metadata:</string>
     <string name="mqtt_state_label">Server State:</string>
diff --git a/mobile/src/main/res/xml/preferences.xml b/mobile/src/main/res/xml/preferences.xml
new file mode 100644
index 0000000..8f56170
--- /dev/null
+++ b/mobile/src/main/res/xml/preferences.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <EditTextPreference
+        android:selectAllOnFocus="true"
+        android:singleLine="true"
+        android:key="prf_mqtt_uri"
+        android:defaultValue="tcp://ctfws-mqtt.ietfng.org:1883"
+        android:title="Change MQTT Server" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:title="Vibrate?"
+        android:key="prf_vibr" />
+</PreferenceScreen>
\ No newline at end of file