diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-01-05 21:46:46 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-01-05 21:46:46 +0300 |
| commit | efa1a8f9cbf786b7c391dbbf07dd8aa78e0ccac4 (patch) | |
| tree | c4057a69238a41492cd1119d31378b5380c71a3b /app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote | |
| parent | 0fe4b5b4b101e6a303e9b9629d38dace6de2651f (diff) | |
| parent | 8fdbd61b683444df52bdc0e2209b2254013f8fc9 (diff) | |
Merge branch 'master' into 831-room
# Conflicts:
# app/build.gradle
# app/src/main/java/it/niedermann/owncloud/notes/FormattingHelpActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/branding/BrandingUtil.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/NoteEditFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/NotePreviewFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/edit/NoteReadonlyFragment.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessor.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/util/text/TextProcessor.java
# app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
# app/src/main/res/drawable/ic_format_bold_black_24dp.xml
# app/src/main/res/drawable/ic_format_italic_black_24dp.xml
# app/src/main/res/drawable/ic_insert_link_black_24dp.xml
# app/src/main/res/menu/context_based_formatting.xml
# app/src/main/res/menu/context_based_range_formatting.xml
# app/src/main/res/values/strings.xml
# app/src/test/java/it/niedermann/owncloud/notes/shared/util/MarkDownUtilTest.java
# app/src/test/java/it/niedermann/owncloud/notes/shared/util/text/NoteLinksProcessorTest.java
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote')
| -rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java index ea36d705..75afc57b 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java @@ -101,12 +101,12 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa if (darkModeActive) { note_content = new RemoteViews(context.getPackageName(), R.layout.widget_single_note_content_dark); note_content.setOnClickFillInIntent(R.id.single_note_content_tv_dark, fillInIntent); - note_content.setTextViewText(R.id.single_note_content_tv_dark, MarkdownUtil.renderForWidget(context, note.getContent())); + note_content.setTextViewText(R.id.single_note_content_tv_dark, MarkdownUtil.renderForRemoteView(context, note.getContent())); } else { note_content = new RemoteViews(context.getPackageName(), R.layout.widget_single_note_content); note_content.setOnClickFillInIntent(R.id.single_note_content_tv, fillInIntent); - note_content.setTextViewText(R.id.single_note_content_tv, MarkdownUtil.renderForWidget(context, note.getContent())); + note_content.setTextViewText(R.id.single_note_content_tv, MarkdownUtil.renderForRemoteView(context, note.getContent())); } return note_content; |