Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-notes.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
authorDaniel Bailey <daniel.bailey@grappleIT.co.uk>2019-01-19 19:59:33 +0300
committerNiedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com>2019-02-06 22:38:55 +0300
commite3d4e87d3c4ab34e6ccd5acb4a6734d66db0fe85 (patch)
tree63bfb6d25c40eb8acb0dc798ccf23850d1729184 /app/src
parentc20e49d50a33d4c86bb5d46717bb5666f2213c59 (diff)
Markdown util needs to hardcode unordered list colour.
getMarkdownConfiguration will set unordered list colour depending on whether or not dark theme is enabled.
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/SingleNoteWidgetFactory.java9
-rw-r--r--app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java13
2 files changed, 17 insertions, 5 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/SingleNoteWidgetFactory.java b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/SingleNoteWidgetFactory.java
index acdec408..9841d48c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/SingleNoteWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/SingleNoteWidgetFactory.java
@@ -34,14 +34,13 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
SingleNoteWidgetFactory(Context context, Intent intent) {
this.context = context;
- markdownProcessor = new MarkdownProcessor(this.context);
- markdownProcessor.factory(TextFactory.create());
- markdownProcessor.config(MarkDownUtil.getMarkDownConfiguration(this.context).build());
appWidgetId = intent.getIntExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,
- AppWidgetManager.INVALID_APPWIDGET_ID);
-
+ AppWidgetManager.INVALID_APPWIDGET_ID);
sp = PreferenceManager.getDefaultSharedPreferences(this.context);
darkTheme = sp.getBoolean(SingleNoteWidget.DARK_THEME_KEY + appWidgetId, false);
+ markdownProcessor = new MarkdownProcessor(this.context);
+ markdownProcessor.factory(TextFactory.create());
+ markdownProcessor.config(MarkDownUtil.getMarkDownConfiguration(this.context, darkTheme).build());
}
@Override
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java
index 7d2c2c1c..b1f8ff82 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java
@@ -31,4 +31,17 @@ public class MarkDownUtil {
.setHorizontalRulesHeight(2)
.setLinkFontColor(ResourcesCompat.getColor(context.getResources(), R.color.primary, null));
}
+
+ public static Builder getMarkDownConfiguration(Context context, Boolean darkTheme) {
+ return new RxMDConfiguration.Builder(context)
+ .setUnOrderListColor(ResourcesCompat.getColor(context.getResources(),
+ darkTheme ? R.color.widget_fg_dark_theme : R.color.widget_fg_default, null))
+ .setHeader2RelativeSize(1.35f)
+ .setHeader3RelativeSize(1.25f)
+ .setHeader4RelativeSize(1.15f)
+ .setHeader5RelativeSize(1.1f)
+ .setHeader6RelativeSize(1.05f)
+ .setHorizontalRulesHeight(2)
+ .setLinkFontColor(ResourcesCompat.getColor(context.getResources(), R.color.primary, null));
+ }
}