From 4299da9b22c62719e16f3e442d339a867dcb116a Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Mon, 22 Jan 2024 16:46:14 +0100 Subject: feat(theming): Use grayscale default theme to avoid wrong color tones Signed-off-by: Stefan Niedermann --- app/src/dev/res/xml/shortcuts.xml | 2 +- .../nextcloud/deck/ui/PickStackActivity.java | 2 +- .../ui/archivedboards/ArchivedBoardViewHolder.java | 4 +- .../deck/ui/attachments/AttachmentsActivity.java | 2 +- .../deck/ui/card/AbstractCardViewHolder.java | 2 +- .../nextcloud/deck/ui/card/EditActivity.java | 18 ++++---- .../ui/card/activities/CardActivityViewHolder.java | 2 +- .../attachments/picker/FileItemViewHolder.java | 10 ++--- .../ui/card/comments/CardCommentsFragment.java | 10 +++++ .../ui/card/comments/ItemCommentViewHolder.java | 14 +++--- .../deck/ui/card/details/CardDetailsFragment.java | 2 +- .../deck/ui/filter/FilterLabelsAdapter.java | 4 +- .../nextcloud/deck/ui/main/DrawerMenuInflater.java | 6 +-- .../deck/ui/main/search/SearchCardViewHolder.java | 1 + .../deck/ui/movecard/MoveCardDialogFragment.java | 2 +- .../ui/widget/singlecard/SingleCardWidget.java | 2 +- .../nextcloud/deck/util/AttachmentUtil.java | 4 +- app/src/main/res/color/text_input_layout_color.xml | 7 --- app/src/main/res/drawable/ic_activity_72dp.xml | 7 +++ .../main/res/drawable/ic_activity_light_grey.xml | 6 --- app/src/main/res/drawable/ic_add_24dp.xml | 6 +++ app/src/main/res/drawable/ic_add_grey_24dp.xml | 5 --- app/src/main/res/drawable/ic_add_white_24dp.xml | 11 ----- app/src/main/res/drawable/ic_archive_24dp.xml | 5 +++ .../main/res/drawable/ic_archive_white_24dp.xml | 5 --- app/src/main/res/drawable/ic_arrow_back_24dp.xml | 5 +++ .../main/res/drawable/ic_arrow_back_white_24dp.xml | 5 --- app/src/main/res/drawable/ic_attach_file_24dp.xml | 5 +++ .../res/drawable/ic_attach_file_grey600_24dp.xml | 5 --- .../res/drawable/ic_baseline_account_circle_24.xml | 4 +- app/src/main/res/drawable/ic_baseline_block_24.xml | 2 +- app/src/main/res/drawable/ic_bug_report_24dp.xml | 5 +++ .../main/res/drawable/ic_bug_report_black_24dp.xml | 5 --- app/src/main/res/drawable/ic_close_24dp.xml | 5 +++ app/src/main/res/drawable/ic_close_white_24dp.xml | 5 --- app/src/main/res/drawable/ic_delete_24dp.xml | 5 +++ app/src/main/res/drawable/ic_delete_black_24dp.xml | 5 --- app/src/main/res/drawable/ic_edit_24dp.xml | 5 +++ app/src/main/res/drawable/ic_edit_grey600_24dp.xml | 5 --- app/src/main/res/drawable/ic_home_24dp.xml | 5 +++ app/src/main/res/drawable/ic_home_grey600_24dp.xml | 5 --- app/src/main/res/drawable/ic_person_add_24dp.xml | 5 +++ .../main/res/drawable/ic_person_add_black_24dp.xml | 5 --- app/src/main/res/drawable/ic_settings_24dp.xml | 5 +++ .../main/res/drawable/ic_settings_grey600_24dp.xml | 5 --- app/src/main/res/drawable/type_comment_36dp.xml | 5 +++ .../res/drawable/type_comment_grey600_36dp.xml | 5 --- app/src/main/res/layout/activity_about.xml | 2 +- app/src/main/res/layout/activity_archived.xml | 2 +- app/src/main/res/layout/activity_attachments.xml | 2 +- app/src/main/res/layout/activity_edit.xml | 2 +- app/src/main/res/layout/activity_exception.xml | 2 +- app/src/main/res/layout/activity_main.xml | 6 +-- .../main/res/layout/activity_manage_accounts.xml | 2 +- .../main/res/layout/activity_push_notification.xml | 2 +- app/src/main/res/layout/activity_settings.xml | 2 +- .../main/res/layout/activity_upcoming_cards.xml | 2 +- .../main/res/layout/dialog_account_switcher.xml | 4 +- .../layout/fragment_card_edit_tab_activities.xml | 2 +- .../layout/fragment_card_edit_tab_attachments.xml | 8 ++-- .../res/layout/fragment_card_edit_tab_comments.xml | 11 +++-- .../res/layout/fragment_card_edit_tab_details.xml | 4 +- app/src/main/res/layout/item_access_control.xml | 2 +- app/src/main/res/layout/item_account_choose.xml | 4 +- .../main/res/layout/item_attachment_default.xml | 2 +- app/src/main/res/layout/item_attachment_image.xml | 1 + app/src/main/res/layout/item_card_compact.xml | 5 ++- app/src/main/res/layout/item_card_default.xml | 7 +-- .../res/layout/item_card_default_only_title.xml | 5 ++- app/src/main/res/layout/item_comment.xml | 18 +++++--- app/src/main/res/layout/item_filter_label.xml | 2 + app/src/main/res/layout/item_manage_label.xml | 4 +- app/src/main/res/layout/item_search_card.xml | 2 +- app/src/main/res/layout/item_search_stack.xml | 2 +- app/src/main/res/layout/item_section.xml | 2 +- app/src/main/res/layout/nav_header_main.xml | 2 +- app/src/main/res/layout/widget_single_card.xml | 2 +- app/src/main/res/menu/attachment_menu.xml | 2 +- app/src/main/res/menu/attachment_picker_menu.xml | 2 +- app/src/main/res/menu/comment_menu.xml | 2 +- app/src/main/res/values-night/colors.xml | 33 +++++++++++++- app/src/main/res/values/colors.xml | 34 +++++++++++++- app/src/main/res/values/styles.xml | 52 ++++++++++++++++------ app/src/main/res/xml/settings.xml | 2 +- app/src/main/res/xml/shortcuts.xml | 2 +- 85 files changed, 294 insertions(+), 193 deletions(-) delete mode 100644 app/src/main/res/color/text_input_layout_color.xml create mode 100644 app/src/main/res/drawable/ic_activity_72dp.xml delete mode 100644 app/src/main/res/drawable/ic_activity_light_grey.xml create mode 100644 app/src/main/res/drawable/ic_add_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_add_grey_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_add_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_archive_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_archive_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_arrow_back_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_arrow_back_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_attach_file_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_attach_file_grey600_24dp.xml create mode 100644 app/src/main/res/drawable/ic_bug_report_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_bug_report_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_close_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_close_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_delete_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_delete_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_edit_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_edit_grey600_24dp.xml create mode 100644 app/src/main/res/drawable/ic_home_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_home_grey600_24dp.xml create mode 100644 app/src/main/res/drawable/ic_person_add_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_person_add_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_settings_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_settings_grey600_24dp.xml create mode 100644 app/src/main/res/drawable/type_comment_36dp.xml delete mode 100644 app/src/main/res/drawable/type_comment_grey600_36dp.xml diff --git a/app/src/dev/res/xml/shortcuts.xml b/app/src/dev/res/xml/shortcuts.xml index ec5df899c..c0c4c6057 100644 --- a/app/src/dev/res/xml/shortcuts.xml +++ b/app/src/dev/res/xml/shortcuts.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PickStackActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PickStackActivity.java index 7e2535755..ac77d9ff0 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PickStackActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PickStackActivity.java @@ -99,7 +99,7 @@ public abstract class PickStackActivity extends AppCompatActivity implements The public void onStackPicked(@NonNull Account account, @Nullable Board board, @Nullable Stack stack) { viewModel.setSelected(account, board, stack); applyTheme(board == null - ? ContextCompat.getColor(this, R.color.accent) + ? ContextCompat.getColor(this, R.color.onSurface) : board.getColor() ); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardViewHolder.java index ba60d9666..2f1dbb06b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardViewHolder.java @@ -42,7 +42,7 @@ public class ArchivedBoardViewHolder extends RecyclerView.ViewHolder { if (account.getServerDeckVersionAsObject().isSupported()) { if (board.isPermissionManage()) { binding.boardMenu.setVisibility(View.VISIBLE); - binding.boardMenu.setImageDrawable(util.platform.tintDrawable(context, R.drawable.ic_menu, ColorRole.ON_SURFACE)); + binding.boardMenu.setImageDrawable(util.platform.tintDrawable(context, R.drawable.ic_menu, ColorRole.ON_SURFACE_VARIANT)); binding.boardMenu.setOnClickListener((v) -> { PopupMenu popup = new PopupMenu(context, binding.boardMenu); popup.getMenuInflater().inflate(R.menu.archived_board_menu, popup.getMenu()); @@ -72,7 +72,7 @@ public class ArchivedBoardViewHolder extends RecyclerView.ViewHolder { }); } else if (board.isPermissionShare()) { binding.boardMenu.setVisibility(View.VISIBLE); - binding.boardMenu.setImageDrawable(util.platform.tintDrawable(context, R.drawable.ic_share_grey600_18dp, ColorRole.ON_SURFACE)); + binding.boardMenu.setImageDrawable(util.platform.tintDrawable(context, R.drawable.ic_share_grey600_18dp, ColorRole.ON_SURFACE_VARIANT)); binding.boardMenu.setOnClickListener((v) -> AccessControlDialogFragment.newInstance(account, board.getLocalId()).show(fragmentManager, AccessControlDialogFragment.class.getSimpleName())); } binding.boardMenu.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentsActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentsActivity.java index 855ddf087..5ceae17bc 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentsActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentsActivity.java @@ -51,7 +51,7 @@ public class AttachmentsActivity extends AppCompatActivity implements Attachment supportPostponeEnterTransition(); setSupportActionBar(binding.toolbar); - final Drawable navigationIcon = ContextCompat.getDrawable(this, R.drawable.ic_arrow_back_white_24dp); + final Drawable navigationIcon = ContextCompat.getDrawable(this, R.drawable.ic_arrow_back_24dp); DrawableCompat.setTint(navigationIcon, ContextCompat.getColor(this, android.R.color.white)); binding.toolbar.setNavigationIcon(navigationIcon); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AbstractCardViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AbstractCardViewHolder.java index ebaeaf637..744f6f7b6 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AbstractCardViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/AbstractCardViewHolder.java @@ -88,7 +88,7 @@ public abstract class AbstractCardViewHolder extends RecyclerView.ViewHolder { protected void applyTheme(@Nullable ThemeUtils utils) { if (utils != null) { utils.platform.colorImageView(getNotSyncedYet(), ColorRole.PRIMARY); - utils.platform.colorImageView(getCardMenu(), ColorRole.ON_SURFACE); + utils.platform.colorImageView(getCardMenu(), ColorRole.ON_SURFACE_VARIANT); utils.platform.colorTextView(getCardTitle(), ColorRole.ON_SURFACE); // TODO should be discussed with UX diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java index 7edd10bbf..bbea33a7f 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java @@ -63,16 +63,16 @@ public class EditActivity extends AppCompatActivity { */ @Deprecated private static final int[] tabIcons = new int[]{ - R.drawable.ic_home_grey600_24dp, - R.drawable.ic_attach_file_grey600_24dp, - R.drawable.ic_activity_light_grey + R.drawable.ic_home_24dp, + R.drawable.ic_attach_file_24dp, + R.drawable.ic_activity_72dp }; private static final int[] tabIconsWithComments = new int[]{ - R.drawable.ic_home_grey600_24dp, - R.drawable.ic_attach_file_grey600_24dp, - R.drawable.type_comment_grey600_36dp, - R.drawable.ic_activity_light_grey + R.drawable.ic_home_24dp, + R.drawable.ic_attach_file_24dp, + R.drawable.type_comment_36dp, + R.drawable.ic_activity_72dp }; @Override @@ -162,7 +162,7 @@ public class EditActivity extends AppCompatActivity { public boolean onCreateOptionsMenu(@NonNull Menu menu) { if (viewModel.canEdit()) { getMenuInflater().inflate(R.menu.card_edit_menu, menu); - @ColorInt final int color = ContextCompat.getColor(this, R.color.accent); + @ColorInt final int color = ContextCompat.getColor(this, R.color.onSurface); final var utils = ThemeUtils.of(color, this); for (int i = 0; i < menu.size(); i++) { @@ -282,7 +282,7 @@ public class EditActivity extends AppCompatActivity { if (navigationIcon == null) { DeckLog.error("Expected navigationIcon to be present."); } else { - DrawableCompat.setTint(binding.toolbar.getNavigationIcon(), ContextCompat.getColor(this, R.color.accent)); + DrawableCompat.setTint(binding.toolbar.getNavigationIcon(), ContextCompat.getColor(this, R.color.onSurface)); } final var utils = ThemeUtils.of(color, this); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java index 677c68e9b..b92dea1e4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java @@ -47,7 +47,7 @@ public class CardActivityViewHolder extends RecyclerView.ViewHolder { case ARCHIVE -> imageView.setImageResource(R.drawable.type_archive_grey600_36dp); case TAGGED_WITH_LABEL -> imageView.setImageResource(R.drawable.type_label_grey600_36dp); - case COMMENT -> imageView.setImageResource(R.drawable.type_comment_grey600_36dp); + case COMMENT -> imageView.setImageResource(R.drawable.type_comment_36dp); case FILES -> imageView.setImageResource(R.drawable.type_file_36dp); case HISTORY -> imageView.setImageResource(R.drawable.type_history_36dp); default -> imageView.setImageResource(R.drawable.ic_app_logo); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/FileItemViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/FileItemViewHolder.java index f7d64aca8..2d7bd7016 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/FileItemViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/FileItemViewHolder.java @@ -1,5 +1,9 @@ package it.niedermann.nextcloud.deck.ui.card.attachments.picker; +import static android.text.format.Formatter.formatFileSize; +import static it.niedermann.nextcloud.deck.util.AttachmentUtil.getIconForMimeType; +import static it.niedermann.nextcloud.deck.util.DateUtil.getRelativeDateTimeString; + import android.net.Uri; import android.util.Pair; @@ -14,10 +18,6 @@ import java.util.function.BiConsumer; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.databinding.ItemAttachmentDefaultBinding; -import static android.text.format.Formatter.formatFileSize; -import static it.niedermann.nextcloud.deck.util.AttachmentUtil.getIconForMimeType; -import static it.niedermann.nextcloud.deck.util.DateUtil.getRelativeDateTimeString; - public class FileItemViewHolder extends RecyclerView.ViewHolder { private final ItemAttachmentDefaultBinding binding; @@ -40,6 +40,6 @@ public class FileItemViewHolder extends RecyclerView.ViewHolder { binding.filesize.setText(null); binding.modified.setText(null); itemView.setOnClickListener(null); - binding.preview.setImageResource(R.drawable.ic_attach_file_grey600_24dp); + binding.preview.setImageResource(R.drawable.ic_attach_file_24dp); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java index caa13cb07..453fc61ad 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java @@ -21,9 +21,11 @@ import androidx.lifecycle.ViewModelProvider; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; +import com.nextcloud.android.common.ui.theme.utils.ColorRole; import com.nextcloud.android.sso.api.EmptyResponse; import java.time.Instant; +import java.util.stream.Stream; import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.R; @@ -195,6 +197,14 @@ public class CardCommentsFragment extends Fragment implements Themed, CommentEdi utils.platform.colorViewBackground(binding.addCommentLayout); utils.material.themeFAB(binding.fab); utils.material.colorTextInputLayout(binding.messageWrapper); + + Stream.of( + binding.replyCommentIcon, + binding.replyCommentCancelButton, + binding.mentionProposerIcon + ).forEach(v -> utils.platform.colorImageView(v, ColorRole.SECONDARY)); + + adapter.applyTheme(color); } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java index 37e9497e4..8dca7d0ac 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java @@ -88,9 +88,6 @@ public class ItemCommentViewHolder extends RecyclerView.ViewHolder { }); TooltipCompat.setTooltipText(binding.creationDateTime, comment.getComment().getCreationDateTime().atZone(ZoneId.systemDefault()).format(dateFormatter)); - if (utils != null) { - utils.platform.colorImageView(binding.notSyncedYet, ColorRole.PRIMARY); - } binding.notSyncedYet.setVisibility(DBStatus.LOCAL_EDITED.equals(comment.getStatusEnum()) ? View.VISIBLE : View.GONE); if (comment.getParent() == null) { @@ -98,9 +95,6 @@ public class ItemCommentViewHolder extends RecyclerView.ViewHolder { } else { final int commentParentMaxLines = itemView.getContext().getResources().getInteger(R.integer.comment_parent_max_lines); binding.parentContainer.setVisibility(View.VISIBLE); - if (utils != null) { - utils.platform.colorViewBackground(binding.parentBorder); - } binding.parent.setText(comment.getParent().getMessage()); binding.parent.setOnClickListener((v) -> { final boolean previouslyCollapsed = binding.parent.getMaxLines() == commentParentMaxLines; @@ -111,6 +105,14 @@ public class ItemCommentViewHolder extends RecyclerView.ViewHolder { binding.parent.setMaxLines(previouslyCollapsed ? Integer.MAX_VALUE : commentParentMaxLines); }); } + + if (utils != null) { + utils.platform.colorViewBackground(binding.parentBorder, ColorRole.SECONDARY); + utils.platform.colorTextView(binding.parent, ColorRole.ON_SURFACE_VARIANT); + utils.platform.colorImageView(binding.notSyncedYet, ColorRole.PRIMARY); + utils.platform.colorTextView(binding.actorDisplayName, ColorRole.ON_SURFACE); + utils.platform.colorTextView(binding.actorDisplayName, ColorRole.ON_SURFACE); + } } public void unbind() { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java index 1c1f737a9..2c030f65d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java @@ -149,7 +149,7 @@ public class CardDetailsFragment extends Fragment implements CardDueDateView.Due viewModel.getDescriptionMode().observe(getViewLifecycleOwner(), (isPreviewMode) -> { if (isPreviewMode) { toggleEditorView(binding.descriptionViewer, binding.descriptionEditorWrapper, binding.descriptionViewer); - binding.descriptionToggle.setImageResource(R.drawable.ic_edit_grey600_24dp); + binding.descriptionToggle.setImageResource(R.drawable.ic_edit_24dp); } else { toggleEditorView(binding.descriptionEditorWrapper, binding.descriptionViewer, binding.descriptionEditor); binding.descriptionToggle.setImageResource(R.drawable.ic_baseline_eye_24); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java index ef8ce7c4d..24d1819e5 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java @@ -95,9 +95,9 @@ public class FilterLabelsAdapter extends RecyclerView.Adapter - - - - - - diff --git a/app/src/main/res/drawable/ic_activity_72dp.xml b/app/src/main/res/drawable/ic_activity_72dp.xml new file mode 100644 index 000000000..6baaf0416 --- /dev/null +++ b/app/src/main/res/drawable/ic_activity_72dp.xml @@ -0,0 +1,7 @@ + + + diff --git a/app/src/main/res/drawable/ic_activity_light_grey.xml b/app/src/main/res/drawable/ic_activity_light_grey.xml deleted file mode 100644 index 7d1932e13..000000000 --- a/app/src/main/res/drawable/ic_activity_light_grey.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_add_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml new file mode 100644 index 000000000..891d7f11a --- /dev/null +++ b/app/src/main/res/drawable/ic_add_24dp.xml @@ -0,0 +1,6 @@ + + + diff --git a/app/src/main/res/drawable/ic_add_grey_24dp.xml b/app/src/main/res/drawable/ic_add_grey_24dp.xml deleted file mode 100644 index 11eeb621c..000000000 --- a/app/src/main/res/drawable/ic_add_grey_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml deleted file mode 100644 index 9605fb3c9..000000000 --- a/app/src/main/res/drawable/ic_add_white_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_archive_24dp.xml b/app/src/main/res/drawable/ic_archive_24dp.xml new file mode 100644 index 000000000..97aa65f30 --- /dev/null +++ b/app/src/main/res/drawable/ic_archive_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_archive_white_24dp.xml b/app/src/main/res/drawable/ic_archive_white_24dp.xml deleted file mode 100644 index 9503d04c2..000000000 --- a/app/src/main/res/drawable/ic_archive_white_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml new file mode 100644 index 000000000..c2414ebca --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_back_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml deleted file mode 100644 index 17d6150d8..000000000 --- a/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_attach_file_24dp.xml b/app/src/main/res/drawable/ic_attach_file_24dp.xml new file mode 100644 index 000000000..27859b34f --- /dev/null +++ b/app/src/main/res/drawable/ic_attach_file_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_attach_file_grey600_24dp.xml b/app/src/main/res/drawable/ic_attach_file_grey600_24dp.xml deleted file mode 100644 index ffcf48bf2..000000000 --- a/app/src/main/res/drawable/ic_attach_file_grey600_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_account_circle_24.xml b/app/src/main/res/drawable/ic_baseline_account_circle_24.xml index 2cb60dcfb..2c2586be1 100644 --- a/app/src/main/res/drawable/ic_baseline_account_circle_24.xml +++ b/app/src/main/res/drawable/ic_baseline_account_circle_24.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/res/drawable/ic_baseline_block_24.xml b/app/src/main/res/drawable/ic_baseline_block_24.xml index 26080c324..f540900d6 100644 --- a/app/src/main/res/drawable/ic_baseline_block_24.xml +++ b/app/src/main/res/drawable/ic_baseline_block_24.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/drawable/ic_bug_report_24dp.xml b/app/src/main/res/drawable/ic_bug_report_24dp.xml new file mode 100644 index 000000000..00e4bbf91 --- /dev/null +++ b/app/src/main/res/drawable/ic_bug_report_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_bug_report_black_24dp.xml b/app/src/main/res/drawable/ic_bug_report_black_24dp.xml deleted file mode 100644 index e2003cef0..000000000 --- a/app/src/main/res/drawable/ic_bug_report_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_close_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml new file mode 100644 index 000000000..53f60c817 --- /dev/null +++ b/app/src/main/res/drawable/ic_close_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml deleted file mode 100644 index 1c878294b..000000000 --- a/app/src/main/res/drawable/ic_close_white_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_delete_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml new file mode 100644 index 000000000..743ca1b3e --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_delete_black_24dp.xml b/app/src/main/res/drawable/ic_delete_black_24dp.xml deleted file mode 100644 index 598764774..000000000 --- a/app/src/main/res/drawable/ic_delete_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_edit_24dp.xml b/app/src/main/res/drawable/ic_edit_24dp.xml new file mode 100644 index 000000000..9a1aa796f --- /dev/null +++ b/app/src/main/res/drawable/ic_edit_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_edit_grey600_24dp.xml b/app/src/main/res/drawable/ic_edit_grey600_24dp.xml deleted file mode 100644 index ded83281f..000000000 --- a/app/src/main/res/drawable/ic_edit_grey600_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_home_24dp.xml b/app/src/main/res/drawable/ic_home_24dp.xml new file mode 100644 index 000000000..6b24d74f1 --- /dev/null +++ b/app/src/main/res/drawable/ic_home_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_home_grey600_24dp.xml b/app/src/main/res/drawable/ic_home_grey600_24dp.xml deleted file mode 100644 index 702c25de6..000000000 --- a/app/src/main/res/drawable/ic_home_grey600_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_person_add_24dp.xml b/app/src/main/res/drawable/ic_person_add_24dp.xml new file mode 100644 index 000000000..0c7a217da --- /dev/null +++ b/app/src/main/res/drawable/ic_person_add_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_person_add_black_24dp.xml b/app/src/main/res/drawable/ic_person_add_black_24dp.xml deleted file mode 100644 index 75fc2f4e6..000000000 --- a/app/src/main/res/drawable/ic_person_add_black_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_settings_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml new file mode 100644 index 000000000..8521eec7b --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings_grey600_24dp.xml b/app/src/main/res/drawable/ic_settings_grey600_24dp.xml deleted file mode 100644 index b4207174c..000000000 --- a/app/src/main/res/drawable/ic_settings_grey600_24dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/type_comment_36dp.xml b/app/src/main/res/drawable/type_comment_36dp.xml new file mode 100644 index 000000000..e089edf46 --- /dev/null +++ b/app/src/main/res/drawable/type_comment_36dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/type_comment_grey600_36dp.xml b/app/src/main/res/drawable/type_comment_grey600_36dp.xml deleted file mode 100644 index ed1e970e9..000000000 --- a/app/src/main/res/drawable/type_comment_grey600_36dp.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 1bc25e332..b950446be 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -14,7 +14,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:navigationIcon="@drawable/ic_arrow_back_white_24dp" + app:navigationIcon="@drawable/ic_arrow_back_24dp" tools:title="@string/about" /> diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index 1da20f6c8..79aed8436 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -14,7 +14,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:navigationIcon="@drawable/ic_close_white_24dp"> + app:navigationIcon="@drawable/ic_close_24dp"> + app:drawableEndCompat="@drawable/ic_bug_report_24dp" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e72601e5e..6e31a98ba 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -42,7 +42,7 @@ android:foreground="?attr/selectableItemBackgroundBorderless" android:tooltipText="@string/manage_list" app:icon="@drawable/ic_menu" - app:iconTint="?attr/colorAccent" + app:iconTint="?attr/colorOnSurface" tools:ignore="UnusedAttribute" /> @@ -131,7 +131,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:menu="@menu/main_menu" - app:navigationIcon="@drawable/ic_arrow_back_white_24dp" /> + app:navigationIcon="@drawable/ic_arrow_back_24dp" /> @@ -143,7 +143,7 @@ android:layout_margin="@dimen/fab_margin" android:text="@string/add_card" android:visibility="gone" - app:icon="@drawable/ic_add_white_24dp" /> + app:icon="@drawable/ic_add_24dp" /> diff --git a/app/src/main/res/layout/activity_push_notification.xml b/app/src/main/res/layout/activity_push_notification.xml index d280ba506..8bed9de42 100644 --- a/app/src/main/res/layout/activity_push_notification.xml +++ b/app/src/main/res/layout/activity_push_notification.xml @@ -11,7 +11,7 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:navigationIcon="@drawable/ic_arrow_back_white_24dp" + app:navigationIcon="@drawable/ic_arrow_back_24dp" app:title="@string/app_name" /> + app:srcCompat="@drawable/ic_person_add_24dp" /> + app:srcCompat="@drawable/ic_settings_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml index 987d22626..e806001b3 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_attachments.xml @@ -22,7 +22,7 @@ android:layout_height="match_parent" android:visibility="gone" app:description="@string/no_files_attached_to_this_card" - app:image="@drawable/ic_attach_file_grey600_24dp" + app:image="@drawable/ic_attach_file_24dp" app:title="@string/attachments" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_card_edit_tab_comments.xml b/app/src/main/res/layout/fragment_card_edit_tab_comments.xml index 0c60c92a2..bcd30d2a0 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_comments.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_comments.xml @@ -22,7 +22,7 @@ android:layout_height="match_parent" android:visibility="gone" app:description="@string/no_comments_yet" - app:image="@drawable/type_comment_grey600_36dp" + app:image="@drawable/type_comment_36dp" app:title="@string/card_edit_comments" /> + app:srcCompat="@drawable/ic_reply_grey600_24dp" + app:tint="?attr/colorSecondary" /> + app:srcCompat="@drawable/ic_baseline_mention_24" + app:tint="?attr/colorSecondary" /> @@ -119,7 +119,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:padding="@dimen/spacer_2x" - android:textColor="?attr/colorAccent" + android:textColor="?attr/colorOnSurface" android:textIsSelectable="true" android:textSize="@dimen/font_size_description" android:translationY="1dp" diff --git a/app/src/main/res/layout/item_access_control.xml b/app/src/main/res/layout/item_access_control.xml index 1edd8c21a..4d88bb079 100644 --- a/app/src/main/res/layout/item_access_control.xml +++ b/app/src/main/res/layout/item_access_control.xml @@ -44,7 +44,7 @@ android:layout_gravity="center" android:background="?android:selectableItemBackground" android:padding="0dp" - app:srcCompat="@drawable/ic_delete_black_24dp" /> + app:srcCompat="@drawable/ic_delete_24dp" /> diff --git a/app/src/main/res/layout/item_attachment_default.xml b/app/src/main/res/layout/item_attachment_default.xml index 9d5781c3e..5e507fba4 100644 --- a/app/src/main/res/layout/item_attachment_default.xml +++ b/app/src/main/res/layout/item_attachment_default.xml @@ -20,7 +20,7 @@ android:layout_gravity="center" android:contentDescription="@null" android:padding="@dimen/spacer_1hx" - app:srcCompat="@drawable/ic_attach_file_grey600_24dp" + app:srcCompat="@drawable/ic_attach_file_24dp" app:tint="?attr/colorSecondary" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_card_compact.xml b/app/src/main/res/layout/item_card_compact.xml index 75d95f796..28a91b020 100644 --- a/app/src/main/res/layout/item_card_compact.xml +++ b/app/src/main/res/layout/item_card_compact.xml @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:paddingVertical="2sp" - android:textColor="?attr/colorAccent" + android:textColor="?attr/colorOnSurface" android:textSize="18sp" tools:ignore="RtlSymmetry" tools:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l" /> @@ -50,6 +50,7 @@ android:contentDescription="@string/not_synced_yet" android:visibility="gone" app:srcCompat="@drawable/ic_sync_blue_24dp" + app:tint="?attr/colorPrimary" tools:visibility="visible" /> + app:tint="?attr/colorOnSurface" /> @@ -52,6 +52,7 @@ android:contentDescription="@string/not_synced_yet" android:visibility="gone" app:srcCompat="@drawable/ic_sync_blue_24dp" + app:tint="?attr/colorPrimary" tools:visibility="visible" /> @@ -138,7 +139,7 @@ android:contentDescription="@string/label_menu" android:padding="@dimen/spacer_1hx" app:srcCompat="@drawable/ic_menu" - app:tint="?attr/colorAccent" /> + app:tint="?attr/colorOnSurface" /> diff --git a/app/src/main/res/layout/item_card_default_only_title.xml b/app/src/main/res/layout/item_card_default_only_title.xml index 145023167..defd61231 100644 --- a/app/src/main/res/layout/item_card_default_only_title.xml +++ b/app/src/main/res/layout/item_card_default_only_title.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:paddingVertical="2sp" - android:textColor="?attr/colorAccent" + android:textColor="?attr/colorOnSurface" android:textSize="18sp" tools:ignore="RtlSymmetry" tools:text="Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut l" /> @@ -35,6 +35,7 @@ android:contentDescription="@string/not_synced_yet" android:visibility="gone" app:srcCompat="@drawable/ic_sync_blue_24dp" + app:tint="?attr/colorPrimary" tools:visibility="visible" /> + app:tint="?attr/colorOnSurface" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_comment.xml b/app/src/main/res/layout/item_comment.xml index 2863699a5..2304206c4 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -22,7 +22,7 @@ android:id="@+id/parentBorder" android:layout_width="2dp" android:layout_height="match_parent" - android:background="?attr/colorPrimary" /> + android:textColor="?attr/colorSecondary" /> @@ -41,10 +42,10 @@ android:baselineAligned="false" android:orientation="horizontal"> - + @@ -77,20 +79,22 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - - diff --git a/app/src/main/res/layout/item_filter_label.xml b/app/src/main/res/layout/item_filter_label.xml index 49bc47fcb..8308d10a4 100644 --- a/app/src/main/res/layout/item_filter_label.xml +++ b/app/src/main/res/layout/item_filter_label.xml @@ -12,6 +12,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:ellipsize="middle" + android:textColor="?attr/colorOnSurface" + app:chipBackgroundColor="?attr/colorSurface" tools:text="@tools:sample/lorem" /> + app:srcCompat="@drawable/ic_edit_24dp" /> + app:srcCompat="@drawable/ic_delete_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_card.xml b/app/src/main/res/layout/item_search_card.xml index c3f30ec5f..f37fa7cec 100644 --- a/app/src/main/res/layout/item_search_card.xml +++ b/app/src/main/res/layout/item_search_card.xml @@ -61,5 +61,5 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/coverImages" app:srcCompat="@drawable/ic_menu" - app:tint="?attr/colorAccent" /> + app:tint="?attr/colorOnSurface" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_stack.xml b/app/src/main/res/layout/item_search_stack.xml index 19e2b7da2..a9ddf5213 100644 --- a/app/src/main/res/layout/item_search_stack.xml +++ b/app/src/main/res/layout/item_search_stack.xml @@ -8,7 +8,7 @@ android:paddingTop="@dimen/spacer_4x" android:paddingEnd="@dimen/spacer_4x" android:paddingBottom="@dimen/spacer_2x" - android:textColor="?attr/colorAccent" + android:textColor="?attr/colorOnSurfaceVariant" android:textSize="22sp" android:textStyle="bold" tools:text="@tools:sample/lorem" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_section.xml b/app/src/main/res/layout/item_section.xml index 2ebb5de81..d6e87e941 100644 --- a/app/src/main/res/layout/item_section.xml +++ b/app/src/main/res/layout/item_section.xml @@ -8,7 +8,7 @@ android:paddingTop="@dimen/spacer_4x" android:paddingEnd="@dimen/spacer_4x" android:paddingBottom="@dimen/spacer_2x" - android:textColor="?attr/colorAccent" + android:textColor="?attr/colorOnSurface" android:textSize="22sp" android:textStyle="bold" tools:text="@tools:sample/lorem" /> \ No newline at end of file diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 222025781..76a560c89 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -48,7 +48,7 @@ android:background="?attr/selectableItemBackground" android:contentDescription="@string/copy_logs" android:padding="@dimen/spacer_2x" - android:src="@drawable/ic_bug_report_black_24dp" + android:src="@drawable/ic_bug_report_24dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/widget_single_card.xml b/app/src/main/res/layout/widget_single_card.xml index b868a59d5..3c8de6a96 100644 --- a/app/src/main/res/layout/widget_single_card.xml +++ b/app/src/main/res/layout/widget_single_card.xml @@ -120,7 +120,7 @@ android:contentDescription="@null" android:tint="@color/grey600" tools:ignore="UseAppTint" - tools:src="@drawable/ic_attach_file_grey600_24dp" /> + tools:src="@drawable/ic_attach_file_24dp" /> diff --git a/app/src/main/res/menu/attachment_picker_menu.xml b/app/src/main/res/menu/attachment_picker_menu.xml index f280ac752..9be81c747 100644 --- a/app/src/main/res/menu/attachment_picker_menu.xml +++ b/app/src/main/res/menu/attachment_picker_menu.xml @@ -13,7 +13,7 @@ app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/comment_menu.xml b/app/src/main/res/menu/comment_menu.xml index afbbb5292..3c1cd12a5 100644 --- a/app/src/main/res/menu/comment_menu.xml +++ b/app/src/main/res/menu/comment_menu.xml @@ -15,7 +15,7 @@ app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 81e38f628..66d2acb7d 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -5,9 +5,40 @@ - @android:color/black @android:color/white + + #1A1C1E + #FFB4AB + #690005 + #93000A + #FFB4AB + #303030 + #4B4B4B + #E2E2E2 + #E2E2E2 + #272727 + #E0E0E0 + #2F2F2F + #E1E1E1 + #E2E2E2 + #C6C6C6 + #313131 + #E4E4E4 + #909090 + #464646 + #C1C1C1 + #383838 + #000000 + #C5C5C5 + #454545 + #000000 + #1B1B1B + #464646 + #C9C9C9 + #484848 + #191919 + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1b9a313f4..60e65bf3d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,11 +5,43 @@ - @android:color/white + @android:color/black #0082C9 #d40000 + + #FCFCFC + #BA1A1A + #FFFFFF + #FFDAD6 + #410002 + #F0F0F0 + #C1C1C1 + #303030 + #1B1B1B + #FFFFFF + #161616 + #FFFFFF + #0E1D2A + #1B1B1B + #464646 + #FFFFFF + #1C1C1C + #767676 + #C6C6C6 + #4B4B4B + #E0E0E0 + #000000 + #5D5D5D + #E1E1E1 + #000000 + #FCFCFC + #E2E2E2 + #606060 + #E4E4E4 + @color/bg_default + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ba047c3ab..6a5fabd6c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,17 +1,43 @@ - - - - @@ -81,10 +71,6 @@ 40dp - - - -- cgit v1.2.3