From 68e7a8de1ee6cc1daad60581f0c1d36199da0b3f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 18 Jun 2016 17:29:45 +0200
Subject: [PATCH] add a Menu item for accessing Settings

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../camera/AboutActivity.java                 | 23 ++++++++++++++++++-
 .../camera/MainActivity.java                  |  5 ++++
 .../com/simplemobiletools/camera/Preview.java |  2 --
 app/src/main/res/menu/menu.xml                |  8 +++++++
 app/src/main/res/values/strings.xml           |  3 +++
 app/src/main/res/values/styles.xml            |  2 +-
 7 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/menu/menu.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 54956459..e833ae41 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,7 +47,7 @@
 
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/about"/>
+            android:label="@string/settings"/>
 
         <receiver
             android:name=".HardwareShutterReceiver"
diff --git a/app/src/main/java/com/simplemobiletools/camera/AboutActivity.java b/app/src/main/java/com/simplemobiletools/camera/AboutActivity.java
index 681156b8..4e6b5041 100644
--- a/app/src/main/java/com/simplemobiletools/camera/AboutActivity.java
+++ b/app/src/main/java/com/simplemobiletools/camera/AboutActivity.java
@@ -6,6 +6,9 @@ import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.widget.TextView;
 
 import java.util.Calendar;
@@ -32,6 +35,25 @@ public class AboutActivity extends AppCompatActivity {
         setupCopyright();
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.settings:
+                final Intent intent = new Intent(getApplicationContext(), SettingsActivity.class);
+                startActivity(intent);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
     private void setupEmail() {
         final String email = res.getString(R.string.email);
         final String appName = res.getString(R.string.app_name);
@@ -52,7 +74,6 @@ public class AboutActivity extends AppCompatActivity {
         copyright.setText(copyrightText);
     }
 
-
     @OnClick(R.id.about_license)
     public void licenseClicked() {
         final Intent intent = new Intent(getApplicationContext(), LicenseActivity.class);
diff --git a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
index d054f07e..eb29b3a8 100644
--- a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
@@ -14,6 +14,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.provider.MediaStore;
 import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.SurfaceView;
@@ -65,6 +66,10 @@ public class MainActivity extends AppCompatActivity implements SensorEventListen
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
         tryInitCamera();
+
+        final ActionBar actionbar = getSupportActionBar();
+        if (actionbar != null)
+            actionbar.hide();
     }
 
     @Override
diff --git a/app/src/main/java/com/simplemobiletools/camera/Preview.java b/app/src/main/java/com/simplemobiletools/camera/Preview.java
index c1cf6615..c6f7eb8d 100644
--- a/app/src/main/java/com/simplemobiletools/camera/Preview.java
+++ b/app/src/main/java/com/simplemobiletools/camera/Preview.java
@@ -53,7 +53,6 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
     private static int lastClickX;
     private static int lastClickY;
     private static int initVideoRotation;
-    private static int navBarHeight;
     private static Point screenSize;
     private static Uri targetUri;
 
@@ -79,7 +78,6 @@ public class Preview extends ViewGroup implements SurfaceHolder.Callback, View.O
         isSurfaceCreated = false;
         setupPreviewAfterMeasure = false;
         curVideoPath = "";
-        navBarHeight = Utils.getNavBarHeight(getResources());
         screenSize = Utils.getScreenSize(activity);
     }
 
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
new file mode 100644
index 00000000..f408693c
--- /dev/null
+++ b/app/src/main/res/menu/menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/settings"
+        android:title="@string/settings"
+        app:showAsAction="never"/>
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c13f2b3c..de226891 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,6 +12,9 @@
     <string name="no_permissions">Not much to do without accessing your camera and storage</string>
     <string name="no_audio_permissions">We need the audio permission for recording videos</string>
 
+    <!-- Settings -->
+    <string name="settings">Settings</string>
+
     <!-- About -->
     <string name="about">About</string>
     <string name="website">For more simple apps or source codes please visit:\nhttp://simplemobiletools.com</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e072e90e..5f3f7b95 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,7 +2,7 @@
 
     <style name="AppTheme" parent="AppTheme.Base"/>
 
-    <style name="AppTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>