Jump to correct heading via id, other tweaks, bugfixes

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

@@ -20,6 +20,7 @@
 import android.view.MotionEvent;
 import android.widget.TextView;
 
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.FragmentManager;
@@ -44,7 +45,6 @@ public class DocumentActivity extends MarkorBaseActivity {
     public static final String EXTRA_DO_PREVIEW = "EXTRA_DO_PREVIEW";
 
     private Toolbar _toolbar;
-    private TextView _toolbarTitleText;
 
     private FragmentManager _fragManager;
 
@@ -153,7 +153,6 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         setContentView(R.layout.document__activity);
         _toolbar = findViewById(R.id.toolbar);
-        _toolbarTitleText = findViewById(R.id.note__activity__text_note_title);
 
         if (_appSettings.isHideSystemStatusbar()) {
             AndroidBug5497Workaround.assistActivity(this);
@@ -281,8 +280,15 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         _cu.extractResultFromActivityResult(this, requestCode, resultCode, data);
     }
 
+    public void setTitle(final CharSequence title) {
+        final ActionBar bar = getSupportActionBar();
+        if (bar != null) {
+            bar.setTitle(title);
+        }
+    }
+
     public void setDocumentTitle(final String title) {
-        _toolbarTitleText.setText(title);
+        setTitle(title);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && _appSettings.isMultiWindowEnabled()) {
             setTaskDescription(new ActivityManager.TaskDescription(title));
         }
@@ -301,8 +307,7 @@ public void showTextEditor(final Document document, final Integer lineNumber, fi
     }
 
     public void showShareInto(Intent intent) {
-        // Disable edittext when going to shareinto
-        _toolbarTitleText.setText(R.string.share_into);
+        setTitle(getString(R.string.share_into));
         showFragment(DocumentShareIntoFragment.newInstance(intent));
     }
 

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

@@ -11,21 +11,27 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
 import android.graphics.Typeface;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.util.Patterns;
 import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.View;
+import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
+import androidx.core.widget.CompoundButtonCompat;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.CheckBoxPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
+import androidx.appcompat.widget.Toolbar;
 
 import net.gsantner.markor.ApplicationObject;
 import net.gsantner.markor.R;
@@ -36,7 +42,6 @@
 import net.gsantner.markor.frontend.NewFileDialog;
 import net.gsantner.markor.frontend.filebrowser.MarkorFileBrowserFactory;
 import net.gsantner.markor.frontend.textview.HighlightingEditor;
-import net.gsantner.markor.frontend.textview.TextViewUtils;
 import net.gsantner.markor.model.AppSettings;
 import net.gsantner.markor.model.Document;
 import net.gsantner.markor.util.MarkorContextUtils;
@@ -88,7 +93,7 @@ protected int getLayoutResId() {
     @Override
     public void onViewCreated(final @NonNull View view, final Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        HighlightingEditor _hlEditor = view.findViewById(R.id.document__fragment__share_into__highlighting_editor);
+        final HighlightingEditor _hlEditor = view.findViewById(R.id.document__fragment__share_into__highlighting_editor);
 
         final String sharedText = (getArguments() != null ? getArguments().getString(EXTRA_SHARED_TEXT, "") : "").trim();
         final ShareIntoImportOptionsFragment _shareIntoImportOptionsFragment;
@@ -102,7 +107,8 @@ public void onViewCreated(final @NonNull View view, final Bundle savedInstanceSt
         }
 
         if (_shareIntoImportOptionsFragment != null) {
-            _shareIntoImportOptionsFragment.setEditor(_hlEditor);
+            _shareIntoImportOptionsFragment._editor = _hlEditor;
+            _shareIntoImportOptionsFragment._linkCheckBox = addCheckBoxToToolbar();
         }
 
         _hlEditor.setTextSize(TypedValue.COMPLEX_UNIT_SP, _appSettings.getFontSize());
@@ -116,22 +122,58 @@ public void onViewCreated(final @NonNull View view, final Bundle savedInstanceSt
         }
     }
 
-    @Override
-    public String getFragmentTag() {
-        return FRAGMENT_TAG;
+    private CheckBox addCheckBoxToToolbar() {
+        final String CHECKBOX_TAG = "insert_link_checkbox";
+
+        final Activity activity = getActivity();
+        if (activity == null) {
+            return null;
+        }
+
+        final Toolbar toolbar = activity.findViewById(R.id.toolbar);
+        if (toolbar == null) {
+            return null;
+        }
+
+        CheckBox checkBox = toolbar.findViewWithTag(CHECKBOX_TAG);
+        if (checkBox == null) {
+
+            checkBox = new CheckBox(activity);
+            checkBox.setText(R.string.format_link);
+            checkBox.setTag(CHECKBOX_TAG);
+            CompoundButtonCompat.setButtonTintList(checkBox, ColorStateList.valueOf(Color.WHITE));
+            checkBox.setTextColor(Color.WHITE);
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                checkBox.setLayoutDirection(CheckBox.LAYOUT_DIRECTION_RTL);
+            }
+
+            final Toolbar.LayoutParams layoutParams = new Toolbar.LayoutParams(
+                    Toolbar.LayoutParams.WRAP_CONTENT,
+                    Toolbar.LayoutParams.WRAP_CONTENT,
+                    Gravity.CENTER_VERTICAL | Gravity.END
+            );
+
+            final int margin = _cu.convertDpToPx(activity, 10);
+            layoutParams.setMargins(0, 0, margin, 0);
+
+            toolbar.addView(checkBox, layoutParams);
+        }
+
+        return checkBox;
     }
 
     @Override
-    public boolean onBackPressed() {
-        return false;
+    public String getFragmentTag() {
+        return FRAGMENT_TAG;
     }
 
-
     public static class ShareIntoImportOptionsFragment extends GsPreferenceFragmentBase<AppSettings> {
         public static final String TAG = "ShareIntoImportOptionsFragment";
         private File workingDir;
 
         private EditText _editor = null;
+        private CheckBox _linkCheckBox = null;
 
         @Override
         public boolean isDividerVisible() {
@@ -142,10 +184,6 @@ public void setWorkingDir(File dir) {
             workingDir = dir;
         }
 
-        public void setEditor(final EditText editor) {
-            _editor = editor;
-        }
-
         @Override
         public int getPreferenceResourceForInflation() {
             return R.xml.prefactions_share_into;
@@ -166,20 +204,16 @@ protected void afterOnCreate(Bundle savedInstances, Context context) {
             super.afterOnCreate(savedInstances, context);
             doUpdatePreferences();
 
-            if (_editor != null) {
-                final CheckBoxPreference asLinkPref = (CheckBoxPreference) findPreference(R.string.pref_key__attach_as_link);
-                if (asLinkPref != null) {
-                    asLinkPref.setVisible(hasLinks(_editor.getText()));
-                    asLinkPref.setChecked(true);
-                    _editor.addTextChangedListener(GsTextWatcherAdapter.on((ctext, arg2, arg3, arg4) ->
-                            asLinkPref.setVisible(hasLinks(ctext))));
-                }
+            if (_editor != null && _linkCheckBox != null) {
+                _linkCheckBox.setVisibility(hasLinks(_editor.getText()) ? View.VISIBLE : View.GONE);
+                _linkCheckBox.setChecked(true);
+                _editor.addTextChangedListener(GsTextWatcherAdapter.on((ctext, arg2, arg3, arg4) ->
+                    _linkCheckBox.setVisibility(hasLinks(_editor.getText()) ? View.VISIBLE : View.GONE)));
             }
         }
 
         private boolean shareAsLink() {
-            final CheckBoxPreference asLinkPref = (CheckBoxPreference) findPreference(R.string.pref_key__attach_as_link);
-            return asLinkPref != null && asLinkPref.isVisible() && asLinkPref.isEnabled() && asLinkPref.isChecked();
+            return _linkCheckBox != null && _linkCheckBox.getVisibility() == View.VISIBLE && _linkCheckBox.isChecked();
         }
 
         private void appendToExistingDocumentAndClose(final File file, final boolean showEditor) {
@@ -244,50 +278,6 @@ private static boolean hasLinks(final CharSequence text) {
             return hasLinks[0];
         }
 
-        /**
-         * Iterates over each line of the text and checks if it is a path or link
-         * The whole line has to be a path or the line must end with a link to match.
-         *
-         * @param text Text to parse
-         * @return List of pairs.
-         * The first element of the pair is the start and end index of the link/path.
-         * Second element is true if it is a path, false if it is a link.
-         */
-        public static List<Pair<int[], Boolean>> findLinksAndPaths(final CharSequence text) {
-            final List<Pair<int[], Boolean>> links = new ArrayList<>();
-
-            GsTextUtils.forEachline(text, (line, start, end) -> {
-
-                start = TextViewUtils.getNextNonWhitespace(text, start);
-                end = TextViewUtils.getLastNonWhitespace(text, end - 1) + 1;
-
-                if (start != -1 && end != -1 && start <= end) {
-
-                    final String trimmed = text.subSequence(start, end).toString();
-                    final boolean hasSpaces = trimmed.contains(" ") || trimmed.contains("\\t");
-
-                    // Test for web links
-                    if (!hasSpaces && Patterns.WEB_URL.matcher(trimmed).matches()) {
-                        links.add(Pair.create(new int[]{start, end}, false));
-                        return true;
-                    }
-
-                    // Test for file links
-                    try {
-                        if (new File(trimmed.replace("%20", " ")).exists()) {
-                            links.add(Pair.create(new int[]{start, end}, true));
-                            return true;
-                        }
-                    } catch (NullPointerException ignored) {
-                    }
-                }
-
-                return true;
-            });
-
-            return links;
-        }
-
         public static String getLinkTitle(final String link) {
             final Matcher m = Patterns.WEB_URL.matcher(link);
             if (m.matches()) {

app/src/main/java/net/gsantner/markor/format/markdown/MarkdownTextConverter.java

@@ -31,12 +31,18 @@
 import com.vladsch.flexmark.ext.yaml.front.matter.AbstractYamlFrontMatterVisitor;
 import com.vladsch.flexmark.ext.yaml.front.matter.YamlFrontMatterExtension;
 import com.vladsch.flexmark.html.HtmlRenderer;
-import com.vladsch.flexmark.html.renderer.HeaderIdGenerator;
+import com.vladsch.flexmark.html.renderer.LinkResolverContext;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.superscript.SuperscriptExtension;
 import com.vladsch.flexmark.util.ast.Document;
+import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.builder.Extension;
+import com.vladsch.flexmark.util.html.Attributes;
+import com.vladsch.flexmark.util.options.MutableDataHolder;
 import com.vladsch.flexmark.util.options.MutableDataSet;
+import com.vladsch.flexmark.html.AttributeProvider;
+import com.vladsch.flexmark.html.AttributeProviderFactory;
+import com.vladsch.flexmark.html.renderer.AttributablePart;
 
 import net.gsantner.markor.R;
 import net.gsantner.markor.format.TextConverterBase;
@@ -49,6 +55,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -149,7 +156,8 @@ public class MarkdownTextConverter extends TextConverterBase {
             TypographicExtension.create(),        // https://github.com/vsch/flexmark-java/wiki/Typographic-Extension
             GitLabExtension.create(),             // https://github.com/vsch/flexmark-java/wiki/Extensions#gitlab-flavoured-markdown
             AdmonitionExtension.create(),         // https://github.com/vsch/flexmark-java/wiki/Extensions#admonition
-            FootnoteExtension.create()            // https://github.com/vsch/flexmark-java/wiki/Footnotes-Extension#overview
+            FootnoteExtension.create(),            // https://github.com/vsch/flexmark-java/wiki/Footnotes-Extension#overview
+            LineNumberIdExtension.create()
     );
     public static final Parser flexmarkParser = Parser.builder().extensions(flexmarkExtensions).build();
     public static final HtmlRenderer flexmarkRenderer = HtmlRenderer.builder().extensions(flexmarkExtensions).build();
@@ -331,17 +339,13 @@ public String convertMarkup(String markup, Context context, boolean lightMode, b
 
         if (enableLineNumbers) {
             // For Prism line numbers plugin
-            onLoadJs += "enableLineNumbers();adjustLineNumbers();";
+            onLoadJs += "enableLineNumbers(); adjustLineNumbers();";
         }
 
         // Deliver result
         return putContentIntoTemplate(context, converted, lightMode, file, onLoadJs, head);
     }
 
-    public static String generateHeaderId(String headerText) {
-        return HeaderIdGenerator.generateId(headerText, toDashChars, false, false);
-    }
-
     private String escapeSpacesInLink(final String markup) {
         final Matcher matcher = linkPattern.matcher(markup);
         if (!matcher.find()) {
@@ -440,4 +444,60 @@ private String replaceTokens(final String markup, final Map<String, List<String>
 
         return markupReplaced;
     }
+
+    // Extension to add line numbers to headings
+    // ---------------------------------------------------------------------------------------------
+
+    public static String getIdForLineNumber(final int num) {
+        return "line-" + num;
+    }
+
+    private static class LineNumberIdProvider implements AttributeProvider {
+        @Override
+        public void setAttributes(Node node, AttributablePart part, Attributes attributes) {
+            if (node instanceof com.vladsch.flexmark.ast.Heading) {
+                final Document document = node.getDocument();
+                final int lineNumber = document.getLineNumber(node.getStartOffset());
+                attributes.addValue("id", getIdForLineNumber(lineNumber));
+            }
+        }
+    }
+
+    private static class LineNumberIdProviderFactory implements AttributeProviderFactory {
+
+        @Override
+        public Set<Class<? extends AttributeProviderFactory>> getAfterDependents() {
+            return null;
+        }
+
+        @Override
+        public Set<Class<? extends AttributeProviderFactory>> getBeforeDependents() {
+            return null;
+        }
+
+        @Override
+        public boolean affectsGlobalScope() {
+            return false;
+        }
+
+        @Override
+        public AttributeProvider create(LinkResolverContext context) {
+            return new LineNumberIdProvider();
+        }
+    }
+
+    private static class LineNumberIdExtension implements HtmlRenderer.HtmlRendererExtension {
+        @Override
+        public void rendererOptions(MutableDataHolder options) {
+        }
+
+        @Override
+        public void extend(HtmlRenderer.Builder rendererBuilder, String rendererType) {
+            rendererBuilder.attributeProviderFactory(new LineNumberIdProviderFactory());
+        }
+
+        public static HtmlRenderer.HtmlRendererExtension create() {
+            return new LineNumberIdExtension();
+        }
+    }
 }