From 87d3200b29d43ec5ee93de18d016c483cb3cb239 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Thu, 10 Aug 2017 01:04:46 -0500
Subject: ProfileActivity: Do menus correctly

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 app/src/main/res/menu/main.xml                | 4 ++--
 app/src/main/res/menu/profile_detail.xml      | 2 +-
 app/src/main/res/menu/profile_detail_edit.xml | 9 ---------
 app/src/main/res/menu/profile_edit.xml        | 9 +++++++++
 4 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 app/src/main/res/menu/profile_detail_edit.xml
 create mode 100644 app/src/main/res/menu/profile_edit.xml

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 96479d08..462558ec 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
+        android:id="@+id/menu_settings"
         android:alphabeticShortcut="s"
         android:icon="@drawable/ic_settings"
-        android:onClick="onMenuSettings"
         android:showAsAction="never"
-        android:title="@string/settings"/>
+        android:title="@string/settings" />
 </menu>
diff --git a/app/src/main/res/menu/profile_detail.xml b/app/src/main/res/menu/profile_detail.xml
index 499adcdb..c00c1603 100644
--- a/app/src/main/res/menu/profile_detail.xml
+++ b/app/src/main/res/menu/profile_detail.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
+        android:id="@+id/menu_action_edit"
         android:alphabeticShortcut="e"
         android:icon="@drawable/ic_action_edit"
-        android:onClick="onMenuEdit"
         android:showAsAction="always"
         android:title="@string/edit" />
 </menu>
diff --git a/app/src/main/res/menu/profile_detail_edit.xml b/app/src/main/res/menu/profile_detail_edit.xml
deleted file mode 100644
index ad97fcbf..00000000
--- a/app/src/main/res/menu/profile_detail_edit.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:alphabeticShortcut="s"
-        android:icon="@drawable/ic_action_save"
-        android:onClick="onMenuSave"
-        android:showAsAction="always"
-        android:title="@string/save" />
-</menu>
diff --git a/app/src/main/res/menu/profile_edit.xml b/app/src/main/res/menu/profile_edit.xml
new file mode 100644
index 00000000..44e719c7
--- /dev/null
+++ b/app/src/main/res/menu/profile_edit.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/menu_action_save"
+        android:alphabeticShortcut="s"
+        android:icon="@drawable/ic_action_save"
+        android:showAsAction="always"
+        android:title="@string/save" />
+</menu>
-- 
cgit v1.2.3