[pull] master from gsantner:master

.github/workflows/build-android-project.yml

@@ -57,14 +57,14 @@ jobs:
 
     - name: "Artifacts: All"
       if: always()
-      uses: actions/upload-artifact@v2.2.1
+      uses: actions/upload-artifact@v4
       with:
         name: "all"
         path: dist
         retention-days: 5
 
     - name: "Artifacts: Android APK"
-      uses: actions/upload-artifact@v2.2.1
+      uses: actions/upload-artifact@v4
       with:
         name: "android-apk"
         path: |

CHANGELOG.md

@@ -1,5 +1,15 @@
 ### Recent changes
 - See [Discussions](https://github.com/gsantner/markor/discussions), [Issues](https://github.com/gsantner/markor/issues) and [Project news](https://github.com/gsantner/markor/blob/master/NEWS.md) to see what is going on.
+- New Updates also visible here: <https://github.com/gsantner/markor/releases>
+
+### v2.12 series
+- [2.12.0](https://github.com/gsantner/markor/compare/v2.11.1...v2.12.0)
+- [2.12.1](https://github.com/gsantner/markor/compare/v2.12.0...v2.12.1)
+- [2.12.2](https://github.com/gsantner/markor/compare/v2.12.1...v2.12.2)
+- [2.12.3](https://github.com/gsantner/markor/compare/v2.12.2...v2.12.3)
+- [2.12.4](https://github.com/gsantner/markor/compare/v2.12.3...v2.12.4)
+- [2.12.5](https://github.com/gsantner/markor/compare/v2.12.4...v2.12.5)
+- [2.12.6](https://github.com/gsantner/markor/compare/v2.12.5...v2.12.6)
 
 ### v2.11 ([Details](https://github.com/gsantner/markor/blob/master/NEWS.md#markor-v211---asciidoc-csv-and-org-mode-todotxt-advanced-search-line-numbers))
 - Reworked attachments (PR #2106 by @harshad1)

CONTRIBUTORS.md

@@ -30,7 +30,7 @@ Where:
 * **[Kanthi Subramanian](https://github.com/subkanthi)**<br/>~° File Info Dialog
 * **[Emanuele Petriglia](https://github.com/ema-pe)**<br/>~° Italian translation
 * **[Tiago Danin](https://tiagodanin.github.io)**<br/>~° Brazilian Portuguese translation
-* **[Jesica Chu](https://github.com/jesicachu)**<br/>~° Spanish and Traiditonal Chinese translation
+* **[Jesica Chu](https://github.com/jesicachu)**<br/>~° Spanish and Traditional Chinese translation
 * **[Ankush S Shetkar](https://www.linkedin.com/in/livelycoder/)**<br/>~° Added Chrome custom tabs for urls
 * **[Lars Pontoppidan](https://github.com/larpon)**<br/>~° Danish translation
 * **[Amaya Lim](https://github.com/nightrainlily)**<br/>~° Improved project description
@@ -42,7 +42,7 @@ Where:
 * **[Vladislav Glinsky](https://github.com/cl0ne)**<br/>~° Ukrainian/Russian translations
 * **[David Hebbeker](https://david.hebbeker.info/)**<br/>~° Added tooltips for text actions
 * **[Harshad Srinivasan](https://github.com/harshad1)**<br/>~° Added functionality to handle leading spaces in lists
-* **[Niels](https://stackoverflow.com/users/432115/niels)**<br/>~° Added encryption for textfile contents
+* **[Niels](https://stackoverflow.com/users/432115/niels)**<br/>~° Added encryption for text file contents
 * **[Helguli](https://github.com/Helguli)**<br/>~° Added fast scroll to editor
 * **[Patricia Heimfarth](https://github.com/PatriciaHeimfarth)**<br/>~° Added checkbox for todo completion date
 * **[Peter Schwede](https://github.com/pschwede)**<br/>~° Added Zim-Wiki support
@@ -52,4 +52,5 @@ Where:
 * **[Li Guanglin](https://github.com/guanglinn)**<br/>~° Added line numbers support
 * **[bigger124](https://github.com/bigger124)**<br>~° Added OrgMode-Support
 * **[Ayowel](https://github.com/ayowel)**<br>~° Mermaid update
+* **[Matthew White](https://github.com/mehw)**<br>~° Zim-Wiki link/attachment conformance
 * **[Markus Paintner](https://github.com/goli4thus)**<br/>~° Added duplicate lines action

NEWS.md

@@ -30,7 +30,6 @@ If you have questions or found an issue please head to the [Markor project](http
 * [**FAQ**](README.md#FAQ)
   * [File browser, file management](README.md#file-browser--file-management)
   * [Format: Markdown](README.md#format-markdown)
-  * [Format: Markdown](README.md#format-markdown)
   * [Format: todo.txt](README.md#format-todotxt)
 * [**More**](doc)
   * [Synced plaintext TODO and notes - Vim / Vimwiki, Markor Android, Syncthing, GTD (Pitt)](doc/2020-09-26-vimwiki-sync-plaintext-to-do-and-notes-todotxt-markdown.md#readme)

README.md

@@ -87,7 +87,6 @@ There is no dedicated view mode implemented.
 * [**FAQ**](README.md#FAQ)
   * [File browser, file management](README.md#file-browser--file-management)
   * [Format: Markdown](README.md#format-markdown)
-  * [Format: Markdown](README.md#format-markdown)
   * [Format: todo.txt](README.md#format-todotxt)
 * [**More**](doc)
   * [Synced plaintext TODO and notes - Vim / Vimwiki, Markor Android, Syncthing, GTD (Pitt)](doc/2020-09-26-vimwiki-sync-plaintext-to-do-and-notes-todotxt-markdown.md)
@@ -256,7 +255,8 @@ Todo.txt is a simple text format for todo. Each line of text is a task. The idea
 | [User Documentation](https://github.com/todotxt/todo.txt-cli/wiki/User-Documentation) | User documentation   |
 
 
-![todotxt](doc/assets/todotxt-format.png)
+![todotxt](doc/assets/todotxt-format-dark.png#gh-dark-mode-only)
+![todotxt](doc/assets/todotxt-format.png#gh-light-mode-only)
 
 #### How to mark a task done?
 Done tasks are marked by a `x ` in begining of the line and can optionally be moved to a done/archive file.

app/build.gradle

@@ -13,7 +13,7 @@ if (enable_plugin_kotlin) {
     apply plugin: 'kotlin-kapt'
 }
 
-rootProject.ext.version_minSdk = 16
+rootProject.ext.version_minSdk = 18
 
 // https://github.com/vsch/flexmark-java/releases
 ext.version_library_flexmark = "0.42.14"
@@ -25,8 +25,8 @@ android {
     defaultConfig {
         resValue "string", "manifest_package_id", "net.gsantner.markor"
         applicationId "net.gsantner.markor"
-        versionName "2.12.3"
-        versionCode 152
+        versionName "2.12.5"
+        versionCode 154
 
         multiDexEnabled true
         minSdkVersion rootProject.ext.version_minSdk
@@ -138,11 +138,11 @@ dependencies {
 
 
     // UI libs
-    implementation 'com.pixplicity.generate:library:1.1.8'
+    implementation 'com.github.Pixplicity:gene-rate:v1.1.8'
     implementation 'com.github.AppIntro:AppIntro:6.2.0'
-    implementation 'com.kailashdabhi:om-recorder:1.1.5'
+    implementation 'com.github.kailash09dabhi:OmRecorder:1.1.5'
     implementation 'com.github.mertakdut:EpubParser:1.0.95'
-    implementation project(':app:thirdparty-lib-src:QuadFlask-colorpicker')
+    implementation 'com.github.martin-stone:hsv-alpha-color-picker-android:3.1.0'
 
     // Tool libraries
     //noinspection AnnotationProcessorOnCompilePath

app/src/main/AndroidManifest.xml

@@ -62,7 +62,7 @@
             android:name=".activity.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
-            android:launchMode="singleInstance"
+            android:launchMode="singleTask"
             android:taskAffinity=".activity.MainActivity"
             android:windowSoftInputMode="stateUnchanged|adjustResize">
             <intent-filter>
@@ -110,6 +110,22 @@
             android:name="other.writeily.widget.WrFilesWidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
+        <receiver
+            android:name=".widget.TodoWidgetProvider"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/todo_widget" />
+        </receiver>
+
+        <service
+            android:name=".widget.TodoWidgetService"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
@@ -167,7 +183,7 @@
         </activity>
         <activity
             android:name=".activity.openeditor.OpenFromShortcutOrWidgetActivity"
-            android:launchMode="singleTop"
+            android:launchMode="standard"
             android:theme="@android:style/Theme.NoDisplay" />
         <activity
             android:name=".activity.DocumentActivity"

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

@@ -35,6 +35,7 @@
 import net.gsantner.markor.format.plaintext.PlaintextActionButtons;
 import net.gsantner.markor.format.todotxt.TodoTxtActionButtons;
 import net.gsantner.markor.format.wikitext.WikitextActionButtons;
+import net.gsantner.markor.format.orgmode.OrgmodeActionButtons;
 import net.gsantner.opoc.util.GsCollectionUtils;
 
 import java.util.ArrayList;
@@ -133,6 +134,8 @@ private void extractActionData() {
             _textActions = new WikitextActionButtons(this, null);
         } else if (documentType == R.string.pref_key__asciidoc__reorder_actions) {
             _textActions = new AsciidocActionButtons(this, null);
+        } else if (documentType == R.string.pref_key__orgmode__reorder_actions) {
+            _textActions = new OrgmodeActionButtons(this, null);
         } else { // Default to Plaintext
             _textActions = new PlaintextActionButtons(this, null);
         }

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

@@ -37,18 +37,24 @@
 import net.gsantner.opoc.util.GsFileUtils;
 
 import java.io.File;
+import java.util.Stack;
 
 import other.so.AndroidBug5497Workaround;
 
 public class DocumentActivity extends MarkorBaseActivity {
-    public static final String EXTRA_DO_PREVIEW = "EXTRA_DO_PREVIEW";
 
     private Toolbar _toolbar;
-
     private FragmentManager _fragManager;
 
     private static boolean nextLaunchTransparentBg = false;
 
+    public static void launch(final Activity activity, final Intent intent) {
+        final File file = MarkorContextUtils.getIntentFile(intent, null);
+        final Integer lineNumber = intent.hasExtra(Document.EXTRA_FILE_LINE_NUMBER) ? intent.getIntExtra(Document.EXTRA_FILE_LINE_NUMBER, -1) : null;
+        final Boolean doPreview = intent.hasExtra(Document.EXTRA_DO_PREVIEW) ? intent.getBooleanExtra(Document.EXTRA_DO_PREVIEW, false) : null;
+        launch(activity, file, doPreview, lineNumber);
+    }
+
     public static void launch(
             final Activity activity,
             final File file,
@@ -84,25 +90,27 @@ private static void launch(
         final Intent intent;
         if (GsFileBrowserListAdapter.isVirtualFolder(file) || file.isDirectory()) {
             intent = new Intent(activity, MainActivity.class);
+            intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
         } else {
             intent = new Intent(activity, DocumentActivity.class);
-        }
 
-        intent.putExtra(Document.EXTRA_FILE, file);
+            if (!(activity instanceof DocumentActivity) &&
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
+                as.isMultiWindowEnabled()
+            ) {
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+            }
 
-        if (lineNumber != null && lineNumber >= 0) {
-            intent.putExtra(Document.EXTRA_FILE_LINE_NUMBER, lineNumber);
-        }
+            if (lineNumber != null) {
+                intent.putExtra(Document.EXTRA_FILE_LINE_NUMBER, lineNumber);
+            }
 
-        if (doPreview != null) {
-            intent.putExtra(DocumentActivity.EXTRA_DO_PREVIEW, doPreview);
+            if (doPreview != null) {
+                intent.putExtra(Document.EXTRA_DO_PREVIEW, doPreview);
+            }
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && as.isMultiWindowEnabled()) {
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-        } else {
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        }
+        intent.putExtra(Document.EXTRA_FILE, file);
 
         nextLaunchTransparentBg = (activity instanceof MainActivity);
         GsContextUtils.instance.animateToActivity(activity, intent, false, null);
@@ -190,7 +198,7 @@ private void handleLaunchingIntent(final Intent intent) {
             final Document doc = new Document(file);
             Integer startLine = null;
             if (intent.hasExtra(Document.EXTRA_FILE_LINE_NUMBER)) {
-                startLine = intent.getIntExtra(Document.EXTRA_FILE_LINE_NUMBER, -1);
+                startLine = intent.getIntExtra(Document.EXTRA_FILE_LINE_NUMBER, Document.EXTRA_FILE_LINE_NUMBER_LAST);
             } else if (intentData != null) {
                 final String line = intentData.getQueryParameter("line");
                 if (line != null) {
@@ -203,7 +211,7 @@ private void handleLaunchingIntent(final Intent intent) {
             if (startLine != null) {
                 // If a line is requested, open in edit mode so the line is shown
                 startInPreview = false;
-            } else if (intent.getBooleanExtra(EXTRA_DO_PREVIEW, false) || file.getName().startsWith("index.")) {
+            } else if (intent.getBooleanExtra(Document.EXTRA_DO_PREVIEW, false) || file.getName().startsWith("index.")) {
                 startInPreview = true;
             }
 
@@ -272,11 +280,11 @@ public void setDocumentTitle(final String title) {
     }
 
     public void showTextEditor(final Document document, final Integer lineNumber, final Boolean startPreview) {
-        final GsFragmentBase currentFragment = getCurrentVisibleFragment();
+        final GsFragmentBase<?, ?> currentFragment = getCurrentVisibleFragment();
 
         final boolean sameDocumentRequested = (
                 currentFragment instanceof DocumentEditAndViewFragment &&
-                        document.getPath().equals(((DocumentEditAndViewFragment) currentFragment).getDocument().getPath()));
+                        document.path.equals(((DocumentEditAndViewFragment) currentFragment).getDocument().path));
 
         if (!sameDocumentRequested) {
             showFragment(DocumentEditAndViewFragment.newInstance(document, lineNumber, startPreview));
@@ -297,21 +305,15 @@ protected void onResume() {
     @Override
     @SuppressWarnings("StatementWithEmptyBody")
     public void onBackPressed() {
-        FragmentManager fragMgr = getSupportFragmentManager();
-        GsFragmentBase top = getCurrentVisibleFragment();
-        if (top != null) {
-            if (!top.onBackPressed()) {
-                if (fragMgr.getBackStackEntryCount() == 1) {
-                    // Back action was not handled by fragment, handle in activity
-                } else if (fragMgr.getBackStackEntryCount() > 0) {
-                    // Back action was to go one fragment back
-                    fragMgr.popBackStack();
-                    return;
-                }
-            } else {
-                // Was handled by child fragment
-                return;
-            }
+        final int entryCount = _fragManager.getBackStackEntryCount();
+        final GsFragmentBase<?, ?> top = getCurrentVisibleFragment();
+
+        // We pop the stack to go back to the previous fragment
+        // if the top fragment does not handle the back press
+        // Doesn't actually get called as we have 1 fragment in the stack
+        if (top != null && !top.onBackPressed() && entryCount > 1) {
+            _fragManager.popBackStack();
+            return;
         }
 
         // Handle in this activity
@@ -324,10 +326,10 @@ public void onBackPressed() {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        return super.onReceiveKeyPress(getCurrentVisibleFragment(), keyCode, event) ? true : super.onKeyDown(keyCode, event);
+        return super.onReceiveKeyPress(getCurrentVisibleFragment(), keyCode, event) || super.onKeyDown(keyCode, event);
     }
 
-    public GsFragmentBase showFragment(GsFragmentBase fragment) {
+    public GsFragmentBase<?, ?> showFragment(GsFragmentBase<?, ?> fragment) {
         if (fragment != getCurrentVisibleFragment()) {
             _fragManager.beginTransaction()
                     .replace(R.id.document__placeholder_fragment, fragment, fragment.getFragmentTag())
@@ -338,11 +340,11 @@ public GsFragmentBase showFragment(GsFragmentBase fragment) {
         return fragment;
     }
 
-    public synchronized GsFragmentBase getExistingFragment(final String fragmentTag) {
-        return (GsFragmentBase) getSupportFragmentManager().findFragmentByTag(fragmentTag);
+    public synchronized GsFragmentBase<?, ?> getExistingFragment(final String fragmentTag) {
+        return (GsFragmentBase<?, ?>) getSupportFragmentManager().findFragmentByTag(fragmentTag);
     }
 
-    private GsFragmentBase getCurrentVisibleFragment() {
-        return (GsFragmentBase) getSupportFragmentManager().findFragmentById(R.id.document__placeholder_fragment);
+    private GsFragmentBase<?, ?> getCurrentVisibleFragment() {
+        return (GsFragmentBase<?, ?>) getSupportFragmentManager().findFragmentById(R.id.document__placeholder_fragment);
     }
 }