Skip to content

Commit

Permalink
Top bar link opt
Browse files Browse the repository at this point in the history
  • Loading branch information
@harshad1
harshad1 committed May 26, 2024
1 parent 0e1c90e commit 0ca919d
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 98 deletions.
157 changes: 65 additions & 92 deletions app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,22 @@
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Pair;
import android.util.Patterns;
import android.util.TypedValue;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.EditText;
import android.widget.Toast;

import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentTransaction;
import androidx.preference.CheckBoxPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceGroup;

Expand All @@ -36,7 +39,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;
Expand Down Expand Up @@ -77,6 +79,8 @@ public static DocumentShareIntoFragment newInstance(final Intent intent) {

private File workingDir;

ShareIntoImportOptionsFragment _shareIntoImportOptionsFragment;

public DocumentShareIntoFragment() {
}

Expand All @@ -88,10 +92,9 @@ 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;
if (_savedInstanceState == null) {
FragmentTransaction t = getChildFragmentManager().beginTransaction();
_shareIntoImportOptionsFragment = new ShareIntoImportOptionsFragment();
Expand All @@ -102,37 +105,43 @@ public void onViewCreated(final @NonNull View view, final Bundle savedInstanceSt
}

if (_shareIntoImportOptionsFragment != null) {
_shareIntoImportOptionsFragment.setEditor(_hlEditor);
_shareIntoImportOptionsFragment.setEditor(hlEditor);
}

_hlEditor.setTextSize(TypedValue.COMPLEX_UNIT_SP, _appSettings.getFontSize());
_hlEditor.setTypeface(Typeface.create(_appSettings.getFontFamily(), Typeface.NORMAL));
_hlEditor.setHighlighter(new PlaintextSyntaxHighlighter(_appSettings));
_hlEditor.setHighlightingEnabled(true);
_hlEditor.setText(sharedText);
hlEditor.setTextSize(TypedValue.COMPLEX_UNIT_SP, _appSettings.getFontSize());
hlEditor.setTypeface(Typeface.create(_appSettings.getFontFamily(), Typeface.NORMAL));
hlEditor.setHighlighter(new PlaintextSyntaxHighlighter(_appSettings));
hlEditor.setHighlightingEnabled(true);
hlEditor.setText(sharedText);

if (sharedText.isEmpty()) {
_hlEditor.requestFocus();
hlEditor.requestFocus();
}
}

@Override
public String getFragmentTag() {
return FRAGMENT_TAG;
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
super.onCreateOptionsMenu(menu, inflater);
inflater.inflate(R.menu.document__share__menu, menu);
_cu.tintMenuItems(menu, true, Color.WHITE);
_shareIntoImportOptionsFragment.setInsertLinkMenuItem(menu.findItem(R.id.action_insert_link));
}

@Override
public boolean onBackPressed() {
return false;
public String getFragmentTag() {
return FRAGMENT_TAG;
}


// Must be public to be inflated from XML
public static class ShareIntoImportOptionsFragment extends GsPreferenceFragmentBase<AppSettings> {
public static final String TAG = "ShareIntoImportOptionsFragment";
private File workingDir;

private EditText _editor = null;

private MenuItem _insertLinkMenu = null;

@Override
public boolean isDividerVisible() {
return true;
Expand All @@ -146,6 +155,25 @@ public void setEditor(final EditText editor) {
_editor = editor;
}

public void setInsertLinkMenuItem(final MenuItem mi) {
_insertLinkMenu = mi;

if (_editor != null && _insertLinkMenu != null) {

_editor.addTextChangedListener(GsTextWatcherAdapter.on(
(ctext, arg2, arg3, arg4) -> _insertLinkMenu.setVisible(hasLinks(ctext))));

_insertLinkMenu.setVisible(ShareIntoImportOptionsFragment.hasLinks(_editor.getText()));

_insertLinkMenu.setOnMenuItemClickListener(item -> {
final boolean isChecked = !_insertLinkMenu.isChecked();
_insertLinkMenu.setChecked(isChecked);
_insertLinkMenu.getIcon().mutate().setAlpha(isChecked ? 255 : 40);
return true;
});
}
}

@Override
public int getPreferenceResourceForInflation() {
return R.xml.prefactions_share_into;
Expand All @@ -165,44 +193,6 @@ protected AppSettings getAppSettings(Context context) {
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))));
}
}
}

private boolean shareAsLink() {
final CheckBoxPreference asLinkPref = (CheckBoxPreference) findPreference(R.string.pref_key__attach_as_link);
return asLinkPref != null && asLinkPref.isVisible() && asLinkPref.isEnabled() && asLinkPref.isChecked();
}

private void appendToExistingDocumentAndClose(final File file, final boolean showEditor) {
final Activity context = getActivity();
final Document document = new Document(file);
final int format = _appSettings.getDocumentFormat(document.getPath(), document.getFormat());
final String formatted = getFormatted(shareAsLink(), file, format);

final String oldContent = document.loadContent(context);
if (oldContent != null) {
final String nline = oldContent.endsWith("\n") ? "" : "\n";
final String newContent = oldContent + nline + formatted;
document.saveContent(context, newContent);
} else {
Toast.makeText(context, R.string.error_could_not_open_file, Toast.LENGTH_LONG).show();
}

_appSettings.addRecentFile(file);
if (showEditor) {
showInDocumentActivity(document);
} else {
context.finish();
}
}

private static Pair<String, File> getLinePath(final CharSequence line) {
Expand Down Expand Up @@ -244,48 +234,31 @@ 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;
}
private boolean shareAsLink() {
return _insertLinkMenu != null && _insertLinkMenu.isVisible() && _insertLinkMenu.isChecked();
}

// 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) {
}
}
private void appendToExistingDocumentAndClose(final File file, final boolean showEditor) {
final Activity context = getActivity();
final Document document = new Document(file);
final int format = _appSettings.getDocumentFormat(document.getPath(), document.getFormat());
final String formatted = getFormatted(shareAsLink(), file, format);

return true;
});
final String oldContent = document.loadContent(context);
if (oldContent != null) {
final String nline = oldContent.endsWith("\n") ? "" : "\n";
final String newContent = oldContent + nline + formatted;
document.saveContent(context, newContent);
} else {
Toast.makeText(context, R.string.error_could_not_open_file, Toast.LENGTH_LONG).show();
}

return links;
_appSettings.addRecentFile(file);
if (showEditor) {
showInDocumentActivity(document);
} else {
context.finish();
}
}

public static String getLinkTitle(final String link) {
Expand Down
21 changes: 21 additions & 0 deletions app/src/main/res/menu/document__share__menu.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?><!--
/*#######################################################
*
* Maintained 2017-2024 by Gregor Santner <gsantner AT mailbox DOT org>
* License of this file: Apache 2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
#########################################################*/
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="AlwaysShowAction">

<item
android:id="@+id/action_insert_link"
android:icon="@drawable/ic_link_black_24dp"
android:title="@string/insert_link"
app:showAsAction="always"
android:visible="false"/>
</menu>
6 changes: 0 additions & 6 deletions app/src/main/res/xml/prefactions_share_into.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@
android:key="@string/pref_key__share_into__calendar_event"
android:title="@string/calendar" />

<CheckBoxPreference
android:checked="true"
android:icon="@drawable/ic_link_black_24dp"
android:key="@string/pref_key__attach_as_link"
android:title="@string/insert_link" />

<PreferenceCategory android:title="@string/file_browser" />

<Preference
Expand Down

0 comments on commit 0ca919d

Please sign in to comment.