Merge branch 'master' into libraries_update

Author: guanglinn

CHANGELOG.md

@@ -3,9 +3,35 @@
 - New Updates also visible here: <https://github.com/gsantner/markor/releases>
 
 
-### v2.14 series
+### v2.14 -> v2.15
 - [2.14.0 - 2.14.1](https://github.com/gsantner/markor/compare/v2.14.0...v2.14.1)
 - [2.14.0 - 2.15.0](https://github.com/gsantner/markor/compare/v2.14.0...v2.15.0)
+- Make .svg editable, closes #2647, by @gsantner
+- keep the toolbar ref intact (#2635)
+- ShareInto: tracking/bloat parameter filtering - Amazon
+- Add SHA-256 to file info dialog (#2622)
+- Simpler http(s) regex for GsSimpleMarkdownParser (PR #2606)
+- Add dyslexia friendly font (PR #2602)
+- Improving view mode and rendering (PR #2566)
+- Fixes and improvements for AsciiDoc (darklight, caution-admonition, linebreak, pagebreak, quote, attachment)  (#2597)
+- Improve PlaintextSyntaxHighlighter with basic programming language editor syntax highlighting (PR #2560)
+- Update README.md (PR #2595)
+- Add AsciiDoc-reference, toolbar swap view and save button (#2580) (#2579)
+- Upgrade to mermaid v11.6.0 (PR #2575)
+- Template: Mermaid-Katex improvements (PR #2574)
+- Settings: Move some 'Other' settings to 'Edit mode' (PR #2562)
+- Quick filter all files, Share files into markor (PR #2521)
+- Fix Prism code block issues (PR #2542)
+- Fix unit tests - Color.rgb is Android only API and not available in junit -> own method
+- CSV: View-Mode syntax highlighting: Make column 3 readable in dark mode (255 blue -> violet-blue), closes #2540, by @gsantner
+- OrgMode: make insert-link action-button use correct syntax, closes #2527 (#2528)
+- Improve text rendering performance, closes #2478, closes #2515 (#2509)
+- Filebrowser: Per folder sort order (PR #2499)
+- Improve line numbers (PR #2470)
+- Orgmode fixes and improvements, closes #2405 (PR #2504)
+- View-Mode: Code highlighting block - Prism add more language (PR #2508)
+- Markdown: Open link action: Fix open links when Markdown link has space at end
+- Update Android gradle/tools to 8.10.2/8.8
 
 ### v2.13 series
 - [2.13.0 - 2.14.0](https://github.com/gsantner/markor/compare/v2.13.0...v2.14.0)

README.md

@@ -169,8 +169,6 @@ Files are stored locally in a user selectable folder, defaulting to the internal
   In user-generated content data can be loaded from the internet.
 * INSTALL_SHORTCUT  
   Install a shortcut to launchers to open a file/folder in Markor.
-* RECORD_AUDIO  
-  Attach voice notes to the text. The permission is only used after click on the "attach audio" button, at the audio record dialog. Audio recording is always started and stopped manually by you (button press).
 
 ## License
 The code of the app is licensed Apache 2.0.  

app/build.gradle

@@ -23,8 +23,8 @@ android {
     defaultConfig {
         resValue "string", "manifest_package_id", "net.gsantner.markor"
         applicationId "net.gsantner.markor"
-        versionName "2.14.1"
-        versionCode 158
+        versionName "2.15.1"
+        versionCode 160
 
         multiDexEnabled true
         minSdkVersion rootProject.ext.version_minSdk

app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java

@@ -582,7 +582,12 @@ private void addDocumentToPrefgroup(String filepath, final PreferenceGroup prefG
     }
 
     private static String sanitize(final String link) {
-        return link.replaceAll("(?m)(?<=&|\\?)(utm_|source|si|__mk_|ref|sprefix|crid|partner|promo|ad_sub|gclid|fbclid|msclkid).*?(&|$|\\s|\\))", "");
+        String dropGetParams = "utm_|source|si|__mk_|ref|sprefix|crid|partner|promo|ad_sub|gclid|fbclid|msclkid|dib";
+        if (link.contains("amazon.")) {
+            dropGetParams += "|qid|sr";
+        }
+
+        return link.replaceAll("(?m)(?<=&|\\?)(" + dropGetParams + ").*?(&|$|\\s|\\))", "");
     }
 
     private static String extractShareText(final Intent intent) {

app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java

@@ -58,6 +58,7 @@ public static class RESULT {
 
     protected Toolbar toolbar;
 
+    @Override
     public void onCreate(Bundle b) {
         // Must be applied before setContentView
         super.onCreate(b);

app/src/main/java/net/gsantner/markor/format/binary/EmbedBinaryTextConverter.java

@@ -26,10 +26,11 @@
 public class EmbedBinaryTextConverter extends TextConverterBase {
     private static final List<String> EXT = new ArrayList<>();
     private static final List<String> EXT_AUDIO = Arrays.asList(".mp3", ".ogg", ".flac", ".opus", ".oga", ".wma", ".m4a", ".aac", ".wav", ".amr", ".mid", ".midi", ".pcm");
-    private static final List<String> EXT_IMAGE = Arrays.asList(".jpg", ".jpeg", ".png", ".bmp", ".gif", ".webp", ".svg", ".heic", ".heif", ".avif");
+    private static final List<String> EXT_IMAGE = Arrays.asList(".jpg", ".jpeg", ".png", ".bmp", ".gif", ".webp", ".heic", ".heif", ".avif");
     private static final List<String> EXT_VIDEO = Arrays.asList(".webm", ".mp4", ".mpeg4", ".mpeg", ".mpg", ".mkv", ".3gp", ".ts", ".m4v");
 
     public static final String EXT_MATCHES_M3U_PLAYLIST = "(?i).m3u8?";
+    public static final String EXT_IMAGE_TEXTUAL = "(?i).svg";
 
     private static final String HTML100_BODY_BEGIN = "<div>\n  ";
     private static final String HTML101_BODY_END = "\n\n</div>";
@@ -63,7 +64,7 @@ public String convertMarkup(String markup, Context context, boolean lightMode, b
         // Sticky header with content depending on type
         if (true) {
             converted += "\n<div class='sticky sticky-blackbox'>\n";
-            if (EXT_IMAGE.contains(extWithDot)) {
+            if (EXT_IMAGE.contains(extWithDot) || extWithDot.matches(EXT_IMAGE_TEXTUAL)) {
                 converted += "<img class='' src='" + TOKEN_FILEURI_VIEWED_FILE + "' alt='Your Android device does not support the file format.'/>";
             } else if (EXT_VIDEO.contains(extWithDot) || extWithDot.matches(EXT_MATCHES_M3U_PLAYLIST)) {
                 converted += "<video class='htmlav' autoplay controls loop style='max-height: 45vh; width: 100%; max-width: 100%;' srcx='" + TOKEN_FILEURI_VIEWED_FILE + "'/>Your Android device does not support the video tag or the file format.</video>";

app/src/main/java/net/gsantner/markor/format/plaintext/PlaintextTextConverter.java

@@ -29,7 +29,7 @@
 public class PlaintextTextConverter extends TextConverterBase {
     private static final String HTML100_BODY_PRE_BEGIN = "<pre style='white-space: pre-wrap;font-family: " + TOKEN_FONT + "' >";
     private static final String HTML101_BODY_PRE_END = "</pre>";
-    private static final List<String> EXT_TEXT = Arrays.asList(".txt", ".taskpaper", ".org", ".ldg", ".ledger", ".m3u", ".m3u8", ".lrc", ".fen");
+    private static final List<String> EXT_TEXT = Arrays.asList(".txt", ".taskpaper", ".org", ".ldg", ".ledger", ".m3u", ".m3u8", ".svg", ".lrc", ".fen");
     private static final List<String> EXT_HTML = Arrays.asList(".html", ".htm");
     private static final List<String> EXT_CODE_HL = Arrays.asList(".py", ".cpp", ".h", ".c", ".js", ".mjs", ".css", ".cs", ".kt", ".lua", ".perl", ".java", ".qml", ".diff", ".php", ".r", ".patch", ".rs", ".swift", ".ts", ".mm", ".go", ".sh", ".rb", ".tex", ".xml", ".xlf");
     private static final List<String> EXT = new ArrayList<>();
@@ -64,7 +64,7 @@ public String convertMarkup(String markup, Context context, boolean lightMode, b
         if (EXT_HTML.contains(extWithDot)) {
             // HTML: Display it
             converted += markup;
-        } else if (extWithDot.matches(EmbedBinaryTextConverter.EXT_MATCHES_M3U_PLAYLIST)) {
+        } else if (extWithDot.matches(EmbedBinaryTextConverter.EXT_MATCHES_M3U_PLAYLIST) || extWithDot.matches(EmbedBinaryTextConverter.EXT_IMAGE_TEXTUAL)) {
             // Playlist: Load in Embed-Binary view-mode
             return FormatRegistry.CONVERTER_EMBEDBINARY.convertMarkup(markup, context, lightMode, lineNum, file);
         } else if (EXT_CODE_HL.contains(extWithDot) || (this instanceof KeyValueTextConverter)) {

app/src/main/java/net/gsantner/markor/frontend/AttachLinkOrFileDialog.java

@@ -101,7 +101,6 @@ public static void showInsertImageOrLinkDialog(
         final Button buttonPictureGallery = view.findViewById(R.id.ui__select_path_dialog__gallery_picture);
         final Button buttonPictureCamera = view.findViewById(R.id.ui__select_path_dialog__camera_picture);
         final Button buttonPictureEdit = view.findViewById(R.id.ui__select_path_dialog__edit_picture);
-        final Button buttonAudioRecord = view.findViewById(R.id.ui__select_path_dialog__record_audio);
 
         builder.setCancelable(true);
         builder.setNegativeButton(android.R.string.cancel, (di, b) -> di.dismiss());
@@ -142,7 +141,6 @@ public static void showInsertImageOrLinkDialog(
             okType = InsertType.IMAGE_DIALOG;
         } else if (action == AUDIO_ACTION) {
             dialog.setTitle(R.string.audio);
-            buttonAudioRecord.setVisibility(View.VISIBLE);
             browseType = InsertType.AUDIO_BROWSE;
             okType = InsertType.AUDIO_DIALOG;
         } else {
@@ -158,7 +156,6 @@ public static void showInsertImageOrLinkDialog(
         buttonSearch.setOnClickListener(v -> _insertItem.callback(InsertType.LINK_SEARCH));
         buttonPictureCamera.setOnClickListener(b -> _insertItem.callback(InsertType.IMAGE_CAMERA));
         buttonPictureGallery.setOnClickListener(v -> _insertItem.callback(InsertType.IMAGE_GALLERY));
-        buttonAudioRecord.setOnClickListener(v -> _insertItem.callback(InsertType.AUDIO_RECORDING));
         buttonPictureEdit.setOnClickListener(v -> _insertItem.callback(InsertType.IMAGE_EDIT));
 
         dialog.show();

app/src/main/java/net/gsantner/markor/frontend/FileInfoDialog.java

@@ -85,11 +85,17 @@ private AlertDialog.Builder setUpDialog(final File file, LayoutInflater inflater
         tv(root, R.id.ui__fileinfodialog__last_modified_caption).setText(getString(R.string.last_modified_witharg, "").replace(":", "").trim());
         tv(root, R.id.ui__fileinfodialog__size_description).setText(GsFileUtils.getReadableFileSize(file.length(), false));
         tv(root, R.id.ui__fileinfodialog__mimetype_description).setText(GsFileUtils.getMimeType(file));
+        tv(root, R.id.ui__fileinfodialog__sha_256).setText(GsFileUtils.sha256(file));
         tv(root, R.id.ui__fileinfodialog__location).setOnLongClickListener(v -> {
             GsContextUtils.instance.setClipboard(v.getContext(), file.getAbsolutePath());
             Toast.makeText(v.getContext(), R.string.clipboard, Toast.LENGTH_SHORT).show();
-            return true;
-        });
+            return true;}
+        );
+        tv(root, R.id.ui__fileinfodialog__sha_256).setOnLongClickListener(v -> {
+            GsContextUtils.instance.setClipboard(v.getContext(), GsFileUtils.sha256(file));
+            Toast.makeText(v.getContext(), R.string.clipboard, Toast.LENGTH_SHORT).show();
+            return true;}
+        );
 
 
         // Number of lines and character count only apply for files.
@@ -117,6 +123,11 @@ private AlertDialog.Builder setUpDialog(final File file, LayoutInflater inflater
         checkHideInRecents.setChecked(appSettings.listFileInRecents(file));
         checkHideInRecents.setOnCheckedChangeListener((buttonView, isChecked) -> appSettings.setListFileInRecents(file, isChecked));
 
+
+        CheckBox checkFavorite = root.findViewById(R.id.ui__fileinfodialog__favorite);
+        checkFavorite.setChecked(appSettings.getFavouriteFiles().contains(file));
+        checkFavorite.setOnCheckedChangeListener((buttonView, isChecked) -> appSettings.toggleFavouriteFile(file));
+
         return dialogBuilder;
     }
 

app/src/main/java/net/gsantner/opoc/format/GsSimpleMarkdownParser.java

@@ -61,7 +61,7 @@ public String filter(String text) {
                     .replaceAll("(?m)^# (.*)$", "<br/><big><big><big><b><font color='#000000'>$1</font></b></big></big></big><br/><br/>") // h1 (DEP: h2,h3)
                     .replaceAll("!\\[(.*?)\\]\\((.*?)\\)", "<a href=\\'$2\\'>$1</a>") // img
                     .replaceAll("\\[(.*?)\\]\\((.*?)\\)", "<a href=\\'$2\\'>$1</a>") // a href (DEP: img)
-                    .replaceAll("<(http|https):\\/\\/(.*)>", "<a href='$1://$2'>$1://$2</a>") // a href (DEP: img)
+                    .replaceAll("<http(s?):\\/\\/(.*)>", "<a href='http$1://$2'>$1://$2</a>") // a href (DEP: img)
                     .replaceAll("(?m)^([-*] )(.*)$", "<font color='#000001'>&#8226;</font> $2<br/>") // unordered list + end line
                     .replaceAll("(?m)^  (-|\\*) ([^<]*)$", "&nbsp;&nbsp;<font color='#000001'>&#8226;</font> $2<br/>") // unordered list2 + end line
                     .replaceAll("`([^<]*)`", "<font face='monospace'>$1</font>") // code
@@ -90,7 +90,7 @@ public String filter(String text) {
                     .replaceAll("(?m)^## (.*)$", "<h2>$1</h2>") /// h2 (DEP: h3)
                     .replaceAll("(?m)^# (.*)$", "<h1>$1</h1>") // h1 (DEP: h2,h3)
                     .replaceAll("!\\[(.*?)\\]\\((.*?)\\)", "<img src=\\'$2\\' alt='$1' />") // img
-                    .replaceAll("<(http|https):\\/\\/(.*)>", "<a href='$1://$2'>$1://$2</a>") // a href (DEP: img)
+                    .replaceAll("<http(s?):\\/\\/(.*)>", "<a href='http$1://$2'>$1://$2</a>") // a href (DEP: img)
                     .replaceAll("\\[(.*?)\\]\\((.*?)\\)", "<a href=\\'$2\\'>$1</a>") // a href (DEP: img)
                     .replaceAll("(?m)^[-*] (.*)$", "<font color='#000001'>&#8226;</font> $1  ") // unordered list + end line
                     .replaceAll("(?m)^  [-*] (.*)$", "&nbsp;&nbsp;<font color='#000001'>&#8226;</font> $1  ") // unordered list2 + end line