Improve code injection dialog

.gitignore

@@ -99,6 +99,8 @@ app/src/main/res/raw/readme.*
 app/src/main/res/raw/contributors.*
 app/flavor*
 
+cm-editor/node_modules/
+
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
 

app/build.gradle

@@ -125,7 +125,10 @@ dependencies {
     implementation "com.vladsch.flexmark:flexmark-ext-typographic:${version_library_flexmark}"
     implementation "com.vladsch.flexmark:flexmark-ext-admonition:${version_library_flexmark}"
 
-    // csv support
+    // Source: https://mvnrepository.com/artifact/org.apache.commons/commons-text
+    implementation 'org.apache.commons:commons-text:1.15.0'
+
+    // CSV support
     // https://opencsv.sourceforge.net/licenses.html License: Apache2
     // opencsv 3.10 was the last java-6 version
     // opencsv 5.7.1' for java-8 may have dependencies that are not backward compatibility with android-4.1

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

@@ -603,7 +603,7 @@ public void onFsViewerConfig(GsFileBrowserOptions.Options dopt) {
             }
             case R.id.action_info: {
                 if (saveDocument(false)) { // In order to have the correct info displayed
-                    FileInfoDialog.show(_document.file, getParentFragmentManager());
+                    FileInfoDialog.show(_document.file, getParentFragmentManager(), null);
                 }
                 return true;
             }

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

@@ -57,6 +57,7 @@
 
 public class MainActivity extends MarkorBaseActivity implements GsFileBrowserFragment.FilesystemFragmentOptionsListener {
 
+    public static final int REQUEST_CODE_SETTINGS = 124;
     public static boolean IS_DEBUG_ENABLED = false;
 
     private BottomNavigationView _bottomNav;
@@ -259,7 +260,7 @@ private void optShowRate() {
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
         super.onOptionsItemSelected(item);
         if (item.getItemId() == R.id.action_settings) {
-            _cu.animateToActivity(this, SettingsActivity.class, false, null);
+            _cu.animateToActivity(this, SettingsActivity.class, false, REQUEST_CODE_SETTINGS);
             return true;
         }
         return false;
@@ -372,6 +373,10 @@ private void newItemCallback(final File file) {
 
     @Override
     public void onBackPressed() {
+        if (getNotebook().clearSelection()) {
+            return;
+        }
+
         // Check if fragment handled back press
         final GsFragmentBase<?, ?> frag = getPosFragment(getCurrentPos());
         if (frag == null || !frag.onBackPressed()) {
@@ -585,6 +590,14 @@ protected void onStop() {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         _cu.extractResultFromActivityResult(this, requestCode, resultCode, data);
+
+        if (requestCode == REQUEST_CODE_SETTINGS) {
+            if (resultCode == SettingsActivity.RESULT.CHANGED) {
+                if (data != null && data.hasExtra(SettingsActivity.INTENT_NAME_THEME_CHANGED)) {
+                    recreate();
+                }
+            }
+        }
     }
 
     @Override

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

@@ -14,6 +14,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.widget.Toast;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
@@ -54,7 +55,7 @@ public boolean isDividerVisible() {
     }
 
     @Override
-    @SuppressWarnings({"ConstantConditions", "ConstantIfStatement", "StatementWithEmptyBody"})
+    @SuppressWarnings({"ConstantConditions", "ConstantIfStatement"})
     public Boolean onPreferenceClicked(Preference preference, String key, int keyResId) {
         Activity activity = getActivity();
         if (isAdded() && preference.hasKey()) {
@@ -64,7 +65,7 @@ public Boolean onPreferenceClicked(Preference preference, String key, int keyRes
                     return true;
                 }
                 case R.string.pref_key__more_info__settings: {
-                    _cu.animateToActivity(activity, SettingsActivity.class, false, 124);
+                    _cu.animateToActivity(activity, SettingsActivity.class, false, MainActivity.REQUEST_CODE_SETTINGS);
                     return true;
                 }
                 case R.string.pref_key__more_info__rate_app: {
@@ -119,12 +120,12 @@ public Boolean onPreferenceClicked(Preference preference, String key, int keyRes
                 }
                 case R.string.pref_key__more_info__copy_build_information: {
                     _cu.setClipboard(getContext(), preference.getSummary());
+                    Toast.makeText(activity, R.string.copied, Toast.LENGTH_SHORT).show();
                     GsSimpleMarkdownParser smp = new GsSimpleMarkdownParser();
                     try {
                         String html = smp.parse(getResources().openRawResource(R.raw.changelog), "", GsSimpleMarkdownParser.FILTER_ANDROID_TEXTVIEW).getHtml();
                         _cu.showDialogWithHtmlTextView(getActivity(), R.string.changelog, html);
-                    } catch (Exception ex) {
-
+                    } catch (Exception ignored) {
                     }
                     return true;
                 }

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

@@ -12,14 +12,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.widget.Toast;
 
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.Preference;
@@ -29,6 +30,7 @@
 import com.rarepebble.colorpicker.ColorPreference;
 
 import net.gsantner.markor.R;
+import net.gsantner.markor.frontend.AdvancedEditTextPreference;
 import net.gsantner.markor.frontend.MarkorDialogFactory;
 import net.gsantner.markor.frontend.filebrowser.MarkorFileBrowserFactory;
 import net.gsantner.markor.model.AppSettings;
@@ -51,13 +53,16 @@ public class SettingsActivity extends MarkorBaseActivity {
 
     @SuppressWarnings("WeakerAccess")
     public static class RESULT {
-        public static final int NOCHANGE = -1;
+        public static final int NO_CHANGE = -1;
         public static final int CHANGED = 1;
         public static final int RESTART_REQ = 2;
     }
 
-    public static int activityRetVal = RESULT.NOCHANGE;
-    private static int iconColor = Color.WHITE;
+    public static int activityRetVal = RESULT.NO_CHANGE;
+
+    // To fix cannot go back previous screen when theme is changed
+    private boolean themeChanged = false;
+    public static final String INTENT_NAME_THEME_CHANGED = "theme_changed";
 
     protected Toolbar toolbar;
 
@@ -72,10 +77,9 @@ public void onCreate(Bundle b) {
 
         // Custom code
         GsFontPreferenceCompat.additionalyCheckedFolder = new File(_appSettings.getNotebookDirectory(), ".app/fonts");
-        iconColor = _cu.rcolor(this, R.color.primary_text);
         toolbar.setTitle(R.string.settings);
         setSupportActionBar(findViewById(R.id.toolbar));
-        toolbar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_white_24dp));
+        toolbar.setNavigationIcon(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_arrow_back_white_24dp, getTheme()));
         toolbar.setNavigationOnClickListener(view -> SettingsActivity.this.onBackPressed());
         showFragment(SettingsFragmentMaster.TAG, false);
     }
@@ -119,7 +123,6 @@ protected void onPreferenceChanged(SharedPreferences prefs, String key) {
         }
 
         @Override
-        @SuppressWarnings("rawtypes")
         protected void onPreferenceScreenChanged(PreferenceFragmentCompat preferenceFragmentCompat, PreferenceScreen preferenceScreen) {
             super.onPreferenceScreenChanged(preferenceFragmentCompat, preferenceScreen);
             final CharSequence title = preferenceScreen.getTitle();
@@ -137,12 +140,30 @@ public void onBackPressed() {
             prefFrag.goBack();
             return;
         }
-        super.onBackPressed();
+
+        if (themeChanged) {
+            Intent resultIntent = new Intent();
+            resultIntent.putExtra(INTENT_NAME_THEME_CHANGED, true);
+            setResult(RESULT.CHANGED, resultIntent);
+            finish();
+        } else {
+            super.onBackPressed();
+        }
     }
 
     public static class SettingsFragmentMaster extends MarkorSettingsFragment {
         public static final String TAG = "SettingsFragmentMaster";
 
+        @Override
+        public void onDisplayPreferenceDialog(Preference preference) {
+            FragmentActivity activity = getActivity();
+            if (preference instanceof AdvancedEditTextPreference && activity != null) {
+                ((AdvancedEditTextPreference) preference).createDialog(activity).show();
+            } else {
+                super.onDisplayPreferenceDialog(preference);
+            }
+        }
+
         @Override
         public int getPreferenceResourceForInflation() {
             return R.xml.preferences_master;
@@ -174,7 +195,7 @@ public void doUpdatePreferences() {
             updateSummary(R.string.pref_key__snippet_directory_path, _appSettings.getSnippetsDirectory().getAbsolutePath());
 
             final String fileDescFormat = _appSettings.getString(R.string.pref_key__file_description_format, "");
-            if (fileDescFormat.equals("")) {
+            if (fileDescFormat.isEmpty()) {
                 updateSummary(R.string.pref_key__file_description_format, getString(R.string.default_));
             } else {
                 updateSummary(R.string.pref_key__file_description_format, fileDescFormat);
@@ -216,9 +237,8 @@ protected void onPreferenceChanged(final SharedPreferences prefs, final String k
                 _appSettings.setRecreateMainRequired(true);
             } else if (eq(key, R.string.pref_key__app_theme)) {
                 _appSettings.applyAppTheme();
-                _appSettings.setRecreateMainRequired(true);
-                if (getActivity() != null) {
-                    getActivity().recreate();
+                if (getActivity() instanceof SettingsActivity) {
+                    ((SettingsActivity) getActivity()).themeChanged = true;
                 }
             } else if (eq(key, R.string.pref_key__theming_hide_system_statusbar)) {
                 activityRetVal = RESULT.RESTART_REQ;
@@ -246,7 +266,7 @@ protected void onPreferenceChanged(final SharedPreferences prefs, final String k
         }
 
         @Override
-        @SuppressWarnings({"ConstantConditions", "ConstantIfStatement", "StatementWithEmptyBody"})
+        @SuppressWarnings({"ConstantConditions", "ConstantIfStatement"})
         public Boolean onPreferenceClicked(Preference preference, String key, int keyResId) {
             final FragmentManager fragManager = getActivity().getSupportFragmentManager();
             switch (keyResId) {
@@ -376,11 +396,11 @@ public void onFsViewerConfig(GsFileBrowserOptions.Options dopt) {
                     break;
                 }
                 case R.string.pref_key__backup_settings: {
-                    BackupUtils.showBackupWriteToDialog(getContext(), getFragmentManager());
+                    BackupUtils.showBackupWriteToDialog(getContext(), getParentFragmentManager());
                     break;
                 }
                 case R.string.pref_key__restore_settings: {
-                    BackupUtils.showBackupSelectFromDialog(getContext(), getFragmentManager());
+                    BackupUtils.showBackupSelectFromDialog(getContext(), getParentFragmentManager());
                     break;
                 }
             }

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

@@ -0,0 +1,96 @@
+package net.gsantner.markor.frontend;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Point;
+import android.util.AttributeSet;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.DialogPreference;
+
+import net.gsantner.markor.R;
+import net.gsantner.markor.frontend.textview.CodeMirrorEditor;
+import net.gsantner.opoc.util.GsContextUtils;
+
+public class AdvancedEditTextPreference extends DialogPreference {
+
+    private String defaultValue;
+    private CodeMirrorEditor editText;
+    private boolean initialized;
+
+    public AdvancedEditTextPreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init();
+    }
+
+    public AdvancedEditTextPreference(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    public AdvancedEditTextPreference(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public AdvancedEditTextPreference(@NonNull Context context) {
+        super(context);
+        init();
+    }
+
+    private void init() {
+        if (!initialized) {
+            setDialogLayoutResource(R.layout.edit_text_preference);
+            initialized = true;
+        }
+    }
+
+    @Nullable
+    @Override
+    protected Object onGetDefaultValue(@NonNull TypedArray a, int index) {
+        defaultValue = a.getString(index);
+        if (defaultValue == null) {
+            defaultValue = "";
+        } else {
+            // Prettify indentation with 2 spaces
+            defaultValue = defaultValue.replaceAll("\n ", "\n  ").replaceAll("\t", "  ");
+        }
+        return defaultValue;
+    }
+
+    public AlertDialog createDialog(FragmentActivity activity) {
+        View view = activity.getLayoutInflater().inflate(R.layout.edit_text_preference, null);
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        activity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        Point size = GsContextUtils.calculateDialogSize(displayMetrics, 0.95f, 1040, 0.52f, 1900);
+        view.setMinimumWidth(size.x);
+        view.setMinimumHeight(size.y);
+
+        editText = view.findViewById(R.id.editor);
+        editText.setOnPreparedListener(() -> {
+            editText.resetText(getPersistedString(defaultValue));
+            editText.requestFocusFromTouch();
+            editText.focus();
+        });
+
+        TextView textView = view.findViewById(R.id.title);
+        textView.setText(getTitle());
+        view.findViewById(R.id.undo).setOnClickListener(v -> editText.undo());
+        view.findViewById(R.id.redo).setOnClickListener(v -> editText.redo());
+        view.findViewById(R.id.reset).setOnClickListener(v -> editText.setText(defaultValue));
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+        builder.setView(view);
+        builder.setPositiveButton(activity.getString(R.string.save),
+                (dialog, which) -> editText.getText(this::persistString));
+        builder.setNegativeButton(activity.getString(R.string.cancel), null);
+
+        return builder.create();
+    }
+}