Merge branch 'master' into 831-room

# Conflicts:
#	app/build.gradle
#	app/src/main/java/it/niedermann/owncloud/notes/shared/util/NoteUtil.java
#	app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidget.java
#	app/src/main/java/it/niedermann/owncloud/notes/widget/notelist/NoteListWidgetFactory.java
#	app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidget.java
#	app/src/main/java/it/niedermann/owncloud/notes/widget/singlenote/SingleNoteWidgetFactory.java
#	app/src/test/java/android/text/TextUtils.java

3 files changed, 10 insertions, 13 deletions

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 77db6004..8735993b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -23,20 +23,13 @@
 
     <color name="icon_color_default">#757575</color>
 
-    <color name="widget_background">#dfffffff</color>
-    <color name="widget_fg_default">#000000</color>
-    <color name="widget_fg_contrast">#ffffff</color>
-
     <color name="category_background">@color/bg_normal</color>
     <color name="category_border">@color/defaultBrand</color>
 
     <color name="appbar">@android:color/white</color>
 
-    <!-- Dark Theme -->
-    <!-- Defined here until appwidgets can use night/colors -->
-    <color name="fg_default_dark_theme">#eeeeee</color>
-    <color name="fg_default_low_dark_theme">#666666</color>
-    <color name="fg_default_high_dark_theme">#cccccc</color>
-
-    <color name="widget_background_dark_theme">#bf222222</color>
+    <color name="widget_background">#ddffffff</color>
+    <color name="widget_foreground">#222222</color>
+    <color name="widget_foreground_strong">#121212</color>
+    <color name="widget_divider">#32d1d1d1</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f869a3a4..08db34b0 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -29,8 +29,11 @@
     <dimen name="note_font_size_large">22sp</dimen>
 
     <!-- Widgets -->
+    <dimen name="widget_outer_radius">@dimen/spacer_1x</dimen>
+    <dimen name="widget_inner_radius">@dimen/spacer_1hx</dimen>
+    <dimen name="widget_divider">1dp</dimen>
+
     <dimen name="widget_margin">@dimen/spacer_1x</dimen>
-    <dimen name="widget_single_note_padding">10dp</dimen>
 
     <dimen name="widget_note_list_hdr_padding">2dp</dimen>
     <dimen name="widget_note_list_header_height">36dp</dimen>
@@ -39,6 +42,7 @@
     <dimen name="widget_note_list_outer_padding">4dp</dimen>
     <dimen name="widget_note_list_inner_padding">4dp</dimen>
 
+    <dimen name="widget_note_list_entry_add_button">34dp</dimen>
     <dimen name="widget_note_list_fav_icon_width">26dp</dimen>
     <dimen name="widget_note_list_fav_icon_height">20dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 22ed8077..99cfe3c5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -148,7 +148,7 @@
     <string name="error_dialog_title">Oh no - What now? 🙁</string>
     <string name="error_dialog_tip_token_mismatch_retry">Please try to force close the app and restart it again. There might have been an incorrect connection to the Nextcloud app.</string>
     <string name="error_dialog_tip_token_mismatch_clear_storage">If the issue persists, try to clear the storage of both apps: Nextcloud and Nextcloud Notes to solve this issue.</string>
-    <string name="error_dialog_tip_clear_storage">You can clear the storage by opening the app info and selecting Storage → Clear storage.</string>
+    <string name="error_dialog_tip_clear_storage">You can clear the storage by opening the app info and selecting Storage → Clear storage. ⚠️ Warning: This will delete not yet synchronized notes!</string>
     <string name="error_dialog_tip_files_outdated">Your Nextcloud app seems to be outdated. Please visit the Play Store or F-Droid to get the latest version.</string>
     <string name="error_dialog_tip_files_force_stop">Something seems to be wrong with your Nextcloud app. Please try to force stop both, the Nextcloud app and the Nextcloud Notes app.</string>
     <string name="error_dialog_tip_files_delete_storage">If force stopping them does not help, you can try to clear the storage of both apps.</string>