From 2e887ef85ee3a367f252f2ac1efd21d1309fb1fd Mon Sep 17 00:00:00 2001
From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Sun, 7 Mar 2021 11:09:03 +0200
Subject: [PATCH] add divider after debug items in the new transaction menu

also, call super.onCreateOptionsMenu to let the system put any system
menu items if needed

also, don't bother with debug menu items in the release build
---
 .../NewTransactionActivity.java               | 13 +++--
 app/src/main/res/menu/new_transaction.xml     | 39 +++++++------
 .../res/menu/new_transaction_fragment.xml     | 58 ++++++++++---------
 3 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java
index 3e177260..5bba06e1 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionActivity.java
@@ -31,6 +31,7 @@ import android.view.View;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
+import androidx.core.view.MenuCompat;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.NavController;
@@ -159,15 +160,15 @@ public class NewTransactionActivity extends ProfileThemedActivity
         new AsyncCrasher().execute();
     }
     public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+
+        if (!BuildConfig.DEBUG)
+            return true;
+
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.new_transaction, menu);
 
-        if (BuildConfig.DEBUG) {
-            menu.findItem(R.id.action_simulate_crash)
-                .setVisible(true);
-            menu.findItem(R.id.action_simulate_save)
-                .setVisible(true);
-        }
+        MenuCompat.setGroupDividerEnabled(menu, true);
 
         model.getSimulateSave()
              .observe(this, state -> {
diff --git a/app/src/main/res/menu/new_transaction.xml b/app/src/main/res/menu/new_transaction.xml
index 06075080..15fe57b0 100644
--- a/app/src/main/res/menu/new_transaction.xml
+++ b/app/src/main/res/menu/new_transaction.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright © 2019 Damyan Ivanov.
+  ~ Copyright © 2021 Damyan Ivanov.
   ~ This file is part of MoLe.
   ~ MoLe is free software: you can distribute it and/or modify it
   ~ under the term of the GNU General Public License as published by
@@ -16,21 +16,24 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/action_simulate_crash"
-        android:title="@string/crash_app_label"
-        android:titleCondensed="@string/crash_app_condensed_label"
-        android:onClick="simulateCrash"
-        android:visible="false"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/action_simulate_save"
-        android:checkable="true"
-        android:checked="false"
-        android:onClick="toggleSimulateSave"
-        android:title="@string/simulate_save_label"
-        android:titleCondensed="@string/simulate_save_condensed_label"
-        android:visible="false"
-        app:showAsAction="never" />
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+    <group android:id="@+id/new_transaction_debug_menu_items">
+        <item
+            android:id="@+id/action_simulate_crash"
+            android:onClick="simulateCrash"
+            android:title="@string/crash_app_label"
+            android:titleCondensed="@string/crash_app_condensed_label"
+            app:showAsAction="never"
+            />
+        <item
+            android:id="@+id/action_simulate_save"
+            android:checkable="true"
+            android:checked="false"
+            android:onClick="toggleSimulateSave"
+            android:title="@string/simulate_save_label"
+            android:titleCondensed="@string/simulate_save_condensed_label"
+            app:showAsAction="never"
+            />
+    </group>
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/new_transaction_fragment.xml b/app/src/main/res/menu/new_transaction_fragment.xml
index 1fe38243..b9a34687 100644
--- a/app/src/main/res/menu/new_transaction_fragment.xml
+++ b/app/src/main/res/menu/new_transaction_fragment.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright © 2021 Damyan Ivanov.
   ~ This file is part of MoLe.
   ~ MoLe is free software: you can distribute it and/or modify it
@@ -19,30 +18,33 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     >
-    <item
-        android:id="@+id/scan_qr"
-        android:icon="@drawable/ic_baseline_qr_code_scanner_24"
-        android:title="@string/scan_qr"
-        app:showAsAction="ifRoom"
-        />
-    <item
-        android:id="@+id/toggle_currency"
-        android:title="@string/show_currency_input"
-        android:checkable="true"
-        android:checked="false"
-        app:actionLayout="@layout/switch_item"
-        app:showAsAction="never"
-        />
-    <item
-        android:id="@+id/toggle_comments"
-        android:checkable="true"
-        android:title="@string/show_comments_switch"
-        app:actionLayout="@layout/switch_item"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/action_reset_new_transaction_activity"
-        android:icon="@drawable/ic_refresh_white_24dp"
-        android:title="@string/action_reset_new_transaction_activity_title"
-        app:showAsAction="never" />
-
+    <group android:id="@+id/new_transaction_fragment_menu_items">
+        <item
+            android:id="@+id/scan_qr"
+            android:icon="@drawable/ic_baseline_qr_code_scanner_24"
+            android:title="@string/scan_qr"
+            app:showAsAction="ifRoom"
+            />
+        <item
+            android:id="@+id/toggle_currency"
+            android:checkable="true"
+            android:checked="false"
+            android:title="@string/show_currency_input"
+            app:actionLayout="@layout/switch_item"
+            app:showAsAction="never"
+            />
+        <item
+            android:id="@+id/toggle_comments"
+            android:checkable="true"
+            android:title="@string/show_comments_switch"
+            app:actionLayout="@layout/switch_item"
+            app:showAsAction="never"
+            />
+        <item
+            android:id="@+id/action_reset_new_transaction_activity"
+            android:icon="@drawable/ic_refresh_white_24dp"
+            android:title="@string/action_reset_new_transaction_activity_title"
+            app:showAsAction="never"
+            />
+    </group>
 </menu>
\ No newline at end of file
-- 
2.39.5