From b55d05919fc98e7aa69a39dbfb1b96f29e043bb1 Mon Sep 17 00:00:00 2001
From: zHd4 <38856321+zHd4@users.noreply.github.com>
Date: Mon, 22 Jun 2026 12:05:50 +0200
Subject: [PATCH 01/15] Add Markwon dependency for markdown support
---
app/build.gradle | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/build.gradle b/app/build.gradle
index c87df9d6..5fbbaa46 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -119,6 +119,7 @@ dependencies {
implementation "androidx.media3:media3-ui:1.1.0"
annotationProcessor 'androidx.room:room-compiler:2.6.1'
implementation 'net.zetetic:android-database-sqlcipher:4.5.4'
+ implementation 'io.noties.markwon:core:4.6.2'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.4'
From 9894dccb335a3c1e6239bc0995dea890bc48eece Mon Sep 17 00:00:00 2001
From: zHd4 <38856321+zHd4@users.noreply.github.com>
Date: Mon, 22 Jun 2026 15:58:02 +0200
Subject: [PATCH 02/15] Add vector drawable for visibility icon
---
app/src/main/res/drawable/ic_visibility.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 app/src/main/res/drawable/ic_visibility.xml
diff --git a/app/src/main/res/drawable/ic_visibility.xml b/app/src/main/res/drawable/ic_visibility.xml
new file mode 100644
index 00000000..2b9c462b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_visibility.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
From 3191da51ed8164fd0f08b95e41d8517af7ecbba1 Mon Sep 17 00:00:00 2001
From: zHd4 <38856321+zHd4@users.noreply.github.com>
Date: Mon, 22 Jun 2026 15:58:35 +0200
Subject: [PATCH 03/15] Add markdown support and view mode options in
OpenNoteActivity
---
.../activity/note/OpenNoteActivity.java | 155 +++++++++++++++---
.../main/res/layout/activity_open_note.xml | 35 ++++
app/src/main/res/menu/menu_note_view_mode.xml | 16 ++
app/src/main/res/menu/menu_open_note.xml | 13 +-
app/src/main/res/values/strings.xml | 5 +-
5 files changed, 196 insertions(+), 28 deletions(-)
create mode 100644 app/src/main/res/menu/menu_note_view_mode.xml
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 e01eec08..f340386e 100644
--- a/app/src/main/java/app/notesr/activity/note/OpenNoteActivity.java
+++ b/app/src/main/java/app/notesr/activity/note/OpenNoteActivity.java
@@ -15,8 +15,11 @@
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
+import android.widget.PopupMenu;
+import android.widget.ScrollView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
import androidx.appcompat.app.ActionBar;
import androidx.core.widget.TextViewKt;
@@ -34,15 +37,13 @@
import app.notesr.core.security.crypto.CryptoManagerProvider;
import app.notesr.core.security.dto.CryptoSecrets;
import app.notesr.core.util.FilesUtils;
+import io.noties.markwon.Markwon;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import java.io.IOException;
import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Objects;
-import java.util.function.Consumer;
import static androidx.core.view.inputmethod.EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
@@ -52,7 +53,6 @@ public final class OpenNoteActivity extends ActivityBase {
public static final String EXTRA_NOTE_ID = "noteId";
public static final String EXTRA_NOTE_MODIFIED = "modified";
private static final long MAX_COUNT_IN_BADGE = 9;
- private final Map> menuItemsMap = new HashMap<>();
private NoteService noteService;
private FileService fileService;
@@ -60,11 +60,27 @@ public final class OpenNoteActivity extends ActivityBase {
private Menu activityMenu;
private DialogFactory dialogFactory;
private boolean isNoteModified;
+ private EditText nameField;
+ private EditText textField;
+ private TextView viewer;
+ private ScrollView viewerContainer;
+ private Markwon markwon;
+ private static final int MODE_EDIT = 0;
+ private static final int MODE_TEXT = 1;
+ private static final int MODE_MARKDOWN = 2;
+ private static final String STATE_VIEW_MODE = "viewMode";
+ private int viewMode = MODE_EDIT;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ if (savedInstanceState != null) {
+ viewMode = savedInstanceState.getInt(STATE_VIEW_MODE, MODE_EDIT);
+ } else {
+ viewMode = MODE_EDIT;
+ }
+
if (isFinishing()) {
return;
}
@@ -81,6 +97,7 @@ protected void onCreate(Bundle savedInstanceState) {
noteService = new NoteService(db);
fileService = new FileService(context, db, cryptor, new FilesUtils());
dialogFactory = new DialogFactory(this);
+ markwon = Markwon.create(this);
String noteId = getIntent().getStringExtra(EXTRA_NOTE_ID);
@@ -90,7 +107,20 @@ protected void onCreate(Bundle savedInstanceState) {
runOnUiThread(() -> {
initializeActionBar();
- prepareEditorFields();
+ prepareViews();
+
+ switch (viewMode) {
+ case MODE_TEXT:
+ switchToViewTextMode();
+ break;
+ case MODE_MARKDOWN:
+ switchToViewMarkdownMode();
+ break;
+ case MODE_EDIT:
+ default:
+ switchToEditMode();
+ break;
+ }
});
});
}
@@ -102,7 +132,7 @@ private void initializeActionBar() {
actionBar.setDisplayHomeAsUpEnabled(true);
if (note != null) {
- actionBar.setTitle(getResources().getString(R.string.edit_note));
+ actionBar.setTitle(getResources().getString(R.string.edit));
} else {
actionBar.setTitle(getResources().getString(R.string.new_note));
}
@@ -111,9 +141,11 @@ private void initializeActionBar() {
}
}
- private void prepareEditorFields() {
- EditText nameField = findViewById(R.id.noteNameField);
- EditText textField = findViewById(R.id.noteTextField);
+ private void prepareViews() {
+ nameField = findViewById(R.id.noteNameField);
+ textField = findViewById(R.id.noteTextField);
+ viewer = findViewById(R.id.viewer);
+ viewerContainer = findViewById(R.id.viewerContainer);
nameField.setImeOptions(IME_FLAG_NO_PERSONALIZED_LEARNING);
textField.setImeOptions(IME_FLAG_NO_PERSONALIZED_LEARNING);
@@ -140,25 +172,34 @@ private void prepareEditorFields() {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
- EditText nameField = findViewById(R.id.noteNameField);
- EditText textField = findViewById(R.id.noteTextField);
-
getMenuInflater().inflate(R.menu.menu_open_note, menu);
this.activityMenu = menu;
+ MenuItem changeModeButton = menu.findItem(R.id.changeViewModeButton);
MenuItem saveNoteButton = menu.findItem(R.id.saveNoteButton);
MenuItem openFilesListButton = menu.findItem(R.id.openFilesListButton);
MenuItem deleteNoteButton = menu.findItem(R.id.deleteNoteButton);
- menuItemsMap.put(saveNoteButton.getItemId(),
- action -> saveNoteOnClick(nameField, textField));
+ changeModeButton.setOnMenuItemClickListener(item -> {
+ changeViewModeButtonOnClick();
+ return true;
+ });
+
+ saveNoteButton.setOnMenuItemClickListener(item -> {
+ saveNoteOnClick(nameField, textField);
+ return true;
+ });
if (note != null) {
- menuItemsMap.put(openFilesListButton.getItemId(),
- action -> openFilesListOnClick());
+ openFilesListButton.setOnMenuItemClickListener(item -> {
+ openFilesListOnClick();
+ return true;
+ });
- menuItemsMap.put(deleteNoteButton.getItemId(),
- action -> deleteNoteOnClick());
+ deleteNoteButton.setOnMenuItemClickListener(item -> {
+ deleteNoteOnClick();
+ return true;
+ });
setAttachedFilesCountBadge(openFilesListButton);
} else {
@@ -212,12 +253,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
return true;
}
- Consumer action = menuItemsMap.get(id);
-
- if (action != null) {
- action.accept(null);
- }
-
return super.onOptionsItemSelected(item);
}
@@ -290,6 +325,78 @@ private DialogInterface.OnClickListener deleteNoteDialogOnClick() {
};
}
+ private void changeViewModeButtonOnClick() {
+ View anchor = findViewById(R.id.changeViewModeButton);
+ PopupMenu popup = new PopupMenu(this, anchor);
+ popup.inflate(R.menu.menu_note_view_mode);
+
+ Menu popupMenu = popup.getMenu();
+
+ if (viewMode == MODE_EDIT) {
+ popupMenu.findItem(R.id.editMenuItem).setChecked(true);
+ } else if (viewMode == MODE_TEXT) {
+ popupMenu.findItem(R.id.viewTextMenuItem).setChecked(true);
+ } else if (viewMode == MODE_MARKDOWN) {
+ popupMenu.findItem(R.id.viewMarkdownMenuItem).setChecked(true);
+ }
+
+ popup.setOnMenuItemClickListener(item -> {
+ int id = item.getItemId();
+
+ if (id == R.id.editMenuItem) {
+ item.setChecked(true);
+ viewMode = MODE_EDIT;
+ switchToEditMode();
+ return true;
+ } else if (id == R.id.viewTextMenuItem) {
+ item.setChecked(true);
+ viewMode = MODE_TEXT;
+ switchToViewTextMode();
+ return true;
+ } else if (id == R.id.viewMarkdownMenuItem) {
+ item.setChecked(true);
+ viewMode = MODE_MARKDOWN;
+ switchToViewMarkdownMode();
+ return true;
+ }
+
+ return false;
+ });
+
+ nameField.post(popup::show);
+ }
+
+ private void switchToEditMode() {
+ viewMode = MODE_EDIT;
+ nameField.setEnabled(false);
+ textField.setVisibility(View.VISIBLE);
+ viewerContainer.setVisibility(View.GONE);
+ }
+
+ private void switchToViewTextMode() {
+ viewMode = MODE_TEXT;
+ nameField.setEnabled(true);
+ textField.setVisibility(View.GONE);
+
+ viewer.setText(textField.getText().toString());
+ viewerContainer.setVisibility(View.VISIBLE);
+ }
+
+ private void switchToViewMarkdownMode() {
+ viewMode = MODE_MARKDOWN;
+ nameField.setEnabled(true);
+ textField.setVisibility(View.GONE);
+
+ markwon.setMarkdown(viewer, textField.getText().toString());
+ viewerContainer.setVisibility(View.VISIBLE);
+ }
+
+ @Override
+ protected void onSaveInstanceState(@NonNull Bundle outState) {
+ super.onSaveInstanceState(outState);
+ outState.putInt(STATE_VIEW_MODE, viewMode);
+ }
+
private void disableMenuItem(MenuItem item) {
item.setEnabled(false);
item.setVisible(false);
diff --git a/app/src/main/res/layout/activity_open_note.xml b/app/src/main/res/layout/activity_open_note.xml
index a4635b74..f0bdd7f9 100644
--- a/app/src/main/res/layout/activity_open_note.xml
+++ b/app/src/main/res/layout/activity_open_note.xml
@@ -44,6 +44,7 @@
android:hint="@string/start_typing"
android:inputType="textMultiLine|textCapSentences"
android:scrollbars="vertical"
+ android:textSize="18sp"
android:textColor="@color/text_color"
android:textColorHighlight="@color/select_text"
android:textColorHint="#8F8F8F"
@@ -61,4 +62,38 @@
app:layout_constraintTop_toBottomOf="@+id/noteNameField"
app:layout_constraintVertical_bias="0.0" />
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_note_view_mode.xml b/app/src/main/res/menu/menu_note_view_mode.xml
new file mode 100644
index 00000000..1e49444c
--- /dev/null
+++ b/app/src/main/res/menu/menu_note_view_mode.xml
@@ -0,0 +1,16 @@
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_open_note.xml b/app/src/main/res/menu/menu_open_note.xml
index f1982bb9..689e2961 100644
--- a/app/src/main/res/menu/menu_open_note.xml
+++ b/app/src/main/res/menu/menu_open_note.xml
@@ -4,7 +4,7 @@