Improvements for the action buttons (closes gsantner#2386, PR gsantne…

…r#2388)
writing-tools · Sep 24, 2024 · c445821 · c445821
1 parent d161e62
commit c445821
Show file tree

Hide file tree

Showing 43 changed files with 124 additions and 74 deletions.
diff --git a/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java b/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java
@@ -546,7 +546,7 @@ protected void runSurroundAction(final String open, final String close, final bo
         final CharSequence selection = text.subSequence(ss, se);
 
         // Case delims around selection
-        if ((ss > ol) && ((se + cl) <= text.length())) {
+        if ((ss >= ol) && ((se + cl) <= text.length())) {
             final String before = text.subSequence(ss - ol, ss).toString();
             final String after = text.subSequence(se, se + cl).toString();
             if (before.equals(open) && after.equals(close)) {

diff --git a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java
@@ -57,7 +57,7 @@ public List<ActionItem> getFormatActionList() {
                 new ActionItem(R.string.abid_todotxt_add_project, R.drawable.ic_new_label_black_24dp, R.string.add_project),
                 new ActionItem(R.string.abid_todotxt_priority, R.drawable.ic_star_border_black_24dp, R.string.priority),
                 new ActionItem(R.string.abid_todotxt_archive_done_tasks, R.drawable.ic_archive_black_24dp, R.string.archive_completed_tasks),
-                new ActionItem(R.string.abid_todotxt_current_date, R.drawable.ic_date_range_black_24dp, R.string.current_date),
+                new ActionItem(R.string.abid_todotxt_due_date, R.drawable.ic_date_range_black_24dp, R.string.due_date),
                 new ActionItem(R.string.abid_todotxt_sort_todo, R.drawable.ic_sort_by_alpha_black_24dp, R.string.sort_by),
                 new ActionItem(R.string.abid_common_insert_link, R.drawable.ic_link_black_24dp, R.string.insert_link),
                 new ActionItem(R.string.abid_common_insert_image, R.drawable.ic_image_black_24dp, R.string.insert_image),
@@ -106,20 +106,11 @@ public boolean onActionClick(final @StringRes int action) {
             }
             case R.string.abid_todotxt_priority: {
                 MarkorDialogFactory.showPriorityDialog(getActivity(), selTasks.get(0).getPriority(), (priority) -> {
-                    ArrayList<ReplacePattern> patterns = new ArrayList<>();
-                    if (priority.length() > 1) {
-                        patterns.add(new ReplacePattern(TodoTxtTask.PATTERN_PRIORITY_ANY, ""));
-                    } else if (priority.length() == 1) {
-                        final String _priority = String.format("(%c) ", priority.charAt(0));
-                        patterns.add(new ReplacePattern(TodoTxtTask.PATTERN_PRIORITY_ANY, _priority));
-                        patterns.add(new ReplacePattern("^\\s*", _priority));
-                    }
-                    runRegexReplaceAction(patterns);
-                    trimLeadingWhiteSpace();
+                    setPriority(priority.length() == 1 ? priority.charAt(0) : TodoTxtTask.PRIORITY_NONE);
                 });
                 return true;
             }
-            case R.string.abid_todotxt_current_date: {
+            case R.string.abid_todotxt_due_date: {
                 setDueDate(_appSettings.getDueDateOffset());
                 return true;
             }
@@ -166,7 +157,52 @@ public boolean onActionLongClick(final @StringRes int action) {
                 }
                 return true;
             }
-            case R.string.abid_todotxt_current_date: {
+            case R.string.abid_todotxt_priority: {
+                final Editable text = _hlEditor.getText();
+                final int[] sel = TextViewUtils.getSelection(_hlEditor);
+                final int lineStart = TextViewUtils.getLineStart(text, sel[0]);
+                final int lineEnd = TextViewUtils.getLineEnd(text, sel[1]);
+                final List<TodoTxtTask> tasks = TodoTxtTask.getTasks(text, new int[]{sel[0], sel[1]});
+                char prevPriority = '\0', nextPriority = '\0';
+                boolean areAllSamePriority = true;
+                if (lineStart != 0) {
+                    final int prevLineStart = TextViewUtils.getLineStart(text, lineStart - 1);
+                    final int prevLineEnd = TextViewUtils.getLineEnd(text, prevLineStart);
+                    final String prevLine = text.subSequence(prevLineStart, prevLineEnd).toString();
+                    prevPriority = new TodoTxtTask(prevLine).getPriority();
+                }
+                if (lineEnd != text.length()) {
+                    final int nextLineStart = TextViewUtils.getLineStart(text, lineEnd + 1);
+                    final int nextLineEnd = TextViewUtils.getLineEnd(text, nextLineStart);
+                    final String nextLine = text.subSequence(nextLineStart, nextLineEnd).toString();
+                    nextPriority = new TodoTxtTask(nextLine).getPriority();
+                }
+                for (TodoTxtTask task : tasks) {
+                    if (task.getPriority() != tasks.get(0).getPriority()) {
+                        areAllSamePriority = false;
+                        break;
+                    }
+                }
+                if (areAllSamePriority) {
+                    if(prevPriority != tasks.get(0).getPriority() && prevPriority != '\0') {
+                        setPriority(prevPriority);
+                    }
+                    else if(nextPriority != tasks.get(tasks.size() - 1).getPriority() && nextPriority != '\0') {
+                        setPriority(nextPriority);
+                    }
+                    else {
+                        setPriority(TodoTxtTask.PRIORITY_NONE);
+                    }
+                } else {
+                    if(prevPriority != '\0') {
+                        setPriority(prevPriority);
+                    } else {
+                        setPriority(tasks.get(0).getPriority());
+                    }
+                }
+                return true;
+            }
+            case R.string.abid_todotxt_due_date: {
                 setDate();
                 return true;
             }
@@ -307,6 +343,19 @@ private static void insertInline(final Editable editable, String thing) {
         editable.replace(sel[0], sel[1], thing);
     }
 
+    private void setPriority(char priority) {
+        ArrayList<ReplacePattern> patterns = new ArrayList<>();
+        if (priority == TodoTxtTask.PRIORITY_NONE) {
+            patterns.add(new ReplacePattern(TodoTxtTask.PATTERN_PRIORITY_ANY, ""));
+        } else {
+            final String _priority = String.format("(%c) ", priority);
+            patterns.add(new ReplacePattern(TodoTxtTask.PATTERN_PRIORITY_ANY, _priority));
+            patterns.add(new ReplacePattern("^\\s*", _priority));
+        }
+        runRegexReplaceAction(patterns);
+        trimLeadingWhiteSpace();
+    }
+
     private static Calendar parseDateString(final String dateString, final Calendar fallback) {
         if (dateString == null || dateString.length() != TodoTxtTask.DATEF_YYYY_MM_DD_LEN) {
             return fallback;

diff --git a/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtBasicSyntaxHighlighter.java b/app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtBasicSyntaxHighlighter.java
@@ -11,11 +11,11 @@ public class TodoTxtBasicSyntaxHighlighter extends SyntaxHighlighterBase {
     private final static int COLOR_CONTEXT = 0xff88b04b;
 
     private final static int COLOR_PRIORITY_A = 0xffEF2929;
-    private final static int COLOR_PRIORITY_B = 0xffF57900;
-    private final static int COLOR_PRIORITY_C = 0xff73D216;
-    private final static int COLOR_PRIORITY_D = 0xff0099CC;
-    private final static int COLOR_PRIORITY_E = 0xffEDD400;
-    private final static int COLOR_PRIORITY_F = 0xff888A85;
+    private final static int COLOR_PRIORITY_B = 0xffd16900;
+    private final static int COLOR_PRIORITY_C = 0xff59a112;
+    private final static int COLOR_PRIORITY_D = 0xff0091c2;
+    private final static int COLOR_PRIORITY_E = 0xffa952cb;
+    private final static int COLOR_PRIORITY_F = 0xff878986;
 
     private final static int COLOR_DONE_DARK = 0x999d9d9d;
     private final static int COLOR_DONE_LIGHT = 0x993d3d3d;

diff --git a/app/src/main/java/net/gsantner/markor/frontend/DatetimeFormatDialog.java b/app/src/main/java/net/gsantner/markor/frontend/DatetimeFormatDialog.java
@@ -103,7 +103,7 @@ public static void showDatetimeFormatDialog(final Activity activity, final Highl
         final Button datePickButton = viewRoot.findViewById(R.id.start_datepicker_button);
         final Button timePickButton = viewRoot.findViewById(R.id.start_timepicker_button);
         final CheckBox formatInsteadCheckbox = viewRoot.findViewById(R.id.get_format_instead_date_or_time_checkbox);
-        final CheckBox alwaysNowCheckBox = viewRoot.findViewById(R.id.always_use_current_datetime_checkbox);
+        final CheckBox useCurrentDateCheckbox = viewRoot.findViewById(R.id.use_current_datetime_checkbox);
 
         final List<String> recentFormats = getRecentFormats(activity);
         final List<String> allFormats = getAllFormats(recentFormats);
@@ -117,7 +117,7 @@ public static void showDatetimeFormatDialog(final Activity activity, final Highl
         popupWindow.setOnItemClickListener((parent, view, position, id) -> {
             formatEditText.setText(allFormats.get(position));
             popupWindow.dismiss();
-            setToNow(cal, alwaysNowCheckBox.isChecked());
+            setToNow(cal, useCurrentDateCheckbox.isChecked());
             previewTextView.setText(cu.formatDateTime(locale, formatEditText.getText().toString(), cal.getTimeInMillis()));
         });
 
@@ -143,7 +143,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
             @Override
             public void afterTextChanged(Editable s) {
                 if (editTime + DELAY > System.currentTimeMillis()) {
-                    setToNow(cal, alwaysNowCheckBox.isChecked());
+                    setToNow(cal, useCurrentDateCheckbox.isChecked());
                     previewTextView.setText(cu.formatDateTime(locale, formatEditText.getText().toString(), cal.getTimeInMillis()));
                     final boolean error = previewTextView.getText().toString().isEmpty() && !formatEditText.getText().toString().isEmpty();
                     formatEditText.setError(error ? "^^^!!!  'normal text'" : null);
@@ -165,6 +165,7 @@ public void afterTextChanged(Editable s) {
 
         // Pick Date Dialog
         datePickButton.setOnClickListener(button -> new DatePickerDialog(activity, (view, year, month, day) -> {
+                    useCurrentDateCheckbox.setChecked(false);
                     cal.set(Calendar.YEAR, year);
                     cal.set(Calendar.MONTH, month);
                     cal.set(Calendar.DAY_OF_MONTH, day);
@@ -174,22 +175,24 @@ public void afterTextChanged(Editable s) {
 
         // Pick Time Dialog
         timePickButton.setOnClickListener(button -> new TimePickerDialog(activity, (timePicker, hour, min) -> {
+                    useCurrentDateCheckbox.setChecked(false);
                     cal.set(Calendar.HOUR_OF_DAY, hour);
                     cal.set(Calendar.MINUTE, min);
                     previewTextView.setText(cu.formatDateTime(locale, formatEditText.getText().toString(), cal.getTimeInMillis()));
                 }, cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), true).show()
         );
 
-        // hide buttons when both check box are checked
-        final View.OnClickListener onOptionsChangedListener = v -> {
-            boolean dateChangeable = !formatInsteadCheckbox.isChecked() && !alwaysNowCheckBox.isChecked();
-            timePickButton.setEnabled(dateChangeable);
-            datePickButton.setEnabled(dateChangeable);
+        formatInsteadCheckbox.setOnClickListener(v -> {
             dateHeadline.setEnabled(!formatInsteadCheckbox.isChecked());
-            alwaysNowCheckBox.setEnabled(!formatInsteadCheckbox.isChecked());
-        };
-        formatInsteadCheckbox.setOnClickListener(onOptionsChangedListener);
-        alwaysNowCheckBox.setOnClickListener(onOptionsChangedListener);
+            datePickButton.setEnabled(!formatInsteadCheckbox.isChecked());
+            timePickButton.setEnabled(!formatInsteadCheckbox.isChecked());
+            useCurrentDateCheckbox.setEnabled(!formatInsteadCheckbox.isChecked());
+        });
+
+        useCurrentDateCheckbox.setOnClickListener(v -> {
+            setToNow(cal, useCurrentDateCheckbox.isChecked());
+            previewTextView.setText(cu.formatDateTime(locale, formatEditText.getText().toString(), cal.getTimeInMillis()));
+        });
 
         // set builder and implement buttons to discard and submit
         builder.setView(viewRoot)
@@ -204,7 +207,7 @@ public void afterTextChanged(Editable s) {
         final AlertDialog dialog = builder.create();
 
         callbackInsertTextToEditor.set((selectedFormat) -> {
-            setToNow(cal, alwaysNowCheckBox.isChecked());
+            setToNow(cal, useCurrentDateCheckbox.isChecked());
             String text = cu.formatDateTime(locale, selectedFormat, cal.getTimeInMillis());
             previewTextView.setText(text);
             hlEditor.insertOrReplaceTextOnCursor(getOutput(

diff --git a/app/src/main/res/layout/time_format_dialog.xml b/app/src/main/res/layout/time_format_dialog.xml
@@ -141,7 +141,6 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:enabled="false"
                 android:text="@string/pick_date"
                 android:textAllCaps="false" />
 
@@ -150,17 +149,16 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:enabled="false"
                 android:text="@string/pick_time"
                 android:textAllCaps="false" />
         </LinearLayout>
 
         <CheckBox
-            android:id="@+id/always_use_current_datetime_checkbox"
+            android:id="@+id/use_current_datetime_checkbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:checked="true"
-            android:text="@string/always_use_current_date_and_time" />
+            android:text="@string/use_current_date_and_time" />
     </LinearLayout>
 
 </ScrollView>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -266,7 +266,7 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="pick_date">اختر تاريخاً</string>
     <string name="pick_time">اختر الوقت</string>
     <string name="get_format_instead_date_or_time">كتابة الصيغة وليس التاريخ أو الوقت</string>
-    <string name="always_use_current_date_and_time">دائما استخدم الوقت والتاريخ الحاليين</string>
+    <string name="use_current_date_and_time">دائما استخدم الوقت والتاريخ الحاليين</string>
     <string name="result">النتيجة</string>
     <string name="just_time">الوقت فقط</string>
     <string name="just_date">التاريخ فقط</string>

diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
@@ -258,7 +258,7 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="pick_date">Izaberi datum</string>
     <string name="pick_time">Odredi vrijeme</string>
     <string name="get_format_instead_date_or_time">Format umjesto datuma ili vremena</string>
-    <string name="always_use_current_date_and_time">Uvijek prikaži trenutni datum i vrijeme</string>
+    <string name="use_current_date_and_time">Uvijek prikaži trenutni datum i vrijeme</string>
     <string name="result">Rezultat</string>
     <string name="just_time">Samo vrijeme</string>
     <string name="just_date">Samo datum</string>

diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
@@ -279,7 +279,7 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="pick_date">Tria la data</string>
     <string name="pick_time">Tria l\'hora</string>
     <string name="get_format_instead_date_or_time">Obtén el format en lloc de la data o l\'hora</string>
-    <string name="always_use_current_date_and_time">Utilitza sempre la data i l\'hora actual</string>
+    <string name="use_current_date_and_time">Utilitza sempre la data i l\'hora actual</string>
     <string name="result">Resultat</string>
     <string name="just_time">Només l\'hora</string>
     <string name="just_date">Només la data</string>

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -269,7 +269,7 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="pick_date">Vybrat datum</string>
     <string name="pick_time">Vybrat čas</string>
     <string name="get_format_instead_date_or_time">Formát místo data nebo času</string>
-    <string name="always_use_current_date_and_time">Vždy používat aktuální datum &amp; čas</string>
+    <string name="use_current_date_and_time">Vždy používat aktuální datum &amp; čas</string>
     <string name="result">Výsledek</string>
     <string name="just_time">Pouze čas</string>
     <string name="just_date">Pouze datum</string>

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -261,7 +261,7 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="pick_date">Vælg dato</string>
     <string name="pick_time">Vælg tidspunkt</string>
     <string name="get_format_instead_date_or_time">Hent format i stedet dato eller tid</string>
-    <string name="always_use_current_date_and_time">Benyt altid aktuel dato &amp; tid</string>
+    <string name="use_current_date_and_time">Benyt altid aktuel dato &amp; tid</string>
     <string name="result">Resultat</string>
     <string name="just_time">Kun tid</string>
     <string name="just_date">Kun dato</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -274,7 +274,7 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="pick_date">Datum auswählen</string>
     <string name="pick_time">Zeit auswählen</string>
     <string name="get_format_instead_date_or_time">Format statt Datum und Zeit</string>
-    <string name="always_use_current_date_and_time">Immer die aktuelle Uhrzeit verwenden</string>
+    <string name="use_current_date_and_time">Immer die aktuelle Uhrzeit verwenden</string>
     <string name="result">Ergebnis</string>
     <string name="just_time">Nur Zeit</string>
     <string name="just_date">Nur Datum</string>

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -269,7 +269,7 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="pick_date">Επιλέξτε ημερομηνία</string>
     <string name="pick_time">Επιλέξτε ώρα</string>
     <string name="get_format_instead_date_or_time">Χρήση μορφής αντί για ημερομηνία ή ώρα</string>
-    <string name="always_use_current_date_and_time">Να χρησιμοποιείται πάντα η τρέχουσα ημερομηνία &amp; ώρα</string>
+    <string name="use_current_date_and_time">Να χρησιμοποιείται πάντα η τρέχουσα ημερομηνία &amp; ώρα</string>
     <string name="result">Αποτέλεσμα</string>
     <string name="just_time">Μόνο ώρα</string>
     <string name="just_date">Μόνο ημερομηνία</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -271,7 +271,7 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="pick_date">Elegir fecha</string>
     <string name="pick_time">Elegir hora</string>
     <string name="get_format_instead_date_or_time">Cambiar formato de fecha y hora</string>
-    <string name="always_use_current_date_and_time">Utilizar siempre la fecha actual &amp; hora</string>
+    <string name="use_current_date_and_time">Utilizar siempre la fecha actual &amp; hora</string>
     <string name="result">Resultado</string>
     <string name="just_time">Sólo hora</string>
     <string name="just_date">Sólo fecha</string>

diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
@@ -273,7 +273,7 @@ work. If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
     <string name="pick_date">Vali kuupäev</string>
     <string name="pick_time">Mära kellaaeg</string>
     <string name="get_format_instead_date_or_time">Hankige kuupäeva või kellaaja asemel vorming</string>
-    <string name="always_use_current_date_and_time">Kasuta alati praegust kuupäeva &amp; aega</string>
+    <string name="use_current_date_and_time">Kasuta alati praegust kuupäeva &amp; aega</string>
     <string name="result">Tulemus</string>
     <string name="just_time">Ainult aeg</string>
     <string name="just_date">Ainult kuupäev</string>