Include a 'menu'-Button

Removed Donation links Updated Whatsnew
pskiwi · Nov 15, 2020 · 716ba4c · 716ba4c
1 parent e573555
commit 716ba4c
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 15 deletions.
diff --git a/app/src/main/assets/whatsnew.html b/app/src/main/assets/whatsnew.html
@@ -5,7 +5,16 @@ <h2>AVR-Remote - Release notes</h2>
 		<p>
 			<i><b>If you experience problems after an update please pull
 					the plug of your receiver for about a minute.</b></i>
-		</p> 
+		</p>
+		</p>
+		<b>1.5.0</b>
+		<ul>
+			<li>AVR-Remote is now OpenSource <a href="https://github.com/pskiwi/avr-remote">Github Project</a></li>
+			<li>Update scanner to detect newer amps such as the X2600H (netmindz)</li>
+			<li>Update target SDK version (netmindz)</li>
+			<li>Icons updated to <a href="https://material.io/resources/icons/?style=baseline">Material Icons</a></li>
+			<li>Menu Button to access Settings</li>
+		</ul>
 		<b>1.4.4</b>
 		<ul>
 			<li>Scan did not work anymore on Android 6.0</li>

diff --git a/app/src/main/java/de/pskiwi/avrremote/AVRRemote.java b/app/src/main/java/de/pskiwi/avrremote/AVRRemote.java
@@ -35,6 +35,7 @@
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.PopupWindow;
 import android.widget.TabHost;
 import android.widget.TabHost.OnTabChangeListener;
 import android.widget.TextView;
@@ -138,6 +139,15 @@ public void onCreate(Bundle savedInstanceState) {
 		getApp().getMacroGUI().initButtons(this, null, viewList,
 				R.id.btnMacro1, R.id.btnMacro2, R.id.btnMacro3);
 
+		final Button menuButton = (Button) findViewById(R.id.btnMenu);
+		menuButton.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				openOptionsMenu();
+			}
+		});
+
+
 		final RenameService renameService = getApp().getRenameService();
 		zoneStates = new ZoneState[zoneCount];
 		Logger.debug("create " + zoneCount + " zones ...");

diff --git a/app/src/main/java/de/pskiwi/avrremote/StatusbarManager.java b/app/src/main/java/de/pskiwi/avrremote/StatusbarManager.java
@@ -48,8 +48,8 @@ private void updateNotification(AVRApplication app, Class<?> cl) {
 		PendingIntent contentIntent = PendingIntent.getActivity(app, 0,
 				notificationIntent, 0);
 
-		notification.setLatestEventInfo(context, contentTitle, contentText,
-				contentIntent);
+//		notification.setLatestEventInfo(context, contentTitle, contentText,
+//				contentIntent);
 	}
 
 	public void update() {

diff --git a/app/src/main/res/layout-xlarge/macro_panel.xml b/app/src/main/res/layout-xlarge/macro_panel.xml
@@ -3,6 +3,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal" android:paddingBottom="2dip" 
 	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<Button android:id="@+id/btnMenu" android:layout_width="wrap_content"
+		android:layout_height="wrap_content" android:text="Menu"
+		android:layout_weight="1" android:width="0dip" />
 	<Button android:id="@+id/btnMacro1" android:layout_width="wrap_content"
 		android:layout_height="wrap_content" android:text="F1"
 		android:layout_weight="1" android:width="0dip" />

diff --git a/app/src/main/res/layout/infotabhost.xml b/app/src/main/res/layout/infotabhost.xml
@@ -72,13 +72,6 @@
         android:layout_marginTop="-50dip"
         android:orientation="horizontal" >
 
-        <Button
-            android:id="@+id/btnDonation"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"            
-            android:text="@string/Donate" />
-
         <Button
             android:id="@+id/btnAboutOk"
             android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/macro_panel.xml b/app/src/main/res/layout/macro_panel.xml
@@ -2,6 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:orientation="horizontal" android:paddingBottom="2dip"
 	android:layout_width="fill_parent" android:layout_height="wrap_content">
+	<Button android:id="@+id/btnMenu" android:layout_width="wrap_content"
+		android:layout_height="wrap_content" android:text="Menu"
+		android:layout_weight="1" android:width="0dip" />
 	<Button android:id="@+id/btnMacro1" android:layout_width="wrap_content"
 		android:layout_height="wrap_content" android:text="F1"
 		android:layout_weight="1" android:width="0dip" />

diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
@@ -2,8 +2,6 @@
 	<item android:title="@string/Settings" android:id="@+id/itemSettings"
 		android:icon="@android:drawable/ic_menu_preferences"></item>
 
-	<item android:title="@string/Donate" android:id="@+id/itemDonation"
-		android:icon="@android:drawable/ic_menu_share"></item>
 	<item android:title="@string/Rename" android:id="@+id/itemRename"
 		android:icon="@android:drawable/ic_menu_sort_alphabetically"></item>
     <item android:id="@+id/itemInfo" android:title="@string/Info"

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.1'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Sep 05 17:25:27 CEST 2020
+#Sun Nov 15 15:37:22 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip