From 25c86be11d10a94f9049ad3571cd6bba2fa48973 Mon Sep 17 00:00:00 2001
From: badaix <snapcast@badaix.de>
Date: Mon, 18 Jan 2016 22:56:28 +0100
Subject: [PATCH] Added dummy About activity

---
 android/Snapcast/src/main/AndroidManifest.xml       | 12 ++++++++++--
 .../main/java/de/badaix/snapcast/AboutActivity.java | 13 +++++++++++++
 .../main/java/de/badaix/snapcast/MainActivity.java  |  3 +++
 .../Snapcast/src/main/res/layout/activity_about.xml | 12 ++++++++++++
 .../Snapcast/src/main/res/menu/menu_snapcast.xml    |  6 ++++++
 android/Snapcast/src/main/res/values/strings.xml    |  2 ++
 6 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 android/Snapcast/src/main/java/de/badaix/snapcast/AboutActivity.java
 create mode 100644 android/Snapcast/src/main/res/layout/activity_about.xml

diff --git a/android/Snapcast/src/main/AndroidManifest.xml b/android/Snapcast/src/main/AndroidManifest.xml
index 71413594..01ecd340 100644
--- a/android/Snapcast/src/main/AndroidManifest.xml
+++ b/android/Snapcast/src/main/AndroidManifest.xml
@@ -32,11 +32,19 @@
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
 
-        <!--            android:theme="@style/Theme.AppCompat.Light.DialogWhenLarge" -->
+        <!-- android:theme="@style/Theme.AppCompat.Light.DialogWhenLarge" -->
         <activity
             android:name=".ClientSettingsActivity"
             android:label="@string/title_activity_client_settings"
-            android:parentActivityName=".MainActivity" >
+            android:parentActivityName=".MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MainActivity" />
+        </activity>
+        <activity
+            android:name=".AboutActivity"
+            android:label="@string/title_activity_about"
+            android:parentActivityName=".MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".MainActivity" />
diff --git a/android/Snapcast/src/main/java/de/badaix/snapcast/AboutActivity.java b/android/Snapcast/src/main/java/de/badaix/snapcast/AboutActivity.java
new file mode 100644
index 00000000..35562c15
--- /dev/null
+++ b/android/Snapcast/src/main/java/de/badaix/snapcast/AboutActivity.java
@@ -0,0 +1,13 @@
+package de.badaix.snapcast;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+public class AboutActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+    }
+}
diff --git a/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java b/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
index 52c9ba4d..7da1bf93 100644
--- a/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
+++ b/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
@@ -160,6 +160,9 @@ public class MainActivity extends AppCompatActivity implements ClientInfoItem.Cl
         } else if (id == R.id.action_refresh) {
             if ((remoteControl != null) && remoteControl.isConnected())
                 remoteControl.getServerStatus();
+        } else if (id == R.id.action_about) {
+            Intent intent = new Intent(this, AboutActivity.class);
+            startActivity(intent);
         }
 
         return super.onOptionsItemSelected(item);
diff --git a/android/Snapcast/src/main/res/layout/activity_about.xml b/android/Snapcast/src/main/res/layout/activity_about.xml
new file mode 100644
index 00000000..60392dee
--- /dev/null
+++ b/android/Snapcast/src/main/res/layout/activity_about.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="de.badaix.snapcast.AboutActivity">
+
+</RelativeLayout>
diff --git a/android/Snapcast/src/main/res/menu/menu_snapcast.xml b/android/Snapcast/src/main/res/menu/menu_snapcast.xml
index ce93bdc6..a0d1db78 100644
--- a/android/Snapcast/src/main/res/menu/menu_snapcast.xml
+++ b/android/Snapcast/src/main/res/menu/menu_snapcast.xml
@@ -13,6 +13,12 @@
         android:orderInCategory="100"
         android:title="@string/action_settings"
         app:showAsAction="never" /> -->
+
+    <item
+        android:id="@+id/action_about"
+        android:orderInCategory="100"
+        android:title="@string/action_about"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_scan"
         android:orderInCategory="100"
diff --git a/android/Snapcast/src/main/res/values/strings.xml b/android/Snapcast/src/main/res/values/strings.xml
index 87989b3b..14b82b63 100644
--- a/android/Snapcast/src/main/res/values/strings.xml
+++ b/android/Snapcast/src/main/res/values/strings.xml
@@ -28,5 +28,7 @@
     <string name="action_play_stop">Play/Stop</string>
     <string name="client_deleted">Client %1$s deleted</string>
     <string name="undo_string">undo</string>
+    <string name="action_about">About...</string>
+    <string name="title_activity_about">About</string>
 </resources>