Merge remote-tracking branch 'origin/master' into synchronize-on-wifi-only

# Conflicts:
#	app/src/main/res/values/strings.xml
#	app/src/main/res/xml/preferences.xml

8 files changed, 67 insertions, 31 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
index 9b781db6..20b4b254 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
@@ -5,14 +5,14 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 
 import java.util.Calendar;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.android.fragment.BaseNoteFragment;
 import it.niedermann.owncloud.notes.android.fragment.NoteEditFragment;
@@ -24,6 +24,8 @@ import it.niedermann.owncloud.notes.util.NoteUtil;
 
 public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragment.NoteFragmentListener {
 
+    private static final String INTENT_GOOGLE_ASSISTANT = "com.google.android.gm.action.AUTO_SEND";
+    private static final String MIMETYPE_TEXT_PLAIN = "text/plain";
     public static final String PARAM_NOTE_ID = "noteId";
     public static final String PARAM_CATEGORY = "category";
 
@@ -138,7 +140,11 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
         }
 
         String content = "";
-        if (Intent.ACTION_SEND.equals(intent.getAction()) && "text/plain".equals(intent.getType())) {
+        if (
+                MIMETYPE_TEXT_PLAIN.equals(intent.getType()) &&
+                        (Intent.ACTION_SEND.equals(intent.getAction()) ||
+                                INTENT_GOOGLE_ASSISTANT.equals(intent.getAction()))
+                ) {
             content = intent.getStringExtra(Intent.EXTRA_TEXT);
         }
 
@@ -199,7 +205,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
             actionBar.setTitle(note.getTitle());
-            if(!note.getCategory().isEmpty()) {
+            if (!note.getCategory().isEmpty()) {
                 actionBar.setSubtitle(NoteUtil.extendCategory(note.getCategory()));
             }
         }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java
index e317235d..c432a869 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java
@@ -1,8 +1,11 @@
 package it.niedermann.owncloud.notes.android.fragment;
 
+import android.content.SharedPreferences;
+import android.graphics.Typeface;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -133,12 +136,17 @@ public class NoteEditFragment extends BaseNoteFragment {
                 public void onError(Throwable e) {
                 }
 
-                @Override
-                public void onNext(CharSequence charSequence) {
-                    editContent.setText(charSequence, TextView.BufferType.SPANNABLE);
-                }
-            });
+                    @Override
+                    public void onNext(CharSequence charSequence) {
+                        editContent.setText(charSequence, TextView.BufferType.SPANNABLE);
+                    }
+                });
+
         editContent.setCustomSelectionActionModeCallback(new StyleCallback(this.editContent));
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
+        if(sp.getBoolean("font", false)) {
+            editContent.setTypeface(Typeface.MONOSPACE);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java
index c661bf20..00f3c5e3 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NotePreviewFragment.java
@@ -1,6 +1,9 @@
 package it.niedermann.owncloud.notes.android.fragment;
 
+import android.content.SharedPreferences;
+import android.graphics.Typeface;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -59,20 +62,20 @@ public class NotePreviewFragment extends BaseNoteFragment {
 
         RxMarkdown.with(content, getActivity())
                 .config(
-                    MarkDownUtil.getMarkDownConfiguration(getActivity().getApplicationContext())
-                        /*.setOnTodoClickCallback(new OnTodoClickCallback() {
-                                @Override
-                                public CharSequence onTodoClicked(View view, String line, int lineNumber) {
-                                String[] lines = TextUtils.split(note.getContent(), "\\r?\\n");
-                                if(lines.length >= lineNumber) {
-                                    lines[lineNumber] = line;
+                        MarkDownUtil.getMarkDownConfiguration(getActivity().getApplicationContext())
+                                /*.setOnTodoClickCallback(new OnTodoClickCallback() {
+                                        @Override
+                                        public CharSequence onTodoClicked(View view, String line, int lineNumber) {
+                                        String[] lines = TextUtils.split(note.getContent(), "\\r?\\n");
+                                        if(lines.length >= lineNumber) {
+                                            lines[lineNumber] = line;
+                                        }
+                                        noteContent.setText(TextUtils.join("\n", lines), TextView.BufferType.SPANNABLE);
+                                        saveNote(null);
+                                        return line;
+                                    }
                                 }
-                                noteContent.setText(TextUtils.join("\n", lines), TextView.BufferType.SPANNABLE);
-                                saveNote(null);
-                                return line;
-                            }
-                        }
-                    )*/.build()
+                            )*/.build()
                 )
                 .factory(TextFactory.create())
                 .intoObservable()
@@ -95,6 +98,11 @@ public class NotePreviewFragment extends BaseNoteFragment {
                 });
         noteContent.setText(content);
         noteContent.setMovementMethod(LinkMovementMethod.getInstance());
