Merge branch 'master' into toggle-checkboxes-in-view-mode

nextcloud · Jan 2, 2020 · e815d6b · e815d6b
2 parents b55b04f + 8cee3a7
commit e815d6b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "it.niedermann.owncloud.notes"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 61
-        versionName "2.3.0"
+        versionCode 62
+        versionName "2.3.1"
 //        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {

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
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 
-import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 
 import com.yydcdut.rxmarkdown.RxMDConfiguration;
@@ -23,28 +22,23 @@ public class MarkDownUtil {
      * @return RxMDConfiguration
      */
     public static Builder getMarkDownConfiguration(Context context) {
-        return new RxMDConfiguration.Builder(context)
-                .setUnOrderListColor(ContextCompat.getColor(context, R.color.fg_default))
-                .setCodeBgColor(ContextCompat.getColor(context, R.color.fg_default_high))
-                .setHeader2RelativeSize(1.35f)
-                .setHeader3RelativeSize(1.25f)
-                .setHeader4RelativeSize(1.15f)
-                .setHeader5RelativeSize(1.1f)
-                .setHeader6RelativeSize(1.05f)
-                .setHorizontalRulesHeight(2)
-                .setLinkFontColor(ContextCompat.getColor(context, R.color.primary));
+        return getMarkDownConfiguration(context, Notes.getAppTheme(context));
     }
 
     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))
+                        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)
+                .setTodoColor(ResourcesCompat.getColor(context.getResources(),
+                        Notes.getAppTheme(context) ? R.color.widget_fg_dark_theme : R.color.widget_fg_default, null))
+                .setTodoDoneColor(ResourcesCompat.getColor(context.getResources(),
+                        Notes.getAppTheme(context) ? R.color.widget_fg_dark_theme : R.color.widget_fg_default, null))
                 .setLinkFontColor(ResourcesCompat.getColor(context.getResources(), R.color.primary, null));
     }
 }
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/5.png b/fastlane/metadata/android/de-DE/images/phoneScreenshots/5.png
diff --git a/fastlane/metadata/android/en-US/changelogs/62.txt b/fastlane/metadata/android/en-US/changelogs/62.txt
@@ -0,0 +1,4 @@
+- Enhance exception handling when pulling notes from server
+
+Requires at least Files app¹ version 3.9.0
+¹ https://github.com/nextcloud/android
diff --git a/fastlane/metadata/android/en-US/changelogs/63.txt b/fastlane/metadata/android/en-US/changelogs/63.txt
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png