Merge branch 'master' into 289-upload-sources

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
#	app/src/main/res/values/strings.xml

5 files changed, 51 insertions, 17 deletions

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6db0c7441..55812677c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,17 +3,13 @@
     <color name="primary">@android:color/white</color>
     <color name="accent">#000000</color>
     <color name="defaultBrand">#0082C9</color>
-    <color name="toolbarEditTextHighlightColor">#55ffffff</color>
     <color name="danger">#d40000</color>
-    <color name="fg_accent">#fff</color>
-    <color name="fg_primary">#333</color>
     <color name="fg_secondary">#999</color>
     <color name="bg_highlighted">#eee</color>
     <color name="grey600">#757575</color>
     <color name="bg_info_box">#dddddd</color>
     <color name="bg_card">@android:color/white</color>
     <color name="bg_card_wrapper">#fafafa</color>
-
     <color name="dark_fg_primary">#e5e5e5</color>
 
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index db8b51610..8aa82c1cf 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,8 +1,12 @@
 <resources>
+    <dimen name="spacer_1qx">2dp</dimen>
     <dimen name="spacer_1hx">4dp</dimen>
     <dimen name="spacer_1x">8dp</dimen>
     <dimen name="spacer_2x">16dp</dimen>
     <dimen name="spacer_3x">24dp</dimen>
+    <dimen name="spacer_4x">32dp</dimen>
+
+    <dimen name="compact_label_height">6dp</dimen>
 
     <!-- Drawer header -->
     <dimen name="drawer_header_height">100dp</dimen>
@@ -16,11 +20,9 @@
     <dimen name="avatar_size_small_overlapping_border">2dp</dimen>
 
     <dimen name="icon_size_details">24dp</dimen>
-    <dimen name="nav_drawer_header_avatar">56dp</dimen>
-    <dimen name="nav_drawer_header_avatar_other_accounts_size">40dp</dimen>
-    <dimen name="nav_drawer_header_avatar_second_account_margin">56dp</dimen>
-    <dimen name="drawer_header_text">14sp</dimen>
-    <dimen name="drawer_header_subtext">12sp</dimen>
-    <dimen name="text_size_attachments">14sp</dimen>
     <dimen name="empty_content_font_size">26sp</dimen>
+
+    <dimen name="widget_stack_card_padding">@dimen/spacer_1hx</dimen>
+    <dimen name="widget_stack_icon_width">30dp</dimen>
+    <dimen name="widget_stack_header_height">36dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index 247bb0697..c790a5868 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -8,6 +8,7 @@
     <string name="pref_key_wifi_only" translatable="false">wifiOnly</string>
     <string name="pref_key_dark_theme" translatable="false">darkTheme</string>
     <string name="pref_key_branding" translatable="false">branding</string>
+    <string name="pref_key_compact" translatable="false">compact</string>
     <string name="pref_key_background_sync" translatable="false">backgroundSync</string>
 
     <string name="pref_value_background_sync_off">off</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index db0dc6400..2d3b16cda 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,6 +40,7 @@
     <string name="simple_disabled">disabled</string>
     <string name="simple_copied">Copied</string>
     <string name="simple_archive">Archive</string>
+    <string name="simple_unassigned">Unassigned</string>
 
     <string name="edit_board">Edit board</string>
     <string name="archive_board">Archive board</string>
@@ -76,9 +77,6 @@
     <string name="about_credits_tab_title">Credits</string>
     <string name="about_contribution_tab_title">Contribution</string>
     <string name="about_license_tab_title">License</string>
-
-    <string name="copied_to_clipboard">Copied to clipboard</string>
-
     <string name="seconds_ago">seconds ago</string>
     <string name="edit">Edit</string>
     <string name="label_labels">Select Tags</string>
@@ -138,6 +136,7 @@
     <string name="no_lists_yet">No lists yet</string>
     <string name="do_you_want_to_save_your_changes">Do you want to save your changes?</string>
     <string name="do_you_want_to_archive_all_cards_of_the_list">Do you want to archive all cards of %1$s?</string>
+    <string name="do_you_want_to_archive_all_cards_of_the_filtered_list">Do you want to archive all filtered cards of %1$s?</string>
     <plurals name="do_you_want_to_delete_the_current_list">
         <item quantity="one">This will permanently delete %1$d card of this list.</item>
         <item quantity="other">This will permanently delete all %1$d cards of this list.</item>
@@ -154,6 +153,7 @@
     <string name="delete_board_message">This will permanently delete this board including all lists and cards.</string>
     <string name="settings_theme_title">Dark theme</string>
     <string name="settings_branding_title">Branding</string>
+    <string name="settings_compact_title">Compact mode</string>
     <string name="settings_background_sync">Background synchronization</string>
     <string name="pref_value_wifi_and_mobile">Sync on Wi-Fi and mobile data</string>
     <string name="pref_value_wifi_only">Sync only on Wi-Fi</string>
@@ -181,7 +181,6 @@
     <string name="maintenance_mode_explanation">The server %1$s is currently in maintenance mode. Please contact your administrator or try later again.</string>
     <string name="share_add_to_card">Add to card</string>
     <string name="share_success">Successfully added %1$s to %2$s</string>
