diff options
| author | Stefan Niedermann <info@niedermann.it> | 2024-01-22 18:46:14 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2024-01-22 18:46:14 +0300 |
| commit | 4299da9b22c62719e16f3e442d339a867dcb116a (patch) | |
| tree | 3e36aa9c1c493dda8c9722d5bb98547d7e0fa349 | |
| parent | dd6e766eed7b3a0fe4b7a2d0fc770858301c7c3c (diff) | |
feat(theming): Use grayscale default theme to avoid wrong color tones
Signed-off-by: Stefan Niedermann <info@niedermann.it>
73 files changed, 243 insertions, 142 deletions
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 @@ <shortcuts xmlns:android="http://schemas.android.com/apk/res/android"> <shortcut android:enabled="true" - android:icon="@drawable/ic_add_grey_24dp" + android:icon="@drawable/ic_add_24dp" android:shortcutId="it.niedermann.nextcloud.deck" android:shortcutLongLabel="@string/add_card" android:shortcutShortLabel="@string/simple_add"> 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<FilterLabelsAdapte public void bindNotAssigned() { binding.label.setText(itemView.getContext().getString(R.string.no_assigned_label)); - binding.label.setTextColor(ColorStateList.valueOf(ContextCompat.getColor(itemView.getContext(), R.color.accent))); + binding.label.setTextColor(ColorStateList.valueOf(ContextCompat.getColor(itemView.getContext(), R.color.onSurface))); binding.label.setChipIcon(ContextCompat.getDrawable(itemView.getContext(), R.drawable.ic_baseline_block_24)); - binding.label.setChipBackgroundColor(ColorStateList.valueOf(ContextCompat.getColor(itemView.getContext(), R.color.primary))); + binding.label.setChipBackgroundColor(ColorStateList.valueOf(ContextCompat.getColor(itemView.getContext(), R.color.surface))); binding.label.setRippleColor(null); itemView.setSelected(selectedLabels.contains(NOT_ASSIGNED)); applyTheme(color); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/DrawerMenuInflater.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/DrawerMenuInflater.java index f85a5e490..dfc9f0ba8 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/DrawerMenuInflater.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/DrawerMenuInflater.java @@ -107,14 +107,14 @@ public class DrawerMenuInflater<T extends FragmentActivity & ArchiveBoardListene } if (hasArchivedBoards) { - menu.add(Menu.NONE, MENU_ID_ARCHIVED_BOARDS, Menu.NONE, R.string.archived_boards).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_archive_white_24dp)); + menu.add(Menu.NONE, MENU_ID_ARCHIVED_BOARDS, Menu.NONE, R.string.archived_boards).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_archive_24dp)); } if (currentServerVersionIsSupported) { - menu.add(Menu.NONE, MENU_ID_ADD_BOARD, Menu.NONE, R.string.add_board).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_add_grey_24dp)); + menu.add(Menu.NONE, MENU_ID_ADD_BOARD, Menu.NONE, R.string.add_board).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_add_24dp)); } - menu.add(Menu.NONE, MENU_ID_SETTINGS, Menu.NONE, R.string.simple_settings).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_settings_grey600_24dp)); + menu.add(Menu.NONE, MENU_ID_SETTINGS, Menu.NONE, R.string.simple_settings).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_settings_24dp)); menu.add(Menu.NONE, MENU_ID_ABOUT, Menu.NONE, R.string.about).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_info_outline_grey600_24dp)); return navigationMap; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/search/SearchCardViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/search/SearchCardViewHolder.java index 29a7373d1..f7dea2385 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/search/SearchCardViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/search/SearchCardViewHolder.java @@ -107,5 +107,6 @@ public class SearchCardViewHolder extends SearchViewHolder { utils.platform.colorTextView(binding.title, ColorRole.ON_SURFACE); utils.platform.highlightText(binding.title, binding.title.getText().toString(), term); utils.platform.highlightText(binding.description, binding.description.getText().toString(), term); + utils.platform.colorImageView(binding.cardMenu, ColorRole.ON_SURFACE_VARIANT); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java index b4c282c97..42c3cce17 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java @@ -127,7 +127,7 @@ public class MoveCardDialogFragment extends DialogFragment implements Themed, Pi this.selectedStack = stack; applyTheme(board == null - ? ContextCompat.getColor(requireContext(), R.color.accent) + ? ContextCompat.getColor(requireContext(), R.color.onSurface) : board.getColor() ); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java index f674047cc..3d6dc0bbc 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/singlecard/SingleCardWidget.java @@ -95,7 +95,7 @@ public class SingleCardWidget extends AppWidgetProvider { } else { views.setViewVisibility(R.id.card_count_attachments, View.VISIBLE); views.setViewVisibility(R.id.card_count_attachments_image, View.VISIBLE); - views.setImageViewResource(R.id.card_count_attachments_image, R.drawable.ic_attach_file_grey600_24dp); + views.setImageViewResource(R.id.card_count_attachments_image, R.drawable.ic_attach_file_24dp); setupCounter(views, R.id.card_count_attachments, attachmentsCount, counterMaxValue); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/AttachmentUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/AttachmentUtil.java index db83a17f0..7b1fab982 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/util/AttachmentUtil.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/AttachmentUtil.java @@ -132,7 +132,7 @@ public class AttachmentUtil { @DrawableRes public static int getIconForMimeType(@NonNull String mimeType) { if (TextUtils.isEmpty(mimeType)) { - return R.drawable.ic_attach_file_grey600_24dp; + return R.drawable.ic_attach_file_24dp; } else if (MimeTypeUtil.isAudio(mimeType)) { return R.drawable.ic_music_note_grey600_24dp; } else if (MimeTypeUtil.isVideo(mimeType)) { @@ -142,7 +142,7 @@ public class AttachmentUtil { } else if (MimeTypeUtil.isContact(mimeType)) { return R.drawable.ic_baseline_contact_mail_24; } else { - return R.drawable.ic_attach_file_grey600_24dp; + return R.drawable.ic_attach_file_24dp; } } diff --git a/app/src/main/res/color/text_input_layout_color.xml b/app/src/main/res/color/text_input_layout_color.xml deleted file mode 100644 index fcd5fa09a..000000000 --- a/app/src/main/res/color/text_input_layout_color.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="true" android:color="@color/accent"/> - <item android:state_hovered="true" android:color="@color/accent"/> - <item android:state_focused="true" android:color="@color/accent"/> - <item android:color="@color/grey600" /> -</selector> diff --git a/app/src/main/res/drawable/ic_activity_light_grey.xml b/app/src/main/res/drawable/ic_activity_72dp.xml index 7d1932e13..6baaf0416 100644 --- a/app/src/main/res/drawable/ic_activity_light_grey.xml +++ b/app/src/main/res/drawable/ic_activity_72dp.xml @@ -1,5 +1,6 @@ <vector android:height="72dp" android:viewportHeight="32" android:viewportWidth="32" + android:tint="?attr/colorOnSurfaceVariant" android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF969696" android:pathData="M16,1.9492 L6,18.8102H17L16,30.0508 26,13.1898H15Z"/> diff --git a/app/src/main/res/drawable/ic_add_grey_24dp.xml b/app/src/main/res/drawable/ic_add_24dp.xml index 11eeb621c..891d7f11a 100644 --- a/app/src/main/res/drawable/ic_add_grey_24dp.xml +++ b/app/src/main/res/drawable/ic_add_24dp.xml @@ -1,5 +1,6 @@ <vector android:autoMirrored="true" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" + android:tint="?attr/colorOnSurface" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#757575" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> </vector> 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 @@ -<vector android:autoMirrored="true" - android:height="24dp" - android:tint="#FFFFFF" - android:viewportHeight="24.0" - android:viewportWidth="24.0" - android:width="24dp" - xmlns:android="http://schemas.android.com/apk/res/android"> - <path - android:fillColor="#FF000000" - android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /> -</vector> diff --git a/app/src/main/res/drawable/ic_archive_white_24dp.xml b/app/src/main/res/drawable/ic_archive_24dp.xml index 9503d04c2..97aa65f30 100644 --- a/app/src/main/res/drawable/ic_archive_white_24dp.xml +++ b/app/src/main/res/drawable/ic_archive_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#FFFFFF" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/> </vector> 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 @@ +<vector android:autoMirrored="true" android:height="24dp" + android:tint="?attr/colorOnSurface" android:viewportHeight="24.0" + android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/colorOnSurface" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/> +</vector> 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 @@ -<vector android:autoMirrored="true" android:height="24dp" - android:tint="@color/accent" android:viewportHeight="24.0" - android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@color/accent" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/> -</vector> diff --git a/app/src/main/res/drawable/ic_attach_file_grey600_24dp.xml b/app/src/main/res/drawable/ic_attach_file_24dp.xml index ffcf48bf2..27859b34f 100644 --- a/app/src/main/res/drawable/ic_attach_file_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_attach_file_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#666666" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M16.5,6v11.5c0,2.21 -1.79,4 -4,4s-4,-1.79 -4,-4V5c0,-1.38 1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5v10.5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1V6H10v9.5c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5V5c0,-2.21 -1.79,-4 -4,-4S7,2.79 7,5v12.5c0,3.04 2.46,5.5 5.5,5.5s5.5,-2.46 5.5,-5.5V6h-1.5z"/> </vector> 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 @@ <vector android:height="24dp" - android:tint="@color/accent" android:viewportHeight="24" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="@color/accent" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/> + <path android:fillColor="?attr/colorOnSurfaceVariant" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/> </vector> 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 @@ -<vector android:height="@dimen/avatar_size" android:tint="#757575" +<vector android:height="@dimen/avatar_size" android:tint="?attr/colorOnSurface" android:viewportHeight="24" android:viewportWidth="24" android:width="@dimen/avatar_size" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/> diff --git a/app/src/main/res/drawable/ic_bug_report_black_24dp.xml b/app/src/main/res/drawable/ic_bug_report_24dp.xml index e2003cef0..00e4bbf91 100644 --- a/app/src/main/res/drawable/ic_bug_report_black_24dp.xml +++ b/app/src/main/res/drawable/ic_bug_report_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#666666" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurface" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/> </vector> diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml index 1c878294b..53f60c817 100644 --- a/app/src/main/res/drawable/ic_close_white_24dp.xml +++ b/app/src/main/res/drawable/ic_close_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="@color/accent" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurface" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/> </vector> diff --git a/app/src/main/res/drawable/ic_delete_black_24dp.xml b/app/src/main/res/drawable/ic_delete_24dp.xml index 598764774..743ca1b3e 100644 --- a/app/src/main/res/drawable/ic_delete_black_24dp.xml +++ b/app/src/main/res/drawable/ic_delete_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#666666" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/> </vector> diff --git a/app/src/main/res/drawable/ic_edit_grey600_24dp.xml b/app/src/main/res/drawable/ic_edit_24dp.xml index ded83281f..9a1aa796f 100644 --- a/app/src/main/res/drawable/ic_edit_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_edit_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#757575" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/> </vector> diff --git a/app/src/main/res/drawable/ic_home_grey600_24dp.xml b/app/src/main/res/drawable/ic_home_24dp.xml index 702c25de6..6b24d74f1 100644 --- a/app/src/main/res/drawable/ic_home_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_home_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#757575" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/> </vector> diff --git a/app/src/main/res/drawable/ic_person_add_black_24dp.xml b/app/src/main/res/drawable/ic_person_add_24dp.xml index 75fc2f4e6..0c7a217da 100644 --- a/app/src/main/res/drawable/ic_person_add_black_24dp.xml +++ b/app/src/main/res/drawable/ic_person_add_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#666666" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/> </vector> diff --git a/app/src/main/res/drawable/ic_settings_grey600_24dp.xml b/app/src/main/res/drawable/ic_settings_24dp.xml index b4207174c..8521eec7b 100644 --- a/app/src/main/res/drawable/ic_settings_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#666666" android:viewportHeight="24" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/> </vector> diff --git a/app/src/main/res/drawable/type_comment_grey600_36dp.xml b/app/src/main/res/drawable/type_comment_36dp.xml index ed1e970e9..e089edf46 100644 --- a/app/src/main/res/drawable/type_comment_grey600_36dp.xml +++ b/app/src/main/res/drawable/type_comment_36dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="36dp" - android:tint="#757575" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/> </vector> 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" /> <com.google.android.material.tabs.TabLayout diff --git a/app/src/main/res/layout/activity_archived.xml b/app/src/main/res/layout/activity_archived.xml index a876f4f49..3eb6e279d 100644 --- a/app/src/main/res/layout/activity_archived.xml +++ b/app/src/main/res/layout/activity_archived.xml @@ -10,7 +10,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/archived_cards" /> <it.niedermann.nextcloud.deck.ui.view.EmptyContentView diff --git a/app/src/main/res/layout/activity_attachments.xml b/app/src/main/res/layout/activity_attachments.xml index 784dd1090..87aee7010 100644 --- a/app/src/main/res/layout/activity_attachments.xml +++ b/app/src/main/res/layout/activity_attachments.xml @@ -16,7 +16,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/attachments" /> </com.google.android.material.appbar.AppBarLayout> 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"> <EditText android:id="@+id/title" diff --git a/app/src/main/res/layout/activity_exception.xml b/app/src/main/res/layout/activity_exception.xml index 37447f958..876b091f4 100644 --- a/app/src/main/res/layout/activity_exception.xml +++ b/app/src/main/res/layout/activity_exception.xml @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:hint="@string/hint_error_appeared" - app:drawableEndCompat="@drawable/ic_bug_report_black_24dp" /> + app:drawableEndCompat="@drawable/ic_bug_report_24dp" /> </LinearLayout> 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" /> </LinearLayout> @@ -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" /> </com.google.android.material.appbar.AppBarLayout> @@ -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" /> <com.google.android.material.search.SearchView android:id="@+id/search_view" diff --git a/app/src/main/res/layout/activity_manage_accounts.xml b/app/src/main/res/layout/activity_manage_accounts.xml index 89ea96a6c..6bbd5d98a 100644 --- a/app/src/main/res/layout/activity_manage_accounts.xml +++ b/app/src/main/res/layout/activity_manage_accounts.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" app:contentInsetStartWithNavigation="0dp" - app:navigationIcon="@drawable/ic_arrow_back_white_24dp" + app:navigationIcon="@drawable/ic_arrow_back_24dp" app:title="@string/manage_accounts" app:titleMarginStart="0dp" /> 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" /> <LinearLayout diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index b3e88552a..42320821f 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -9,7 +9,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/simple_settings" /> <androidx.fragment.app.FragmentContainerView diff --git a/app/src/main/res/layout/activity_upcoming_cards.xml b/app/src/main/res/layout/activity_upcoming_cards.xml index 7c16ae357..da4421fc9 100644 --- a/app/src/main/res/layout/activity_upcoming_cards.xml +++ b/app/src/main/res/layout/activity_upcoming_cards.xml @@ -10,7 +10,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/widget_upcoming_title" /> <it.niedermann.nextcloud.deck.ui.view.EmptyContentView diff --git a/app/src/main/res/layout/dialog_account_switcher.xml b/app/src/main/res/layout/dialog_account_switcher.xml index 048fc0bcd..341e99f26 100644 --- a/app/src/main/res/layout/dialog_account_switcher.xml +++ b/app/src/main/res/layout/dialog_account_switcher.xml @@ -96,7 +96,7 @@ android:contentDescription="@null" android:focusable="false" android:scaleType="center" - app:srcCompat="@drawable/ic_person_add_black_24dp" /> + app:srcCompat="@drawable/ic_person_add_24dp" /> <TextView android:layout_width="wrap_content" @@ -129,7 +129,7 @@ android:contentDescription="@null" android:focusable="false" android:scaleType="center" - app:srcCompat="@drawable/ic_settings_grey600_24dp" /> + app:srcCompat="@drawable/ic_settings_24dp" /> <TextView android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/fragment_card_edit_tab_activities.xml b/app/src/main/res/layout/fragment_card_edit_tab_activities.xml index 0cebd3471..30be21168 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_activities.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_activities.xml @@ -21,6 +21,6 @@ android:layout_height="match_parent" android:visibility="gone" app:description="@string/no_activities" - app:image="@drawable/ic_activity_light_grey" + app:image="@drawable/ic_activity_72dp" app:title="@string/activity" /> </FrameLayout>
\ 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" /> <com.google.android.material.floatingactionbutton.FloatingActionButton @@ -78,9 +78,9 @@ android:layout_width="match_parent" android:layout_height="@dimen/attachments_bottom_navigation_height" android:translationY="@dimen/attachments_bottom_navigation_height" - app:backgroundTint="?attr/colorPrimary" - app:itemIconTint="?attr/colorAccent" - app:itemTextColor="?attr/colorAccent" + app:backgroundTint="?attr/colorSurface" + app:itemIconTint="?attr/colorOnSecondaryContainer" + app:itemTextColor="?attr/colorOnSurface" app:menu="@menu/attachment_picker_menu" /> </LinearLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ 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" /> <LinearLayout @@ -39,15 +39,18 @@ android:background="@drawable/gradient_vertical" android:padding="@dimen/spacer_2x" android:visibility="gone" + app:tint="?attr/colorSecondary" tools:visibility="visible"> <ImageView + android:id="@+id/replyCommentIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/spacer_1x" android:contentDescription="@string/simple_reply" android:padding="@dimen/spacer_1x" - app:srcCompat="@drawable/ic_reply_grey600_24dp" /> + app:srcCompat="@drawable/ic_reply_grey600_24dp" + app:tint="?attr/colorSecondary" /> <it.niedermann.android.markdown.MarkdownViewerImpl android:id="@+id/replyCommentText" @@ -84,12 +87,14 @@ tools:visibility="visible"> <ImageView + android:id="@+id/mentionProposerIcon" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/spacer_1x" android:contentDescription="@string/simple_reply" android:padding="@dimen/spacer_1x" - app:srcCompat="@drawable/ic_baseline_mention_24" /> + app:srcCompat="@drawable/ic_baseline_mention_24" + app:tint="?attr/colorSecondary" /> <LinearLayout android:id="@+id/mention_proposer" diff --git a/app/src/main/res/layout/fragment_card_edit_tab_details.xml b/app/src/main/res/layout/fragment_card_edit_tab_details.xml index c39a00fc5..b27cea71f 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_details.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_details.xml @@ -108,7 +108,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="@dimen/spacer_2x" - android:textColor="?attr/colorAccent" + android:textColor="?attr/colorOnSurface" android:textSize="@dimen/font_size_description" /> </com.google.android.material.textfield.TextInputLayout> @@ -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" /> </LinearLayout> <com.google.android.flexbox.FlexboxLayout diff --git a/app/src/main/res/layout/item_account_choose.xml b/app/src/main/res/layout/item_account_choose.xml index b5a6dd726..8ad105b96 100644 --- a/app/src/main/res/layout/item_account_choose.xml +++ b/app/src/main/res/layout/item_account_choose.xml @@ -65,10 +65,10 @@ android:layout_width="36dp" android:layout_height="36dp" android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@null" + android:contentDescription="@string/simple_delete" android:focusable="false" android:scaleType="center" android:visibility="gone" - app:srcCompat="@drawable/ic_delete_black_24dp" + app:srcCompat="@drawable/ic_delete_24dp" tools:visibility="visible" /> </LinearLayout> 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" /> <ImageView diff --git a/app/src/main/res/layout/item_attachment_image.xml b/app/src/main/res/layout/item_attachment_image.xml index 3b41a9fe8..36448c441 100644 --- a/app/src/main/res/layout/item_attachment_image.xml +++ b/app/src/main/res/layout/item_attachment_image.xml @@ -24,5 +24,6 @@ android:translationY="-8dp" android:visibility="gone" app:srcCompat="@drawable/ic_sync_blue_24dp" + app:tint="?attr/colorPrimary" tools:visibility="visible" /> </it.niedermann.nextcloud.deck.ui.view.SquareRelativeLayout>
\ 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" /> <it.niedermann.nextcloud.deck.ui.view.DueDateChip @@ -68,7 +69,7 @@ android:contentDescription="@string/label_menu" android:padding="@dimen/spacer_1hx" app:srcCompat="@drawable/ic_menu" - app:tint="?attr/colorAccent" /> + app:tint="?attr/colorOnSurface" /> </LinearLayout> <it.niedermann.nextcloud.deck.ui.view.labellayout.CompactLabelLayout diff --git a/app/src/main/res/layout/item_card_default.xml b/app/src/main/res/layout/item_card_default.xml index 3dfcff46e..de3684e14 100644 --- a/app/src/main/res/layout/item_card_default.xml +++ b/app/src/main/res/layout/item_card_default.xml @@ -39,7 +39,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" /> @@ -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" /> <it.niedermann.nextcloud.deck.ui.view.DueDateChip @@ -111,7 +112,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:padding="@dimen/spacer_1hx" - app:drawableStartCompat="@drawable/ic_attach_file_grey600_24dp" + app:drawableStartCompat="@drawable/ic_attach_file_24dp" tools:text="3" /> </LinearLayout> @@ -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" /> </LinearLayout> </LinearLayout> </LinearLayout> 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" /> <it.niedermann.nextcloud.deck.ui.view.DueDateChip @@ -52,6 +53,6 @@ android:contentDescription="@string/label_menu" android:padding="@dimen/spacer_1hx" app:srcCompat="@drawable/ic_menu" - app:tint="?attr/colorAccent" /> + app:tint="?attr/colorOnSurface" /> </LinearLayout> </com.google.android.material.card.MaterialCardView>
\ 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" /> <TextView android:id="@+id/parent" @@ -32,6 +32,7 @@ android:maxLines="@integer/comment_parent_max_lines" android:paddingStart="@dimen/spacer_1x" android:paddingEnd="@null" + android:textColor="?attr/colorOnSurfaceVariant" tools:text="@tools:sample/lorem/random" /> </LinearLayout> @@ -41,10 +42,10 @@ android:baselineAligned="false" android:orientation="horizontal"> - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/spacer_1x"> + <FrameLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/spacer_1x"> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/avatar" @@ -63,6 +64,7 @@ android:layout_gravity="bottom|end" android:visibility="gone" app:srcCompat="@drawable/ic_sync_blue_24dp" + app:tint="?attr/colorPrimary" tools:visibility="visible" /> </FrameLayout> @@ -77,20 +79,22 @@ android:layout_height="wrap_content" android:orientation="horizontal"> - <TextView + <com.google.android.material.textview.MaterialTextView android:id="@+id/actorDisplayName" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:textAppearance="?attr/textAppearanceListItem" + android:textColor="?attr/colorOnSurface" tools:text="@tools:sample/full_names" /> - <TextView + <com.google.android.material.textview.MaterialTextView android:id="@+id/creationDateTime" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" android:textAppearance="?attr/textAppearanceListItemSecondary" + android:textColor="?attr/colorOnSurface" tools:text="@tools:sample/date/day_of_week" /> </LinearLayout> 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" /> <androidx.appcompat.widget.AppCompatImageView diff --git a/app/src/main/res/layout/item_manage_label.xml b/app/src/main/res/layout/item_manage_label.xml index c95614e83..2bc79a546 100644 --- a/app/src/main/res/layout/item_manage_label.xml +++ b/app/src/main/res/layout/item_manage_label.xml @@ -31,7 +31,7 @@ android:layout_gravity="center|end" android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/spacer_1x" - app:srcCompat="@drawable/ic_edit_grey600_24dp" /> + app:srcCompat="@drawable/ic_edit_24dp" /> <androidx.appcompat.widget.AppCompatImageButton android:id="@+id/delete" @@ -40,5 +40,5 @@ android:layout_gravity="center|end" android:background="?attr/selectableItemBackgroundBorderless" android:padding="@dimen/spacer_1x" - app:srcCompat="@drawable/ic_delete_black_24dp" /> + app:srcCompat="@drawable/ic_delete_24dp" /> </LinearLayout>
\ 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" /> </androidx.constraintlayout.widget.ConstraintLayout>
\ 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" /> <TextView android:id="@+id/card_count_attachments" diff --git a/app/src/main/res/menu/attachment_menu.xml b/app/src/main/res/menu/attachment_menu.xml index 0d9e85e86..bbc41b263 100644 --- a/app/src/main/res/menu/attachment_menu.xml +++ b/app/src/main/res/menu/attachment_menu.xml @@ -7,7 +7,7 @@ app:showAsAction="ifRoom" /> <item android:id="@+id/delete" - android:icon="@drawable/ic_delete_black_24dp" + android:icon="@drawable/ic_delete_24dp" android:title="@string/simple_delete" app:showAsAction="ifRoom" /> </menu> 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" /> <item android:id="@+id/files" - android:icon="@drawable/ic_attach_file_grey600_24dp" + android:icon="@drawable/ic_attach_file_24dp" android:title="@string/files" app:showAsAction="ifRoom" /> </menu> 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" /> <item android:id="@+id/delete" - android:icon="@drawable/ic_delete_black_24dp" + android:icon="@drawable/ic_delete_24dp" android:title="@string/simple_delete" app:showAsAction="ifRoom" /> </menu> 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 @@ <!-- Base Theme --> <!-- ======================================= --> - <color name="primary">@android:color/black</color> <color name="accent">@android:color/white</color> + <!-- Generated by android-common, grayscale by https://hexcolorcodes.org/greyscale-desaturate-color --> + <color name="background">#1A1C1E</color> + <color name="error">#FFB4AB</color> + <color name="onError">#690005</color> + <color name="errorContainer">#93000A</color> + <color name="onErrorContainer">#FFB4AB</color> + <color name="inverseOnSurface">#303030</color> + <color name="inversePrimary">#4B4B4B</color> + <color name="inverseSurface">#E2E2E2</color> + <color name="onBackground">#E2E2E2</color> + <color name="onPrimary">#272727</color> + <color name="onPrimaryContainer">#E0E0E0</color> + <color name="onSecondary">#2F2F2F</color> + <color name="onSecondaryContainer">#E1E1E1</color> + <color name="onSurface">#E2E2E2</color> + <color name="onSurfaceVariant">#C6C6C6</color> + <color name="onTertiary">#313131</color> + <color name="onTertiaryContainer">#E4E4E4</color> + <color name="outline">#909090</color> + <color name="outlineVariant">#464646</color> + <color name="primary">#C1C1C1</color> + <color name="primaryContainer">#383838</color> + <color name="scrim">#000000</color> + <color name="secondary">#C5C5C5</color> + <color name="secondaryContainer">#454545</color> + <color name="shadow">#000000</color> + <color name="surface">#1B1B1B</color> + <color name="surfaceVariant">#464646</color> + <color name="tertiary">#C9C9C9</color> + <color name="tertiaryContainer">#484848</color> + <color name="colorSurfaceContainerHigh">#191919</color> + <!-- ======================================= --> <!-- Custom styles --> <!-- TODO REMOVE --> 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 @@ <!-- Base Theme --> <!-- ======================================= --> - <color name="primary">@android:color/white</color> + <!-- <color name="primary">@android:color/white</color>--> <color name="accent">@android:color/black</color> <color name="defaultBrand">#0082C9</color> <color name="danger">#d40000</color> + <!-- Generated by android-common, grayscale by https://hexcolorcodes.org/greyscale-desaturate-color --> + <color name="background">#FCFCFC</color> + <color name="error">#BA1A1A</color> + <color name="onError">#FFFFFF</color> + <color name="errorContainer">#FFDAD6</color> + <color name="onErrorContainer">#410002</color> + <color name="inverseOnSurface">#F0F0F0</color> + <color name="inversePrimary">#C1C1C1</color> + <color name="inverseSurface">#303030</color> + <color name="onBackground">#1B1B1B</color> + <color name="onPrimary">#FFFFFF</color> + <color name="onPrimaryContainer">#161616</color> + <color name="onSecondary">#FFFFFF</color> + <color name="onSecondaryContainer">#0E1D2A</color> + <color name="onSurface">#1B1B1B</color> + <color name="onSurfaceVariant">#464646</color> + <color name="onTertiary">#FFFFFF</color> + <color name="onTertiaryContainer">#1C1C1C</color> + <color name="outline">#767676</color> + <color name="outlineVariant">#C6C6C6</color> + <color name="primary">#4B4B4B</color> + <color name="primaryContainer">#E0E0E0</color> + <color name="scrim">#000000</color> + <color name="secondary">#5D5D5D</color> + <color name="secondaryContainer">#E1E1E1</color> + <color name="shadow">#000000</color> + <color name="surface">#FCFCFC</color> + <color name="surfaceVariant">#E2E2E2</color> + <color name="tertiary">#606060</color> + <color name="tertiaryContainer">#E4E4E4</color> + <color name="colorSurfaceContainerHigh">@color/bg_default</color> + <!-- ======================================= --> <!-- Custom styles --> <!-- TODO REMOVE --> 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 @@ <resources> <style name="BaseTheme" parent="Theme.Material3.DayNight.NoActionBar"> - <item name="colorPrimary">@color/primary</item> - <item name="colorAccent">@color/accent</item> - <item name="android:windowBackground">@color/bg_default</item> - <item name="android:statusBarColor">@color/bg_default</item> - <item name="android:navigationBarColor">@color/bg_default</item> + <item name="background">@color/bg_default</item> + + <item name="colorError">@color/error</item> + <item name="colorErrorContainer">@color/errorContainer</item> + <item name="colorOnBackground">@color/onBackground</item> + <item name="colorOnError">@color/onError</item> + <item name="colorOnErrorContainer">@color/onErrorContainer</item> + <item name="colorOnPrimary">@color/onPrimary</item> + <item name="colorOnPrimaryContainer">@color/onPrimaryContainer</item> + <item name="colorOnSecondary">@color/onSecondary</item> + <item name="colorOnSecondaryContainer">@color/onSecondaryContainer</item> + <item name="colorOnSurface">@color/onSurface</item> + <item name="colorOnSurfaceVariant">@color/onSurfaceVariant</item> + <item name="colorOnTertiary">@color/onTertiary</item> + <item name="colorOnTertiaryContainer">@color/onTertiaryContainer</item> + <item name="colorOutline">@color/outline</item> + <item name="colorOutlineVariant">@color/outlineVariant</item> + <item name="colorPrimary">@color/primary</item> + <item name="colorPrimaryContainer">@color/primaryContainer</item> + <item name="colorSecondary">@color/secondary</item> + <item name="colorSecondaryContainer">@color/secondaryContainer</item> + <item name="colorSurface">@color/surface</item> + <item name="colorSurfaceVariant">@color/surfaceVariant</item> + <item name="colorTertiary">@color/tertiary</item> + <item name="colorTertiaryContainer">@color/tertiaryContainer</item> + + <!-- Used by Material Dialogs & Material SearchBar --> + <item name="colorSurfaceContainerHigh">@color/colorSurfaceContainerHigh</item> + + <item name="android:windowBackground">?attr/background</item> + <item name="android:statusBarColor">?attr/background</item> + <item name="android:navigationBarColor">?attr/background</item> <item name="android:windowLightStatusBar">@bool/isDayMode</item> - <item name="android:colorControlNormal">?attr/colorAccent</item> - <item name="android:colorControlActivated">?attr/colorAccent</item> - <item name="android:textColorLink">?attr/colorAccent</item> - <item name="android:textColorHighlight">@color/defaultTextHighlightBackground</item> + <item name="android:colorControlNormal">?attr/colorOnSurfaceVariant</item> + <item name="android:colorControlActivated">?attr/colorOnSurfaceVariant</item> + <item name="android:textColorHighlight">?attr/colorSurfaceVariant</item> <!-- Workaround: Preferences Dialogs are using AlertDialogs instead of MaterialAlertDialogs. --> <!-- https://stackoverflow.com/questions/70650073/adjust-androidx-preference-dialogs-to-follow-material-you --> @@ -43,7 +69,7 @@ </style> <style name="buttonStyle" parent="Widget.Material3.Button.TextButton.Dialog"> - <item name="android:textColor">?attr/colorAccent</item> + <item name="android:textColor">?attr/colorOnSurface</item> </style> <style name="chipGroupStyle" parent="Widget.Material3.ChipGroup"> @@ -62,9 +88,9 @@ <style name="tabStyle" parent="Widget.Material3.TabLayout"> <item name="backgroundColor">@android:color/transparent</item> <item name="itemBackground">@android:color/transparent</item> - <item name="tabIndicatorColor">?attr/colorAccent</item> - <item name="tabTextColor">?attr/colorAccent</item> - <item name="tabIconTint">?attr/colorAccent</item> + <item name="tabIndicatorColor">?attr/colorSurfaceVariant</item> + <item name="tabTextColor">?attr/colorSurfaceVariant</item> + <item name="tabIconTint">?attr/colorPrimary</item> </style> <style name="materialCardViewStyle" parent="Widget.Material3.CardView.Elevated"> diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index 3896c8ebd..bb9a4dfd7 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -51,7 +51,7 @@ <it.niedermann.nextcloud.deck.ui.theme.ThemedPreferenceCategory android:title="@string/simple_expert_settings"> <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference - android:icon="@drawable/ic_bug_report_black_24dp" + android:icon="@drawable/ic_bug_report_24dp" android:key="@string/pref_key_debugging" android:title="@string/settings_debugging" app:defaultValue="false" /> diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml index f84b7363e..988183d95 100644 --- a/app/src/main/res/xml/shortcuts.xml +++ b/app/src/main/res/xml/shortcuts.xml @@ -2,7 +2,7 @@ <shortcuts xmlns:android="http://schemas.android.com/apk/res/android"> <shortcut android:enabled="true" - android:icon="@drawable/ic_add_grey_24dp" + android:icon="@drawable/ic_add_24dp" android:shortcutId="it.niedermann.nextcloud.deck" android:shortcutLongLabel="@string/add_card" android:shortcutShortLabel="@string/simple_add"> |