diff --git a/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java b/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java index d81443524a..13802e5164 100644 --- a/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java +++ b/app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java @@ -966,32 +966,34 @@ public void runSpecialKeyAction() { _hlEditor.simulateKeyPress(KeyEvent.KEYCODE_MOVE_END); } else if (callbackPayload.equals(rstr(R.string.key_pos_1_document))) { _hlEditor.setSelection(0); + } else if (callbackPayload.equals(rstr(R.string.key_pos_end_document))) { + _hlEditor.setSelection(_hlEditor.length()); } else if (callbackPayload.equals(rstr(R.string.move_text_one_line_up))) { ActionButtonBase.moveLineSelectionBy1(_hlEditor, true); } else if (callbackPayload.equals(rstr(R.string.move_text_one_line_down))) { ActionButtonBase.moveLineSelectionBy1(_hlEditor, false); - } else if (callbackPayload.equals(rstr(R.string.key_pos_end_document))) { - _hlEditor.setSelection(_hlEditor.length()); + } else if (callbackPayload.equals(rstr(R.string.select_current_line))) { + selectWholeLines(_hlEditor.getText()); } else if (callbackPayload.equals(rstr(R.string.key_ctrl_a))) { _hlEditor.setSelection(0, _hlEditor.length()); } else if (callbackPayload.equals(rstr(R.string.key_tab))) { _hlEditor.insertOrReplaceTextOnCursor("\u0009"); } else if (callbackPayload.equals(rstr(R.string.zero_width_space))) { _hlEditor.insertOrReplaceTextOnCursor("\u200B"); - } else if (callbackPayload.equals(rstr(R.string.search))) { - onSearch(); + } else if (callbackPayload.equals(rstr(R.string.em_space))) { + _hlEditor.insertOrReplaceTextOnCursor("\u2003"); } else if (callbackPayload.equals(rstr(R.string.break_page_pdf_print))) { _hlEditor.insertOrReplaceTextOnCursor("
"); + } else if (callbackPayload.equals(rstr(R.string.search))) { + onSearch(); } else if (callbackPayload.equals(rstr(R.string.ohm))) { _hlEditor.insertOrReplaceTextOnCursor("Ω"); + } else if (callbackPayload.equals(rstr(R.string.char_punctation_mark_arrows))) { + _hlEditor.insertOrReplaceTextOnCursor("»«"); } else if (callbackPayload.equals(rstr(R.string.continued_overline))) { _hlEditor.insertOrReplaceTextOnCursor("‾‾‾‾‾"); } else if (callbackPayload.equals(rstr(R.string.shrug))) { _hlEditor.insertOrReplaceTextOnCursor("¯\\_(ツ)_/¯"); - } else if (callbackPayload.equals(rstr(R.string.char_punctation_mark_arrows))) { - _hlEditor.insertOrReplaceTextOnCursor("»«"); - } else if (callbackPayload.equals(rstr(R.string.select_current_line))) { - selectWholeLines(_hlEditor.getText()); } }); } diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index f50ee08d0d..5c1941b552 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -52,20 +52,21 @@ @string/key_page_down @string/key_pos_1 @string/key_pos_end - @string/move_text_one_line_up - @string/move_text_one_line_down @string/key_pos_1_document @string/key_pos_end_document + @string/move_text_one_line_up + @string/move_text_one_line_down + @string/select_current_line @string/key_ctrl_a @string/key_tab - @string/search @string/zero_width_space + @string/em_space @string/break_page_pdf_print + @string/search @string/ohm @string/char_punctation_mark_arrows - @string/shrug @string/continued_overline - @string/select_current_line + @string/shrug diff --git a/app/src/main/res/values/string-not_translatable.xml b/app/src/main/res/values/string-not_translatable.xml index d816e37b5e..c6d32d2613 100644 --- a/app/src/main/res/values/string-not_translatable.xml +++ b/app/src/main/res/values/string-not_translatable.xml @@ -35,7 +35,6 @@ work. If not, see . Front Matter MIME type - Community sans-serif-regular Start QuickNote @@ -294,38 +293,38 @@ work. If not, see . - role - underline - role - overline - role - linethrough - role - nobreak - role - nowrap - role - prewrap + role - underline + role - overline + role - linethrough + role - nobreak + role - nowrap + role - prewrap - inline - highlight + inline - highlight - inline - subscript - inline - superscript + inline - subscript + inline - superscript - block - comment - block - example - block - listing - block - literal - block - open - block - sidebar - block - table - block - pass - block - quote - - block - code + block - comment + block - example + block - listing + block - literal + block - open + block - sidebar + block - table + block - pass + block - quote + + block - code block - collapsible break - thematic - break - page + break - page abid_wikitext_h1 @@ -390,7 +389,6 @@ work. If not, see . pref_key__new_file_dialog_lastused_extension pref_key__new_file_dialog_lastused_type pref_key__file_browser_last_browsed_folder - Select current line(s) pref_key__file_description_format pref_key__wikitext_bigger_headings pref_key__asciidoc_bigger_headings diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 376e9a968f..bc1786c8ad 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -191,15 +191,18 @@ work. If not, see . Special AsciiDoc Content Page Up (Page Up) Page Down (Page Down) - Move text one line up - Move text one line down - Start new line below Line Start (Pos Home) Line End (Pos End) Document Start Document End + Move line up + Move line down + Start new line + Select current line Select all (Ctrl+A) Tabulator + Zero-width space + Em space ( ) Start on bottom Upon loading a document, position cursor at its end Unordered list character @@ -243,6 +246,7 @@ work. If not, see . Project License Contribute code to the project. Everybody is welcome to do so, including newcomers Project Team + Community Show contributor info. Provide it to be shown here on an opt-in basis after contributing descending @@ -274,7 +278,6 @@ work. If not, see . No calendar app is installed! Popular documents Color - Zero-width space Basic color scheme Changes background and foreground color of the text editor. Adjusts to app theme so available in light and dark theme. Syntax highlighting colors remain the same. Preset