Merge branch 'master' into api-v1

# Conflicts:
#	app/src/androidTest/java/it/niedermann/owncloud/notes/persistence/NotesDatabaseTest.java
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/AbstractNotesDatabase.java
#	app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesDatabase.java
#	app/src/main/java/it/niedermann/owncloud/notes/util/NoteUtil.java

2 files changed, 52 insertions, 0 deletions

diff --git a/app/src/main/res/layout/activity_formatting_help.xml b/app/src/main/res/layout/activity_formatting_help.xml
new file mode 100644
index 00000000..69c6838d
--- /dev/null
+++ b/app/src/main/res/layout/activity_formatting_help.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/primary"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            app:contentInsetStartWithNavigation="0dp"
+            app:navigationIcon="@drawable/ic_arrow_back_grey600_24dp"
+            app:title="@string/action_formatting_help"
+            app:titleMarginStart="0dp" />
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <ScrollView
+        android:id="@+id/scrollView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context="it.niedermann.owncloud.notes.android.activity.EditNoteActivity">
+
+        <com.yydcdut.markdown.MarkdownTextView
+            android:id="@+id/content"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/spacer_2x"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/fg_default"
+            android:textIsSelectable="true"
+            android:theme="@style/textViewStyle"
+            tools:text="@tools:sample/lorem/random" />
+    </ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_note_edit.xml b/app/src/main/res/layout/fragment_note_edit.xml
index 64f83e5e..a6ea2fde 100644
--- a/app/src/main/res/layout/fragment_note_edit.xml
+++ b/app/src/main/res/layout/fragment_note_edit.xml
@@ -6,6 +6,15 @@
     android:layout_height="match_parent"
     tools:background="?attr/colorPrimary">
 
+    <!-- Dummy item to prevent editContent from receiving focus -->
+    <LinearLayout
+        android:id="@+id/focus_workaround"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:orientation="horizontal" />
+
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"