diff --git a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java b/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java
index 0e78d5d5..5317d2b2 100644
--- a/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java
+++ b/app/src/main/java/ru/noties/markwon/MarkdownRenderer.java
@@ -74,6 +74,7 @@ public class MarkdownRenderer {
.syntaxHighlight(Prism4jSyntaxHighlight.create(prism4j, prism4jTheme))
.theme(SpannableTheme.builderWithDefaults(context)
.codeBackgroundColor(prism4jTheme.background())
+ .codeTextColor(prism4jTheme.textColor())
.build())
.build();
diff --git a/app/src/main/java/ru/noties/markwon/Themes.java b/app/src/main/java/ru/noties/markwon/Themes.java
index d6a9ae8b..1371f1a7 100644
--- a/app/src/main/java/ru/noties/markwon/Themes.java
+++ b/app/src/main/java/ru/noties/markwon/Themes.java
@@ -25,9 +25,9 @@ public class Themes {
// we have only 2 themes and Light one is default
final int theme;
if (dark) {
- theme = R.style.AppThemeBaseDark;
+ theme = R.style.AppThemeDark;
} else {
- theme = R.style.AppThemeBaseLight;
+ theme = R.style.AppThemeLight;
}
final Context appContext = context.getApplicationContext();
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c82a2b37..9dd0654f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,17 @@
+
#424242
#212121
#4caf50
+
+ #FFF
+ #dd000000
+
+ #FFF
+ #dd000000
+
+ #303030
+ #ddffffff
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d8703dd5..1da91be9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,7 +10,14 @@
- @drawable/ic_app_bar_theme_dark
-
-
+
+
+
diff --git a/build.gradle b/build.gradle
index be941d6f..08a49161 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,5 +51,5 @@ ext {
OK_HTTP = 'com.squareup.okhttp3:okhttp:3.9.0'
PRISM_4J = 'ru.noties:prism4j:1.0.0'
- PRISM_4J_BUNDLER = 'ru.noties:prism4j-bundler:1.0.0'
+ PRISM_4J_BUNDLER = 'ru.noties:prism4j-bundler:1.0.1'
}
diff --git a/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java b/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java
index 5d168a7a..3932bafc 100644
--- a/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java
+++ b/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jTheme.java
@@ -11,6 +11,9 @@ public interface Prism4jTheme {
@ColorInt
int background();
+ @ColorInt
+ int textColor();
+
void apply(
@NonNull String language,
@NonNull Prism4j.Syntax syntax,
diff --git a/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java b/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java
index ebb1bf2a..ff44d359 100644
--- a/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java
+++ b/library-syntax/src/main/java/ru/noties/markwon/syntax/Prism4jThemeDefault.java
@@ -67,4 +67,9 @@ public class Prism4jThemeDefault extends Prism4jThemeBase {
public int background() {
return 0xFFf5f2f0;
}
+
+ @Override
+ public int textColor() {
+ return 0xFF000000;
+ }
}