diff options
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r-- | app/src/main/res/values/attrs.xml | 3 | ||||
-rw-r--r-- | app/src/main/res/values/colors.xml | 12 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 33 |
3 files changed, 19 insertions, 29 deletions
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 715f8b814..8e70e68ea 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -8,4 +8,7 @@ <attr name="description" format="string" /> <attr name="image" format="reference" /> </declare-styleable> + <declare-styleable name="DueDateChip"> + <attr name="compactMode" format="boolean" /> + </declare-styleable> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1983b6367..b556a9e94 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -37,12 +37,12 @@ <!-- ======================================= --> <!-- Due Date badges --> - <color name="due_tomorrow">#f2f2f2</color> - <color name="due_today">#f1c14b</color> - <color name="due_overdue">#ef6e6b</color> - <color name="due_text_tomorrow">#666666</color> - <color name="due_text_today">#333333</color> - <color name="due_text_overdue">#ffffff</color> + <color name="due_today">#f8f2e5</color> + <color name="due_overdue">#fbe7e6</color> + <color name="due_done">#e9f1eb</color> + <color name="due_text_today">#855d00</color> + <color name="due_text_overdue">#c61610</color> + <color name="due_text_done">#286c39</color> <!-- Activity --> <color name="activity_create">#00D400</color> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c6eca37fa..4b59ce20d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5,7 +5,6 @@ <string name="navigation_drawer_close">Close navigation drawer</string> <string name="hint_search_deck">Search deck</string> - <string name="simple_boards">Boards</string> <string name="simple_add">Add</string> <string name="simple_save">Save</string> <string name="simple_more">More</string> @@ -16,11 +15,9 @@ <string name="simple_error">Error</string> <string name="simple_exception">Exception</string> <string name="simple_close">Close</string> - <string name="simple_open">Open</string> - <string name="simple_switch">Switch</string> <string name="simple_filter">Filter</string> - <string name="simple_overdue">Overdue</string> - <string name="simple_clear">Clear</string> + <string name="simple_completed">Completed</string> + <string name="simple_reset">Reset</string> <string name="simple_discard">Discard</string> <string name="simple_update">Update</string> <string name="simple_delete">Delete</string> @@ -32,7 +29,6 @@ <string name="simple_select">Select</string> <string name="simple_comment">Comment</string> <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="hint_error_appeared">An error appeared</string> @@ -97,6 +93,8 @@ <string name="add_board">Add board</string> <string name="label_clear_due_date">Clear due date</string> + <string name="label_clear_done">Not completed</string> + <string name="label_due_at">Due at: %1$s</string> <string name="label_add">Add %1$s</string> <string name="url_maintainer" translatable="false">https://www.niedermann.it/</string> @@ -112,6 +110,7 @@ <string name="url_fragment_server_logs" translatable="false">/index.php/settings/admin/logging</string> <string name="url_fragment_share_card_pre_1_0_0" translatable="false">/index.php/apps/deck/#!/board/%1$d/card/%2$d</string> <string name="url_fragment_share_card_since_1_0_0" translatable="false">/index.php/apps/deck/#/board/%1$d/card/%2$d</string> + <string name="url_fragment_share_card_since_1_12_0" translatable="false">/index.php/apps/deck/board/%1$d/card/%2$d</string> <string name="card_edit_details">Details</string> <string name="card_edit_attachments">Attachments</string> @@ -120,9 +119,7 @@ <string name="no_files_attached_to_this_card">There are no files attached to this card.</string> <string name="attachments">Attachments</string> <string name="no_cards">No cards yet</string> - <string name="no_account">No account configured</string> <string name="account_already_added">The account %1$s has already been added</string> - <string name="account_is_getting_imported">Account is getting imported</string> <string name="not_synced_yet">Not synced yet</string> <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> @@ -138,11 +135,9 @@ </plurals> <string name="add_a_new_list_using_the_button">Add a new list using the + button</string> <string name="add_a_new_card_using_the_button">Add a new card using the + button</string> - <string name="update_deck">Update Deck web app</string> <string name="deck_outdated_please_update">Your Deck web app version is too old (%1$s). Please update to use this Android app as client.</string> <string name="delete_board_message">This will permanently delete this board including all lists and cards.</string> <string name="settings_theme_title">Theme</string> - <string name="settings_branding_title">Branding</string> <string name="settings_compact_title">Compact mode</string> <string name="settings_cover_images_title">Cover images</string> <string name="settings_debugging">Debug logs</string> @@ -178,7 +173,6 @@ <string name="provide_at_least_a_title_or_description">Provide at least a title or description</string> <string name="welcome_text">Welcome to %1$s</string> <string name="welcome_text_further_accounts">Add another account</string> - <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="add_comment">Add comment</string> @@ -187,7 +181,6 @@ <string name="no_boards">No boards yet</string> <string name="add_a_new_board_using_the_button">Add a new board using the + button</string> <string name="choose_board">Choose board</string> - <string name="choose_list">Choose list</string> <string name="task_count">%1$s/%2$s</string> <string name="open_in_browser">Open in browser</string> <string name="updating_card">Updating card…</string> @@ -203,13 +196,12 @@ <string name="filter_month">Next 30 days</string> <string name="filter_no_due">No due date</string> <string name="filter_later">Later</string> - <string name="filter_by_tag">Filter by tag</string> - <string name="filter_by_assigned_user">Filter by assigned user</string> - <string name="filter_by_duedate">Filter by due date</string> + + <string name="filter_done_no_filter">All</string> + <string name="filter_done_done">Completed</string> + <string name="filter_done_undone">Not completed</string> <string name="archived_cards">Archived cards</string> - <string name="action_card_dearchive">Undo card archiving</string> - <string name="action_archived_cards">Browse archived cards</string> <string name="attachment_already_exists">Attachment already exists</string> <string name="pick_custom_color">Pick custom color</string> <string name="manage_tags">Manage tags</string> @@ -220,6 +212,7 @@ <string name="filter_tags_title">Tags</string> <string name="filter_user_title">Users</string> <string name="filter_duedate_title">Due date</string> + <string name="filter_done_title">Completed</string> <string name="action_board_dearchive">Undo board archiving</string> <string name="archived_boards">Archived boards</string> @@ -230,7 +223,6 @@ <string name="error_revoking_ac">Error while revoking the access for %1$s</string> <string name="error_create_label">Error while creating label %1$s</string> <string name="maintenance_mode">Server is in maintenance mode</string> - <string name="server_error">Server error</string> <string name="error_edit_activity_killed_by_android">Android finished the edit mode because it needed more system resources for other apps.</string> <string name="error_dialog_title">Oh no - What now? 🙁</string> @@ -298,10 +290,8 @@ <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_filter_title">Filter</string> <string name="widget_stack_header_icon">Widget header icon</string> <string name="widget_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> @@ -319,9 +309,6 @@ <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> <string name="take_photo">Take a photo</string> <string name="take_photo_switch_camera">Switch camera</string> <string name="take_photo_toggle_torch">Toggle torch</string> |