-    <string name="could_not_copy_to_clipboard">Could not copy to clipboard</string>
     <string name="add_comment">Add comment</string>
     <string name="card_edit_comments">Comments</string>
     <string name="no_comments_yet">No comments yet</string>
@@ -241,8 +240,8 @@
 
     <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 Deck to solve this issue.</string>
-    <string name="error_dialog_tip_database_upgrade_failed">The ugprade of the database failed. Please report the issue and clear the storage to use the app normally.</string>
+    <string name="error_dialog_tip_clear_storage_might_help">If the issue persists, try to clear the storage of both apps: Nextcloud and Nextcloud Deck to solve this issue.</string>
+    <string name="error_dialog_tip_database_upgrade_failed">The upgrade of the database failed. Please report the issue and clear the storage to use the app normally.</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_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 Deck app.</string>
@@ -256,6 +255,8 @@
     <string name="error_dialog_we_need_info">We need the following technical information to help you:</string>
     <string name="error_dialog_redirect">Your server did respond with a HTTP 302 status code, which implies, that you do not have installed the Deck app on your server or something is misconfigured. This can be caused by custom overrides in a .htaccess-file or by Nextcloud apps like OID Client.</string>
     <string name="error_dialog_version_not_parsable">We could not determine the version of the server side Deck app. Please make sure it is installed and enabled.</string>
+    <string name="error_dialog_account_might_not_be_authorized">The account of your Nextcloud app might no longer be authorized.</string>
+    <string name="error_dialog_user_not_found_in_database">The current user does not match the user we have in our database. If you are using LDAP on your Nextcloud instance, your Nextcloud app might have stored an old user ID.</string>
     <string name="error_dialog_capabilities_not_parsable">We could not fetch the capabilities of your server. Please make sure your server is running well and other client apps are able to access Nextcloud.</string>
     <string name="error_dialog_attachment_upload_failed">An attachment could not be uploaded. Please try to share it on another way and let us know about this bug.</string>
     <string name="error_dialog_tip_disable_battery_optimizations">Please disable all battery optimizations for Nextcloud and the Deck app.</string>
@@ -268,6 +269,7 @@
     <string name="info_box_version_not_supported">Server version %1$s not supported, please update to %2$s</string>
     <string name="share_link">Share link</string>
     <string name="archive_cards">Archive cards</string>
+
     <string name="manage_accounts">Manage accounts</string>
     <string name="manage_list">Manage list</string>
     <string name="simple_reply">Reply</string>
@@ -276,11 +278,39 @@
     <string name="add_text_as_comment">Add as comment</string>
     <string name="progress_count">%1$d of %2$d</string>
     <plurals name="progress_error_count">
-        <item quantity="one">%1$d error while uploading.</item>
+        <item quantity="one">%1$d error while uploading</item>
         <item quantity="other">%1$d errors while uploading</item>
     </plurals>
     <string name="simple_report">Report</string>
     <string name="error_action_open_battery_settings">Battery settings</string>
+    <string name="move_warning">Neither comments nor attachments can be transferred when moving the card to another board.</string>
+    <string name="clone_board">Clone board</string>
+    <string name="cloning_board">Cloning %1$s…</string>
+    <string name="successfully_cloned_board">Successfully cloned %1$s</string>
+    <string name="attachment_does_not_yet_exist">Attachment does not yet exist in Deck</string>
+    <string name="card_does_not_yet_exist">Card does not yet exist in Deck</string>
+
+    <string name="widget_stack_title">List</string>
+    <string name="widget_stack_header_icon">Widget header icon</string>
+    <string name="widget_stack_placeholder_icon">Widget placeholder icon</string>
+    <string name="select_stack">Select list</string>
+    <string name="project_type_deck_board">Deck board</string>
+    <string name="project_type_deck_card">Deck card</string>
+    <string name="project_type_file">File</string>
+    <string name="projects_title">Projects</string>
+    <plurals name="resources_count">
+        <item quantity="one">%1$d resource</item>
+        <item quantity="other">%1$d resources</item>
+    </plurals>
+    <string name="no_assigned_label">No assigned tag</string>
+    <string name="single_card">Single card</string>
+    <string name="project_type_room">Talk room</string>
+    <string name="simple_move">Move</string>
+    <string name="cannot_upload_files_without_permission">Can not upload files without permission</string>
+    <string name="clone_cards">Clone cards</string>
+    <string name="simple_clone">Clone</string>
+    <string name="user_avatar">User avatar</string>
+    <string name="simple_unassign">Unassign</string>
     <string name="simple_contact">Contact</string>
     <string name="simple_file">File</string>
     <string name="simple_camera">Camera</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f0bff78fe..c253ae461 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,6 +6,7 @@
         <item name="colorAccent">@color/accent</item>
         <item name="toolbarStyle">@style/toolbarStyle</item>
         <item name="android:windowBackground">?attr/colorPrimary</item>
+        <item name="textAppearanceHeadline1">@style/Deck.TextAppearance.Headline1</item>
     </style>
 
     <style name="toolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@@ -32,4 +33,8 @@
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowIsTranslucent">true</item>
     </style>
+
+    <style name="Deck.TextAppearance.Headline1" parent="TextAppearance.MaterialComponents.Headline1">
+        <item name="android:textSize">36sp</item>
+    </style>
 </resources>