From 61eb2cb7f641e0ef32309013f0ac121bb7488777 Mon Sep 17 00:00:00 2001 From: zHd4 <38856321+zHd4@users.noreply.github.com> Date: Thu, 25 Jun 2026 13:25:15 +0200 Subject: [PATCH 1/6] Add invisible ImageButton for popup menu anchor in OpenNoteActivity layout --- app/src/main/res/layout/activity_open_note.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/res/layout/activity_open_note.xml b/app/src/main/res/layout/activity_open_note.xml index eacc1064..72a92ada 100644 --- a/app/src/main/res/layout/activity_open_note.xml +++ b/app/src/main/res/layout/activity_open_note.xml @@ -98,4 +98,13 @@ + + \ No newline at end of file From f02eddf483923c0ff6a9017b7ced75463b9b5a1d Mon Sep 17 00:00:00 2001 From: zHd4 <38856321+zHd4@users.noreply.github.com> Date: Thu, 25 Jun 2026 13:25:33 +0200 Subject: [PATCH 2/6] Fix anchor view for popup menu in OpenNoteActivity --- .../main/java/app/notesr/activity/note/OpenNoteActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/app/notesr/activity/note/OpenNoteActivity.java b/app/src/main/java/app/notesr/activity/note/OpenNoteActivity.java index 523c0ba1..794d1c1d 100644 --- a/app/src/main/java/app/notesr/activity/note/OpenNoteActivity.java +++ b/app/src/main/java/app/notesr/activity/note/OpenNoteActivity.java @@ -246,7 +246,7 @@ public boolean onOptionsItemSelected(MenuItem item) { } private void changeOpenModeButtonOnClick() { - View anchor = findViewById(R.id.changeOpenModeButton); + View anchor = findViewById(R.id.popupMenuAnchor); PopupMenu popup = new PopupMenu(this, anchor); popup.inflate(R.menu.menu_open_node_open_mode); From 1c07557e77fa37483f28e2fe2634e1808376b978 Mon Sep 17 00:00:00 2001 From: zHd4 <38856321+zHd4@users.noreply.github.com> Date: Thu, 25 Jun 2026 13:26:09 +0200 Subject: [PATCH 3/6] Update dialog and menu item titles --- .../notesr/activity/file/viewer/FileViewerActivityBase.java | 2 +- .../java/app/notesr/activity/note/DeleteNoteOnClick.java | 2 +- app/src/main/res/menu/menu_open_note.xml | 6 +++--- app/src/main/res/values/strings.xml | 6 ++++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/app/notesr/activity/file/viewer/FileViewerActivityBase.java b/app/src/main/java/app/notesr/activity/file/viewer/FileViewerActivityBase.java index c24f1e84..3503689d 100644 --- a/app/src/main/java/app/notesr/activity/file/viewer/FileViewerActivityBase.java +++ b/app/src/main/java/app/notesr/activity/file/viewer/FileViewerActivityBase.java @@ -160,7 +160,7 @@ protected final void deleteFileOnClick() { showConfirmationDialog( R.layout.dialog_action_cannot_be_undo, R.string.warning, - R.string.delete, + R.string.delete_caps, (dialog, which) -> runWithProgressDialog(task, post) ); } diff --git a/app/src/main/java/app/notesr/activity/note/DeleteNoteOnClick.java b/app/src/main/java/app/notesr/activity/note/DeleteNoteOnClick.java index a6585966..418430d4 100644 --- a/app/src/main/java/app/notesr/activity/note/DeleteNoteOnClick.java +++ b/app/src/main/java/app/notesr/activity/note/DeleteNoteOnClick.java @@ -38,7 +38,7 @@ public boolean onMenuItemClick(@NonNull MenuItem item) { DialogInterface.OnClickListener buttonHandler = deleteNoteDialogOnClick(); dialogFactory.getThemedAlertDialogBuilder(R.layout.dialog_action_cannot_be_undo) .setTitle(R.string.warning) - .setPositiveButton(R.string.delete, buttonHandler) + .setPositiveButton(R.string.delete_caps, buttonHandler) .setNegativeButton(R.string.no, buttonHandler) .create() .show(); diff --git a/app/src/main/res/menu/menu_open_note.xml b/app/src/main/res/menu/menu_open_note.xml index 7b3a81a0..db679eb0 100644 --- a/app/src/main/res/menu/menu_open_note.xml +++ b/app/src/main/res/menu/menu_open_note.xml @@ -5,7 +5,7 @@ android:id="@+id/saveNoteButton" android:icon="@android:drawable/ic_menu_save" android:orderInCategory="4" - android:title="@string/save_note" + android:title="@string/save" android:visible="false" app:showAsAction="always" /> @@ -13,7 +13,7 @@ android:id="@+id/deleteNoteButton" android:icon="@android:drawable/ic_menu_delete" android:orderInCategory="3" - android:title="@string/delete_note" + android:title="@string/delete" app:showAsAction="ifRoom" /> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4e95a3df..96635754 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,7 +36,8 @@ This action cannot be undone.\nAre you sure? YES NO - DELETE + Delete + DELETE Enter the code! Note Search @@ -106,5 +107,6 @@ Re-encryption failed, your key and your data remains unchanged. View Text Markdown View - Change open mode + Change mode + Invisible popup menu anchor \ No newline at end of file From 28cc6c29512eece1e2c0c17f3a2621ef3c24c573 Mon Sep 17 00:00:00 2001 From: zHd4 <38856321+zHd4@users.noreply.github.com> Date: Thu, 25 Jun 2026 13:27:09 +0200 Subject: [PATCH 4/6] Make SaveNoteOnClick class final --- app/src/main/java/app/notesr/activity/note/SaveNoteOnClick.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/app/notesr/activity/note/SaveNoteOnClick.java b/app/src/main/java/app/notesr/activity/note/SaveNoteOnClick.java index 1b1c2104..718ad2dd 100644 --- a/app/src/main/java/app/notesr/activity/note/SaveNoteOnClick.java +++ b/app/src/main/java/app/notesr/activity/note/SaveNoteOnClick.java @@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -public class SaveNoteOnClick implements MenuItem.OnMenuItemClickListener { +public final class SaveNoteOnClick implements MenuItem.OnMenuItemClickListener { private final ActivityBase activity; private final Note note; From 2de78c992490d90523bca580401fbedbabe2986e Mon Sep 17 00:00:00 2001 From: zHd4 <38856321+zHd4@users.noreply.github.com> Date: Thu, 25 Jun 2026 13:27:17 +0200 Subject: [PATCH 5/6] Make OpenFilesListOnClick class final --- .../java/app/notesr/activity/note/OpenFilesListOnClick.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/app/notesr/activity/note/OpenFilesListOnClick.java b/app/src/main/java/app/notesr/activity/note/OpenFilesListOnClick.java index 8759ce8b..5583919c 100644 --- a/app/src/main/java/app/notesr/activity/note/OpenFilesListOnClick.java +++ b/app/src/main/java/app/notesr/activity/note/OpenFilesListOnClick.java @@ -17,7 +17,7 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -public class OpenFilesListOnClick implements MenuItem.OnMenuItemClickListener, View.OnClickListener { +public final class OpenFilesListOnClick implements MenuItem.OnMenuItemClickListener, View.OnClickListener { private final ActivityBase activity; private final Note note; From fff5fa6aa7a16e6b11ab6d7199d0ccc8a6d300e3 Mon Sep 17 00:00:00 2001 From: zHd4 <38856321+zHd4@users.noreply.github.com> Date: Thu, 25 Jun 2026 13:27:26 +0200 Subject: [PATCH 6/6] Make DeleteNoteOnClick class final --- .../main/java/app/notesr/activity/note/DeleteNoteOnClick.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/app/notesr/activity/note/DeleteNoteOnClick.java b/app/src/main/java/app/notesr/activity/note/DeleteNoteOnClick.java index 418430d4..6903e238 100644 --- a/app/src/main/java/app/notesr/activity/note/DeleteNoteOnClick.java +++ b/app/src/main/java/app/notesr/activity/note/DeleteNoteOnClick.java @@ -25,7 +25,7 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor -public class DeleteNoteOnClick implements MenuItem.OnMenuItemClickListener { +public final class DeleteNoteOnClick implements MenuItem.OnMenuItemClickListener { private final ActivityBase activity; private final Note note;