luckyimnotanigger/Aegis
1
0
Fork 0
mirror of https://github.com/beemdevelopment/Aegis.git synced 2025-04-24 15:56:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Introduce a separate menu for AssignIconsActivity

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

This also moves ``AssignIconsActivity`` to the right package.
This commit is contained in:
Alexander Bakker 2023-09-18 22:31:38 +02:00
parent 305e157fc5
commit 03f1a0e8ab
6 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -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"

7
app/src/main/java/com/beemdevelopment/aegis/AssignIconsActivity.java → app/src/main/java/com/beemdevelopment/aegis/ui/AssignIconsActivity.java
View file

@ -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;
}

2
app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java
View file

@ -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;

1
app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java
View file

@ -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;

2
app/src/main/res/layout/activity_assign_icons.xml
View file

@ -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"

10
app/src/main/res/menu/menu_assign_icons.xml Normal file
View file

@ -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>