diff options
| author | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2024-01-23 12:53:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-23 12:53:25 +0300 |
| commit | e735ce1c24e5a0305d6a08e5764864c2c96c8a58 (patch) | |
| tree | 91b5666877820ab62e858fa38a44d5b969e61564 | |
| parent | 5944cab8a086e953fa4fdd2e90e2bc01f38f30f0 (diff) | |
| parent | b66b980a495b100108cf2efb3e45bb006b5e0117 (diff) | |
Merge pull request #1570 from stefan-niedermann/grayscale-default-theme
feat(theming): Use grayscale default theme to avoid wrong color tones
178 files changed, 580 insertions, 484 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/accountswitcher/AccountSwitcherDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java index 2f9671ce5..cedcef707 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherDialog.java @@ -19,6 +19,7 @@ import androidx.lifecycle.ViewModelProvider; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import com.nextcloud.android.common.ui.theme.utils.ColorRole; import java.util.Objects; import java.util.stream.Collectors; @@ -77,8 +78,8 @@ public class AccountSwitcherDialog extends DialogFragment { Glide.with(requireContext()) .load(currentAccount.getAvatarUrl(binding.currentAccountItemAvatar.getResources().getDimensionPixelSize(R.dimen.avatar_size))) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_baseline_account_circle_24) - .error(R.drawable.ic_baseline_account_circle_24) + .placeholder(R.drawable.ic_account_circle_24) + .error(R.drawable.ic_account_circle_24) .into(binding.currentAccountItemAvatar); applyTheme(currentAccount.getColor()); @@ -115,5 +116,9 @@ public class AccountSwitcherDialog extends DialogFragment { private void applyTheme(int color) { final var utils = ThemeUtils.of(color, requireContext()); utils.deck.themeSelectedCheck(binding.check.getContext(), binding.check.getDrawable()); + utils.platform.colorImageView(binding.addAccountIcon, ColorRole.ON_SURFACE); + utils.platform.colorImageView(binding.manageAccountsIcon, ColorRole.ON_SURFACE); + utils.platform.colorTextView(binding.addAccountLabel, ColorRole.ON_SURFACE); + utils.platform.colorTextView(binding.manageAccountsLabel, ColorRole.ON_SURFACE); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java index f3c61c3ce..8e0e010c9 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/accountswitcher/AccountSwitcherViewHolder.java @@ -10,6 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; +import com.nextcloud.android.common.ui.theme.utils.ColorRole; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.databinding.ItemAccountChooseBinding; @@ -35,13 +36,15 @@ public class AccountSwitcherViewHolder extends RecyclerView.ViewHolder { Glide.with(itemView.getContext()) .load(account.getAvatarUrl(binding.accountItemAvatar.getResources().getDimensionPixelSize(R.dimen.avatar_size))) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_baseline_account_circle_24) - .error(R.drawable.ic_baseline_account_circle_24) + .placeholder(R.drawable.ic_account_circle_24) + .error(R.drawable.ic_account_circle_24) .into(binding.accountItemAvatar); itemView.setOnClickListener((v) -> onAccountClick.accept(account)); binding.delete.setVisibility(View.GONE); final var utils = ThemeUtils.of(account.getColor(), itemView.getContext()); utils.deck.themeSelectedCheck(binding.currentAccountIndicator.getContext(), binding.currentAccountIndicator.getDrawable()); + utils.platform.colorTextView(binding.accountName, ColorRole.ON_SURFACE); + utils.platform.colorTextView(binding.accountHost, ColorRole.ON_SURFACE_VARIANT); } } 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..7d774fed8 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_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/AttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java index bfc21b787..88cc5113f 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/attachments/AttachmentViewHolder.java @@ -37,7 +37,7 @@ public class AttachmentViewHolder extends RecyclerView.ViewHolder { public void bind(@NonNull Account account, @NonNull Attachment attachment, long cardRemoteId) { if (MimeTypeUtil.isImage(attachment.getMimetype())) { binding.preview.setTransitionName(parentContext.getString(R.string.transition_attachment_preview, String.valueOf(attachment.getLocalId()))); - binding.preview.setImageResource(R.drawable.ic_image_grey600_24dp); + binding.preview.setImageResource(R.drawable.ic_image_24dp); binding.preview.post(() -> { final String uri = AttachmentUtil.getThumbnailUrl(account, cardRemoteId, attachment, binding.preview.getWidth(), binding.preview.getHeight()); Glide.with(parentContext) @@ -61,7 +61,7 @@ public class AttachmentViewHolder extends RecyclerView.ViewHolder { return false; } }) - .error(R.drawable.ic_image_grey600_24dp) + .error(R.drawable.ic_image_24dp) .into(binding.preview); }); } 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/board/accesscontrol/AccessControlAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java index 0c813d04e..01c5b06e9 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlAdapter.java @@ -83,8 +83,8 @@ public class AccessControlAdapter extends RecyclerView.Adapter<RecyclerView.View Glide.with(ownerHolder.binding.avatar.getContext()) .load(account.getAvatarUrl(ownerHolder.binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size), ac.getUser().getUid())) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_person_grey600_24dp) - .error(R.drawable.ic_person_grey600_24dp) + .placeholder(R.drawable.ic_person_24dp) + .error(R.drawable.ic_person_24dp) .into(ownerHolder.binding.avatar); break; } @@ -94,13 +94,13 @@ public class AccessControlAdapter extends RecyclerView.Adapter<RecyclerView.View Glide.with(acHolder.binding.avatar.getContext()) .load(account.getAvatarUrl(acHolder.binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size), ac.getUser().getUid())) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_person_grey600_24dp) - .error(R.drawable.ic_person_grey600_24dp) + .placeholder(R.drawable.ic_person_24dp) + .error(R.drawable.ic_person_24dp) .into(acHolder.binding.avatar); acHolder.binding.username.setText(ac.getUser().getDisplayname()); acHolder.binding.username.setCompoundDrawables(null, null, ac.getStatus() == DBStatus.LOCAL_EDITED.getId() - ? ContextCompat.getDrawable(context, R.drawable.ic_sync_blue_24dp) : null, null); + ? ContextCompat.getDrawable(context, R.drawable.ic_sync_18dp) : null, null); acHolder.binding.delete.setOnClickListener((v) -> accessControlChangedListener.deleteAccessControl(ac)); if (hasManagePermission) { 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..b2146796c 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 @@ -149,8 +149,8 @@ public abstract class AbstractCardViewHolder extends RecyclerView.ViewHolder { coverImagesHolder.addView(coverImageView); Glide.with(coverImageView) .load(new SingleSignOnUrl(account.getName(), AttachmentUtil.getThumbnailUrl(account, fullCard.getId(), coverImage, coverWidth, coverHeight))) - .placeholder(R.drawable.ic_image_grey600_24dp) - .error(R.drawable.ic_image_grey600_24dp) + .placeholder(R.drawable.ic_image_24dp) + .error(R.drawable.ic_image_24dp) .into(coverImageView); } }); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java index 97144ad44..566b55512 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/DefaultCardViewHolder.java @@ -87,7 +87,7 @@ public class DefaultCardViewHolder extends AbstractCardViewHolder { } else { final String description = fullCard.getCard().getDescription(); if (!TextUtils.isEmpty(description)) { - binding.cardCountTasks.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(context, R.drawable.ic_baseline_subject_24), null, null, null); + binding.cardCountTasks.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(context, R.drawable.ic_subject_24), null, null, null); binding.cardCountTasks.setText(null); binding.cardCountTasks.setVisibility(View.VISIBLE); } else { 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/UserAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java index 9140e305e..329c6b85f 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java @@ -83,8 +83,8 @@ public class UserAutoCompleteAdapter extends AutoCompleteAdapter<User> { Glide.with(binding.icon.getContext()) .load(account.getAvatarUrl(binding.icon.getResources().getDimensionPixelSize(R.dimen.avatar_size), getItem(position).getUid())) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_person_grey600_24dp) - .error(R.drawable.ic_person_grey600_24dp) + .placeholder(R.drawable.ic_person_24dp) + .error(R.drawable.ic_person_24dp) .into(binding.icon); binding.label.setText(getItem(position).getDisplayname()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityAdapter.java index a64cf3a44..adcc21dc0 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityAdapter.java @@ -5,24 +5,28 @@ import android.view.MenuInflater; import android.view.ViewGroup; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; +import java.util.ArrayList; import java.util.List; import it.niedermann.nextcloud.deck.databinding.ItemActivityBinding; import it.niedermann.nextcloud.deck.model.ocs.Activity; +import it.niedermann.nextcloud.deck.ui.theme.ThemeUtils; public class CardActivityAdapter extends RecyclerView.Adapter<CardActivityViewHolder> { @NonNull - private final List<Activity> activities; + private final List<Activity> activities = new ArrayList<>(); + @Nullable + private ThemeUtils utils; @NonNull private final MenuInflater menuInflater; @SuppressWarnings("WeakerAccess") - public CardActivityAdapter(@NonNull List<Activity> activities, @NonNull MenuInflater menuInflater) { + public CardActivityAdapter(@NonNull MenuInflater menuInflater) { super(); - this.activities = activities; this.menuInflater = menuInflater; } @@ -34,9 +38,16 @@ public class CardActivityAdapter extends RecyclerView.Adapter<CardActivityViewHo return new CardActivityViewHolder(binding); } + public void setData(@NonNull List<Activity> activities, @NonNull ThemeUtils utils) { + this.activities.clear(); + this.activities.addAll(activities); + this.utils = utils; + this.notifyDataSetChanged(); + } + @Override public void onBindViewHolder(@NonNull CardActivityViewHolder holder, int position) { - holder.bind(activities.get(position), menuInflater); + holder.bind(activities.get(position), menuInflater, utils); } @Override diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityFragment.java index d301968c4..41d4d0963 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityFragment.java @@ -9,6 +9,7 @@ import androidx.annotation.NonNull; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; +import it.niedermann.android.reactivelivedata.ReactiveLiveData; import it.niedermann.nextcloud.deck.DeckLog; import it.niedermann.nextcloud.deck.databinding.FragmentCardEditTabActivitiesBinding; import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel; @@ -38,18 +39,22 @@ public class CardActivityFragment extends Fragment implements Themed { return binding.getRoot(); } - viewModel.getBoardColor().observe(getViewLifecycleOwner(), this::applyTheme); + final var adapter = new CardActivityAdapter(requireActivity().getMenuInflater()); + binding.activitiesList.setAdapter(adapter); - viewModel.syncActivitiesForCard(viewModel.getFullCard().getCard()).observe(getViewLifecycleOwner(), (activities -> { - if (activities == null || activities.size() == 0) { - binding.emptyContentView.setVisibility(View.VISIBLE); - binding.activitiesList.setVisibility(View.GONE); - } else { - binding.emptyContentView.setVisibility(View.GONE); - binding.activitiesList.setVisibility(View.VISIBLE); - binding.activitiesList.setAdapter(new CardActivityAdapter(activities, requireActivity().getMenuInflater())); - } - })); + new ReactiveLiveData<>(viewModel.syncActivitiesForCard(viewModel.getFullCard().getCard())) + .combineWith(viewModel::getBoardColor) + .observe(getViewLifecycleOwner(), data -> { + applyTheme(data.second); + if (data.first == null || data.first.size() == 0) { + binding.emptyContentView.setVisibility(View.VISIBLE); + binding.activitiesList.setVisibility(View.GONE); + } else { + binding.emptyContentView.setVisibility(View.GONE); + binding.activitiesList.setVisibility(View.VISIBLE); + } + adapter.setData(data.first, ThemeUtils.of(data.second, requireContext())); + }); return binding.getRoot(); } 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..b9f4ca436 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 @@ -1,19 +1,25 @@ package it.niedermann.nextcloud.deck.ui.card.activities; import android.content.Context; +import android.content.res.ColorStateList; import android.view.MenuInflater; import android.view.View; -import android.widget.ImageView; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; +import com.nextcloud.android.common.ui.theme.utils.ColorRole; + +import java.util.function.Function; + import it.niedermann.android.util.ClipboardUtil; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.databinding.ItemActivityBinding; import it.niedermann.nextcloud.deck.model.enums.ActivityType; import it.niedermann.nextcloud.deck.model.ocs.Activity; -import it.niedermann.nextcloud.deck.ui.theme.DeckViewThemeUtils; +import it.niedermann.nextcloud.deck.ui.theme.ThemeUtils; import it.niedermann.nextcloud.deck.util.DateUtil; public class CardActivityViewHolder extends RecyclerView.ViewHolder { @@ -25,7 +31,7 @@ public class CardActivityViewHolder extends RecyclerView.ViewHolder { this.binding = binding; } - public void bind(@NonNull Activity activity, @NonNull MenuInflater inflater) { + public void bind(@NonNull Activity activity, @NonNull MenuInflater inflater, @Nullable ThemeUtils utils) { final var context = itemView.getContext(); binding.date.setText(DateUtil.getRelativeDateTimeString(context, activity.getLastModified().toEpochMilli())); binding.subject.setText(activity.getSubject()); @@ -34,33 +40,39 @@ public class CardActivityViewHolder extends RecyclerView.ViewHolder { inflater.inflate(R.menu.activity_menu, menu); menu.findItem(android.R.id.copy).setOnMenuItemClickListener(item -> ClipboardUtil.copyToClipboard(context, activity.getSubject())); }); + final var type = ActivityType.findById(activity.getType()); - setImageResource(binding.type, type); - setImageColor(context, binding.type, type); + bindImageResource(type); + if (utils != null) { + applyTheme(context, utils, type); + } } - private static void setImageResource(@NonNull ImageView imageView, @NonNull ActivityType type) { + private void bindImageResource(@NonNull ActivityType type) { switch (type) { - case CHANGE -> imageView.setImageResource(R.drawable.type_change_36dp); - case ADD -> imageView.setImageResource(R.drawable.type_add_color_36dp); - case DELETE -> imageView.setImageResource(R.drawable.type_delete_color_36dp); - 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 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); + case CHANGE -> binding.type.setImageResource(R.drawable.type_change_36dp); + case ADD -> binding.type.setImageResource(R.drawable.type_add_color_36dp); + case DELETE -> binding.type.setImageResource(R.drawable.type_delete_color_36dp); + case ARCHIVE -> binding.type.setImageResource(R.drawable.type_archive_36dp); + case TAGGED_WITH_LABEL -> binding.type.setImageResource(R.drawable.type_label_36dp); + case COMMENT -> binding.type.setImageResource(R.drawable.type_comment_36dp); + case FILES -> binding.type.setImageResource(R.drawable.type_file_36dp); + case HISTORY -> binding.type.setImageResource(R.drawable.type_history_36dp); + default -> binding.type.setImageResource(R.drawable.ic_app_logo); } } - private static void setImageColor(@NonNull Context context, @NonNull ImageView imageView, @NonNull ActivityType type) { + private void applyTheme(@NonNull Context context, @NonNull ThemeUtils utils, @NonNull ActivityType type) { + utils.platform.colorTextView(binding.subject, ColorRole.ON_SURFACE); + utils.platform.colorTextView(binding.date, ColorRole.ON_SURFACE_VARIANT); + + final Function<Integer, ColorStateList> getColor = color -> + ColorStateList.valueOf(ContextCompat.getColor(context, color)); + switch (type) { - case ADD -> - DeckViewThemeUtils.setImageColor(context, imageView, R.color.activity_create); - case DELETE -> - DeckViewThemeUtils.setImageColor(context, imageView, R.color.activity_delete); - default -> DeckViewThemeUtils.setImageColor(context, imageView, R.color.grey600); + case ADD -> binding.type.setImageTintList(getColor.apply(R.color.activity_create)); + case DELETE -> binding.type.setImageTintList(getColor.apply(R.color.activity_delete)); + default -> utils.platform.colorImageView(binding.type, ColorRole.ON_SURFACE_VARIANT); } } }
\ No newline at end of file diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java index 2709e056e..c46ee562d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java @@ -91,7 +91,7 @@ public class CardAssigneeDialog extends DialogFragment { binding.avatar.post(() -> Glide.with(binding.avatar.getContext()) .load(viewModel.getAccount().getAvatarUrl(binding.avatar.getWidth(), user.getUid())) .placeholder(circularProgressDrawable) - .error(R.drawable.ic_person_grey600_24dp) + .error(R.drawable.ic_person_24dp) .into(binding.avatar)); binding.title.setText(user.getDisplayname()); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java index 473937753..13fc2a676 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsBottomsheetBehaviorCallback.java @@ -5,11 +5,11 @@ import static android.view.View.VISIBLE; import static com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN; import android.content.Context; +import android.graphics.Color; import android.view.View; import androidx.activity.OnBackPressedCallback; import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; import androidx.annotation.DimenRes; import androidx.annotation.NonNull; import androidx.annotation.Px; @@ -43,16 +43,15 @@ public class CardAttachmentsBottomsheetBehaviorCallback extends BottomSheetBehav @NonNull FloatingActionButton fab, @NonNull View pickerBackdrop, @NonNull BottomNavigationView bottomNavigation, - @ColorRes int backdropColorExpanded, - @ColorRes int backdropColorCollapsed, @DimenRes int bottomNavigationHeight ) { this.backPressedCallback = backPressedCallback; this.fab = fab; this.pickerBackdrop = pickerBackdrop; this.bottomNavigation = bottomNavigation; - this.backdropColorExpanded = ContextCompat.getColor(context, backdropColorExpanded); - this.backdropColorCollapsed = ContextCompat.getColor(context, backdropColorCollapsed); + final var color = ContextCompat.getColor(context, android.R.color.black); + this.backdropColorExpanded = Color.argb(127, Color.red(color), Color.green(color), Color.blue(color)); + this.backdropColorCollapsed = ContextCompat.getColor(context, android.R.color.transparent); this.bottomNavigationHeight = context.getResources().getDimensionPixelSize(bottomNavigationHeight); } @@ -75,13 +74,9 @@ public class CardAttachmentsBottomsheetBehaviorCallback extends BottomSheetBehav pickerBackdrop.setBackgroundColor(ArgbEvaluatorCompat.getInstance().evaluate(bottomSheetPercentageShown, backdropColorExpanded, backdropColorCollapsed)); bottomNavigation.setTranslationY(bottomSheetPercentageShown * bottomNavigationHeight); if (slideOffset <= lastOffset && slideOffset != 0) { - if (fab.getVisibility() == GONE) { - fab.show(); - } + fab.show(); } else { - if (fab.getVisibility() == VISIBLE) { - fab.hide(); - } + fab.hide(); } } lastOffset = slideOffset; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java index 42906d499..5e20eb6a2 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java @@ -165,8 +165,6 @@ public class CardAttachmentsFragment extends Fragment implements AttachmentDelet binding.fab, binding.pickerBackdrop, binding.bottomNavigation, - R.color.bottom_sheet_backdrop, - android.R.color.transparent, R.dimen.attachments_bottom_navigation_height)); binding.pickerBackdrop.setOnClickListener(v -> mBottomSheetBehaviour.setState(STATE_HIDDEN)); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java index 72d942618..fa61859d3 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/ImageAttachmentViewHolder.java @@ -43,8 +43,8 @@ public class ImageAttachmentViewHolder extends AttachmentViewHolder { @Nullable final String uri = AttachmentUtil.getThumbnailUrl(account, cardRemoteId, attachment, getPreview().getWidth()); Glide.with(getPreview().getContext()) .load(uri) - .placeholder(R.drawable.ic_image_grey600_24dp) - .error(R.drawable.ic_image_grey600_24dp) + .placeholder(R.drawable.ic_image_24dp) + .error(R.drawable.ic_image_24dp) .into(getPreview()); }); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactItemViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactItemViewHolder.java index 7630d2d9e..5bdcb1814 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactItemViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/ContactItemViewHolder.java @@ -52,8 +52,8 @@ public class ContactItemViewHolder extends RecyclerView.ViewHolder { Glide.with(itemView.getContext()) .load(image) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_person_grey600_24dp) - .error(R.drawable.ic_person_grey600_24dp) + .placeholder(R.drawable.ic_person_24dp) + .error(R.drawable.ic_person_24dp) .into(binding.avatar); } } @@ -61,7 +61,7 @@ public class ContactItemViewHolder extends RecyclerView.ViewHolder { public void bindError() { itemView.setOnClickListener(null); Glide.with(itemView.getContext()) - .load(R.drawable.ic_person_grey600_24dp) + .load(R.drawable.ic_person_24dp) .into(binding.avatar); } } 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/attachments/picker/GalleryItemViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryItemViewHolder.java index 402329767..b416c7b6d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryItemViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/picker/GalleryItemViewHolder.java @@ -29,15 +29,15 @@ public class GalleryItemViewHolder extends RecyclerView.ViewHolder { itemView.setOnClickListener((v) -> onSelect.accept(uri, new Pair<>(null, Glide.with(itemView.getContext()).load(image)))); Glide.with(itemView.getContext()) .load(image) - .placeholder(R.drawable.ic_image_grey600_24dp) - .error(R.drawable.ic_image_grey600_24dp) + .placeholder(R.drawable.ic_image_24dp) + .error(R.drawable.ic_image_24dp) .into(binding.preview); } public void bindError() { itemView.setOnClickListener(null); Glide.with(itemView.getContext()) - .load(R.drawable.ic_image_grey600_24dp) + .load(R.drawable.ic_image_24dp) .into(binding.preview); } } 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..70eec95d7 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; @@ -96,8 +98,8 @@ public class CardCommentsFragment extends Fragment implements Themed, CommentEdi Glide.with(binding.avatar.getContext()) .load(editCardViewModel.getAccount().getAvatarUrl(binding.avatar.getResources().getDimensionPixelSize(R.dimen.icon_size_details))) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_person_grey600_24dp) - .error(R.drawable.ic_person_grey600_24dp) + .placeholder(R.drawable.ic_person_24dp) + .error(R.drawable.ic_person_24dp) .into(binding.avatar); commentsViewModel.getReplyToComment().observe(getViewLifecycleOwner(), (comment) -> { @@ -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/CardCommentsMentionProposer.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java index fe10f6cfa..b8d8286f5 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsMentionProposer.java @@ -92,8 +92,8 @@ public class CardCommentsMentionProposer implements TextWatcher { Glide.with(avatar.getContext()) .load(account.getAvatarUrl(avatarSize, user.getUid())) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_person_grey600_24dp) - .error(R.drawable.ic_person_grey600_24dp) + .placeholder(R.drawable.ic_person_24dp) + .error(R.drawable.ic_person_24dp) .into(avatar); } } else { 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..839b904c0 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 @@ -44,8 +44,8 @@ public class ItemCommentViewHolder extends RecyclerView.ViewHolder { Glide.with(binding.avatar.getContext()) .load(account.getAvatarUrl(binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size), comment.getComment().getActorId())) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_person_grey600_24dp) - .error(R.drawable.ic_person_grey600_24dp) + .placeholder(R.drawable.ic_person_24dp) + .error(R.drawable.ic_person_24dp) .into(binding.avatar); final var mentions = new HashMap<String, String>(comment.getComment().getMentions().size()); @@ -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,16 @@ 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.creationDateTime, ColorRole.ON_SURFACE_VARIANT); + utils.platform.colorTextView(binding.message, ColorRole.ON_SURFACE); + } } public void unbind() { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/AssigneeViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/AssigneeViewHolder.java index 8148ff783..a7420ec69 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/AssigneeViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/AssigneeViewHolder.java @@ -26,8 +26,8 @@ public class AssigneeViewHolder extends RecyclerView.ViewHolder { Glide.with(binding.avatar.getContext()) .load(account.getAvatarUrl(binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size), user.getUid())) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_person_grey600_24dp) - .error(R.drawable.ic_person_grey600_24dp) + .placeholder(R.drawable.ic_person_24dp) + .error(R.drawable.ic_person_24dp) .into(binding.avatar); if (onClickListener != null) { itemView.setOnClickListener((v) -> onClickListener.accept(user)); 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..e2f43d696 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,10 +149,10 @@ 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); + binding.descriptionToggle.setImageResource(R.drawable.ic_eye_24); } }); binding.descriptionToggle.setOnClickListener((v) -> viewModel.toggleDescriptionPreviewMode()); @@ -267,7 +267,7 @@ public class CardDetailsFragment extends Fragment implements CardDueDateView.Due final var chip = new Chip(requireContext()); chip.setText(label.getTitle()); if (viewModel.canEdit()) { - chip.setCloseIcon(ContextCompat.getDrawable(requireContext(), R.drawable.ic_close_circle_grey600)); + chip.setCloseIcon(ContextCompat.getDrawable(requireContext(), R.drawable.ic_close_circle)); chip.setCloseIconVisible(true); chip.setOnCloseIconClickListener(v -> { binding.labelsGroup.removeView(chip); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java index d3b39caff..bb4e27473 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterDialogFragment.java @@ -44,7 +44,7 @@ public class FilterDialogFragment extends ThemedDialogFragment { final var context = requireContext(); - indicator = ContextCompat.getDrawable(context, R.drawable.circle_grey600_8dp); + indicator = ContextCompat.getDrawable(context, R.drawable.circle_8dp); filterViewModel = new ViewModelProvider(requireActivity()).get(FilterViewModel.class); 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..bb17d6e83 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.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.setTextColor(ColorStateList.valueOf(ContextCompat.getColor(itemView.getContext(), R.color.onSurface))); + binding.label.setChipIcon(ContextCompat.getDrawable(itemView.getContext(), R.drawable.ic_block_24)); + 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/filter/FilterUserAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserAdapter.java index 1657efdff..cdd22b961 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterUserAdapter.java @@ -90,8 +90,8 @@ public class FilterUserAdapter extends RecyclerView.Adapter<FilterUserAdapter.Us Glide.with(binding.avatar.getContext()) .load(account.getAvatarUrl(binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size), user.getUid())) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_person_grey600_24dp) - .error(R.drawable.ic_person_grey600_24dp) + .placeholder(R.drawable.ic_person_24dp) + .error(R.drawable.ic_person_24dp) .into(binding.avatar); itemView.setSelected(selectedUsers.contains(user)); applyTheme(color); @@ -101,7 +101,7 @@ public class FilterUserAdapter extends RecyclerView.Adapter<FilterUserAdapter.Us public void bindNotAssigned() { binding.title.setText(itemView.getContext().getString(R.string.simple_unassigned)); Glide.with(itemView.getContext()) - .load(R.drawable.ic_baseline_block_24) + .load(R.drawable.ic_block_24) .into(binding.avatar); itemView.setSelected(selectedUsers.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..70a3d1531 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 @@ -49,7 +49,7 @@ public class DrawerMenuInflater<T extends FragmentActivity & ArchiveBoardListene final var navigationMap = new HashMap<Integer, Long>(); menu.clear(); - menu.add(Menu.NONE, MENU_ID_UPCOMING_CARDS, Menu.NONE, R.string.widget_upcoming_title).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.calendar_blank_grey600_24dp)); + menu.add(Menu.NONE, MENU_ID_UPCOMING_CARDS, Menu.NONE, R.string.widget_upcoming_title).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.calendar_blank_24dp)); int index = 0; for (final var fullBoard : fullBoards) { @@ -99,7 +99,7 @@ public class DrawerMenuInflater<T extends FragmentActivity & ArchiveBoardListene } else if (fullBoard.getBoard().isPermissionShare()) { final var contextMenu = new AppCompatImageButton(activity); contextMenu.setBackgroundDrawable(null); - contextMenu.setImageDrawable(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_share_grey600_18dp)); + contextMenu.setImageDrawable(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_share_18dp)); contextMenu.setOnClickListener((v) -> AccessControlDialogFragment.newInstance(account, fullBoard.getLocalId()).show(activity.getSupportFragmentManager(), AccessControlDialogFragment.class.getSimpleName())); menuItem.setActionView(contextMenu); } @@ -107,15 +107,15 @@ 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_ABOUT, Menu.NONE, R.string.about).setIcon(utils.deck.themeNavigationViewIcon(activity, R.drawable.ic_info_outline_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_24dp)); return navigationMap; } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java index 4388d0ae3..a9cae64de 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java @@ -16,7 +16,6 @@ import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; import android.view.View; -import android.widget.PopupMenu; import androidx.activity.OnBackPressedCallback; import androidx.activity.result.ActivityResultLauncher; @@ -28,6 +27,7 @@ import androidx.annotation.Nullable; import androidx.annotation.UiThread; import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.PopupMenu; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.core.graphics.drawable.DrawableCompat; @@ -326,8 +326,8 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen .with(binding.toolbar.getContext()) .load(account.getAvatarUrl(binding.toolbar.getMenu().findItem(R.id.avatar).getIcon().getIntrinsicWidth())) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_baseline_account_circle_24) - .error(R.drawable.ic_baseline_account_circle_24) + .placeholder(R.drawable.ic_account_circle_24) + .error(R.drawable.ic_account_circle_24) .into(new CustomTarget<Drawable>() { @Override public void onResourceReady(@NonNull Drawable resource, @Nullable Transition<? super Drawable> transition) { 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..8ca2a9841 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 @@ -65,8 +65,8 @@ public class SearchCardViewHolder extends SearchViewHolder { new CenterCrop(), new RoundedCorners(context.getResources().getDimensionPixelSize(R.dimen.spacer_1x)) )) - .placeholder(R.drawable.ic_image_grey600_24dp) - .error(R.drawable.ic_image_grey600_24dp) + .placeholder(R.drawable.ic_image_24dp) + .error(R.drawable.ic_image_24dp) .into(binding.coverImages)); } else { binding.coverImages.setVisibility(View.GONE); @@ -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/manageaccounts/ManageAccountViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java index 10249fc5b..2ee0b1451 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/manageaccounts/ManageAccountViewHolder.java @@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; +import com.nextcloud.android.common.ui.theme.utils.ColorRole; import it.niedermann.nextcloud.deck.R; import it.niedermann.nextcloud.deck.databinding.ItemAccountChooseBinding; @@ -39,8 +40,8 @@ public class ManageAccountViewHolder extends RecyclerView.ViewHolder { Glide.with(itemView.getContext()) .load(account.getAvatarUrl(binding.accountItemAvatar.getResources().getDimensionPixelSize(R.dimen.avatar_size))) .apply(RequestOptions.circleCropTransform()) - .placeholder(R.drawable.ic_baseline_account_circle_24) - .error(R.drawable.ic_baseline_account_circle_24) + .placeholder(R.drawable.ic_account_circle_24) + .error(R.drawable.ic_account_circle_24) .into(binding.accountItemAvatar); binding.currentAccountIndicator.setSelected(isCurrentAccount); itemView.setOnClickListener((v) -> onAccountClick.accept(account)); @@ -58,5 +59,8 @@ public class ManageAccountViewHolder extends RecyclerView.ViewHolder { final var utils = ThemeUtils.of(account.getColor(), itemView.getContext()); utils.deck.themeSelectedCheck(binding.currentAccountIndicator.getContext(), binding.currentAccountIndicator.getDrawable()); + utils.platform.colorImageView(binding.delete, ColorRole.ON_SURFACE); + utils.platform.colorTextView(binding.accountName, ColorRole.ON_SURFACE); + utils.platform.colorTextView(binding.accountHost, 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/preparecreate/AccountAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java index 279540b72..dea4c07c0 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/preparecreate/AccountAdapter.java @@ -49,8 +49,8 @@ public class AccountAdapter extends AbstractAdapter<Account> { Glide.with(getContext()) .load(account.getAvatarUrl(binding.avatar.getResources().getDimensionPixelSize(R.dimen.avatar_size))) - .placeholder(R.drawable.ic_baseline_account_circle_24) - .error(R.drawable.ic_baseline_account_circle_24) + .placeholder(R.drawable.ic_account_circle_24) + .error(R.drawable.ic_account_circle_24) .apply(RequestOptions.circleCropTransform()) .into(binding.avatar); } else { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java index 1456b159d..61bc0c48a 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java @@ -21,15 +21,14 @@ import androidx.camera.lifecycle.ProcessCameraProvider; import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProvider; -import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.common.util.concurrent.ListenableFuture; import java.io.File; import java.time.Instant; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.util.Arrays; import java.util.concurrent.ExecutionException; +import java.util.stream.Stream; import it.niedermann.android.reactivelivedata.ReactiveLiveData; import it.niedermann.nextcloud.deck.DeckLog; @@ -44,8 +43,6 @@ public class TakePhotoActivity extends AppCompatActivity { private ActivityTakePhotoBinding binding; private TakePhotoViewModel viewModel; - private FloatingActionButton[] brandedFABs; - private ListenableFuture<ProcessCameraProvider> cameraProviderFuture; private OrientationEventListener orientationEventListener; @@ -92,8 +89,6 @@ public class TakePhotoActivity extends AppCompatActivity { finish(); } }, ContextCompat.getMainExecutor(this)); - - brandedFABs = new FloatingActionButton[]{binding.takePhoto, binding.switchCamera, binding.toggleTorch}; } private ImageCapture getCaptureUseCase() { @@ -186,6 +181,7 @@ public class TakePhotoActivity extends AppCompatActivity { private void applyBoardColorBrand(int color) { final var utils = ThemeUtils.of(color, this); - Arrays.stream(brandedFABs).forEach(utils.material::themeFAB); + Stream.of(binding.takePhoto).forEach(utils.material::themeFAB); + Stream.of(binding.switchCamera, binding.toggleTorch).forEach(utils.deck::themeSecondaryFAB); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java index ff12de766..a6375c9f8 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoViewModel.java @@ -19,7 +19,7 @@ public class TakePhotoViewModel extends BaseViewModel { @NonNull private CameraSelector cameraSelector = DEFAULT_BACK_CAMERA; @NonNull - private final MutableLiveData<Integer> cameraSelectorToggleButtonImageResource = new MutableLiveData<>(R.drawable.ic_baseline_camera_front_24); + private final MutableLiveData<Integer> cameraSelectorToggleButtonImageResource = new MutableLiveData<>(R.drawable.ic_camera_front_24); @NonNull private final MutableLiveData<Boolean> torchEnabled = new MutableLiveData<>(false); @@ -51,10 +51,10 @@ public class TakePhotoViewModel extends BaseViewModel { public void toggleCameraSelector() { if (this.cameraSelector == DEFAULT_BACK_CAMERA) { this.cameraSelector = DEFAULT_FRONT_CAMERA; - this.cameraSelectorToggleButtonImageResource.postValue(R.drawable.ic_baseline_camera_rear_24); + this.cameraSelectorToggleButtonImageResource.postValue(R.drawable.ic_camera_rear_24); } else { this.cameraSelector = DEFAULT_BACK_CAMERA; - this.cameraSelectorToggleButtonImageResource.postValue(R.drawable.ic_baseline_camera_front_24); + this.cameraSelectorToggleButtonImageResource.postValue(R.drawable.ic_camera_front_24); } } @@ -70,7 +70,7 @@ public class TakePhotoViewModel extends BaseViewModel { public LiveData<Integer> getTorchToggleButtonImageResource() { return new ReactiveLiveData<>(isTorchEnabled()) .map(enabled -> enabled - ? R.drawable.ic_baseline_flash_off_24 - : R.drawable.ic_baseline_flash_on_24); + ? R.drawable.ic_flash_off_24 + : R.drawable.ic_flash_on_24); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeckViewThemeUtils.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeckViewThemeUtils.java index d2dff1ae4..9fb7ea74d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeckViewThemeUtils.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeckViewThemeUtils.java @@ -5,6 +5,7 @@ import static com.nextcloud.android.common.ui.util.PlatformThemeUtil.isDarkMode; import android.content.Context; import android.content.res.ColorStateList; +import android.graphics.Color; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; import android.graphics.drawable.StateListDrawable; @@ -24,6 +25,7 @@ import androidx.core.content.res.ResourcesCompat; import androidx.core.graphics.drawable.DrawableCompat; import androidx.core.widget.TextViewCompat; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.search.SearchBar; import com.google.android.material.search.SearchView; import com.google.android.material.tabs.TabLayout; @@ -90,7 +92,7 @@ public class DeckViewThemeUtils extends ViewThemeUtilsBase { public void themeEmptyContentView(@NonNull EmptyContentView emptyContentView) { withScheme(emptyContentView.getContext(), scheme -> { - platform.colorImageView(emptyContentView.getImage(), ColorRole.SURFACE_VARIANT); + platform.colorImageView(emptyContentView.getImage(), ColorRole.ON_SURFACE_VARIANT); platform.colorTextView(emptyContentView.getTitle(), ColorRole.ON_BACKGROUND); platform.colorTextView(emptyContentView.getDescription(), ColorRole.ON_BACKGROUND); return emptyContentView; @@ -134,7 +136,7 @@ public class DeckViewThemeUtils extends ViewThemeUtilsBase { */ @Nullable public Drawable getColoredBoardDrawable(@NonNull Context context, @ColorInt int boardColor) { - final var drawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.circle_grey600_36dp, null); + final var drawable = ResourcesCompat.getDrawable(context.getResources(), R.drawable.circle_36dp, null); return drawable == null ? null : platform.colorDrawable(drawable, boardColor); } @@ -213,4 +215,23 @@ public class DeckViewThemeUtils extends ViewThemeUtilsBase { public static void setImageColor(@NonNull Context context, @NonNull ImageView imageView, @ColorRes int colorRes) { imageView.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(context, colorRes))); } + + /** + * @see <a href="https://github.com/nextcloud/android-common/pull/250">Upstream Pull Request</a> + */ + @Deprecated(forRemoval = true) + public void themeSecondaryFAB(@NonNull FloatingActionButton fab) { + withScheme(fab.getContext(), scheme -> { + fab.setBackgroundTintList(buildColorStateList( + new Pair<>(android.R.attr.state_enabled, scheme.getSecondaryContainer()), + new Pair<>(-android.R.attr.state_enabled, Color.GRAY) + )); + + fab.setImageTintList(buildColorStateList( + new Pair<>(android.R.attr.state_enabled, scheme.getOnSecondaryContainer()), + new Pair<>(-android.R.attr.state_enabled, Color.GRAY) + )); + return fab; + }); + } }
\ No newline at end of file diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeleteAlertDialogBuilder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeleteAlertDialogBuilder.java index 2b5543e59..06b82c6b7 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeleteAlertDialogBuilder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/theme/DeleteAlertDialogBuilder.java @@ -31,7 +31,7 @@ public class DeleteAlertDialogBuilder extends MaterialAlertDialogBuilder { public void applyTheme() { final var positiveButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE); if (positiveButton != null) { - positiveButton.setTextColor(ContextCompat.getColor(getContext(), R.color.danger)); + positiveButton.setTextColor(ContextCompat.getColor(getContext(), R.color.error)); } } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java index a653feac8..131fca77d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/ColorChooser.java @@ -59,7 +59,7 @@ public class ColorChooser extends LinearLayout { image.setLayoutParams(params); image.setOnClickListener((imageView) -> { if (previouslySelectedImageView != null) { // null when first selection - previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_grey600_36dp, previouslySelectedColor)); + previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_36dp, previouslySelectedColor)); } image.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_alpha_check_36dp, color)); selectedColor = color; @@ -69,7 +69,7 @@ public class ColorChooser extends LinearLayout { binding.customColorPicker.setVisibility(View.GONE); binding.brightnessSlide.setVisibility(View.GONE); }); - image.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_grey600_36dp, color)); + image.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_36dp, color)); binding.colorPicker.addView(image, binding.colorPicker.getChildCount() - 1); } @@ -78,14 +78,14 @@ public class ColorChooser extends LinearLayout { binding.customColorPicker.setVisibility(View.VISIBLE); binding.brightnessSlide.setVisibility(View.VISIBLE); if (previouslySelectedImageView != null) { - previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(context, R.drawable.circle_grey600_36dp, selectedColor)); + previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(context, R.drawable.circle_36dp, selectedColor)); previouslySelectedImageView = null; } }); binding.customColorPicker.setColorListener((ColorEnvelopeListener) (envelope, fromUser) -> { if (previouslySelectedImageView != null) { - previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_grey600_36dp, previouslySelectedColor)); + previouslySelectedImageView.setImageDrawable(DeckViewThemeUtils.getTintedImageView(this.context, R.drawable.circle_36dp, previouslySelectedColor)); previouslySelectedImageView = null; } @ColorInt diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java index 4c52ffc1a..dd874045f 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/OverlappingAvatars.java @@ -48,7 +48,7 @@ public class OverlappingAvatars extends RelativeLayout { overlapPx = resources.getDimensionPixelSize(R.dimen.avatar_size_small_overlapping); borderDrawable = ContextCompat.getDrawable(context, R.drawable.avatar_border); assert borderDrawable != null; - DrawableCompat.setTint(borderDrawable, ContextCompat.getColor(context, R.color.bg_card)); + DrawableCompat.setTint(borderDrawable, ContextCompat.getColor(context, R.color.colorSurfaceContainer)); } public void setAvatars(@NonNull Account account, @NonNull List<User> assignedUsers) { @@ -70,8 +70,8 @@ public class OverlappingAvatars extends RelativeLayout { avatar.requestLayout(); Glide.with(context) .load(account.getAvatarUrl(avatarSize, assignedUsers.get(avatarCount).getUid())) - .placeholder(R.drawable.ic_person_grey600_24dp) - .error(R.drawable.ic_person_grey600_24dp) + .placeholder(R.drawable.ic_person_24dp) + .error(R.drawable.ic_person_24dp) .apply(RequestOptions.circleCropTransform()) .into(avatar); } 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..86324c6d1 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); } @@ -106,7 +106,7 @@ public class SingleCardWidget extends AppWidgetProvider { } else { views.setViewVisibility(R.id.card_count_comments, View.VISIBLE); views.setViewVisibility(R.id.card_count_comments_image, View.VISIBLE); - views.setImageViewResource(R.id.card_count_comments_image, R.drawable.ic_comment_white_24dp); + views.setImageViewResource(R.id.card_count_comments_image, R.drawable.ic_comment_24dp); setupCounter(views, R.id.card_count_comments, commentsCount, counterMaxValue); } @@ -115,7 +115,7 @@ public class SingleCardWidget extends AppWidgetProvider { views.setViewVisibility(R.id.card_count_tasks, View.VISIBLE); views.setViewVisibility(R.id.card_count_tasks_image, View.VISIBLE); views.setTextViewText(R.id.card_count_tasks, context.getResources().getString(R.string.task_count, String.valueOf(taskStatus.doneCount), String.valueOf(taskStatus.taskCount))); - views.setImageViewResource(R.id.card_count_tasks_image, R.drawable.ic_check_grey600_24dp); + views.setImageViewResource(R.id.card_count_tasks_image, R.drawable.ic_check_24dp); } else { views.setViewVisibility(R.id.card_count_tasks, View.GONE); views.setViewVisibility(R.id.card_count_tasks_image, View.GONE); 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..e510a237e 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,17 +132,17 @@ 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; + return R.drawable.ic_music_note_24dp; } else if (MimeTypeUtil.isVideo(mimeType)) { - return R.drawable.ic_local_movies_grey600_24dp; + return R.drawable.ic_local_movies_24dp; } else if (MimeTypeUtil.isPdf(mimeType)) { - return R.drawable.ic_baseline_picture_as_pdf_24; + return R.drawable.ic_picture_as_pdf_24; } else if (MimeTypeUtil.isContact(mimeType)) { - return R.drawable.ic_baseline_contact_mail_24; + return R.drawable.ic_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/java/it/niedermann/nextcloud/deck/util/SpannableUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/SpannableUtil.java index 664407d72..80a0dfe83 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/util/SpannableUtil.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/SpannableUtil.java @@ -33,7 +33,7 @@ public class SpannableUtil { public static SpannableString disabled(@NonNull CharSequence text, @NonNull Context context) { final var spannable = new SpannableString(text); spannable.setSpan(new StyleSpan(Typeface.ITALIC), 0, spannable.length(), 0); - spannable.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.fg_secondary)), 0, spannable.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + spannable.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.onSurfaceVariant)), 0, spannable.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); return spannable; } 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/bg_navdrawer_item.xml b/app/src/main/res/drawable/bg_navdrawer_item.xml index 0c60f8c76..183046bf2 100644 --- a/app/src/main/res/drawable/bg_navdrawer_item.xml +++ b/app/src/main/res/drawable/bg_navdrawer_item.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:color="@color/bg_highlighted" android:state_checked="true" /> + <item android:color="?attr/colorSecondaryContainer" android:state_checked="true" /> <item android:color="@android:color/transparent" /> </selector>
\ No newline at end of file diff --git a/app/src/main/res/drawable/calendar_blank_grey600_24dp.xml b/app/src/main/res/drawable/calendar_blank_24dp.xml index 688fd49b1..688fd49b1 100644 --- a/app/src/main/res/drawable/calendar_blank_grey600_24dp.xml +++ b/app/src/main/res/drawable/calendar_blank_24dp.xml diff --git a/app/src/main/res/drawable/circle_grey600_36dp.xml b/app/src/main/res/drawable/circle_36dp.xml index 2f6dc6475..2f6dc6475 100644 --- a/app/src/main/res/drawable/circle_grey600_36dp.xml +++ b/app/src/main/res/drawable/circle_36dp.xml diff --git a/app/src/main/res/drawable/circle_grey600_8dp.xml b/app/src/main/res/drawable/circle_8dp.xml index 8f641b82b..8f641b82b 100644 --- a/app/src/main/res/drawable/circle_grey600_8dp.xml +++ b/app/src/main/res/drawable/circle_8dp.xml diff --git a/app/src/main/res/drawable/filter_active.xml b/app/src/main/res/drawable/filter_active.xml index 06b74eb85..555d73af6 100644 --- a/app/src/main/res/drawable/filter_active.xml +++ b/app/src/main/res/drawable/filter_active.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/ic_filter_list_white_24dp" /> + <item android:drawable="@drawable/ic_filter_list_24dp" /> <item android:width="8dp" android:height="8dp" android:enterFadeDuration="@android:integer/config_shortAnimTime" android:gravity="bottom|end"> <shape android:shape="oval"> - <solid android:color="?attr/colorOnSurface" /> + <solid android:color="?attr/colorPrimary" /> </shape> </item> </layer-list> diff --git a/app/src/main/res/drawable/gradient_vertical.xml b/app/src/main/res/drawable/gradient_vertical.xml index f38d1d0b8..e94b5ea14 100644 --- a/app/src/main/res/drawable/gradient_vertical.xml +++ b/app/src/main/res/drawable/gradient_vertical.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> <gradient android:angle="270" - android:startColor="@color/bg_highlighted" android:endColor="@android:color/transparent" + android:startColor="?attr/colorSecondaryContainer" android:type="linear" /> </shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/ic_account_circle_24.xml b/app/src/main/res/drawable/ic_account_circle_24.xml new file mode 100644 index 000000000..2c2586be1 --- /dev/null +++ b/app/src/main/res/drawable/ic_account_circle_24.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + 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="?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_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 deleted file mode 100644 index 2cb60dcfb..000000000 --- a/app/src/main/res/drawable/ic_baseline_account_circle_24.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:tint="@color/accent" 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"/> -</vector> diff --git a/app/src/main/res/drawable/ic_baseline_block_24.xml b/app/src/main/res/drawable/ic_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_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_brightness_2_grey600_24dp.xml b/app/src/main/res/drawable/ic_brightness_2_24dp.xml index 8f6ebab70..7b60a65ff 100644 --- a/app/src/main/res/drawable/ic_brightness_2_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_brightness_2_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="M10,2c-1.82,0 -3.53,0.5 -5,1.35C7.99,5.08 10,8.3 10,12s-2.01,6.92 -5,8.65C6.47,21.5 8.18,22 10,22c5.52,0 10,-4.48 10,-10S15.52,2 10,2z"/> </vector> 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..0e93d3935 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/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,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_baseline_camera_front_24.xml b/app/src/main/res/drawable/ic_camera_front_24.xml index 25c1a79b8..dba6d1b73 100644 --- a/app/src/main/res/drawable/ic_baseline_camera_front_24.xml +++ b/app/src/main/res/drawable/ic_camera_front_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M10,20L5,20v2h5v2l3,-3 -3,-3v2zM14,20v2h5v-2h-5zM12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -1.99,0.9 -1.99,2S10.9,8 12,8zM17,0L7,0C5.9,0 5,0.9 5,2v14c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,2c0,-1.1 -0.9,-2 -2,-2zM7,2h10v10.5c0,-1.67 -3.33,-2.5 -5,-2.5s-5,0.83 -5,2.5L7,2z"/> diff --git a/app/src/main/res/drawable/ic_baseline_camera_rear_24.xml b/app/src/main/res/drawable/ic_camera_rear_24.xml index 51cea2177..935c5ee45 100644 --- a/app/src/main/res/drawable/ic_baseline_camera_rear_24.xml +++ b/app/src/main/res/drawable/ic_camera_rear_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M10,20L5,20v2h5v2l3,-3 -3,-3v2zM14,20v2h5v-2h-5zM17,0L7,0C5.9,0 5,0.9 5,2v14c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,2c0,-1.1 -0.9,-2 -2,-2zM12,6c-1.11,0 -2,-0.9 -2,-2s0.89,-2 1.99,-2 2,0.9 2,2C14,5.1 13.1,6 12,6z"/> diff --git a/app/src/main/res/drawable/ic_check_grey600_24dp.xml b/app/src/main/res/drawable/ic_check_24dp.xml index 8993126d9..6e8b79047 100644 --- a/app/src/main/res/drawable/ic_check_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_check_24dp.xml @@ -1,5 +1,5 @@ <vector 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="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/> </vector> diff --git a/app/src/main/res/drawable/ic_check_box_24.xml b/app/src/main/res/drawable/ic_check_box_24.xml index 0c3970b1a..5972d0d6f 100644 --- a/app/src/main/res/drawable/ic_check_box_24.xml +++ b/app/src/main/res/drawable/ic_check_box_24.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#757575" 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="@android:color/white" android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/> </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_close_circle_grey600.xml b/app/src/main/res/drawable/ic_close_circle.xml index db44e0a02..db44e0a02 100644 --- a/app/src/main/res/drawable/ic_close_circle_grey600.xml +++ b/app/src/main/res/drawable/ic_close_circle.xml diff --git a/app/src/main/res/drawable/ic_colorize_24dp.xml b/app/src/main/res/drawable/ic_colorize_24dp.xml index 15f20c075..13b7408a1 100644 --- a/app/src/main/res/drawable/ic_colorize_24dp.xml +++ b/app/src/main/res/drawable/ic_colorize_24dp.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <vector xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="#FFFFFF" + android:tint="?attr/colorOnSurfaceVariant" android:viewportWidth="24.0" android:viewportHeight="24.0" android:width="24dp" diff --git a/app/src/main/res/drawable/ic_comment_white_24dp.xml b/app/src/main/res/drawable/ic_comment_24dp.xml index 1fb3fc251..012e4d57b 100644 --- a/app/src/main/res/drawable/ic_comment_white_24dp.xml +++ b/app/src/main/res/drawable/ic_comment_24dp.xml @@ -2,7 +2,7 @@ android:width="24dp" android:height="24dp" android:autoMirrored="true" - android:tint="#FFFFFF" + android:tint="?attr/colorOnSurfaceVariant" android:viewportWidth="24.0" android:viewportHeight="24.0"> <path diff --git a/app/src/main/res/drawable/ic_baseline_compact_24.xml b/app/src/main/res/drawable/ic_compact_24.xml index d395a7338..e91774183 100644 --- a/app/src/main/res/drawable/ic_baseline_compact_24.xml +++ b/app/src/main/res/drawable/ic_compact_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M8,19h3v4h2v-4h3l-4,-4 -4,4zM16,5h-3L13,1h-2v4L8,5l4,4 4,-4zM4,11v2h16v-2L4,11z"/> diff --git a/app/src/main/res/drawable/ic_baseline_contact_mail_24.xml b/app/src/main/res/drawable/ic_contact_mail_24.xml index 79f9e21a8..6be87b740 100644 --- a/app/src/main/res/drawable/ic_baseline_contact_mail_24.xml +++ b/app/src/main/res/drawable/ic_contact_mail_24.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#757575" 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="@android:color/white" android:pathData="M21,8L21,7l-3,2 -3,-2v1l3,2 3,-2zM22,3L2,3C0.9,3 0,3.9 0,5v14c0,1.1 0.9,2 2,2h20c1.1,0 1.99,-0.9 1.99,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM8,6c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM14,18L2,18v-1c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1zM22,12h-8L14,6h8v6z"/> </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_baseline_eye_24.xml b/app/src/main/res/drawable/ic_eye_24.xml index c8acf29a8..9d2c7ac5f 100644 --- a/app/src/main/res/drawable/ic_baseline_eye_24.xml +++ b/app/src/main/res/drawable/ic_eye_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/> diff --git a/app/src/main/res/drawable/ic_file_upload_white_24dp.xml b/app/src/main/res/drawable/ic_file_upload_24dp.xml index 961f38da2..2f05400ee 100644 --- a/app/src/main/res/drawable/ic_file_upload_white_24dp.xml +++ b/app/src/main/res/drawable/ic_file_upload_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#FFFFFF" android:viewportHeight="24.0" + android:tint="?attr/colorOnPrimary" 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="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z"/> </vector> diff --git a/app/src/main/res/drawable/ic_filter_list_white_24dp.xml b/app/src/main/res/drawable/ic_filter_list_24dp.xml index 46fabab9c..46fabab9c 100644 --- a/app/src/main/res/drawable/ic_filter_list_white_24dp.xml +++ b/app/src/main/res/drawable/ic_filter_list_24dp.xml diff --git a/app/src/main/res/drawable/ic_baseline_flash_off_24.xml b/app/src/main/res/drawable/ic_flash_off_24.xml index 2a3b0ff5d..9f7baad76 100644 --- a/app/src/main/res/drawable/ic_baseline_flash_off_24.xml +++ b/app/src/main/res/drawable/ic_flash_off_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M3.27,3L2,4.27l5,5V13h3v9l3.58,-6.14L17.73,20 19,18.73 3.27,3zM17,10h-4l4,-8H7v2.18l8.46,8.46L17,10z"/> diff --git a/app/src/main/res/drawable/ic_baseline_flash_on_24.xml b/app/src/main/res/drawable/ic_flash_on_24.xml index 4574d0e20..618ae8709 100644 --- a/app/src/main/res/drawable/ic_baseline_flash_on_24.xml +++ b/app/src/main/res/drawable/ic_flash_on_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M7,2v11h3v9l7,-12h-4l4,-8z"/> 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_image_grey600_24dp.xml b/app/src/main/res/drawable/ic_image_24dp.xml index 8f1684e0d..b0eb6d87b 100644 --- a/app/src/main/res/drawable/ic_image_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_image_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="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/> </vector> diff --git a/app/src/main/res/drawable/ic_info_outline_grey600_24dp.xml b/app/src/main/res/drawable/ic_info_outline_24dp.xml index 55e282789..e24a9a535 100644 --- a/app/src/main/res/drawable/ic_info_outline_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_info_outline_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="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/> </vector> diff --git a/app/src/main/res/drawable/ic_label_grey600_24dp.xml b/app/src/main/res/drawable/ic_label_24dp.xml index 63f0f65f2..63f0f65f2 100644 --- a/app/src/main/res/drawable/ic_label_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_label_24dp.xml diff --git a/app/src/main/res/drawable/ic_lightbulb_outline_grey600_24dp.xml b/app/src/main/res/drawable/ic_lightbulb_outline_24dp.xml index 9272a07a6..6dbe46699 100644 --- a/app/src/main/res/drawable/ic_lightbulb_outline_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_lightbulb_outline_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="M9,21c0,0.55 0.45,1 1,1h4c0.55,0 1,-0.45 1,-1v-1L9,20v1zM12,2C8.14,2 5,5.14 5,9c0,2.38 1.19,4.47 3,5.74L8,17c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1v-2.26c1.81,-1.27 3,-3.36 3,-5.74 0,-3.86 -3.14,-7 -7,-7zM14.85,13.1l-0.85,0.6L14,16h-4v-2.3l-0.85,-0.6C7.8,12.16 7,10.63 7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,1.63 -0.8,3.16 -2.15,4.1z"/> </vector> diff --git a/app/src/main/res/drawable/ic_local_movies_grey600_24dp.xml b/app/src/main/res/drawable/ic_local_movies_24dp.xml index a038f7727..a65159cb2 100644 --- a/app/src/main/res/drawable/ic_local_movies_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_local_movies_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="M18,3v2h-2L16,3L8,3v2L6,5L6,3L4,3v18h2v-2h2v2h8v-2h2v2h2L20,3h-2zM8,17L6,17v-2h2v2zM8,13L6,13v-2h2v2zM8,9L6,9L6,7h2v2zM18,17h-2v-2h2v2zM18,13h-2v-2h2v2zM18,9h-2L16,7h2v2z"/> </vector> diff --git a/app/src/main/res/drawable/ic_baseline_mention_24.xml b/app/src/main/res/drawable/ic_mention_24.xml index 32c6f57e9..01eff7137 100644 --- a/app/src/main/res/drawable/ic_baseline_mention_24.xml +++ b/app/src/main/res/drawable/ic_mention_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10h5v-2h-5c-4.34,0 -8,-3.66 -8,-8s3.66,-8 8,-8 8,3.66 8,8v1.43c0,0.79 -0.71,1.57 -1.5,1.57s-1.5,-0.78 -1.5,-1.57L17,12c0,-2.76 -2.24,-5 -5,-5s-5,2.24 -5,5 2.24,5 5,5c1.38,0 2.64,-0.56 3.54,-1.47 0.65,0.89 1.77,1.47 2.96,1.47 1.97,0 3.5,-1.6 3.5,-3.57L22,12c0,-5.52 -4.48,-10 -10,-10zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3z"/> diff --git a/app/src/main/res/drawable/ic_music_note_grey600_24dp.xml b/app/src/main/res/drawable/ic_music_note_24dp.xml index ab9af4e6a..943b53d9f 100644 --- a/app/src/main/res/drawable/ic_music_note_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_music_note_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="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/> </vector> diff --git a/app/src/main/res/drawable/ic_network_wifi_grey600_24dp.xml b/app/src/main/res/drawable/ic_network_wifi_24dp.xml index 1c3b9a41c..bc3a5a819 100644 --- a/app/src/main/res/drawable/ic_network_wifi_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_network_wifi_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:fillAlpha=".3" android:fillColor="#FF000000" android:pathData="M12.01,21.49L23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4C5.28,3 0.81,6.66 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01z"/> <path android:fillColor="#FF000000" android:pathData="M3.53,10.95l8.46,10.54 0.01,0.01 0.01,-0.01 8.46,-10.54C20.04,10.62 16.81,8 12,8c-4.81,0 -8.04,2.62 -8.47,2.95z"/> diff --git a/app/src/main/res/drawable/ic_person_grey600_24dp.xml b/app/src/main/res/drawable/ic_person_24dp.xml index 23b5b1c10..9e18df4f4 100644 --- a/app/src/main/res/drawable/ic_person_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_person_24dp.xml @@ -3,7 +3,8 @@ android:height="24dp" android:autoMirrored="true" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?attr/colorOnSurface"> <path android:fillColor="#757575" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" /> 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..0dadeaeda 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/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="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_baseline_photo_camera_24.xml b/app/src/main/res/drawable/ic_photo_camera_24.xml index 497db8383..37eeb1384 100644 --- a/app/src/main/res/drawable/ic_baseline_photo_camera_24.xml +++ b/app/src/main/res/drawable/ic_photo_camera_24.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#757575" 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="@android:color/white" android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/> <path android:fillColor="@android:color/white" android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/> diff --git a/app/src/main/res/drawable/ic_baseline_photo_size_select_small_24.xml b/app/src/main/res/drawable/ic_photo_size_select_small_24.xml index 948e77c03..3f4708e25 100644 --- a/app/src/main/res/drawable/ic_baseline_photo_size_select_small_24.xml +++ b/app/src/main/res/drawable/ic_photo_size_select_small_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M23,15h-2v2h2v-2zM23,11h-2v2h2v-2zM23,19h-2v2c1,0 2,-1 2,-2zM15,3h-2v2h2L15,3zM23,7h-2v2h2L23,7zM21,3v2h2c0,-1 -1,-2 -2,-2zM3,21h8v-6L1,15v4c0,1.1 0.9,2 2,2zM3,7L1,7v2h2L3,7zM15,19h-2v2h2v-2zM19,3h-2v2h2L19,3zM19,19h-2v2h2v-2zM3,3C2,3 1,4 1,5h2L3,3zM3,11L1,11v2h2v-2zM11,3L9,3v2h2L11,3zM7,3L5,3v2h2L7,3z"/> diff --git a/app/src/main/res/drawable/ic_baseline_picture_as_pdf_24.xml b/app/src/main/res/drawable/ic_picture_as_pdf_24.xml index 22af51195..ec0fc7d0b 100644 --- a/app/src/main/res/drawable/ic_baseline_picture_as_pdf_24.xml +++ b/app/src/main/res/drawable/ic_picture_as_pdf_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM11.5,9.5c0,0.83 -0.67,1.5 -1.5,1.5L9,11v2L7.5,13L7.5,7L10,7c0.83,0 1.5,0.67 1.5,1.5v1zM16.5,11.5c0,0.83 -0.67,1.5 -1.5,1.5h-2.5L12.5,7L15,7c0.83,0 1.5,0.67 1.5,1.5v3zM20.5,8.5L19,8.5v1h1.5L20.5,11L19,11v2h-1.5L17.5,7h3v1.5zM9,9.5h1v-1L9,8.5v1zM4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6zM14,11.5h1v-3h-1v3z"/> diff --git a/app/src/main/res/drawable/ic_reply_grey600_24dp.xml b/app/src/main/res/drawable/ic_reply_24dp.xml index 31f0bbab5..777361fff 100644 --- a/app/src/main/res/drawable/ic_reply_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_reply_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,9V5l-7,7 7,7v-4.1c5,0 8.5,1.6 11,5.1 -1,-5 -4,-10 -11,-11z"/> </vector> diff --git a/app/src/main/res/drawable/ic_baseline_search_24.xml b/app/src/main/res/drawable/ic_search_24.xml index 2eb5033c1..023dc3f64 100644 --- a/app/src/main/res/drawable/ic_baseline_search_24.xml +++ b/app/src/main/res/drawable/ic_search_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/> diff --git a/app/src/main/res/drawable/ic_send_white_24dp.xml b/app/src/main/res/drawable/ic_send_24dp.xml index 97dd32a4d..4afe083af 100644 --- a/app/src/main/res/drawable/ic_send_white_24dp.xml +++ b/app/src/main/res/drawable/ic_send_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#FFFFFF" android:viewportHeight="24.0" + android:tint="?attr/colorOnPrimary" 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="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/> </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..8ce6afc9b 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/colorOnSurface" 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/ic_share_grey600_18dp.xml b/app/src/main/res/drawable/ic_share_18dp.xml index 03b089523..e31236fbf 100644 --- a/app/src/main/res/drawable/ic_share_grey600_18dp.xml +++ b/app/src/main/res/drawable/ic_share_18dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="18dp" - android:tint="#757575" android:viewportHeight="24.0" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/> </vector> diff --git a/app/src/main/res/drawable/ic_baseline_speed_24.xml b/app/src/main/res/drawable/ic_speed_24.xml index 4f24621a4..5c9948fda 100644 --- a/app/src/main/res/drawable/ic_baseline_speed_24.xml +++ b/app/src/main/res/drawable/ic_speed_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#757575" +<vector android:height="24dp" 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="@android:color/white" android:pathData="M20.38,8.57l-1.23,1.85a8,8 0,0 1,-0.22 7.58L5.07,18A8,8 0,0 1,15.58 6.85l1.85,-1.23A10,10 0,0 0,3.35 19a2,2 0,0 0,1.72 1h13.85a2,2 0,0 0,1.74 -1,10 10,0 0,0 -0.27,-10.44zM10.59,15.41a2,2 0,0 0,2.83 0l5.66,-8.49 -8.49,5.66a2,2 0,0 0,0 2.83z"/> diff --git a/app/src/main/res/drawable/ic_baseline_subject_24.xml b/app/src/main/res/drawable/ic_subject_24.xml index 37cd0c43d..9d3b803c3 100644 --- a/app/src/main/res/drawable/ic_baseline_subject_24.xml +++ b/app/src/main/res/drawable/ic_subject_24.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#757575" 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="M14,17L4,17v2h10v-2zM20,9L4,9v2h16L20,9zM4,15h16v-2L4,13v2zM4,5v2h16L20,5L4,5z"/> </vector> diff --git a/app/src/main/res/drawable/ic_sync_blue_24dp.xml b/app/src/main/res/drawable/ic_sync_18dp.xml index d6e3493dd..4da4bbd56 100644 --- a/app/src/main/res/drawable/ic_sync_blue_24dp.xml +++ b/app/src/main/res/drawable/ic_sync_18dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="18dp" - android:tint="#2268AB" android:viewportHeight="24.0" + android:tint="?attr/colorPrimary" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="#FF000000" android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/> </vector> diff --git a/app/src/main/res/drawable/ic_sync_grey600_24dp.xml b/app/src/main/res/drawable/ic_sync_24dp.xml index 3628dedbf..b9d9448e6 100644 --- a/app/src/main/res/drawable/ic_sync_grey600_24dp.xml +++ b/app/src/main/res/drawable/ic_sync_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="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/> </vector> diff --git a/app/src/main/res/drawable/ic_warning_white_24dp.xml b/app/src/main/res/drawable/ic_warning_24dp.xml index 5f638708f..4b0c577f7 100644 --- a/app/src/main/res/drawable/ic_warning_white_24dp.xml +++ b/app/src/main/res/drawable/ic_warning_24dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="24dp" - android:tint="#FFFFFF" android:viewportHeight="24.0" + android:tint="?attr/colorOnError" 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="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/> </vector> diff --git a/app/src/main/res/drawable/project_deck_36dp.xml b/app/src/main/res/drawable/project_deck_36dp.xml index 4a9468e4e..819f70d1e 100644 --- a/app/src/main/res/drawable/project_deck_36dp.xml +++ b/app/src/main/res/drawable/project_deck_36dp.xml @@ -2,7 +2,7 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="36dp" android:height="36dp" - android:tint="#757575" + android:tint="?attr/colorOnSurfaceVariant" android:viewportWidth="16" android:viewportHeight="16"> <group> diff --git a/app/src/main/res/drawable/project_file_36dp.xml b/app/src/main/res/drawable/project_file_36dp.xml index 8d025588c..3171ec8e3 100644 --- a/app/src/main/res/drawable/project_file_36dp.xml +++ b/app/src/main/res/drawable/project_file_36dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="false" android:height="36dp" - android:tint="#757575" android:viewportHeight="36" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="36" android:viewportWidth="36" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="@android:color/white" android:pathData="m3 4c-0.5 0-1 0.5-1 1v22c0 0.52 0.48 1 1 1h26c0.52 0 1-0.482 1-1v-18c0-0.5-0.5-1-1-1h-13l-4-4z"/> </vector>
\ No newline at end of file diff --git a/app/src/main/res/drawable/project_talk_36dp.xml b/app/src/main/res/drawable/project_talk_36dp.xml index 46fe60de5..55eff93c4 100644 --- a/app/src/main/res/drawable/project_talk_36dp.xml +++ b/app/src/main/res/drawable/project_talk_36dp.xml @@ -2,7 +2,7 @@ android:width="16dp" android:height="16dp" android:autoMirrored="false" - android:tint="#757575" + android:tint="?attr/colorOnSurfaceVariant" android:viewportWidth="16" android:viewportHeight="16"> <path diff --git a/app/src/main/res/drawable/type_archive_grey600_36dp.xml b/app/src/main/res/drawable/type_archive_36dp.xml index e80a180f4..365e29f0b 100644 --- a/app/src/main/res/drawable/type_archive_grey600_36dp.xml +++ b/app/src/main/res/drawable/type_archive_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="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/type_change_36dp.xml b/app/src/main/res/drawable/type_change_36dp.xml index 3187e7dc4..4c21fb91f 100644 --- a/app/src/main/res/drawable/type_change_36dp.xml +++ b/app/src/main/res/drawable/type_change_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="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/> </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/drawable/type_file_36dp.xml b/app/src/main/res/drawable/type_file_36dp.xml index 357b53789..461e8049b 100644 --- a/app/src/main/res/drawable/type_file_36dp.xml +++ b/app/src/main/res/drawable/type_file_36dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="36dp" - android:tint="#757575" android:viewportHeight="24" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24" android:viewportWidth="24" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="@android:color/white" android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/> </vector> diff --git a/app/src/main/res/drawable/type_history_36dp.xml b/app/src/main/res/drawable/type_history_36dp.xml index 8b2c1577b..374b73a06 100644 --- a/app/src/main/res/drawable/type_history_36dp.xml +++ b/app/src/main/res/drawable/type_history_36dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="36dp" - android:tint="#757575" android:viewportHeight="24" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24" android:viewportWidth="24" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="@android:color/white" android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/> </vector> diff --git a/app/src/main/res/drawable/type_label_grey600_36dp.xml b/app/src/main/res/drawable/type_label_36dp.xml index 9767da003..1491602de 100644 --- a/app/src/main/res/drawable/type_label_grey600_36dp.xml +++ b/app/src/main/res/drawable/type_label_36dp.xml @@ -1,5 +1,5 @@ <vector android:autoMirrored="true" android:height="36dp" - android:tint="#757575" android:viewportHeight="24" + android:tint="?attr/colorOnSurfaceVariant" android:viewportHeight="24" android:viewportWidth="24" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path android:fillColor="@android:color/white" android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z"/> </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..c50338d96 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> @@ -24,12 +24,4 @@ android:id="@+id/view_pager" android:layout_width="match_parent" android:layout_height="match_parent" /> - -<!-- <androidx.appcompat.widget.AppCompatImageView--> -<!-- android:id="@+id/image"--> -<!-- android:layout_width="match_parent"--> -<!-- android:layout_height="match_parent"--> -<!-- android:contentDescription="@null"--> -<!-- android:transitionName="@string/transition_attachment_preview"--> -<!-- tools:src="@drawable/ic_image_grey600_24dp" />--> </LinearLayout>
\ No newline at end of file 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..7bc0108ff 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> @@ -59,7 +59,7 @@ android:layout_height="0dp" android:layout_marginHorizontal="@dimen/spacer_2x" android:layout_weight="1" - android:background="@color/bg_highlighted"> + android:background="?attr/colorSurfaceVariant"> <TextView android:id="@+id/stacktrace" diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e72601e5e..4f4c813b9 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> @@ -61,7 +61,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal|bottom" - android:background="@color/bg_info_box" + android:background="?attr/colorSurfaceVariant" android:gravity="center" android:padding="@dimen/spacer_1hx" android:visibility="gone" @@ -74,8 +74,8 @@ android:gravity="center" android:paddingHorizontal="@dimen/spacer_1hx" android:text="@string/info_box_maintenance_mode" - android:textColor="@color/grey600" - app:drawableStartCompat="@drawable/ic_info_outline_grey600_24dp" /> + android:textColor="?attr/colorOnSurfaceVariant" + app:drawableStartCompat="@drawable/ic_info_outline_24dp" /> </LinearLayout> @@ -83,16 +83,17 @@ android:id="@+id/info_box_version_not_supported" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/danger" + android:background="?attr/colorError" android:drawablePadding="@dimen/spacer_1hx" android:gravity="center" android:paddingHorizontal="@dimen/spacer_2x" android:paddingVertical="@dimen/spacer_1x" android:text="@string/info_box_version_not_supported" - android:textColor="@android:color/white" + android:textColor="?attr/colorOnError" android:textSize="14sp" android:visibility="gone" - app:drawableStartCompat="@drawable/ic_warning_white_24dp" + app:drawableStartCompat="@drawable/ic_warning_24dp" + app:drawableTint="?attr/colorOnError" tools:visibility="visible" /> <it.niedermann.nextcloud.deck.ui.view.EmptyContentView @@ -131,7 +132,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 +144,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" @@ -167,7 +168,7 @@ android:layout_height="match_parent" android:visibility="gone" app:description="@string/enter_search_term_description" - app:image="@drawable/ic_baseline_search_24" + app:image="@drawable/ic_search_24" app:title="@string/enter_search_term_title" /> <it.niedermann.nextcloud.deck.ui.view.EmptyContentView @@ -176,7 +177,7 @@ android:layout_height="match_parent" android:visibility="gone" app:description="@string/no_search_results_description" - app:image="@drawable/ic_baseline_search_24" + app:image="@drawable/ic_search_24" app:title="@string/no_search_results_title" /> </com.google.android.material.search.SearchView> 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_pick_stack.xml b/app/src/main/res/layout/activity_pick_stack.xml index d6edce3bb..e4f7d0d9b 100644 --- a/app/src/main/res/layout/activity_pick_stack.xml +++ b/app/src/main/res/layout/activity_pick_stack.xml @@ -54,8 +54,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/inputWrapper" - app:layout_constraintVertical_weight="1" - tools:background="@color/bg_highlighted"> + app:layout_constraintVertical_weight="1"> <androidx.fragment.app.FragmentContainerView android:id="@+id/fragment_container" 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_take_photo.xml b/app/src/main/res/layout/activity_take_photo.xml index 6f4823204..2dc643442 100644 --- a/app/src/main/res/layout/activity_take_photo.xml +++ b/app/src/main/res/layout/activity_take_photo.xml @@ -26,13 +26,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/take_photo_switch_camera" - android:tint="@android:color/white" - app:backgroundTint="@color/defaultBrand" app:layout_constraintBottom_toBottomOf="@id/takePhoto" app:layout_constraintEnd_toStartOf="@id/takePhoto" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/takePhoto" - tools:srcCompat="@drawable/ic_baseline_camera_front_24" /> + tools:srcCompat="@drawable/ic_camera_front_24" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/takePhoto" @@ -40,13 +38,11 @@ android:layout_height="wrap_content" android:layout_margin="@dimen/fab_margin" android:contentDescription="@string/take_photo" - android:tint="@android:color/white" - app:backgroundTint="@color/defaultBrand" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@id/toggle_torch" app:layout_constraintStart_toEndOf="@id/switchCamera" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/ic_baseline_photo_camera_24" /> + app:srcCompat="@drawable/ic_photo_camera_24" /> <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/toggle_torch" @@ -54,12 +50,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@string/take_photo_toggle_torch" - android:tint="@android:color/white" - app:backgroundTint="@color/defaultBrand" app:layout_constraintBottom_toBottomOf="@id/takePhoto" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/takePhoto" app:layout_constraintTop_toTopOf="@id/takePhoto" - tools:srcCompat="@drawable/ic_baseline_flash_on_24" /> + tools:srcCompat="@drawable/ic_flash_on_24" /> </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file 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..feff52fe3 100644 --- a/app/src/main/res/layout/dialog_account_switcher.xml +++ b/app/src/main/res/layout/dialog_account_switcher.xml @@ -23,7 +23,7 @@ android:contentDescription="@null" android:focusable="false" android:scaleType="center" - app:srcCompat="@drawable/ic_person_grey600_24dp" /> + app:srcCompat="@drawable/ic_person_24dp" /> <LinearLayout android:layout_width="0dp" @@ -66,7 +66,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/bg_highlighted" /> + android:background="?attr/colorOutlineVariant" /> <androidx.recyclerview.widget.RecyclerView android:id="@+id/accounts_list" @@ -91,14 +91,16 @@ android:paddingBottom="@dimen/spacer_1x"> <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/add_account_icon" android:layout_width="36dp" android:layout_height="36dp" 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 + <com.google.android.material.textview.MaterialTextView + android:id="@+id/add_account_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -107,7 +109,7 @@ android:singleLine="true" android:text="@string/add_account" android:textAppearance="@style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem" - android:textColor="?android:textColorPrimary" /> + android:textColor="?attr/colorOnSurface" /> </LinearLayout> @@ -124,14 +126,16 @@ android:paddingBottom="@dimen/spacer_1x"> <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/manage_accounts_icon" android:layout_width="36dp" android:layout_height="36dp" android:contentDescription="@null" android:focusable="false" android:scaleType="center" - app:srcCompat="@drawable/ic_settings_grey600_24dp" /> + app:srcCompat="@drawable/ic_settings_24dp" /> <TextView + android:id="@+id/manage_accounts_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" @@ -140,7 +144,7 @@ android:singleLine="true" android:text="@string/manage_accounts" android:textAppearance="@style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem" - android:textColor="?android:textColorPrimary" /> + android:textColor="?attr/colorOnSurface" /> </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/dialog_board_manage_labels.xml b/app/src/main/res/layout/dialog_board_manage_labels.xml index 5c6154bb0..76b09d520 100644 --- a/app/src/main/res/layout/dialog_board_manage_labels.xml +++ b/app/src/main/res/layout/dialog_board_manage_labels.xml @@ -38,8 +38,7 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:contentDescription="@string/add_comment" - app:backgroundTint="@color/defaultBrand" - app:srcCompat="@drawable/ic_send_white_24dp" /> + app:srcCompat="@drawable/ic_send_24dp" /> </LinearLayout> <androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/res/layout/dialog_exception.xml b/app/src/main/res/layout/dialog_exception.xml index 5789b1b5e..ac81f4719 100644 --- a/app/src/main/res/layout/dialog_exception.xml +++ b/app/src/main/res/layout/dialog_exception.xml @@ -35,7 +35,7 @@ android:layout_marginTop="@dimen/spacer_2x" android:layout_marginBottom="@dimen/spacer_2x" android:layout_weight="1" - android:background="@color/bg_highlighted"> + android:background="?attr/colorSurfaceVariant"> <TextView android:id="@+id/stacktrace" diff --git a/app/src/main/res/layout/dialog_move_card.xml b/app/src/main/res/layout/dialog_move_card.xml index a8d70fcdd..773fbb29d 100644 --- a/app/src/main/res/layout/dialog_move_card.xml +++ b/app/src/main/res/layout/dialog_move_card.xml @@ -22,8 +22,8 @@ <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1" - android:layout_marginTop="@dimen/spacer_2x"> + android:layout_marginTop="@dimen/spacer_2x" + android:layout_weight="1"> <androidx.fragment.app.FragmentContainerView android:id="@+id/fragment_container" @@ -40,10 +40,10 @@ android:paddingStart="@dimen/spacer_3x" android:paddingEnd="@dimen/spacer_1x" android:text="@string/move_warning" - android:textColor="@color/danger" + android:textColor="?attr/colorError" android:visibility="gone" - app:drawableStartCompat="@drawable/ic_warning_white_24dp" - app:drawableTint="@color/danger" + app:drawableStartCompat="@drawable/ic_warning_24dp" + app:drawableTint="?attr/colorError" tools:visibility="visible" /> <com.google.android.flexbox.FlexboxLayout diff --git a/app/src/main/res/layout/dialog_preview.xml b/app/src/main/res/layout/dialog_preview.xml index 2765a659f..519875cb9 100644 --- a/app/src/main/res/layout/dialog_preview.xml +++ b/app/src/main/res/layout/dialog_preview.xml @@ -11,7 +11,7 @@ android:layout_height="200dp" android:contentDescription="@string/user_avatar" android:scaleType="centerCrop" - android:background="@color/bg_info_box" /> + android:background="?attr/colorSurfaceVariant" /> <TextView android:padding="?dialogPreferredPadding" 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..73cd9dfa8 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 @@ -33,8 +33,7 @@ android:layout_margin="@dimen/fab_margin" android:contentDescription="@string/upload_a_new_attachment" android:visibility="gone" - app:backgroundTint="@color/defaultBrand" - app:srcCompat="@drawable/ic_file_upload_white_24dp" + app:srcCompat="@drawable/ic_file_upload_24dp" tools:visibility="visible" /> <FrameLayout @@ -78,9 +77,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..e8c29254f 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_24dp" + app:tint="?attr/colorSecondary" /> <it.niedermann.android.markdown.MarkdownViewerImpl android:id="@+id/replyCommentText" @@ -69,7 +72,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@android:string/cancel" android:padding="@dimen/spacer_1x" - app:srcCompat="@drawable/ic_close_circle_grey600" /> + app:srcCompat="@drawable/ic_close_circle" /> </LinearLayout> @@ -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_mention_24" + app:tint="?attr/colorSecondary" /> <LinearLayout android:id="@+id/mention_proposer" @@ -116,7 +121,7 @@ android:layout_margin="@dimen/spacer_1x" android:contentDescription="@null" android:translationY="@dimen/spacer_1qx" - app:srcCompat="@drawable/ic_person_grey600_24dp" + app:srcCompat="@drawable/ic_person_24dp" tools:srcCompat="@tools:sample/avatars" /> <com.google.android.material.textfield.TextInputLayout @@ -151,8 +156,7 @@ android:layout_gravity="center" android:contentDescription="@string/add_comment" android:translationY="@dimen/spacer_1qx" - app:backgroundTint="@color/defaultBrand" - app:srcCompat="@drawable/ic_send_white_24dp" /> + app:srcCompat="@drawable/ic_send_24dp" /> </LinearLayout> </LinearLayout> </RelativeLayout>
\ No newline at end of file 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..8fd8b4bef 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 @@ -20,7 +20,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:startIconDrawable="@drawable/ic_label_grey600_24dp"> + app:startIconDrawable="@drawable/ic_label_24dp"> <it.niedermann.nextcloud.deck.ui.view.ToggleAutoCompleteTextView android:id="@+id/labels" @@ -51,7 +51,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/labelsGroup" - app:startIconDrawable="@drawable/ic_person_grey600_24dp"> + app:startIconDrawable="@drawable/ic_person_24dp"> <it.niedermann.nextcloud.deck.ui.view.ToggleAutoCompleteTextView android:id="@+id/people" @@ -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" @@ -141,7 +141,7 @@ android:paddingBottom="@dimen/spacer_1hx" android:translationY="-7dp" android:visibility="invisible" - app:srcCompat="@drawable/ic_baseline_eye_24" + app:srcCompat="@drawable/ic_eye_24" tools:visibility="visible" /> </RelativeLayout> diff --git a/app/src/main/res/layout/item_access_control.xml b/app/src/main/res/layout/item_access_control.xml index 1edd8c21a..86167c237 100644 --- a/app/src/main/res/layout/item_access_control.xml +++ b/app/src/main/res/layout/item_access_control.xml @@ -13,7 +13,7 @@ android:layout_height="match_parent" android:layout_marginEnd="@dimen/spacer_2x" android:contentDescription="@null" - app:srcCompat="@drawable/ic_person_grey600_24dp" + app:srcCompat="@drawable/ic_person_24dp" tools:srcCompat="@tools:sample/avatars" /> <LinearLayout @@ -34,7 +34,7 @@ android:layout_gravity="center" android:layout_weight="1" android:textAppearance="?attr/textAppearanceListItem" - tools:drawableEnd="@drawable/ic_sync_blue_24dp" + tools:drawableEnd="@drawable/ic_sync_18dp" tools:text="@tools:sample/full_names" /> <androidx.appcompat.widget.AppCompatImageButton @@ -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_access_control_owner.xml b/app/src/main/res/layout/item_access_control_owner.xml index 0bacae453..b9e7ebdcf 100644 --- a/app/src/main/res/layout/item_access_control_owner.xml +++ b/app/src/main/res/layout/item_access_control_owner.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:layout_marginEnd="@dimen/spacer_2x" android:contentDescription="@null" - app:srcCompat="@drawable/ic_person_grey600_24dp" + app:srcCompat="@drawable/ic_person_24dp" tools:srcCompat="@tools:sample/avatars" /> <LinearLayout diff --git a/app/src/main/res/layout/item_account_choose.xml b/app/src/main/res/layout/item_account_choose.xml index b5a6dd726..9d880bec8 100644 --- a/app/src/main/res/layout/item_account_choose.xml +++ b/app/src/main/res/layout/item_account_choose.xml @@ -5,8 +5,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/selectableItemBackground" - android:orientation="horizontal" android:gravity="center_vertical" + android:orientation="horizontal" android:padding="@dimen/spacer_3x"> <FrameLayout @@ -21,7 +21,7 @@ android:contentDescription="@null" android:focusable="false" android:scaleType="center" - app:srcCompat="@drawable/ic_person_grey600_24dp" /> + app:srcCompat="@drawable/ic_person_24dp" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/currentAccountIndicator" @@ -30,7 +30,7 @@ android:layout_gravity="end|bottom" android:visibility="gone" app:srcCompat="@drawable/selected_check" - tools:src="@drawable/ic_check_grey600_24dp" + tools:src="@drawable/ic_check_24dp" tools:visibility="visible" /> </FrameLayout> @@ -65,10 +65,11 @@ 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" + app:tint="?attr/colorOnSurface" tools:visibility="visible" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_activity.xml b/app/src/main/res/layout/item_activity.xml index 85fc740f8..436e47ffc 100644 --- a/app/src/main/res/layout/item_activity.xml +++ b/app/src/main/res/layout/item_activity.xml @@ -8,12 +8,13 @@ android:orientation="vertical" android:padding="@dimen/spacer_2x"> - <TextView + <com.google.android.material.textview.MaterialTextView android:id="@+id/date" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="56dp" android:textAppearance="?attr/textAppearanceListItemSecondary" + android:textColor="?attr/colorOnSurfaceVariant" tools:text="4 days ago" /> <LinearLayout @@ -28,11 +29,12 @@ android:layout_marginEnd="@dimen/spacer_2x" app:srcCompat="@drawable/type_change_36dp" /> - <TextView + <com.google.android.material.textview.MaterialTextView android:id="@+id/subject" android:layout_width="match_parent" android:layout_height="wrap_content" android:textAppearance="?attr/textAppearanceListItem" + android:textColor="?attr/colorOnSurface" tools:maxLength="150" tools:text="@tools:sample/lorem/random" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_archived_board.xml b/app/src/main/res/layout/item_archived_board.xml index bbb425a18..43d8583b4 100644 --- a/app/src/main/res/layout/item_archived_board.xml +++ b/app/src/main/res/layout/item_archived_board.xml @@ -13,7 +13,7 @@ android:layout_height="24dp" android:layout_marginTop="@dimen/spacer_1hx" android:contentDescription="@null" - tools:src="@drawable/circle_grey600_36dp" /> + tools:src="@drawable/circle_36dp" /> <TextView android:id="@+id/board_title" diff --git a/app/src/main/res/layout/item_assignee.xml b/app/src/main/res/layout/item_assignee.xml index 961bdea30..0188f1a9e 100644 --- a/app/src/main/res/layout/item_assignee.xml +++ b/app/src/main/res/layout/item_assignee.xml @@ -12,6 +12,6 @@ android:layout_gravity="center" android:scaleType="centerCrop" android:background="?attr/selectableItemBackgroundBorderless" - app:srcCompat="@drawable/ic_person_grey600_24dp"/> + app:srcCompat="@drawable/ic_person_24dp"/> </FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_attachment_default.xml b/app/src/main/res/layout/item_attachment_default.xml index 9d5781c3e..064678933 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 @@ -30,7 +30,7 @@ android:layout_gravity="bottom|end" android:contentDescription="@string/not_synced_yet" android:visibility="gone" - app:srcCompat="@drawable/ic_sync_blue_24dp" + app:srcCompat="@drawable/ic_sync_18dp" app:tint="?attr/colorPrimary" tools:visibility="visible" /> </FrameLayout> diff --git a/app/src/main/res/layout/item_attachment_image.xml b/app/src/main/res/layout/item_attachment_image.xml index 3b41a9fe8..4a5076bbc 100644 --- a/app/src/main/res/layout/item_attachment_image.xml +++ b/app/src/main/res/layout/item_attachment_image.xml @@ -12,7 +12,7 @@ android:layout_height="match_parent" android:layout_gravity="center" android:scaleType="centerCrop" - app:srcCompat="@drawable/ic_image_grey600_24dp" /> + app:srcCompat="@drawable/ic_image_24dp" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/not_synced_yet" @@ -23,6 +23,7 @@ android:translationX="-8dp" android:translationY="-8dp" android:visibility="gone" - app:srcCompat="@drawable/ic_sync_blue_24dp" + app:srcCompat="@drawable/ic_sync_18dp" + 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..7d7b63cdd 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" /> @@ -49,7 +49,8 @@ android:layout_marginTop="8sp" android:contentDescription="@string/not_synced_yet" android:visibility="gone" - app:srcCompat="@drawable/ic_sync_blue_24dp" + app:srcCompat="@drawable/ic_sync_18dp" + 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..deb975483 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" /> @@ -51,7 +51,8 @@ android:layout_marginTop="8sp" android:contentDescription="@string/not_synced_yet" android:visibility="gone" - app:srcCompat="@drawable/ic_sync_blue_24dp" + app:srcCompat="@drawable/ic_sync_18dp" + app:tint="?attr/colorPrimary" tools:visibility="visible" /> <it.niedermann.nextcloud.deck.ui.view.DueDateChip @@ -91,8 +92,7 @@ android:drawablePadding="@dimen/spacer_1hx" android:gravity="center_vertical" android:padding="@dimen/spacer_1hx" - app:drawableStartCompat="@drawable/ic_comment_white_24dp" - app:drawableTint="@color/grey600" + app:drawableStartCompat="@drawable/ic_comment_24dp" tools:text="2" /> <com.google.android.material.textview.MaterialTextView @@ -111,7 +111,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 +138,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..0ecbec592 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" /> @@ -34,7 +34,8 @@ android:layout_marginTop="8sp" android:contentDescription="@string/not_synced_yet" android:visibility="gone" - app:srcCompat="@drawable/ic_sync_blue_24dp" + app:srcCompat="@drawable/ic_sync_18dp" + 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..655d88c2f 100644 --- a/app/src/main/res/layout/item_comment.xml +++ b/app/src/main/res/layout/item_comment.xml @@ -13,8 +13,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="54dp" + android:layout_marginBottom="@dimen/spacer_1x" android:orientation="horizontal" - android:paddingBottom="@dimen/spacer_1x" android:visibility="gone" tools:visibility="visible"> @@ -22,7 +22,7 @@ android:id="@+id/parentBorder" android:layout_width="2dp" android:layout_height="match_parent" - android:background="?attr/colorPrimary" /> + android:background="?attr/colorSecondary" /> <TextView android:id="@+id/parent" @@ -30,8 +30,10 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="@integer/comment_parent_max_lines" + android:paddingVertical="@dimen/spacer_1hx" android:paddingStart="@dimen/spacer_1x" android:paddingEnd="@null" + android:textColor="?attr/colorOnSurfaceVariant" tools:text="@tools:sample/lorem/random" /> </LinearLayout> @@ -41,10 +43,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" @@ -53,7 +55,7 @@ android:layout_gravity="center" android:layout_margin="@dimen/spacer_1x" android:contentDescription="@null" - app:srcCompat="@drawable/ic_person_grey600_24dp" + app:srcCompat="@drawable/ic_person_24dp" tools:srcCompat="@tools:sample/avatars" /> <androidx.appcompat.widget.AppCompatImageView @@ -62,7 +64,8 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:visibility="gone" - app:srcCompat="@drawable/ic_sync_blue_24dp" + app:srcCompat="@drawable/ic_sync_18dp" + app:tint="?attr/colorPrimary" tools:visibility="visible" /> </FrameLayout> @@ -77,20 +80,23 @@ 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" + android:textColorHighlight="?attr/colorOnSurfaceVariant" tools:text="@tools:sample/date/day_of_week" /> </LinearLayout> @@ -101,6 +107,7 @@ android:layout_gravity="center" android:autofillHints="@null" android:textAppearance="?attr/textAppearanceListItem" + android:textColor="?attr/colorOnSurface" tools:maxLength="200" tools:text="@tools:sample/lorem/random" /> </LinearLayout> diff --git a/app/src/main/res/layout/item_filter_donetype.xml b/app/src/main/res/layout/item_filter_donetype.xml index 9cf823c77..c200f298c 100644 --- a/app/src/main/res/layout/item_filter_donetype.xml +++ b/app/src/main/res/layout/item_filter_donetype.xml @@ -24,6 +24,6 @@ app:layout_alignSelf="center" app:layout_flexShrink="0" app:srcCompat="@drawable/selected_check" - tools:src="@drawable/ic_check_grey600_24dp" /> + tools:src="@drawable/ic_check_24dp" /> </com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_filter_duetype.xml b/app/src/main/res/layout/item_filter_duetype.xml index 1e3f5ac8e..2a3da0802 100644 --- a/app/src/main/res/layout/item_filter_duetype.xml +++ b/app/src/main/res/layout/item_filter_duetype.xml @@ -24,6 +24,6 @@ app:layout_alignSelf="center" app:layout_flexShrink="0" app:srcCompat="@drawable/selected_check" - tools:src="@drawable/ic_check_grey600_24dp" /> + tools:src="@drawable/ic_check_24dp" /> </com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_filter_label.xml b/app/src/main/res/layout/item_filter_label.xml index 49bc47fcb..dd93d9edd 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 @@ -22,6 +24,6 @@ app:layout_alignSelf="center" app:layout_flexShrink="0" app:srcCompat="@drawable/selected_check" - tools:src="@drawable/ic_check_grey600_24dp" /> + tools:src="@drawable/ic_check_24dp" /> </com.google.android.flexbox.FlexboxLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_filter_user.xml b/app/src/main/res/layout/item_filter_user.xml index 35324d859..59d8be1a6 100644 --- a/app/src/main/res/layout/item_filter_user.xml +++ b/app/src/main/res/layout/item_filter_user.xml @@ -19,7 +19,7 @@ android:layout_height="@dimen/avatar_size" android:layout_marginEnd="10dp" android:contentDescription="@null" - app:srcCompat="@drawable/ic_person_grey600_24dp" + app:srcCompat="@drawable/ic_person_24dp" tools:srcCompat="@tools:sample/avatars" /> <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_photo_preview.xml b/app/src/main/res/layout/item_photo_preview.xml index 280ed063c..c36f93a3f 100644 --- a/app/src/main/res/layout/item_photo_preview.xml +++ b/app/src/main/res/layout/item_photo_preview.xml @@ -22,6 +22,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintWidth_percent=".3" - app:srcCompat="@drawable/ic_baseline_photo_camera_24" + app:srcCompat="@drawable/ic_photo_camera_24" app:tint="@android:color/white" /> </it.niedermann.nextcloud.deck.ui.view.SquareConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/item_picker_native.xml b/app/src/main/res/layout/item_picker_native.xml index 167cbd7ff..9e3cf74ee 100644 --- a/app/src/main/res/layout/item_picker_native.xml +++ b/app/src/main/res/layout/item_picker_native.xml @@ -20,7 +20,7 @@ android:layout_marginEnd="@dimen/spacer_2x" android:contentDescription="@null" android:padding="@dimen/spacer_1hx" - app:srcCompat="@drawable/ic_baseline_search_24" /> + app:srcCompat="@drawable/ic_search_24" /> <TextView android:id="@+id/title" @@ -35,7 +35,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/bg_info_box" /> + android:background="?attr/colorOutlineVariant" /> <TextView android:id="@+id/subtitle" diff --git a/app/src/main/res/layout/item_prepare_create_account.xml b/app/src/main/res/layout/item_prepare_create_account.xml index 9a76b898e..6e33f5f11 100644 --- a/app/src/main/res/layout/item_prepare_create_account.xml +++ b/app/src/main/res/layout/item_prepare_create_account.xml @@ -13,7 +13,7 @@ android:layout_height="@dimen/avatar_size" android:layout_marginEnd="@dimen/spacer_2x" android:contentDescription="@null" - app:srcCompat="@drawable/ic_person_grey600_24dp" + app:srcCompat="@drawable/ic_person_24dp" tools:src="@tools:sample/avatars" /> diff --git a/app/src/main/res/layout/item_prepare_create_board.xml b/app/src/main/res/layout/item_prepare_create_board.xml index 9fc5defa1..78e1796a8 100644 --- a/app/src/main/res/layout/item_prepare_create_board.xml +++ b/app/src/main/res/layout/item_prepare_create_board.xml @@ -14,7 +14,7 @@ android:layout_height="@dimen/avatar_size" android:layout_marginEnd="@dimen/spacer_2x" android:contentDescription="@null" - app:srcCompat="@drawable/circle_grey600_36dp" + app:srcCompat="@drawable/circle_36dp" tools:tint="@color/board_default_color" /> <TextView diff --git a/app/src/main/res/layout/item_prepare_create_stack.xml b/app/src/main/res/layout/item_prepare_create_stack.xml index 303c9328d..fa71cb656 100644 --- a/app/src/main/res/layout/item_prepare_create_stack.xml +++ b/app/src/main/res/layout/item_prepare_create_stack.xml @@ -27,6 +27,6 @@ android:layout_height="22dp" android:layout_marginStart="@dimen/spacer_1x" app:srcCompat="@drawable/selected_check" - tools:src="@drawable/ic_check_grey600_24dp" /> + tools:src="@drawable/ic_check_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/item_tip.xml b/app/src/main/res/layout/item_tip.xml index d74648df6..7fe684909 100644 --- a/app/src/main/res/layout/item_tip.xml +++ b/app/src/main/res/layout/item_tip.xml @@ -14,7 +14,7 @@ android:drawablePadding="@dimen/spacer_2x" android:gravity="start|center" android:textAppearance="?attr/textAppearanceListItem" - app:drawableStartCompat="@drawable/ic_lightbulb_outline_grey600_24dp" + app:drawableStartCompat="@drawable/ic_lightbulb_outline_24dp" tools:maxLength="200" tools:text="@tools:sample/lorem/random" /> 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/view_card_due_date.xml b/app/src/main/res/layout/view_card_due_date.xml index 77398f5b1..04654f9c4 100644 --- a/app/src/main/res/layout/view_card_due_date.xml +++ b/app/src/main/res/layout/view_card_due_date.xml @@ -56,7 +56,7 @@ app:layout_constraintBottom_toBottomOf="@id/doneDate" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/doneDate" - app:srcCompat="@drawable/ic_close_circle_grey600" + app:srcCompat="@drawable/ic_close_circle" tools:visibility="gone" /> <com.google.android.material.textfield.TextInputLayout @@ -71,7 +71,7 @@ app:layout_constraintHorizontal_weight="2" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/done_due_date" - app:startIconDrawable="@drawable/calendar_blank_grey600_24dp"> + app:startIconDrawable="@drawable/calendar_blank_24dp"> <EditText android:id="@+id/dueDateDate" @@ -126,7 +126,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/dueDateTimeWrapper" app:layout_constraintTop_toTopOf="@id/dueDateTimeWrapper" - app:srcCompat="@drawable/ic_close_circle_grey600" /> + app:srcCompat="@drawable/ic_close_circle" /> <com.google.android.material.button.MaterialButton android:id="@+id/markAsDone" diff --git a/app/src/main/res/layout/widget_color_chooser.xml b/app/src/main/res/layout/widget_color_chooser.xml index 0230a2b31..d35c4105f 100644 --- a/app/src/main/res/layout/widget_color_chooser.xml +++ b/app/src/main/res/layout/widget_color_chooser.xml @@ -26,8 +26,7 @@ android:layout_marginTop="@dimen/spacer_1x" android:contentDescription="@string/pick_custom_color" app:layout_flexBasisPercent="15%" - app:srcCompat="@drawable/circle_alpha_colorize_36dp" - tools:tint="@color/grey600" /> + app:srcCompat="@drawable/circle_alpha_colorize_36dp" /> </com.google.android.flexbox.FlexboxLayout> <com.skydoves.colorpickerview.ColorPickerView diff --git a/app/src/main/res/layout/widget_empty_content_view.xml b/app/src/main/res/layout/widget_empty_content_view.xml index ab8b3b9b9..990a1f662 100644 --- a/app/src/main/res/layout/widget_empty_content_view.xml +++ b/app/src/main/res/layout/widget_empty_content_view.xml @@ -15,7 +15,7 @@ android:layout_above="@+id/title" android:layout_marginBottom="@dimen/spacer_2x" android:contentDescription="@null" - android:tint="@color/fg_secondary" + android:tint="?attr/colorSurfaceVariant" app:layout_constraintBottom_toTopOf="@id/title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="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..2a9640c81 100644 --- a/app/src/main/res/layout/widget_single_card.xml +++ b/app/src/main/res/layout/widget_single_card.xml @@ -83,9 +83,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@null" - android:tint="@color/grey600" - tools:ignore="UseAppTint" - tools:src="@drawable/ic_comment_white_24dp" /> + tools:src="@drawable/ic_comment_24dp" /> <TextView android:id="@+id/card_count_comments" @@ -102,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:contentDescription="@null" - tools:src="@drawable/ic_check_grey600_24dp" /> + tools:src="@drawable/ic_check_24dp" /> <TextView android:id="@+id/card_count_tasks" @@ -118,9 +116,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" 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/layout/widget_stack.xml b/app/src/main/res/layout/widget_stack.xml index b02e9a1db..f0b0c33fd 100644 --- a/app/src/main/res/layout/widget_stack.xml +++ b/app/src/main/res/layout/widget_stack.xml @@ -29,7 +29,7 @@ android:layout_alignParentStart="true" android:layout_centerVertical="true" android:contentDescription="@string/widget_stack_header_icon" - android:src="@drawable/circle_grey600_8dp" /> + android:src="@drawable/circle_8dp" /> <TextView android:id="@+id/widget_stack_title_tv" @@ -68,8 +68,8 @@ android:contentDescription="@string/widget_placeholder_icon" android:gravity="center" android:text="@string/app_name_short" - android:textColor="@color/fg_secondary" - app:srcCompat="@drawable/ic_local_movies_grey600_24dp" + android:textColor="?attr/colorOnSurfaceVariant" + app:srcCompat="@drawable/ic_local_movies_24dp" tools:visibility="gone" /> </LinearLayout> diff --git a/app/src/main/res/layout/widget_upcoming.xml b/app/src/main/res/layout/widget_upcoming.xml index 75aa09d9b..f95d87eb7 100644 --- a/app/src/main/res/layout/widget_upcoming.xml +++ b/app/src/main/res/layout/widget_upcoming.xml @@ -26,8 +26,8 @@ android:contentDescription="@string/widget_placeholder_icon" android:gravity="center" android:text="@string/app_name_short" - android:textColor="@color/fg_secondary" - app:srcCompat="@drawable/ic_local_movies_grey600_24dp" + android:textColor="?attr/colorOnSurfaceVariant" + app:srcCompat="@drawable/ic_local_movies_24dp" tools:visibility="gone" /> </LinearLayout> 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..69abbafbd 100644 --- a/app/src/main/res/menu/attachment_picker_menu.xml +++ b/app/src/main/res/menu/attachment_picker_menu.xml @@ -3,17 +3,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/gallery" - android:icon="@drawable/ic_baseline_photo_camera_24" + android:icon="@drawable/ic_photo_camera_24" android:title="@string/gallery" app:showAsAction="ifRoom" /> <item android:id="@+id/contacts" - android:icon="@drawable/ic_person_grey600_24dp" + android:icon="@drawable/ic_person_24dp" android:title="@string/contacts" 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/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index 7c0d51182..9d2114352 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/filter" - android:icon="@drawable/ic_filter_list_white_24dp" + android:icon="@drawable/ic_filter_list_24dp" android:title="@string/simple_filter" app:showAsAction="ifRoom" /> <item @@ -14,7 +14,7 @@ app:showAsAction="ifRoom" /> <item android:id="@+id/avatar" - android:icon="@drawable/ic_baseline_account_circle_24" + android:icon="@drawable/ic_account_circle_24" android:title="@string/choose_account" 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..31c1f32ef 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -5,19 +5,37 @@ <!-- Base Theme --> <!-- ======================================= --> - <color name="primary">@android:color/black</color> - <color name="accent">@android:color/white</color> - - <!-- ======================================= --> - <!-- Custom styles --> - <!-- TODO REMOVE --> - <!-- ======================================= --> - - <color name="fg_secondary">#666</color> - <color name="bg_highlighted">#212121</color> - <color name="bg_info_box">#222222</color> - <color name="bg_card">#1e1e1e</color> - <color name="defaultTextHighlightBackground">#55eeeeff</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">@android:color/black</color> + <color name="secondary">#C5C5C5</color> + <color name="secondaryContainer">#454545</color> + <color name="shadow">@android:color/black</color> + <color name="surface">#1B1B1B</color> + <color name="surfaceVariant">#464646</color> + <color name="tertiary">#C9C9C9</color> + <color name="tertiaryContainer">#484848</color> + <color name="colorSurfaceContainer">#191919</color> <!-- ======================================= --> <!-- Widgets --> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1b9a313f4..17f44e0ce 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,27 +1,44 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <!-- ======================================= --> - <!-- Base Theme --> - <!-- ======================================= --> - - <color name="primary">@android:color/white</color> - <color name="accent">@android:color/black</color> + <!-- TODO Limit usage only to where it actually is needed (Import, About, …) --> <color name="defaultBrand">#0082C9</color> - <color name="danger">#d40000</color> <!-- ======================================= --> - <!-- Custom styles --> - <!-- TODO REMOVE --> + <!-- Base Theme --> <!-- ======================================= --> - <color name="bottom_sheet_backdrop">#7f000000</color> - <color name="grey600">#757575</color> - <color name="fg_secondary">#999</color> - <color name="bg_highlighted">#eee</color> - <color name="bg_info_box">#dddddd</color> - <color name="bg_card">@android:color/white</color> - <color name="defaultTextHighlightBackground">#2233334a</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">@android:color/white</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">@android:color/white</color> + <color name="onPrimaryContainer">#161616</color> + <color name="onSecondary">@android:color/white</color> + <color name="onSecondaryContainer">#0E1D2A</color> + <color name="onSurface">#1B1B1B</color> + <color name="onSurfaceVariant">#464646</color> + <color name="onTertiary">@android:color/white</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="colorSurfaceContainer">@color/bg_default</color> <!-- ======================================= --> <!-- Widgets --> @@ -46,8 +63,8 @@ <color name="due_text_done">#286c39</color> <!-- Activity --> - <color name="activity_create">#00D400</color> - <color name="activity_delete">#D40000</color> + <color name="activity_create">#286c39</color> + <color name="activity_delete">#c61610</color> <!-- ======================================= --> <!-- Static colors --> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index ba047c3ab..de5c4b296 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,25 +1,51 @@ <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 PopupMenus --> + <item name="colorSurfaceContainer">@color/colorSurfaceContainer</item> + + <!-- Used by Material Dialogs & Material SearchBar --> + <item name="colorSurfaceContainerHigh">@color/colorSurfaceContainer</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 --> <item name="alertDialogTheme">@style/PreferencesAlertDialogTheme</item> - <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item> - - <item name="toolbarStyle">@style/toolbarStyle</item> <item name="chipGroupStyle">@style/chipGroupStyle</item> <item name="chipStyle">@style/chipStyle</item> <item name="tabStyle">@style/tabStyle</item> @@ -30,22 +56,12 @@ <style name="AppTheme" parent="BaseTheme" /> - <style name="MaterialAlertDialogTheme" parent="ThemeOverlay.Material3.MaterialAlertDialog"> - <item name="buttonBarPositiveButtonStyle">@style/buttonStyle</item> - <item name="buttonBarNegativeButtonStyle">@style/buttonStyle</item> - <item name="buttonBarNeutralButtonStyle">@style/buttonStyle</item> - </style> - - <style name="PreferencesAlertDialogTheme" parent="MaterialAlertDialogTheme"> + <style name="PreferencesAlertDialogTheme" parent="ThemeOverlay.Material3.MaterialAlertDialog"> <!-- https://m3.material.io/components/dialogs/specs#6771d107-624e-47cc-b6d8-2b7b620ba2f1 --> <item name="dialogCornerRadius">28dp</item> <item name="android:background">?attr/colorSurface</item> </style> - <style name="buttonStyle" parent="Widget.Material3.Button.TextButton.Dialog"> - <item name="android:textColor">?attr/colorAccent</item> - </style> - <style name="chipGroupStyle" parent="Widget.Material3.ChipGroup"> <item name="chipSpacingVertical">0dp</item> </style> @@ -55,24 +71,17 @@ <item name="chipCornerRadius">40dp</item> </style> - <style name="toolbarStyle" parent="@style/Widget.Material3.Toolbar"> - <item name="android:background">?android:windowBackground</item> - </style> - <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"> - <item name="strokeWidth">1dp</item> - <item name="strokeColor">@color/bg_highlighted</item> - <item name="android:focusable">true</item> - <item name="cardElevation">2dp</item> - <item name="cardBackgroundColor">@color/bg_card</item> + <style name="materialCardViewStyle" parent="Widget.Material3.CardView.Outlined"> + <item name="strokeColor">?attr/colorSurfaceVariant</item> + <item name="cardBackgroundColor">?attr/colorSurfaceContainer</item> </style> <style name="textAppearanceHeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge"> diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index 3896c8ebd..d4791c575 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -4,7 +4,7 @@ <it.niedermann.nextcloud.deck.ui.theme.ThemedPreferenceCategory app:title="@string/simple_synchronization"> <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference android:defaultValue="@string/pref_value_wifi_and_mobile" - android:icon="@drawable/ic_network_wifi_grey600_24dp" + android:icon="@drawable/ic_network_wifi_24dp" android:key="@string/pref_key_wifi_only" android:title="@string/pref_value_wifi_only" /> @@ -12,13 +12,13 @@ android:defaultValue="@string/minutes_15" android:entries="@array/background_sync_entries" android:entryValues="@array/background_sync_values" - android:icon="@drawable/ic_sync_grey600_24dp" + android:icon="@drawable/ic_sync_24dp" android:key="@string/pref_key_background_sync" android:summary="%s" android:title="@string/settings_background_sync" /> <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference - android:icon="@drawable/ic_baseline_photo_size_select_small_24" + android:icon="@drawable/ic_photo_size_select_small_24" android:key="@string/pref_key_compress_image_attachments" android:summary="@string/settings_compress_image_attachments_summary" android:title="@string/settings_compress_image_attachments" @@ -30,19 +30,19 @@ android:defaultValue="@string/pref_value_theme_system_default" android:entries="@array/darkmode_entries" android:entryValues="@array/darkMode_values" - android:icon="@drawable/ic_brightness_2_grey600_24dp" + android:icon="@drawable/ic_brightness_2_24dp" android:key="@string/pref_key_dark_theme" android:summary="%s" android:title="@string/settings_theme_title" /> <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference - android:icon="@drawable/ic_baseline_compact_24" + android:icon="@drawable/ic_compact_24" android:key="@string/pref_key_compact" android:title="@string/settings_compact_title" app:defaultValue="false" /> <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference - android:icon="@drawable/ic_image_grey600_24dp" + android:icon="@drawable/ic_image_24dp" android:key="@string/pref_key_cover_images" android:title="@string/settings_cover_images_title" app:defaultValue="true" /> @@ -51,13 +51,13 @@ <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" /> <it.niedermann.nextcloud.deck.ui.theme.ThemedSwitchPreference - android:icon="@drawable/ic_baseline_speed_24" + android:icon="@drawable/ic_speed_24" android:key="@string/pref_key_etags" android:summary="@string/settings_etags_summary" android:title="@string/settings_etags" 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"> diff --git a/app/src/play/res/xml/shortcuts.xml b/app/src/play/res/xml/shortcuts.xml index 6c6471880..82bbffd12 100644 --- a/app/src/play/res/xml/shortcuts.xml +++ b/app/src/play/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"> |