plectrum

commit 7ddfbfc435eb6003af16cfa3a71a4935d654d525
parent 9998d11f162777ede392081a46cd5d2944ef0404
Author: gstraube <gstraube@mailbox.org>
Date:   Wed,  3 Jan 2018 17:23:59 +0100

Add reference to privacy policy

Diffstat:
M
app/src/main/AndroidManifest.xml
 | 
4
++--
M
app/src/main/java/com/github/cythara/MainActivity.java
 | 
31
+++++++++++++++++++++++++++++++
M
app/src/main/res/layout/activity_main.xml
 | 
10
++++++++++
A
app/src/main/res/menu/toolbar_menu.xml
 | 
10
++++++++++
M
app/src/main/res/values/strings.xml
 | 
1
+

5 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,10 +7,10 @@
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:label="@string/app_name"
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/github/cythara/MainActivity.java b/app/src/main/java/com/github/cythara/MainActivity.java
@@ -4,13 +4,18 @@ import android.Manifest;
 import android.app.AlertDialog;
 import android.app.FragmentManager;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.WindowManager;
 import android.widget.ArrayAdapter;
 
@@ -50,6 +55,32 @@ public class MainActivity extends AppCompatActivity implements ListenerFragment.
         spinner.setOnItemSelectedListener(this);
 
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+        Toolbar myToolbar = findViewById(R.id.my_toolbar);
+        myToolbar.setTitle(R.string.app_name);
+        myToolbar.showOverflowMenu();
+        setSupportActionBar(myToolbar);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.toolbar_menu, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.show_privacy_policy: {
+                Intent browserIntent = new Intent(Intent.ACTION_VIEW,
+                        Uri.parse("https://gstraube.github.io/privacy_policy.html"));
+                startActivity(browserIntent);
+
+                break;
+            }
+        }
+
+        return false;
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context="com.github.cythara.MainActivity">
 
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/my_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        android:elevation="4dp"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+
     <com.jaredrummler.materialspinner.MaterialSpinner
         android:id="@+id/tuning"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/toolbar_menu.xml b/app/src/main/res/menu/toolbar_menu.xml
@@ -0,0 +1,9 @@
+<?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/show_privacy_policy"
+        android:title="@string/privacy_policy"
+        app:showAsAction="never" />
+</menu>
+\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name">Cythara</string>
+    <string name="privacy_policy">Show privacy policy</string>
     <string-array name="tunings">
         <item>Guitar (standard)</item>
         <item>Guitar (Drop D)</item>