Merge branch 'master' into auto_scroll_dialog

guanglinn · Jul 27, 2024 · ccb7df2 · ccb7df2
2 parents 6ee973a + 446d4f9
commit ccb7df2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ### 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)
 
 ### 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)

diff --git a/app/build.gradle b/app/build.gradle
@@ -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.4"
+        versionCode 153
 
         multiDexEnabled true
         minSdkVersion rootProject.ext.version_minSdk

diff --git a/app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java b/app/src/main/java/net/gsantner/markor/activity/DocumentShareIntoFragment.java
@@ -220,9 +220,9 @@ protected AppSettings getAppSettings(Context context) {
         @Override
         protected void afterOnCreate(Bundle savedInstances, Context context) {
             super.afterOnCreate(savedInstances, context);
-            doUpdatePreferences();
 
             if (_editor != null && _linkCheckBox != null) {
+                doUpdatePreferences();
                 _linkCheckBox.setVisibility(hasLinks(_editor.getText()) ? View.VISIBLE : View.GONE);
                 _linkCheckBox.setChecked(true);
                 _editor.addTextChangedListener(GsTextWatcherAdapter.on((ctext, arg2, arg3, arg4) ->

diff --git a/app/src/main/java/net/gsantner/markor/frontend/SearchAndReplaceTextDialog.java b/app/src/main/java/net/gsantner/markor/frontend/SearchAndReplaceTextDialog.java
@@ -201,6 +201,9 @@ public void afterTextChanged(Editable s) {
 
         builder.setView(viewRoot).setNegativeButton(R.string.cancel, null);
         dialog.set(builder.show());
+
+        //noinspection DataFlowIssue
+        dialog.get().getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
     }
 
     private void performReplace(final boolean replaceAll) {