+
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
+        if (sp.getBoolean("font", false)) {
+            noteContent.setTypeface(Typeface.MONOSPACE);
+        }
     }
 
     @Override
diff --git a/app/src/main/res/drawable/ic_text_fields_black_24dp.xml b/app/src/main/res/drawable/ic_text_fields_black_24dp.xml
new file mode 100644
index 00000000..b9117ad9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_text_fields_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#757575"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z"/>
+</vector>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 8bd366f2..8b37c430 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -4,7 +4,7 @@
 
     <color name="primary_dark">#286090</color>
 
-    <color name="separator">#444</color>
+    <color name="separator">#262626</color>
 
     <color name="bg_highlighted">#111</color>
     <color name="bg_normal">#222222</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 50bb8bf0..ef9efb0b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,7 +5,7 @@
     <color name="primary">#0082C9</color>
     <color name="primary_dark">#286090</color>
 
-    <color name="separator">#d2d2d2</color>
+    <color name="separator">#fbfbfb</color>
 
     <color name="bg_transparent">#aa000000</color>
     <color name="bg_highlighted">#f3f3f3</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1c8a1c3..9eb4dad8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -53,8 +53,9 @@
     <string name="settings_password_check_description">Displays whether the credentials are correct.</string>
     <string name="settings_submit">Connect</string>
     <string name="settings_submitting">Connecting &#8230;</string>
-    <string name="settings_note_mode">Display mode for Notes</string>
+    <string name="settings_note_mode">Display mode for notes</string>
     <string name="settings_theme_title">Theme</string>
+    <string name="settings_font_title">Monospace font</string>
     <string name="settings_theme_wifi_only">Sync</string>
     <string name="settings_cert_category">Manage certificates</string>
     <string name="settings_cert_trust_system">Trust system certificates</string>
@@ -140,6 +141,7 @@
     <string name="pref_key_reset_trust" translatable="false">resetTrust</string>
     <string name="pref_key_note_mode" translatable="false">noteMode</string>
     <string name="pref_key_theme" translatable="false">darkTheme</string>
+    <string name="pref_key_font" translatable="false">font</string>
     <string name="pref_key_wifi_only" translatable="false">wifiOnly</string>
     <string name="pref_key_last_note_mode" translatable="false">lastNoteMode</string>
     <string name="pref_value_mode_edit" translatable="false">edit</string>
@@ -148,6 +150,7 @@
     <string name="pref_value_mode_note" translatable="false">note</string>
     <string name="pref_value_theme_light">Light</string>
     <string name="pref_value_theme_dark">Dark</string>
+    <string name="pref_value_font_normal">Normal</string>
     <string name="pref_value_wifi_only">Sync only on Wi-Fi</string>
     <string name="pref_value_wifi_and_mobile">Sync on Wi-Fi and mobile data</string>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 7f2049ef..46870cae 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -19,18 +19,24 @@
         android:title="@string/settings_note_mode" />
 
     <SwitchPreference
+        android:defaultValue="@string/pref_value_wifi_and_mobile"
+        android:icon="@drawable/ic_sync_black_24dp"
+        android:key="@string/pref_key_wifi_only"
+        android:summary="%s"
+        android:title="@string/settings_theme_wifi_only" />
+
+    <SwitchPreference
         android:defaultValue="@string/pref_value_theme_light"
         android:icon="@drawable/ic_brightness_2_grey_24dp"
         android:key="@string/pref_key_theme"
         android:summary="%s"
         android:title="@string/settings_theme_title" />
-
     <SwitchPreference
-        android:defaultValue="@string/pref_value_wifi_and_mobile"
-        android:icon="@drawable/ic_sync_black_24dp"
-        android:key="@string/pref_key_wifi_only"
-        android:summary="%s"
-        android:title="@string/settings_theme_wifi_only" />
+        android:defaultValue="@string/pref_value_font_normal"
+        android:icon="@drawable/ic_text_fields_black_24dp"
+        android:key="@string/pref_key_font"
+        android:title="@string/settings_font_title" />
+
 
     <PreferenceScreen
         android:key="@string/pref_key_certs"