From 03f1a0e8ab7a52cb9bf0f64d09130127ac6ba440 Mon Sep 17 00:00:00 2001
From: Alexander Bakker <ab@alexbakker.me>
Date: Mon, 18 Sep 2023 22:31:38 +0200
Subject: [PATCH] Introduce a separate menu for AssignIconsActivity

Apparently this was using ``menu_groups``, probably a copy-paste error.

This also moves ``AssignIconsActivity`` to the right package.
---
 app/src/main/AndroidManifest.xml                       |  2 +-
 .../aegis/{ => ui}/AssignIconsActivity.java            |  7 ++++---
 .../aegis/ui/ImportEntriesActivity.java                |  2 --
 .../com/beemdevelopment/aegis/ui/MainActivity.java     |  1 -
 app/src/main/res/layout/activity_assign_icons.xml      |  2 +-
 app/src/main/res/menu/menu_assign_icons.xml            | 10 ++++++++++
 6 files changed, 16 insertions(+), 8 deletions(-)
 rename app/src/main/java/com/beemdevelopment/aegis/{ => ui}/AssignIconsActivity.java (98%)
 create mode 100644 app/src/main/res/menu/menu_assign_icons.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 215c62b0..36e70d77 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -82,7 +82,7 @@
         <activity
             android:name=".ui.GroupManagerActivity"
             android:label="@string/title_activity_manage_groups" />
-        <activity android:name=".AssignIconsActivity"
+        <activity android:name=".ui.AssignIconsActivity"
             android:label="@string/title_activity_assign_icons"/>
         <activity
             android:name=".ui.PanicResponderActivity"
diff --git a/app/src/main/java/com/beemdevelopment/aegis/AssignIconsActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/AssignIconsActivity.java
similarity index 98%
rename from app/src/main/java/com/beemdevelopment/aegis/AssignIconsActivity.java
rename to app/src/main/java/com/beemdevelopment/aegis/ui/AssignIconsActivity.java
index 8009a1d8..572d39f2 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/AssignIconsActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/AssignIconsActivity.java
@@ -1,4 +1,4 @@
-package com.beemdevelopment.aegis;
+package com.beemdevelopment.aegis.ui;
 
 import android.content.Intent;
 import android.graphics.Rect;
@@ -13,9 +13,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.helpers.MetricsHelper;
 import com.beemdevelopment.aegis.icons.IconPack;
-import com.beemdevelopment.aegis.ui.AegisActivity;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.dialogs.IconPickerDialog;
 import com.beemdevelopment.aegis.ui.glide.IconLoader;
@@ -156,7 +157,7 @@ public class AssignIconsActivity extends AegisActivity implements AssignIconAdap
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_groups, menu);
+        getMenuInflater().inflate(R.menu.menu_assign_icons, menu);
         return true;
     }
 
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java
index 6d8ca097..5b5b560e 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java
@@ -15,14 +15,12 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.beemdevelopment.aegis.AssignIconsActivity;
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.helpers.FabScrollHelper;
 import com.beemdevelopment.aegis.importers.DatabaseImporter;
 import com.beemdevelopment.aegis.importers.DatabaseImporterEntryException;
 import com.beemdevelopment.aegis.importers.DatabaseImporterException;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
-import com.beemdevelopment.aegis.ui.models.AssignIconEntry;
 import com.beemdevelopment.aegis.ui.models.ImportEntry;
 import com.beemdevelopment.aegis.ui.tasks.RootShellTask;
 import com.beemdevelopment.aegis.ui.views.ImportEntriesAdapter;
diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
index 77835ebf..c262ab83 100644
--- a/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
+++ b/app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
@@ -35,7 +35,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
 
-import com.beemdevelopment.aegis.AssignIconsActivity;
 import com.beemdevelopment.aegis.CopyBehavior;
 import com.beemdevelopment.aegis.AccountNamePosition;
 import com.beemdevelopment.aegis.Preferences;
diff --git a/app/src/main/res/layout/activity_assign_icons.xml b/app/src/main/res/layout/activity_assign_icons.xml
index 3cef9268..bd310201 100644
--- a/app/src/main/res/layout/activity_assign_icons.xml
+++ b/app/src/main/res/layout/activity_assign_icons.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/background"
-    tools:context="com.beemdevelopment.aegis.AssignIconsActivity">
+    tools:context="com.beemdevelopment.aegis.ui.AssignIconsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/menu_assign_icons.xml b/app/src/main/res/menu/menu_assign_icons.xml
new file mode 100644
index 00000000..1d5c11be
--- /dev/null
+++ b/app/src/main/res/menu/menu_assign_icons.xml
@@ -0,0 +1,10 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.beemdevelopment.aegis.ui.AssignIconsActivity">
+    <item
+        android:id="@+id/action_save"
+        app:showAsAction="always"
+        android:title="@string/save"/>
+</menu>