Main: screen-wake option

Fixes https://github.com/cmukgb/ctfws-timer-android/issues/11

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
index 093a2aa0546b7169d04ad2b145f7ef0945d0b64e..a38c296ba03fc760512afb4278d4d35e08001f9c 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainActivity.java
@@ -17,6 +17,7 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.TextView;
 
 public class MainActivity extends AppCompatActivity {
@@ -232,6 +233,14 @@ public class MainActivity extends AppCompatActivity {
             case R.id.mainmenu_hand:
                 startActivity(new Intent(this, HandbookActivity.class));
                 return true;
+            case R.id.mainmenu_screenwake:
+                boolean checked = mi.isChecked();
+                if (checked) {
+                    getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                } else {
+                    getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                }
+                mi.setChecked(!checked);
             case R.id.mainmenu_reconn:
                 if (mSrvBinder != null) {
                     mSrvBinder.connect(true);

diff --git a/mobile/src/main/res/menu/mainmenu.xml b/mobile/src/main/res/menu/mainmenu.xml
index ae8150d7fa4783b90323e4d2fe98e1405857d629..05c1a577c71fb7adf936221c1182381d496ca2eb 100644 (file)
--- a/mobile/src/main/res/menu/mainmenu.xml
+++ b/mobile/src/main/res/menu/mainmenu.xml
@@ -3,6 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <item
+        android:id="@+id/mainmenu_screenwake"
+        android:checkable="true"
+        android:enabled="true"
+        android:title="@string/menutext_screenwake"
+        android:visible="true"
+        app:showAsAction="never" />
     <item
         android:id="@+id/mainmenu_hand"
         android:icon="@drawable/ic_library_books_24dp"

diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 769e0194e0c7102d6b4395ebea9438988db74948..976c4b9080383b23c83f9847eb403fecacf43e33 100644 (file)
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -52,6 +52,7 @@
     <string name="menutext_prf">Settings</string>
     <string name="menutext_quit">Quit</string>
     <string name="menutext_reconn">Reconnect</string>
+    <string name="menutext_screenwake">Keep Screen On</string>
     <string name="menutext_search">Search</string>
 
     <string name="mqtt_uri_label">Server URI:</string>