[pull] master from gsantner:master #219
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Caused by java.lang.NullPointerException: Attempt to invoke virtual method 'android.text.Editable android.widget.EditText.getText()' on a null object reference at net.gsantner.markor.activity.DocumentShareIntoFragment$ShareIntoImportOptionsFragment.doUpdatePreferences (DocumentShareIntoFragment.java:532) at net.gsantner.markor.activity.DocumentShareIntoFragment$ShareIntoImportOptionsFragment.afterOnCreate (DocumentShareIntoFragment.java:223) at net.gsantner.opoc.frontend.base.GsPreferenceFragmentBase.onCreatePreferences (GsPreferenceFragmentBase.java:162)
FAILURE: Build failed with an exception.
* What went wrong:
A problem was found with the configuration of task ':app:mapFlavorAtestDebugSourceSetPaths' (type 'MapSourceSetPathsTask').
- Gradle detected a problem with the following location: '/mnt/store/Dokumente/aaDev/markor/app/src/main/res'.
Reason: Task ':app:mapFlavorAtestDebugSourceSetPaths' uses this output of task ':copyRepoFiles' without declaring an explicit or implicit dependency. This can lead to incorrect results being produced, depending on what order the tasks are executed.
…2203 by @halfdane) * fixes #1428 by introducing a new color picker * Update preferences_master.xml * Restore preference --------- Co-authored-by: Gregor Santner <[email protected]>
* feat(font size dialog): add auto scroll for selection list * feat(special key dialog): add auto restore scroll for key list * feat(text actions bar): add auto restore scroll position * refactor: remove unnecessary font size in range 1 to 4 * refactor: minor improvements to padding of Markdown in view mode * refactor: minor improvements to padding of editor in edit mode
The format {{}} is for images, other types should use [[]] instead.
References:
- https://github.com/zim-desktop-wiki/zim-desktop-wiki/blob/c88cf3cb53896bf272e87704826b77e82eddb3ef/data/manual/Help/Wiki_Syntax.txt
Zim: Fix link/attachment path of file selection
While editing a wiki file, Zim adds links to a target residing inside
the Notebook (where notebook.zim file is found) resolving the path as
relative to the wiki file's attachment directory (same parent/name of
the wiki file, but without the extension). If a link's target is not
a child of the Notebook, Zim adds the link as an absolute path.
Zim always prefixes relative paths, adding './' if a link's target is
a child of a wiki file's attachment directory.
/home/user/Notebook # Notebook directory
| |
| `- notebook.zim # marks the root of the Notebook
| |
| `- wiki-example # wiki file's attachment directory
| | |
| | `- video.mkv # wiki-example.txt file attachment
| |
| `- wiki-example.txt # wiki file written in wiki markup
|
`- README # file outside the Notebook's root
In wiki-example.txt, [[./video.mkv]] would be a link to an attachment
residing in the 'wiki-example' directory. Linking notebook.zim would
add [[../notebook.zim]], and [[/home/user/README]] would be a link to
a file outside the Notebook.
Zim: Fix attachment path of imported image
Zim uses the path of the .txt wiki file for attachments, but without
the extension, i.e. wiki-text.txt would be connected to wiki-text as
attachment directory.
Zim: Fix attachment path of edit image
Zim local paths are relative to the current wiki file's attachment
directory. Properly resolve an attachment path to edit the image.
Zim: Fix file link conversion to markdown
Zim inserts file links relative to a wiki page's attachment directory,
if the target is a child of the Notebook. Adapt the conversion of Zim
wiki pages to markdown, translating Zim file links accordingly.
Zim: Fallback to the current directory as root
Assume the current directory as top link if root cannot be determined.
Zim: Interpret image link attributes
Zim may insert attributes, as html tags, in an image link: id, width,
height, type, href.
{{./image.png?href=.%2Fvideo.mkv&id=anchor-name&width=50}}
In markdown [](link) is close to the above, but without
the possibility to insert extra tags.
Zim: Enable audio recording/link button
Add logic to insert an audio recording/link.
Zim: Contribution for link/attachment fixes
Adding myself to CONTRIBUTORS.md
Co-authored-by: Gregor Santner <[email protected]>
…#2410) * Many fixes to navigation and go back * Cleanups to fragment handling * Tweaks to showing keyboard * Final tweaks to activity stacks * Removed unnecessary 'synchronized' calls for perf * Tweaks to highlighting * Reverted some highlighting changes * Fix template cursor start * Improvements to display of file browser dialog / fragment * Initial set of changes for async * Using canonical paths and and static members * Defensive logic for indices * Batching fixup for reduced computation * Switching back to start end as it made no difference * Tweaks to launching; file paths -> canonical * Fixed wikitext link formatting
) * This commit introduces the ability to change text case within the editor, addressing issue #2390. Users can now toggle case, switch case, capitalize words, and capitalize sentences directly from the Edit menu. * Added an example to the display text of each text case.
… overview in filemanager instead (PR #2440 by @gsantner) * Remove top menu submenu to open special folders, go to virtual storage directory folder instead * There all special folders/devices/lists are available too, and only needs to be maintained at one location then * this way less duplication of those options, and all of them are available outside mainactivity too
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )