diff options
231 files changed, 476 insertions, 879 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java index 15d0bec4a..5d1ab2fc3 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -222,10 +222,10 @@ public class VideoplayerActivity extends MediaplayerActivity { FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) skipAnimationView.getLayoutParams(); if (isForward) { - skipAnimationView.setImageResource(R.drawable.ic_av_fast_forward_white_80dp); + skipAnimationView.setImageResource(R.drawable.ic_fast_forward_video_white); params.gravity = Gravity.RIGHT | Gravity.CENTER_VERTICAL; } else { - skipAnimationView.setImageResource(R.drawable.ic_av_fast_rewind_white_80dp); + skipAnimationView.setImageResource(R.drawable.ic_fast_rewind_video_white); params.gravity = Gravity.LEFT | Gravity.CENTER_VERTICAL; } @@ -421,7 +421,7 @@ public class VideoplayerActivity extends MediaplayerActivity { if (PictureInPictureUtil.supportsPictureInPicture(this)) { menu.findItem(R.id.player_go_to_picture_in_picture).setVisible(true); } - menu.findItem(R.id.audio_controls).setIcon(R.drawable.ic_sliders_white); + menu.findItem(R.id.audio_controls).setIcon(R.drawable.ic_sliders); return true; } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java index 8380d8626..b06c94abd 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java @@ -77,7 +77,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte holder.link.setText(sc.getLink()); holder.link.setOnClickListener(v -> IntentUtils.openInBrowser(context, sc.getLink())); } - holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.av_play)); + holder.secondaryActionIcon.setImageResource(R.drawable.ic_play_48dp); holder.secondaryActionButton.setContentDescription(context.getString(R.string.play_chapter)); holder.secondaryActionButton.setOnClickListener(v -> { if (callback != null) { @@ -92,7 +92,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte progress = Math.max(progress, CircularProgressBar.MINIMUM_PERCENTAGE); progress = Math.min(progress, CircularProgressBar.MAXIMUM_PERCENTAGE); holder.progressBar.setPercentage(progress, position); - holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.av_replay)); + holder.secondaryActionIcon.setImageResource(R.drawable.ic_replay); } else { holder.itemView.setBackgroundColor(ContextCompat.getColor(context, android.R.color.transparent)); holder.progressBar.setPercentage(0, null); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java index 811e1e31b..896daae18 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadLogAdapter.java @@ -20,7 +20,6 @@ import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.storage.DBTasks; import de.danoeh.antennapod.core.storage.DownloadRequestException; import de.danoeh.antennapod.core.storage.DownloadRequester; -import de.danoeh.antennapod.ui.common.ThemeUtils; import de.danoeh.antennapod.view.viewholder.DownloadItemViewHolder; /** @@ -82,8 +81,7 @@ public class DownloadLogAdapter extends BaseAdapter { holder.secondaryActionButton.setOnClickListener(null); holder.secondaryActionButton.setTag(null); } else { - holder.secondaryActionIcon.setImageResource( - ThemeUtils.getDrawableFromAttr(context, R.attr.navigation_refresh)); + holder.secondaryActionIcon.setImageResource(R.drawable.ic_refresh); holder.secondaryActionButton.setVisibility(View.VISIBLE); if (status.getFeedfileType() == Feed.FEEDFILETYPE_FEED) { diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java index 9363edc9f..f559d4f74 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java @@ -15,7 +15,6 @@ import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.service.download.DownloadRequest; import de.danoeh.antennapod.core.service.download.DownloadStatus; import de.danoeh.antennapod.core.service.download.Downloader; -import de.danoeh.antennapod.ui.common.ThemeUtils; import de.danoeh.antennapod.ui.common.CircularProgressBar; public class DownloadlistAdapter extends BaseAdapter { @@ -64,7 +63,7 @@ public class DownloadlistAdapter extends BaseAdapter { } holder.title.setText(request.getTitle()); - holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.navigation_cancel)); + holder.secondaryActionIcon.setImageResource(R.drawable.ic_cancel); holder.secondaryActionButton.setContentDescription(context.getString(R.string.cancel_download_label)); holder.secondaryActionButton.setTag(downloader); holder.secondaryActionButton.setOnClickListener(butSecondaryListener); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java index 911e20aa5..816d36353 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java @@ -3,10 +3,9 @@ package de.danoeh.antennapod.adapter; import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; -import android.content.res.TypedArray; -import android.graphics.drawable.Drawable; import android.view.ContextMenu; import android.view.LayoutInflater; +import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; import android.util.TypedValue; @@ -34,7 +33,6 @@ import de.danoeh.antennapod.fragment.NavDrawerFragment; import de.danoeh.antennapod.fragment.PlaybackHistoryFragment; import de.danoeh.antennapod.fragment.QueueFragment; import de.danoeh.antennapod.fragment.SubscriptionFragment; -import de.danoeh.antennapod.ui.common.ThemeUtils; import org.apache.commons.lang3.ArrayUtils; import java.lang.ref.WeakReference; @@ -109,38 +107,23 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder> return titles[index]; } - private Drawable getDrawable(String tag) { - Activity context = activity.get(); - if (context == null) { - return null; - } - int icon; + private @DrawableRes int getDrawable(String tag) { switch (tag) { case QueueFragment.TAG: - icon = R.attr.stat_playlist; - break; + return R.drawable.ic_playlist; case EpisodesFragment.TAG: - icon = R.attr.feed; - break; + return R.drawable.ic_feed; case DownloadsFragment.TAG: - icon = R.attr.av_download; - break; + return R.drawable.ic_download; case PlaybackHistoryFragment.TAG: - icon = R.attr.ic_history; - break; + return R.drawable.ic_history; case SubscriptionFragment.TAG: - icon = R.attr.ic_folder; - break; + return R.drawable.ic_folder; case AddFeedFragment.TAG: - icon = R.attr.content_new; - break; + return R.drawable.ic_add; default: - return null; + return 0; } - TypedArray ta = context.obtainStyledAttributes(new int[] { icon }); - Drawable result = ta.getDrawable(0); - ta.recycle(); - return result; } public List<String> getFragmentTags() { @@ -283,7 +266,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder> } } - holder.image.setImageDrawable(getDrawable(fragmentTags.get(position))); + holder.image.setImageResource(getDrawable(fragmentTags.get(position))); } private void bindSectionDivider(DividerHolder holder) { @@ -353,7 +336,7 @@ public class NavListAdapter extends RecyclerView.Adapter<NavListAdapter.Holder> holder.count.setVisibility(View.GONE); } Glide.with(context).clear(holder.image); - holder.image.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.ic_folder)); + holder.image.setImageResource(R.drawable.ic_folder); holder.failure.setVisibility(View.GONE); } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java index fc97cace5..b18fea481 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java @@ -24,7 +24,6 @@ import de.danoeh.antennapod.core.feed.LocalFeedUpdater; import de.danoeh.antennapod.core.storage.NavDrawerData; import de.danoeh.antennapod.fragment.FeedItemlistFragment; import de.danoeh.antennapod.fragment.SubscriptionFragment; -import de.danoeh.antennapod.ui.common.ThemeUtils; import jp.shts.android.library.TriangleLabelView; /** @@ -115,7 +114,7 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI .load(); } else { new CoverLoader(mainActivityRef.get()) - .withResource(ThemeUtils.getDrawableFromAttr(mainActivityRef.get(), R.attr.ic_folder)) + .withResource(R.drawable.ic_folder) .withPlaceholderView(holder.feedTitle, true) .withCoverView(holder.imageView) .load(); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java index a8001eeb1..f68e9761f 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/AddToQueueActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; @@ -20,9 +20,9 @@ class AddToQueueActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.content_new; + return R.drawable.ic_add; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java index a31d2fdc0..d4a7713d9 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/CancelDownloadActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import android.widget.Toast; @@ -25,9 +25,9 @@ public class CancelDownloadActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.navigation_cancel; + return R.drawable.ic_cancel; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java index 45cce23b8..3de3019bb 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java @@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; import android.view.View; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; @@ -22,9 +22,9 @@ public class DeleteActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.ic_delete; + return R.drawable.ic_delete; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java index 0f7c2bdd0..689ecceb0 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DownloadActionButton.java @@ -4,7 +4,7 @@ import android.content.Context; import android.view.View; import android.widget.Toast; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; @@ -33,9 +33,9 @@ public class DownloadActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.av_download; + return R.drawable.ic_download; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java index 5d95d3775..c694c0a0e 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/ItemActionButton.java @@ -1,9 +1,8 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import android.content.res.TypedArray; import android.widget.ImageView; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; import android.view.View; @@ -23,7 +22,7 @@ public abstract class ItemActionButton { @StringRes public abstract int getLabel(); - @AttrRes + @DrawableRes public abstract int getDrawable(); public abstract void onClick(Context context); @@ -62,9 +61,6 @@ public abstract class ItemActionButton { button.setVisibility(getVisibility()); button.setContentDescription(context.getString(getLabel())); button.setOnClickListener((view) -> onClick(context)); - - TypedArray drawables = context.obtainStyledAttributes(new int[]{getDrawable()}); - icon.setImageDrawable(drawables.getDrawable(0)); - drawables.recycle(); + icon.setImageResource(getDrawable()); } } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java index 14fa94f7a..2eab092af 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/MarkAsPlayedActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import android.view.View; @@ -22,9 +22,9 @@ public class MarkAsPlayedActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.navigation_accept; + return R.drawable.ic_check; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java index 4ac03c50e..ec6284e82 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PauseActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; @@ -23,9 +23,9 @@ public class PauseActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.av_pause; + return R.drawable.ic_pause; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java index 512f1a512..467af5aa2 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; @@ -24,9 +24,9 @@ public class PlayActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.av_play; + return R.drawable.ic_play_24dp; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java index 78ea3b93f..86ac3db7d 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/PlayLocalActionButton.java @@ -1,7 +1,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; @@ -23,9 +23,9 @@ public class PlayLocalActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.av_play; + return R.drawable.ic_play_24dp; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java index 8a892a621..ce7c467e1 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/StreamActionButton.java @@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; @@ -28,9 +28,9 @@ public class StreamActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.action_stream; + return R.drawable.ic_stream; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java index e45280eed..41b8ecb4c 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/VisitWebsiteActionButton.java @@ -2,7 +2,7 @@ package de.danoeh.antennapod.adapter.actionbutton; import android.content.Context; import android.view.View; -import androidx.annotation.AttrRes; +import androidx.annotation.DrawableRes; import androidx.annotation.StringRes; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.feed.FeedItem; @@ -21,9 +21,9 @@ public class VisitWebsiteActionButton extends ItemActionButton { } @Override - @AttrRes + @DrawableRes public int getDrawable() { - return R.attr.location_web_site; + return R.drawable.ic_web; } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java index e1e8f1c2e..071dcc158 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/EpisodesApplyActionFragment.java @@ -28,7 +28,6 @@ import de.danoeh.antennapod.core.storage.DownloadRequester; import de.danoeh.antennapod.core.util.FeedItemPermutors; import de.danoeh.antennapod.core.util.LongList; import de.danoeh.antennapod.core.util.SortOrder; -import de.danoeh.antennapod.ui.common.ThemeUtils; import java.util.ArrayList; import java.util.Arrays; @@ -215,10 +214,10 @@ public class EpisodesApplyActionFragment extends Fragment implements Toolbar.OnM public void refreshToolbarState() { MenuItem selectAllItem = toolbar.getMenu().findItem(R.id.select_toggle); if (checkedIds.size() == episodes.size()) { - selectAllItem.setIcon(ThemeUtils.getDrawableFromAttr(getContext(), R.attr.ic_select_none)); + selectAllItem.setIcon(R.drawable.ic_select_none); selectAllItem.setTitle(R.string.deselect_all_label); } else { - selectAllItem.setIcon(ThemeUtils.getDrawableFromAttr(getContext(), R.attr.ic_select_all)); + selectAllItem.setIcon(R.drawable.ic_select_all); selectAllItem.setTitle(R.string.select_all_label); } } diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java index 24a0cc192..422ed5012 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/TagSettingsDialog.java @@ -81,7 +81,7 @@ public class TagSettingsDialog extends DialogFragment { public TagSelectionAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { Chip chip = new Chip(getContext()); chip.setCloseIconVisible(true); - chip.setCloseIconResource(R.drawable.ic_delete_black); + chip.setCloseIconResource(R.drawable.ic_delete); return new TagSelectionAdapter.ViewHolder(chip); } diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java index 65e7c4424..cd6f006ac 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/VariableSpeedDialog.java @@ -98,7 +98,7 @@ public class VariableSpeedDialog extends DialogFragment { addCurrentSpeedChip = root.findViewById(R.id.add_current_speed_chip); addCurrentSpeedChip.setCloseIconVisible(true); - addCurrentSpeedChip.setCloseIconResource(R.drawable.ic_add_black); + addCurrentSpeedChip.setCloseIconResource(R.drawable.ic_add); addCurrentSpeedChip.setOnCloseIconClickListener(v -> addCurrentSpeed()); addCurrentSpeedChip.setOnClickListener(v -> addCurrentSpeed()); @@ -126,7 +126,7 @@ public class VariableSpeedDialog extends DialogFragment { public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { Chip chip = new Chip(getContext()); chip.setCloseIconVisible(true); - chip.setCloseIconResource(R.drawable.ic_delete_black); + chip.setCloseIconResource(R.drawable.ic_delete); return new ViewHolder(chip); } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java index acda462bd..9a583401b 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java @@ -60,7 +60,7 @@ public class ChaptersFragment extends Fragment { EmptyViewHandler emptyView = new EmptyViewHandler(getContext()); emptyView.attachToRecyclerView(recyclerView); - emptyView.setIcon(R.attr.ic_bookmark); + emptyView.setIcon(R.drawable.ic_bookmark); emptyView.setTitle(R.string.no_chapters_head_label); emptyView.setMessage(R.string.no_chapters_label); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java index 3519a34b4..2de586968 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java @@ -146,7 +146,7 @@ public class CompletedDownloadsFragment extends Fragment { private void addEmptyView() { emptyView = new EmptyViewHandler(getActivity()); - emptyView.setIcon(R.attr.av_download); + emptyView.setIcon(R.drawable.ic_download); emptyView.setTitle(R.string.no_comp_downloads_head_label); emptyView.setMessage(R.string.no_comp_downloads_label); emptyView.attachToRecyclerView(recyclerView); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java index 2e11ea4ec..5f9cd6cc0 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java @@ -81,7 +81,7 @@ public class DownloadLogFragment extends ListFragment { lv.setPadding(0, vertPadding, 0, vertPadding); EmptyViewHandler emptyView = new EmptyViewHandler(getActivity()); - emptyView.setIcon(R.attr.av_download); + emptyView.setIcon(R.drawable.ic_download); emptyView.setTitle(R.string.no_log_downloads_head_label); emptyView.setMessage(R.string.no_log_downloads_label); emptyView.attachToListView(getListView()); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java index 39f935bbe..067f41b24 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesListFragment.java @@ -216,7 +216,7 @@ public abstract class EpisodesListFragment extends Fragment { emptyView = new EmptyViewHandler(getContext()); emptyView.attachToRecyclerView(recyclerView); - emptyView.setIcon(R.attr.feed); + emptyView.setIcon(R.drawable.ic_feed); emptyView.setTitle(R.string.no_all_episodes_head_label); emptyView.setMessage(R.string.no_all_episodes_label); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java index e1fd36731..729cc39d2 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FavoriteEpisodesFragment.java @@ -55,7 +55,7 @@ public class FavoriteEpisodesFragment extends EpisodesListFragment { @Override public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View root = super.onCreateView(inflater, container, savedInstanceState); - emptyView.setIcon(R.attr.ic_unfav); + emptyView.setIcon(R.drawable.ic_star); emptyView.setTitle(R.string.no_fav_episodes_head_label); emptyView.setMessage(R.string.no_fav_episodes_label); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java index 81e400f97..89a75b1dd 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedInfoFragment.java @@ -13,6 +13,7 @@ import android.os.Bundle; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.AppCompatDrawableManager; import androidx.appcompat.widget.Toolbar; import androidx.documentfile.provider.DocumentFile; import androidx.fragment.app.Fragment; @@ -49,7 +50,6 @@ import de.danoeh.antennapod.core.storage.DownloadRequestException; import de.danoeh.antennapod.core.storage.StatisticsItem; import de.danoeh.antennapod.core.util.Converter; import de.danoeh.antennapod.core.util.IntentUtils; -import de.danoeh.antennapod.ui.common.ThemeUtils; import de.danoeh.antennapod.core.util.syndication.HtmlToPlainText; import de.danoeh.antennapod.fragment.preferences.StatisticsFragment; import de.danoeh.antennapod.menuhandler.FeedMenuHandler; @@ -137,9 +137,9 @@ public class FeedInfoFragment extends Fragment implements Toolbar.OnMenuItemClic @Override protected void doTint(Context themedContext) { toolbar.getMenu().findItem(R.id.visit_website_item) - .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.location_web_site)); + .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_web)); toolbar.getMenu().findItem(R.id.share_parent) - .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.ic_share)); + .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_share)); } }; iconTintManager.updateTint(); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java index 7a363bcc1..2194ff8b1 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java @@ -20,6 +20,7 @@ import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatDrawableManager; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.RecyclerView; @@ -56,7 +57,6 @@ import de.danoeh.antennapod.core.storage.DownloadRequestException; import de.danoeh.antennapod.core.storage.DownloadRequester; import de.danoeh.antennapod.core.util.FeedItemPermutors; import de.danoeh.antennapod.core.util.FeedItemUtil; -import de.danoeh.antennapod.ui.common.ThemeUtils; import de.danoeh.antennapod.core.util.gui.MoreContentListFooterUtil; import de.danoeh.antennapod.dialog.EpisodesApplyActionFragment; import de.danoeh.antennapod.dialog.FilterDialog; @@ -176,13 +176,13 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem @Override protected void doTint(Context themedContext) { toolbar.getMenu().findItem(R.id.sort_items) - .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.ic_sort)); + .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_sort)); toolbar.getMenu().findItem(R.id.filter_items) - .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.ic_filter)); + .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_filter)); toolbar.getMenu().findItem(R.id.refresh_item) - .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.navigation_refresh)); + .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_refresh)); toolbar.getMenu().findItem(R.id.action_search) - .setIcon(ThemeUtils.getDrawableFromAttr(themedContext, R.attr.action_search)); + .setIcon(AppCompatDrawableManager.get().getDrawable(themedContext, R.drawable.ic_search)); } }; iconTintManager.updateTint(); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java index 224210d63..497d6f5b0 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java @@ -6,7 +6,6 @@ import android.os.Bundle; import android.text.Layout; import android.text.TextUtils; import android.util.Log; -import android.util.TypedValue; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -357,15 +356,12 @@ public class ItemFragment extends Fragment { butAction1Text.setText(actionButton1.getLabel()); butAction1Text.setTransformationMethod(null); - TypedValue typedValue = new TypedValue(); - getContext().getTheme().resolveAttribute(actionButton1.getDrawable(), typedValue, true); - butAction1Icon.setImageResource(typedValue.resourceId); + butAction1Icon.setImageResource(actionButton1.getDrawable()); butAction1.setVisibility(actionButton1.getVisibility()); butAction2Text.setText(actionButton2.getLabel()); butAction2Text.setTransformationMethod(null); - getContext().getTheme().resolveAttribute(actionButton2.getDrawable(), typedValue, true); - butAction2Icon.setImageResource(typedValue.resourceId); + butAction2Icon.setImageResource(actionButton2.getDrawable()); butAction2.setVisibility(actionButton2.getVisibility()); } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java index e97b7cd7f..6ec101439 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java @@ -81,7 +81,7 @@ public class PlaybackHistoryFragment extends Fragment implements Toolbar.OnMenuI progressBar = root.findViewById(R.id.progLoading); emptyView = new EmptyViewHandler(getActivity()); - emptyView.setIcon(R.attr.ic_history); + emptyView.setIcon(R.drawable.ic_history); emptyView.setTitle(R.string.no_history_head_label); emptyView.setMessage(R.string.no_history_label); emptyView.attachToRecyclerView(recyclerView); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java index 5eb71b984..7b6f43a1b 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -537,7 +537,7 @@ public class QueueFragment extends Fragment implements Toolbar.OnMenuItemClickLi emptyView = new EmptyViewHandler(getContext()); emptyView.attachToRecyclerView(recyclerView); - emptyView.setIcon(R.attr.stat_playlist); + emptyView.setIcon(R.drawable.ic_playlist); emptyView.setTitle(R.string.no_items_header_label); emptyView.setMessage(R.string.no_items_label); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java index fc500a223..132561aa0 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java @@ -61,7 +61,7 @@ public class RunningDownloadsFragment extends ListFragment { setListAdapter(adapter); EmptyViewHandler emptyView = new EmptyViewHandler(getActivity()); - emptyView.setIcon(R.attr.av_download); + emptyView.setIcon(R.drawable.ic_download); emptyView.setTitle(R.string.no_run_downloads_head_label); emptyView.setMessage(R.string.no_run_downloads_label); emptyView.attachToListView(getListView()); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java index e791da1c6..9309bd1ea 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java @@ -133,7 +133,7 @@ public class SearchFragment extends Fragment { emptyViewHandler = new EmptyViewHandler(getContext()); emptyViewHandler.attachToRecyclerView(recyclerView); - emptyViewHandler.setIcon(R.attr.action_search); + emptyViewHandler.setIcon(R.drawable.ic_search); emptyViewHandler.setTitle(R.string.search_status_no_results); EventBus.getDefault().register(this); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java index f6b7e74bb..b8ef2d43c 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java @@ -207,7 +207,7 @@ public class SubscriptionFragment extends Fragment implements Toolbar.OnMenuItem private void setupEmptyView() { emptyView = new EmptyViewHandler(getContext()); - emptyView.setIcon(R.attr.ic_folder); + emptyView.setIcon(R.drawable.ic_folder); emptyView.setTitle(R.string.no_subscriptions_head_label); emptyView.setMessage(R.string.no_subscriptions_label); emptyView.attachToListView(subscriptionGridLayout); diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java index fbfdf537f..b42244160 100644 --- a/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java +++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/MenuItemUtils.java @@ -24,10 +24,10 @@ public class MenuItemUtils extends de.danoeh.antennapod.core.menuhandler.MenuIte final MenuItem queueLock = menu.findItem(R.id.queue_lock); if (UserPreferences.isQueueLocked()) { queueLock.setTitle(de.danoeh.antennapod.R.string.unlock_queue); - queueLock.setIcon(ThemeUtils.getDrawableFromAttr(context, R.attr.ic_lock_open)); + queueLock.setIcon(R.drawable.ic_lock_open); } else { queueLock.setTitle(de.danoeh.antennapod.R.string.lock_queue); - queueLock.setIcon(ThemeUtils.getDrawableFromAttr(context, R.attr.ic_lock_closed)); + queueLock.setIcon(R.drawable.ic_lock_closed); } } diff --git a/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java b/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java index eaad11d1a..ce8f08511 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java +++ b/app/src/main/java/de/danoeh/antennapod/view/EmptyViewHandler.java @@ -2,15 +2,12 @@ package de.danoeh.antennapod.view; import android.content.Context;
import android.database.DataSetObserver;
-import android.graphics.drawable.Drawable;
import android.view.Gravity;
import android.widget.AbsListView;
import android.widget.FrameLayout;
import android.widget.ListAdapter;
-import androidx.annotation.AttrRes;
-import androidx.core.content.ContextCompat;
+import androidx.annotation.DrawableRes;
import androidx.recyclerview.widget.RecyclerView;
-import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
@@ -25,7 +22,6 @@ public class EmptyViewHandler { private ListAdapter listAdapter;
private RecyclerView.Adapter<?> recyclerAdapter;
- private final Context context;
private final View emptyView;
private final TextView tvTitle;
private final TextView tvMessage;
@@ -33,7 +29,6 @@ public class EmptyViewHandler { public EmptyViewHandler(Context context) {
emptyView = View.inflate(context, R.layout.empty_view_layout, null);
- this.context = context;
tvTitle = emptyView.findViewById(R.id.emptyViewTitle);
tvMessage = emptyView.findViewById(R.id.emptyViewMessage);
ivIcon = emptyView.findViewById(R.id.emptyViewIcon);
@@ -51,11 +46,8 @@ public class EmptyViewHandler { tvMessage.setText(message);
}
- public void setIcon(@AttrRes int iconAttr) {
- TypedValue typedValue = new TypedValue();
- context.getTheme().resolveAttribute(iconAttr, typedValue, true);
- Drawable d = ContextCompat.getDrawable(context, typedValue.resourceId);
- ivIcon.setImageDrawable(d);
+ public void setIcon(@DrawableRes int icon) {
+ ivIcon.setImageResource(icon);
ivIcon.setVisibility(View.VISIBLE);
}
diff --git a/app/src/main/java/de/danoeh/antennapod/view/PlayButton.java b/app/src/main/java/de/danoeh/antennapod/view/PlayButton.java index 691a15ca2..04b277fb4 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/PlayButton.java +++ b/app/src/main/java/de/danoeh/antennapod/view/PlayButton.java @@ -7,7 +7,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatImageButton; import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat; import de.danoeh.antennapod.R; -import de.danoeh.antennapod.ui.common.ThemeUtils; public class PlayButton extends AppCompatImageButton { private boolean isShowPlay = true; @@ -34,10 +33,9 @@ public class PlayButton extends AppCompatImageButton { this.isShowPlay = showPlay; setContentDescription(getContext().getString(showPlay ? R.string.play_label : R.string.pause_label)); if (isVideoScreen) { - setImageResource(showPlay ? R.drawable.ic_av_play_white_80dp : R.drawable.ic_av_pause_white_80dp); + setImageResource(showPlay ? R.drawable.ic_play_video_white : R.drawable.ic_pause_video_white); } else if (!isShown()) { - setImageResource(ThemeUtils.getDrawableFromAttr(getContext(), - showPlay ? R.attr.av_play : R.attr.av_pause)); + setImageResource(showPlay ? R.drawable.ic_play_48dp : R.drawable.ic_pause); } else if (showPlay) { AnimatedVectorDrawableCompat drawable = AnimatedVectorDrawableCompat.create( getContext(), R.drawable.ic_animate_pause_play); diff --git a/app/src/main/res/layout/activity_widget_config.xml b/app/src/main/res/layout/activity_widget_config.xml index 6e31aec0d..8c540fcc6 100644 --- a/app/src/main/res/layout/activity_widget_config.xml +++ b/app/src/main/res/layout/activity_widget_config.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" @@ -15,7 +16,7 @@ android:id="@+id/widget_config_background" android:layout_width="match_parent" android:layout_height="match_parent" - android:src="@drawable/teaser" + app:srcCompat="@drawable/teaser" android:scaleType="centerCrop" /> <include diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index d6ebd58d7..a6e0fc9ea 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -34,7 +34,7 @@ android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:contentDescription="@string/search_podcast_hint" - app:srcCompat="?attr/action_search" + app:srcCompat="@drawable/ic_search" android:id="@+id/searchButton" android:scaleType="center"/> @@ -90,8 +90,8 @@ android:id="@+id/addViaUrlButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/feed" - app:drawableLeftCompat="?attr/feed" + app:drawableStartCompat="@drawable/ic_feed" + app:drawableLeftCompat="@drawable/ic_feed" style="@style/AddPodcastTextView" android:text="@string/add_podcast_by_url"/> @@ -99,8 +99,8 @@ android:id="@+id/addLocalFolderButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/ic_folder" - app:drawableLeftCompat="?attr/ic_folder" + app:drawableStartCompat="@drawable/ic_folder" + app:drawableLeftCompat="@drawable/ic_folder" style="@style/AddPodcastTextView" android:text="@string/add_local_folder"/> @@ -108,8 +108,8 @@ android:id="@+id/searchItunesButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/action_search" - app:drawableLeftCompat="?attr/action_search" + app:drawableStartCompat="@drawable/ic_search" + app:drawableLeftCompat="@drawable/ic_search" style="@style/AddPodcastTextView" android:text="@string/search_itunes_label"/> @@ -117,8 +117,8 @@ android:id="@+id/searchFyydButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/action_search" - app:drawableLeftCompat="?attr/action_search" + app:drawableStartCompat="@drawable/ic_search" + app:drawableLeftCompat="@drawable/ic_search" style="@style/AddPodcastTextView" android:text="@string/search_fyyd_label"/> @@ -126,8 +126,8 @@ android:id="@+id/searchGPodderButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/action_search" - app:drawableLeftCompat="?attr/action_search" + app:drawableStartCompat="@drawable/ic_search" + app:drawableLeftCompat="@drawable/ic_search" style="@style/AddPodcastTextView" android:text="@string/browse_gpoddernet_label"/> @@ -135,8 +135,8 @@ android:id="@+id/searchPodcastIndexButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/action_search" - app:drawableLeftCompat="?attr/action_search" + app:drawableStartCompat="@drawable/ic_search" + app:drawableLeftCompat="@drawable/ic_search" style="@style/AddPodcastTextView" android:text="@string/search_podcastindex_label"/> @@ -144,8 +144,8 @@ android:id="@+id/opmlImportButton" android:layout_width="match_parent" android:layout_height="wrap_content" - app:drawableStartCompat="?attr/av_download" - app:drawableLeftCompat="?attr/av_download" + app:drawableStartCompat="@drawable/ic_download" + app:drawableLeftCompat="@drawable/ic_download" style="@style/AddPodcastTextView" android:text="@string/opml_add_podcast_label"/> </LinearLayout> diff --git a/app/src/main/res/layout/audioplayer_fragment.xml b/app/src/main/res/layout/audioplayer_fragment.xml index 3685032e6..c173371d3 100644 --- a/app/src/main/res/layout/audioplayer_fragment.xml +++ b/app/src/main/res/layout/audioplayer_fragment.xml @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="8dp" android:layout_alignBottom="@id/pager" - android:src="@drawable/bg_gradient" + app:srcCompat="@drawable/bg_gradient" app:tint="?android:attr/windowBackground" android:importantForAccessibility="no"/> @@ -153,9 +153,9 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/pause_label" - app:srcCompat="?attr/av_play" + app:srcCompat="@drawable/ic_play_48dp" android:scaleType="fitCenter" - tools:srcCompat="@drawable/ic_av_play_white_24dp"/> + tools:srcCompat="@drawable/ic_play_48dp"/> <de.danoeh.antennapod.ui.common.CircularProgressBar android:layout_width="@dimen/audioplayer_playercontrols_length_big" @@ -188,9 +188,9 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/rewind_label" - app:srcCompat="?attr/av_rewind" + app:srcCompat="@drawable/ic_fast_rewind" android:scaleType="fitCenter" - tools:srcCompat="@drawable/ic_av_fast_rewind_white_48dp"/> + tools:srcCompat="@drawable/ic_fast_rewind"/> <TextView android:id="@+id/txtvRev" @@ -216,7 +216,7 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/playback_speed" - tools:srcCompat="@drawable/ic_playback_speed_white" + tools:srcCompat="@drawable/ic_playback_speed" app:foregroundColor="?attr/action_icon_color"/> <TextView @@ -245,9 +245,9 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/fast_forward_label" - app:srcCompat="?attr/av_fast_forward" + app:srcCompat="@drawable/ic_fast_forward" android:scaleType="fitCenter" - tools:srcCompat="@drawable/ic_av_fast_forward_white_48dp"/> + tools:srcCompat="@drawable/ic_fast_forward"/> <TextView android:id="@+id/txtvFF" @@ -273,9 +273,9 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:scaleType="fitCenter" - app:srcCompat="?attr/av_skip" + app:srcCompat="@drawable/ic_skip_48dp" android:contentDescription="@string/skip_episode_label" - tools:srcCompat="@drawable/ic_av_skip_white_48dp"/> + tools:srcCompat="@drawable/ic_skip_48dp"/> </RelativeLayout> </LinearLayout> diff --git a/app/src/main/res/layout/edit_tags_dialog.xml b/app/src/main/res/layout/edit_tags_dialog.xml index e83cce9cf..2e7774cea 100644 --- a/app/src/main/res/layout/edit_tags_dialog.xml +++ b/app/src/main/res/layout/edit_tags_dialog.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" @@ -32,7 +33,7 @@ <ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="?attr/content_new" + app:srcCompat="@drawable/ic_add" android:contentDescription="@string/new_label" android:id="@+id/newTagButton"/> </LinearLayout> diff --git a/app/src/main/res/layout/empty_view_layout.xml b/app/src/main/res/layout/empty_view_layout.xml index da2040d93..c6de8d2d0 100644 --- a/app/src/main/res/layout/empty_view_layout.xml +++ b/app/src/main/res/layout/empty_view_layout.xml @@ -14,7 +14,7 @@ android:layout_width="32dp"
android:layout_height="32dp"
android:visibility="gone"
- tools:src="@drawable/ic_feed_black"
+ tools:src="@drawable/ic_feed"
tools:visibility="visible"/>
<TextView
diff --git a/app/src/main/res/layout/episodes_apply_action_fragment.xml b/app/src/main/res/layout/episodes_apply_action_fragment.xml index 304588e3e..78827a12a 100644 --- a/app/src/main/res/layout/episodes_apply_action_fragment.xml +++ b/app/src/main/res/layout/episodes_apply_action_fragment.xml @@ -47,7 +47,7 @@ android:id="@+id/fabSD" android:layout_width="match_parent" android:layout_height="wrap_content" - app:sdMainFabClosedSrc="?attr/batch_edit_fab_icon" + app:sdMainFabClosedSrc="@drawable/ic_fab_edit" app:sdOverlayLayout="@id/fabSDOverlay" android:layout_marginEnd="16dp" android:layout_marginRight="16dp" diff --git a/app/src/main/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml index 4f200162a..fa881e622 100644 --- a/app/src/main/res/layout/external_player_fragment.xml +++ b/app/src/main/res/layout/external_player_fragment.xml @@ -63,10 +63,10 @@ android:layout_height="match_parent" android:contentDescription="@string/pause_label" android:background="?attr/selectableItemBackground" - app:srcCompat="?attr/av_play" + app:srcCompat="@drawable/ic_play_48dp" android:scaleType="fitCenter" android:padding="8dp" - tools:src="@drawable/ic_av_play_white_48dp"/> + tools:src="@drawable/ic_play_48dp"/> </LinearLayout> diff --git a/app/src/main/res/layout/feeditem_fragment.xml b/app/src/main/res/layout/feeditem_fragment.xml index 049182803..256f45fe7 100644 --- a/app/src/main/res/layout/feeditem_fragment.xml +++ b/app/src/main/res/layout/feeditem_fragment.xml @@ -126,7 +126,7 @@ android:layout_marginEnd="8dp" android:layout_marginTop="12dp" android:layout_marginBottom="12dp" - tools:src="@drawable/ic_settings_black" /> + tools:src="@drawable/ic_settings" /> <TextView android:textAppearance="@style/TextAppearance.AppCompat.Button" @@ -154,7 +154,7 @@ android:layout_marginEnd="8dp" android:layout_marginTop="12dp" android:layout_marginBottom="12dp" - tools:src="@drawable/ic_settings_black" /> + tools:src="@drawable/ic_settings" /> <TextView android:textAppearance="@style/TextAppearance.AppCompat.Button" diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index e1f382e46..37b88d1b5 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -35,7 +35,7 @@ android:layout_height="match_parent" android:importantForAccessibility="no" android:scaleType="fitCenter" - android:src="?attr/dragview_background" + app:srcCompat="?attr/dragview_background" android:paddingStart="0dp" android:paddingLeft="0dp" android:paddingEnd="4dp" @@ -114,24 +114,21 @@ <ImageView android:layout_width="14sp" android:layout_height="14sp" - app:srcCompat="?attr/type_video" - tools:srcCompat="@drawable/ic_videocam_black_24dp" + app:srcCompat="@drawable/ic_videocam" android:contentDescription="@string/media_type_video_label" android:id="@+id/ivIsVideo"/> <ImageView android:layout_width="14sp" android:layout_height="14sp" - app:srcCompat="?attr/ic_unfav" - tools:srcCompat="@drawable/ic_star_black" + app:srcCompat="@drawable/ic_star" android:contentDescription="@string/is_favorite_label" android:id="@+id/isFavorite"/> <ImageView android:layout_width="14sp" android:layout_height="14sp" - app:srcCompat="?attr/stat_playlist" - tools:srcCompat="@drawable/ic_playlist_black" + app:srcCompat="@drawable/ic_playlist" android:contentDescription="@string/in_queue_label" android:id="@+id/ivInPlaylist"/> diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml index c738300c5..61d33f534 100644 --- a/app/src/main/res/layout/fragment_subscriptions.xml +++ b/app/src/main/res/layout/fragment_subscriptions.xml @@ -65,5 +65,5 @@ android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:contentDescription="@string/add_feed_label" - app:srcCompat="@drawable/ic_add_white"/> + app:srcCompat="@drawable/ic_add"/> </RelativeLayout> diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml index 99991e919..56d351d62 100644 --- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml +++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml @@ -65,7 +65,7 @@ <ImageView android:layout_width="14sp" android:layout_height="14sp" - app:srcCompat="?attr/feed"/> + app:srcCompat="@drawable/ic_feed"/> <TextView android:id="@+id/txtvSubscribers" style="@style/AntennaPod.TextView.ListItemSecondaryTitle" diff --git a/app/src/main/res/layout/gpodnetauth_credentials.xml b/app/src/main/res/layout/gpodnetauth_credentials.xml index 9fcf67cff..8cf6941c9 100644 --- a/app/src/main/res/layout/gpodnetauth_credentials.xml +++ b/app/src/main/res/layout/gpodnetauth_credentials.xml @@ -2,6 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -15,7 +16,7 @@ <ImageView android:layout_width="64dp" android:layout_height="64dp" - android:src="@drawable/gpodder_icon"/> + app:srcCompat="@drawable/gpodder_icon"/> <TextView android:id="@+id/createAccountButton" diff --git a/app/src/main/res/layout/gpodnetauth_finish.xml b/app/src/main/res/layout/gpodnetauth_finish.xml index f0bcfd4dc..8eced7304 100644 --- a/app/src/main/res/layout/gpodnetauth_finish.xml +++ b/app/src/main/res/layout/gpodnetauth_finish.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -9,7 +10,7 @@ android:id="@id/icon" android:layout_width="64dp" android:layout_height="64dp" - android:src="@drawable/gpodder_icon" /> + app:srcCompat="@drawable/gpodder_icon" /> <TextView android:id="@+id/txtvDescription" diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml index 70a71a453..a24ea3fba 100644 --- a/app/src/main/res/layout/nav_list.xml +++ b/app/src/main/res/layout/nav_list.xml @@ -1,6 +1,7 @@ <?xml version='1.0' encoding='utf-8'?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/nav_layout" android:layout_width="match_parent" android:layout_height="match_parent" @@ -18,7 +19,6 @@ android:focusable="true"> <ImageView - android:id="@+id/imgvCover" android:layout_width="@dimen/thumbnail_length_navlist" android:layout_height="@dimen/thumbnail_length_navlist" android:layout_marginBottom="4dp" @@ -30,7 +30,7 @@ android:cropToPadding="true" android:padding="8dp" android:scaleType="centerCrop" - android:src="?attr/ic_settings" + app:srcCompat="@drawable/ic_settings" tools:background="@android:color/holo_orange_dark" tools:src="@android:drawable/sym_def_app_icon" /> diff --git a/app/src/main/res/layout/storage_error.xml b/app/src/main/res/layout/storage_error.xml index 7b0579927..6a7fda341 100644 --- a/app/src/main/res/layout/storage_error.xml +++ b/app/src/main/res/layout/storage_error.xml @@ -14,7 +14,7 @@ android:layout_width="36dp" android:layout_height="36dp" android:layout_margin="8dp" - app:srcCompat="?attr/storage" /> + app:srcCompat="@drawable/ic_storage" /> <TextView android:id="@+id/textView1" diff --git a/app/src/main/res/layout/videoplayer_activity.xml b/app/src/main/res/layout/videoplayer_activity.xml index fc902602c..f5a163849 100644 --- a/app/src/main/res/layout/videoplayer_activity.xml +++ b/app/src/main/res/layout/videoplayer_activity.xml @@ -39,7 +39,7 @@ android:layout_margin="8dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/rewind_label" - app:srcCompat="@drawable/ic_av_fast_rewind_white_80dp" /> + app:srcCompat="@drawable/ic_fast_rewind_video_white" /> <de.danoeh.antennapod.view.PlayButton android:id="@+id/butPlay" @@ -48,7 +48,7 @@ android:layout_margin="8dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/pause_label" - app:srcCompat="@drawable/ic_av_pause_white_80dp" /> + app:srcCompat="@drawable/ic_pause_video_white" /> <ImageButton android:id="@+id/butFF" @@ -57,7 +57,7 @@ android:layout_margin="8dp" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/fast_forward_label" - app:srcCompat="@drawable/ic_av_fast_forward_white_80dp" /> + app:srcCompat="@drawable/ic_fast_forward_video_white" /> </LinearLayout> diff --git a/app/src/main/res/menu/downloads.xml b/app/src/main/res/menu/downloads.xml index c8ee20e35..142f251fc 100644 --- a/app/src/main/res/menu/downloads.xml +++ b/app/src/main/res/menu/downloads.xml @@ -5,14 +5,14 @@ android:id="@+id/episode_actions" android:menuCategory="container" android:title="@string/multi_select" - android:icon="?attr/checkbox_multiple" + android:icon="@drawable/ic_check_multiple" android:visible="false" app:showAsAction="ifRoom" /> <item android:id="@+id/clear_logs_item" android:menuCategory="container" android:title="@string/clear_history_label" - android:icon="?attr/ic_delete" + android:icon="@drawable/ic_delete" android:visible="false" app:showAsAction="ifRoom" /> <item @@ -20,5 +20,5 @@ android:title="@string/refresh_label" android:menuCategory="container" app:showAsAction="ifRoom" - android:icon="?attr/navigation_refresh"/> + android:icon="@drawable/ic_refresh"/> </menu> diff --git a/app/src/main/res/menu/episodes.xml b/app/src/main/res/menu/episodes.xml index 2fac77375..22121c905 100644 --- a/app/src/main/res/menu/episodes.xml +++ b/app/src/main/res/menu/episodes.xml @@ -5,7 +5,7 @@ <item android:id="@+id/action_search" - android:icon="?attr/action_search" + android:icon="@drawable/ic_search" custom:showAsAction="collapseActionView|always" custom:actionViewClass="androidx.appcompat.widget.SearchView" android:title="@string/search_label"/> @@ -15,11 +15,11 @@ android:title="@string/refresh_label" android:menuCategory="container" custom:showAsAction="always" - android:icon="?attr/navigation_refresh"/> + android:icon="@drawable/ic_refresh"/> <item android:id="@+id/filter_items" - android:icon="?attr/ic_filter" + android:icon="@drawable/ic_filter" android:menuCategory="container" android:title="@string/filter" android:visible="false" @@ -31,7 +31,7 @@ android:menuCategory="container" custom:showAsAction="collapseActionView" android:visible="false" - android:icon="?attr/navigation_accept"/> + android:icon="@drawable/ic_check"/> <item android:id="@+id/remove_all_new_flags_item" @@ -39,6 +39,6 @@ android:menuCategory="container" custom:showAsAction="collapseActionView" android:visible="false" - android:icon="?attr/navigation_accept"/> + android:icon="@drawable/ic_check"/> </menu> diff --git a/app/src/main/res/menu/episodes_apply_action_options.xml b/app/src/main/res/menu/episodes_apply_action_options.xml index 181300fc5..221ec4d59 100644 --- a/app/src/main/res/menu/episodes_apply_action_options.xml +++ b/app/src/main/res/menu/episodes_apply_action_options.xml @@ -4,7 +4,7 @@ <item android:id="@+id/sort" - android:icon="?attr/ic_sort" + android:icon="@drawable/ic_sort" android:title="@string/sort" app:showAsAction="always"> <menu> @@ -25,7 +25,7 @@ <item android:id="@+id/select_options" - android:icon="?attr/ic_filter" + android:icon="@drawable/ic_filter" android:title="@string/filter" app:showAsAction="always"> diff --git a/app/src/main/res/menu/episodes_apply_action_speeddial.xml b/app/src/main/res/menu/episodes_apply_action_speeddial.xml index 370cedd90..a2f509ec5 100644 --- a/app/src/main/res/menu/episodes_apply_action_speeddial.xml +++ b/app/src/main/res/menu/episodes_apply_action_speeddial.xml @@ -6,29 +6,29 @@ visually it will be shown at the bottom of the list of actions. --> <item android:id="@+id/delete_batch" - android:icon="?attr/ic_delete" + android:icon="@drawable/ic_delete" android:title="@string/delete_episode_label" /> <item android:id="@+id/download_batch" - android:icon="?attr/av_download" + android:icon="@drawable/ic_download" android:title="@string/download_label" /> <item android:id="@+id/mark_unread_batch" - android:icon="?attr/navigation_cancel" + android:icon="@drawable/ic_cancel" android:title="@string/mark_unread_label" /> <item android:id="@+id/mark_read_batch" - android:icon="?attr/navigation_accept" + android:icon="@drawable/ic_check" android:title="@string/mark_read_label" /> <item android:id="@+id/remove_from_queue_batch" - android:icon="?attr/content_remove_from_queue" + android:icon="@drawable/ic_remove" android:title="@string/remove_from_queue_label" /> <item android:id="@+id/add_to_queue_batch" - android:icon="?attr/content_new" + android:icon="@drawable/ic_add" android:title="@string/add_to_queue_label" /> </menu> diff --git a/app/src/main/res/menu/feedinfo.xml b/app/src/main/res/menu/feedinfo.xml index a5fbe0c20..83ad079b4 100644 --- a/app/src/main/res/menu/feedinfo.xml +++ b/app/src/main/res/menu/feedinfo.xml @@ -3,7 +3,7 @@ xmlns:custom="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/visit_website_item" - android:icon="?attr/location_web_site" + android:icon="@drawable/ic_web" custom:showAsAction="ifRoom|collapseActionView" android:title="@string/visit_website_label" android:visible="true"/> @@ -11,7 +11,7 @@ android:id="@+id/share_parent" custom:showAsAction="ifRoom" android:title="@string/share_label_with_ellipses" - android:icon="?attr/ic_share" + android:icon="@drawable/ic_share" android:visible="true"> <menu android:id="@+id/share_submenu"> <item diff --git a/app/src/main/res/menu/feeditem_options.xml b/app/src/main/res/menu/feeditem_options.xml index c29229e37..5b33539e1 100644 --- a/app/src/main/res/menu/feeditem_options.xml +++ b/app/src/main/res/menu/feeditem_options.xml @@ -64,7 +64,7 @@ <item android:id="@+id/visit_website_item" - android:icon="?attr/location_web_site" + android:icon="@drawable/ic_web" custom:showAsAction="ifRoom|collapseActionView" android:title="@string/visit_website_label"> </item> diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml index 3614cfffa..85e7a95ba 100644 --- a/app/src/main/res/menu/feedlist.xml +++ b/app/src/main/res/menu/feedlist.xml @@ -4,21 +4,21 @@ <item android:id="@+id/sort_items" - android:icon="?attr/ic_sort" + android:icon="@drawable/ic_sort" android:menuCategory="container" android:title="@string/sort" custom:showAsAction="always"> </item> <item android:id="@+id/filter_items" - android:icon="?attr/ic_filter" + android:icon="@drawable/ic_filter" android:menuCategory="container" android:title="@string/filter" custom:showAsAction="always"> </item> <item android:id="@+id/refresh_item" - android:icon="?attr/navigation_refresh" + android:icon="@drawable/ic_refresh" android:menuCategory="container" android:title="@string/refresh_label" custom:showAsAction="always"> @@ -32,7 +32,7 @@ <item android:id="@+id/action_search" - android:icon="?attr/action_search" + android:icon="@drawable/ic_search" custom:showAsAction="always|collapseActionView" custom:actionViewClass="androidx.appcompat.widget.SearchView" android:title="@string/search_label"/> @@ -40,13 +40,13 @@ <item android:id="@+id/episode_actions" android:menuCategory="container" - android:icon="?attr/checkbox_multiple" + android:icon="@drawable/ic_check_multiple" android:title="@string/multi_select" custom:showAsAction="collapseActionView"> </item> <item android:id="@+id/visit_website_item" - android:icon="?attr/location_web_site" + android:icon="@drawable/ic_web" android:menuCategory="container" custom:showAsAction="collapseActionView" android:title="@string/visit_website_label" @@ -79,7 +79,7 @@ <item android:id="@+id/remove_item" - android:icon="?attr/ic_delete" + android:icon="@drawable/ic_delete" android:menuCategory="container" android:title="@string/remove_feed_label" android:visible="true" diff --git a/app/src/main/res/menu/mediaplayer.xml b/app/src/main/res/menu/mediaplayer.xml index 8afdba369..a9f15317b 100644 --- a/app/src/main/res/menu/mediaplayer.xml +++ b/app/src/main/res/menu/mediaplayer.xml @@ -4,40 +4,40 @@ <item android:id="@+id/add_to_favorites_item" - android:icon="?attr/ic_fav" + android:icon="@drawable/ic_star_border" android:title="@string/add_to_favorite_label" custom:showAsAction="always"> </item> <item android:id="@+id/remove_from_favorites_item" - android:icon="?attr/ic_unfav" + android:icon="@drawable/ic_star" android:title="@string/remove_from_favorite_label" custom:showAsAction="always"> </item> <item android:id="@+id/disable_sleeptimer_item" - android:icon="?attr/ic_sleep_off" + android:icon="@drawable/ic_sleep_off" custom:showAsAction="always" android:title="@string/sleep_timer_label"> </item> <item android:id="@+id/set_sleeptimer_item" - android:icon="?attr/ic_sleep" + android:icon="@drawable/ic_sleep" custom:showAsAction="always" android:title="@string/set_sleeptimer_label"> </item> <item android:id="@+id/audio_controls" - android:icon="?attr/ic_sliders" + android:icon="@drawable/ic_sliders" android:title="@string/audio_controls" custom:showAsAction="always"> </item> <item android:id="@+id/open_feed_item" - android:icon="?attr/feed" + android:icon="@drawable/ic_feed" custom:showAsAction="collapseActionView" android:title="@string/open_podcast" android:visible="false"> @@ -45,7 +45,7 @@ <item android:id="@+id/visit_website_item" - android:icon="?attr/location_web_site" + android:icon="@drawable/ic_web" custom:showAsAction="collapseActionView" android:title="@string/visit_website_label" android:visible="false"> diff --git a/app/src/main/res/menu/online_search.xml b/app/src/main/res/menu/online_search.xml index 93d93157a..374a054fa 100644 --- a/app/src/main/res/menu/online_search.xml +++ b/app/src/main/res/menu/online_search.xml @@ -1,11 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> - <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:custom="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_search" - android:icon="?attr/action_search" + android:icon="@drawable/ic_search" custom:showAsAction="collapseActionView|ifRoom" custom:actionViewClass="androidx.appcompat.widget.SearchView" android:title="@string/search_label"/> diff --git a/app/src/main/res/menu/opml_selection_options.xml b/app/src/main/res/menu/opml_selection_options.xml index 8b3310dc2..1b7bc9331 100644 --- a/app/src/main/res/menu/opml_selection_options.xml +++ b/app/src/main/res/menu/opml_selection_options.xml @@ -4,14 +4,14 @@ <item android:id="@id/select_all_item" - android:icon="?attr/ic_select_all" + android:icon="@drawable/ic_select_all" android:title="@string/select_all_label" custom:showAsAction="ifRoom"> </item> <item android:id="@id/deselect_all_item" - android:icon="?attr/ic_select_none" + android:icon="@drawable/ic_select_none" android:title="@string/deselect_all_label" custom:showAsAction="ifRoom"> </item> diff --git a/app/src/main/res/menu/playback_history.xml b/app/src/main/res/menu/playback_history.xml index 5362f0a25..f8cfd76b0 100644 --- a/app/src/main/res/menu/playback_history.xml +++ b/app/src/main/res/menu/playback_history.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/clear_history_item" - android:icon="?attr/ic_delete" + android:icon="@drawable/ic_delete" android:title="@string/clear_history_label" app:showAsAction="ifRoom"/> </menu> diff --git a/app/src/main/res/menu/queue.xml b/app/src/main/res/menu/queue.xml index 43702e07f..adf44b8b1 100644 --- a/app/src/main/res/menu/queue.xml +++ b/app/src/main/res/menu/queue.xml @@ -14,11 +14,11 @@ android:title="@string/refresh_label" android:menuCategory="container" custom:showAsAction="always" - android:icon="?attr/navigation_refresh"/> + android:icon="@drawable/ic_refresh"/> <item android:id="@+id/action_search" - android:icon="?attr/action_search" + android:icon="@drawable/ic_search" custom:showAsAction="collapseActionView|ifRoom" custom:actionViewClass="androidx.appcompat.widget.SearchView" android:title="@string/search_label"/> @@ -114,7 +114,7 @@ android:id="@+id/clear_queue" android:title="@string/clear_queue_label" custom:showAsAction="collapseActionView" - android:icon="?attr/navigation_accept"/> + android:icon="@drawable/ic_check"/> <item android:id="@+id/episode_actions" diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml index d3a2477be..f6ef15516 100644 --- a/app/src/main/res/menu/search.xml +++ b/app/src/main/res/menu/search.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_search" - android:icon="?attr/action_search" + android:icon="@drawable/ic_search" app:showAsAction="collapseActionView|always" app:actionViewClass="androidx.appcompat.widget.SearchView" android:title="@string/search_label"/> diff --git a/app/src/main/res/menu/statistics.xml b/app/src/main/res/menu/statistics.xml index eb2a51550..9e4b7fab1 100644 --- a/app/src/main/res/menu/statistics.xml +++ b/app/src/main/res/menu/statistics.xml @@ -10,7 +10,7 @@ <item android:id="@+id/statistics_mode" - android:icon="?attr/ic_filter" + android:icon="@drawable/ic_filter" android:title="@string/statistics_mode" custom:showAsAction="never"> </item> diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml index 99acc4bb6..b1cc89eb6 100644 --- a/app/src/main/res/menu/subscriptions.xml +++ b/app/src/main/res/menu/subscriptions.xml @@ -7,7 +7,7 @@ android:title="@string/refresh_label" android:menuCategory="container" custom:showAsAction="always" - android:icon="?attr/navigation_refresh"/> + android:icon="@drawable/ic_refresh"/> <item diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml index 8a63ac8e9..457ff6e5b 100644 --- a/app/src/main/res/xml/feed_settings.xml +++ b/app/src/main/res/xml/feed_settings.xml @@ -5,7 +5,7 @@ <SwitchPreferenceCompat android:key="keepUpdated" - android:icon="?attr/navigation_refresh" + android:icon="@drawable/ic_refresh" android:title="@string/keep_updated" android:summary="@string/keep_updated_summary"/> @@ -13,38 +13,38 @@ android:key="episodeNotification" android:defaultValue="false" android:dependency="keepUpdated" - android:icon="?attr/ic_notifications" + android:icon="@drawable/ic_notifications" android:title="@string/episode_notification" android:summary="@string/episode_notification_summary"/> <Preference android:key="authentication" - android:icon="?attr/ic_key" + android:icon="@drawable/ic_key" android:title="@string/authentication_label" android:summary="@string/authentication_descr"/> <Preference android:key="tags" - android:icon="?attr/ic_folder" + android:icon="@drawable/ic_folder" android:title="@string/feed_folders_label" android:summary="@string/feed_folders_summary"/> <ListPreference android:key="feedPlaybackSpeed" - android:icon="?attr/ic_settings_speed" + android:icon="@drawable/ic_playback_speed" android:title="@string/playback_speed" android:summary="@string/pref_feed_playback_speed_sum"/> <Preference android:key="feedAutoSkip" - android:icon="?attr/ic_settings_skip" + android:icon="@drawable/ic_skip_24dp" android:summary="@string/pref_feed_skip_sum" android:title="@string/pref_feed_skip" /> <ListPreference android:entries="@array/spnAutoDeleteItems" android:entryValues="@array/spnAutoDeleteValues" - android:icon="?attr/ic_delete" + android:icon="@drawable/ic_delete" android:title="@string/auto_delete_label" android:summary="@string/feed_auto_download_global" android:key="autoDelete"/> @@ -52,7 +52,7 @@ <ListPreference android:entries="@array/spnVolumeReductionItems" android:entryValues="@array/spnVolumeReductionValues" - android:icon="?attr/ic_volume_adaption" + android:icon="@drawable/ic_volume_adaption" android:summary="@string/feed_volume_reduction_summary" android:title="@string/feed_volume_reduction" android:defaultValue="off" diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8cf31a20f..523c7cd0f 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -13,41 +13,41 @@ android:key="prefScreenInterface" android:title="@string/user_interface_label" android:summary="@string/user_interface_sum" - android:icon="?attr/ic_appearance" /> + android:icon="@drawable/ic_appearance" /> <Preference android:key="prefScreenPlayback" android:title="@string/playback_pref" android:summary="@string/playback_pref_sum" - android:icon="?attr/ic_settings_playback" /> + android:icon="@drawable/ic_play_24dp" /> <Preference android:key="prefScreenNetwork" android:title="@string/network_pref" android:summary="@string/network_pref_sum" - android:icon="?attr/ic_network" /> + android:icon="@drawable/ic_network" /> <Preference android:key="prefScreenGpodder" android:title="@string/synchronization_pref" android:summary="@string/synchronization_sum" - android:icon="?attr/ic_unfav" /> + android:icon="@drawable/ic_star" /> <Preference android:key="prefScreenStorage" android:title="@string/storage_pref" android:summary="@string/storage_sum" - android:icon="?attr/storage" /> + android:icon="@drawable/ic_storage" /> <Preference android:key="notifications" android:title="@string/notification_pref_fragment" - android:icon="?attr/ic_notifications"/> + android:icon="@drawable/ic_notifications"/> <Preference android:key="statistics" android:title="@string/statistics_label" - android:icon="?attr/statistics" /> + android:icon="@drawable/ic_statistics" /> <PreferenceCategory android:key="project" @@ -55,22 +55,22 @@ <Preference android:key="prefDocumentation" android:title="@string/documentation_support" - android:icon="?attr/ic_questionmark" /> + android:icon="@drawable/ic_questionmark" /> <Preference android:key="prefViewForum" android:title="@string/visit_user_forum" - android:icon="?attr/ic_chat" /> + android:icon="@drawable/ic_chat" /> <Preference android:key="prefContribute" android:title="@string/pref_contribute" - android:icon="?attr/ic_contribute" /> + android:icon="@drawable/ic_contribute" /> <Preference android:key="prefSendBugReport" android:title="@string/bug_report_title" - android:icon="?attr/ic_bug" /> + android:icon="@drawable/ic_bug" /> <Preference android:key="prefAbout" android:title="@string/about_pref" - android:icon="?attr/action_about" /> + android:icon="@drawable/ic_info" /> </PreferenceCategory> </PreferenceScreen> diff --git a/app/src/main/res/xml/preferences_about.xml b/app/src/main/res/xml/preferences_about.xml index f56b7f2ac..1312d5466 100644 --- a/app/src/main/res/xml/preferences_about.xml +++ b/app/src/main/res/xml/preferences_about.xml @@ -7,21 +7,21 @@ <Preference android:key="about_version" android:title="@string/antennapod_version" - android:icon="?attr/ic_unfav" + android:icon="@drawable/ic_star" android:summary="1.7.2 (asd8qs)"/> <Preference android:key="about_contributors" - android:icon="?attr/ic_settings" + android:icon="@drawable/ic_settings" android:summary="@string/contributors_summary" android:title="@string/contributors"/> <Preference android:key="about_privacy_policy" - android:icon="?attr/ic_questionmark" + android:icon="@drawable/ic_questionmark" android:summary="www.antennapod.org/privacy" android:title="@string/privacy_policy"/> <Preference android:key="about_licenses" - android:icon="?attr/action_about" + android:icon="@drawable/ic_info" android:summary="@string/licenses_summary" android:title="@string/licenses"/> diff --git a/core/build.gradle b/core/build.gradle index 27854389e..3d725e6dd 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -8,6 +8,8 @@ android { targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled false + vectorDrawables.useSupportLibrary true + vectorDrawables.generatedDensities = [] testApplicationId "de.danoeh.antennapod.core.tests" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -74,6 +76,7 @@ dependencies { implementation project(':net:ssl') implementation project(':ui:app-start-intent') implementation project(':ui:common') + implementation project(':ui:png-icons') annotationProcessor "androidx.annotation:annotation:$annotationVersion" implementation "androidx.appcompat:appcompat:$appcompatVersion" diff --git a/core/lint.xml b/core/lint.xml new file mode 100644 index 000000000..f3cb24810 --- /dev/null +++ b/core/lint.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<lint> + <issue id="VectorPath"> + <ignore path="res/drawable/ic_settings.xml" /> + <ignore path="res/drawable/ic_settings_white.xml" /> + </issue> +</lint> diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java index 7b7879409..45e81491e 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadServiceNotification.java @@ -205,7 +205,7 @@ public class DownloadServiceNotification { .setContentText(context.getText(R.string.authentication_notification_msg)) .setStyle(new NotificationCompat.BigTextStyle().bigText(context.getText(R.string.authentication_notification_msg) + ": " + resourceTitle)) - .setSmallIcon(R.drawable.ic_key_white) + .setSmallIcon(R.drawable.ic_notification_key) .setAutoCancel(true) .setContentIntent(ClientConfig.downloadServiceCallbacks.getAuthentificationNotificationContentIntent(context, downloadRequest)); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index dbf7760a5..c89724605 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -613,17 +613,17 @@ public class PlaybackService extends MediaBrowserServiceCompat { NotificationCompat.Builder builder = new NotificationCompat.Builder(this, NotificationUtils.CHANNEL_ID_USER_ACTION) - .setSmallIcon(R.drawable.ic_stream_white) + .setSmallIcon(R.drawable.ic_notification_stream) .setContentTitle(getString(R.string.confirm_mobile_streaming_notification_title)) .setContentText(getString(R.string.confirm_mobile_streaming_notification_message)) .setStyle(new NotificationCompat.BigTextStyle() .bigText(getString(R.string.confirm_mobile_streaming_notification_message))) .setPriority(NotificationCompat.PRIORITY_DEFAULT) .setContentIntent(pendingIntentAllowThisTime) - .addAction(R.drawable.ic_stream_white, + .addAction(R.drawable.ic_notification_stream, getString(R.string.confirm_mobile_streaming_button_once), pendingIntentAllowThisTime) - .addAction(R.drawable.ic_stream_white, + .addAction(R.drawable.ic_notification_stream, getString(R.string.confirm_mobile_streaming_button_always), pendingIntentAlwaysAllow) .setAutoCancel(true); diff --git a/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java b/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java index afbe6526b..c541285b4 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java +++ b/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java @@ -122,14 +122,14 @@ public abstract class WidgetUpdater { } if (widgetState.status == PlayerStatus.PLAYING) { - views.setImageViewResource(R.id.butPlay, R.drawable.ic_av_pause_white_48dp); + views.setImageViewResource(R.id.butPlay, R.drawable.ic_pause); views.setContentDescription(R.id.butPlay, context.getString(R.string.pause_label)); - views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_av_pause_white_48dp); + views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_pause); views.setContentDescription(R.id.butPlayExtended, context.getString(R.string.pause_label)); } else { - views.setImageViewResource(R.id.butPlay, R.drawable.ic_av_play_white_48dp); + views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_48dp); views.setContentDescription(R.id.butPlay, context.getString(R.string.play_label)); - views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_av_play_white_48dp); + views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_play_48dp); views.setContentDescription(R.id.butPlayExtended, context.getString(R.string.play_label)); } views.setOnClickPendingIntent(R.id.butPlay, @@ -152,8 +152,8 @@ public abstract class WidgetUpdater { views.setViewVisibility(R.id.txtvTitle, View.GONE); views.setViewVisibility(R.id.txtNoPlaying, View.VISIBLE); views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_round); - views.setImageViewResource(R.id.butPlay, R.drawable.ic_av_play_white_48dp); - views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_av_play_white_48dp); + views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_48dp); + views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_play_48dp); } if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) { diff --git a/core/src/main/res/drawable/filter_dialog_background_light.xml b/core/src/main/res/drawable/filter_dialog_background_light.xml index e0a80737c..09af585a6 100644 --- a/core/src/main/res/drawable/filter_dialog_background_light.xml +++ b/core/src/main/res/drawable/filter_dialog_background_light.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@color/accent_light" android:state_checked="true" /> + <item android:drawable="@color/accent_light" android:state_checked="true"/> <item android:drawable="@color/dialog_filter_inactive_light" /> </selector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/ic_add_black.xml b/core/src/main/res/drawable/ic_add.xml index 624c18b7b..404275dd3 100644 --- a/core/src/main/res/drawable/ic_add_black.xml +++ b/core/src/main/res/drawable/ic_add.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" 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"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> </vector> diff --git a/core/src/main/res/drawable/ic_appearance.xml b/core/src/main/res/drawable/ic_appearance.xml new file mode 100644 index 000000000..b65bc0194 --- /dev/null +++ b/core/src/main/res/drawable/ic_appearance.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M17,19V5H7V19H17M17,1A2,2 0 0,1 19,3V21A2,2 0 0,1 17,23H7C5.89,23 5,22.1 5,21V3C5,1.89 5.89,1 7,1H17M9,7H15V9H9V7M9,11H13V13H9V11Z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_appearance_black.xml b/core/src/main/res/drawable/ic_appearance_black.xml deleted file mode 100644 index 7c574b336..000000000 --- a/core/src/main/res/drawable/ic_appearance_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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="M17,19V5H7V19H17M17,1A2,2 0 0,1 19,3V21A2,2 0 0,1 17,23H7C5.89,23 5,22.1 5,21V3C5,1.89 5.89,1 7,1H17M9,7H15V9H9V7M9,11H13V13H9V11Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_appearance_white.xml b/core/src/main/res/drawable/ic_appearance_white.xml deleted file mode 100644 index 882f47937..000000000 --- a/core/src/main/res/drawable/ic_appearance_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M17,19V5H7V19H17M17,1A2,2 0 0,1 19,3V21A2,2 0 0,1 17,23H7C5.89,23 5,22.1 5,21V3C5,1.89 5.89,1 7,1H17M9,7H15V9H9V7M9,11H13V13H9V11Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_av_fast_forward_white_48dp.xml b/core/src/main/res/drawable/ic_av_fast_forward_white_48dp.xml deleted file mode 100644 index aca5bcf29..000000000 --- a/core/src/main/res/drawable/ic_av_fast_forward_white_48dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="48dp" - android:height="48dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0"> - <path android:fillColor="#FFFFFFFF" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_av_pause_white_48dp.xml b/core/src/main/res/drawable/ic_av_pause_white_48dp.xml deleted file mode 100644 index 3512563ec..000000000 --- a/core/src/main/res/drawable/ic_av_pause_white_48dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="48dp" - android:height="48dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0"> - <path android:fillColor="#FFFFFFFF" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_av_play_white_48dp.xml b/core/src/main/res/drawable/ic_av_play_white_48dp.xml deleted file mode 100644 index bf94a000b..000000000 --- a/core/src/main/res/drawable/ic_av_play_white_48dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="48dp" - android:height="48dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0"> - <path android:fillColor="#FFFFFFFF" android:pathData="M8,5v14l11,-7z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_av_replay_white_48dp.xml b/core/src/main/res/drawable/ic_av_replay_white_48dp.xml deleted file mode 100644 index b6343effc..000000000 --- a/core/src/main/res/drawable/ic_av_replay_white_48dp.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt" - android:viewportWidth="24" - android:viewportHeight="24" - android:width="48dp" - android:height="48dp"> - <path - android:pathData="M12 5V1L7 6l5 5V7c3.31 0 6 2.69 6 6s-2.69 6 -6 6s-6 -2.69 -6 -6H4c0 4.42 3.58 8 8 8s8 -3.58 8 -8S16.42 5 12 5z" - android:fillColor="#FFFFFF" /> -</vector> diff --git a/core/src/main/res/drawable/ic_av_skip_black_24dp.xml b/core/src/main/res/drawable/ic_av_skip_black_24dp.xml deleted file mode 100644 index 3ca3734a8..000000000 --- a/core/src/main/res/drawable/ic_av_skip_black_24dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0"> - <path android:fillColor="#FF000000" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_av_skip_black_48dp.xml b/core/src/main/res/drawable/ic_av_skip_black_48dp.xml deleted file mode 100644 index 24a795dbc..000000000 --- a/core/src/main/res/drawable/ic_av_skip_black_48dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="48dp" - android:height="48dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0"> - <path android:fillColor="#FF000000" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_av_skip_white_24dp.xml b/core/src/main/res/drawable/ic_av_skip_white_24dp.xml deleted file mode 100644 index 9df98de70..000000000 --- a/core/src/main/res/drawable/ic_av_skip_white_24dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0"> - <path android:fillColor="#FFFFFFFF" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_av_skip_white_48dp.xml b/core/src/main/res/drawable/ic_av_skip_white_48dp.xml deleted file mode 100644 index 7e0073e88..000000000 --- a/core/src/main/res/drawable/ic_av_skip_white_48dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="48dp" - android:height="48dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0"> - <path android:fillColor="#FFFFFFFF" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_bookmark_white_24dp.xml b/core/src/main/res/drawable/ic_bookmark.xml index 798df2d24..d599b13a9 100644 --- a/core/src/main/res/drawable/ic_bookmark_white_24dp.xml +++ b/core/src/main/res/drawable/ic_bookmark.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/> </vector> diff --git a/core/src/main/res/drawable/ic_bug.xml b/core/src/main/res/drawable/ic_bug.xml new file mode 100644 index 000000000..c2086502c --- /dev/null +++ b/core/src/main/res/drawable/ic_bug.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" 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/core/src/main/res/drawable/ic_bug_black.xml b/core/src/main/res/drawable/ic_bug_black.xml deleted file mode 100644 index 59d6fa653..000000000 --- a/core/src/main/res/drawable/ic_bug_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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/core/src/main/res/drawable/ic_bug_white.xml b/core/src/main/res/drawable/ic_bug_white.xml deleted file mode 100644 index c22514bfe..000000000 --- a/core/src/main/res/drawable/ic_bug_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" 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/core/src/main/res/drawable/ic_cancel.xml b/core/src/main/res/drawable/ic_cancel.xml new file mode 100644 index 000000000..dcb2e0fc7 --- /dev/null +++ b/core/src/main/res/drawable/ic_cancel.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_cancel_black.xml b/core/src/main/res/drawable/ic_cancel_black.xml deleted file mode 100644 index e254218af..000000000 --- a/core/src/main/res/drawable/ic_cancel_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_cancel_white.xml b/core/src/main/res/drawable/ic_cancel_white.xml deleted file mode 100644 index a5480c71f..000000000 --- a/core/src/main/res/drawable/ic_cancel_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_chat.xml b/core/src/main/res/drawable/ic_chat.xml new file mode 100644 index 000000000..63044c237 --- /dev/null +++ b/core/src/main/res/drawable/ic_chat.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M15,4V11H5.17L4,12.17V4H15M16,2H3A1,1 0 0,0 2,3V17L6,13H16A1,1 0 0,0 17,12V3A1,1 0 0,0 16,2M21,6H19V15H6V17A1,1 0 0,0 7,18H18L22,22V7A1,1 0 0,0 21,6Z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_chat_black.xml b/core/src/main/res/drawable/ic_chat_black.xml deleted file mode 100644 index 3f2692d39..000000000 --- a/core/src/main/res/drawable/ic_chat_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,4V11H5.17L4,12.17V4H15M16,2H3A1,1 0 0,0 2,3V17L6,13H16A1,1 0 0,0 17,12V3A1,1 0 0,0 16,2M21,6H19V15H6V17A1,1 0 0,0 7,18H18L22,22V7A1,1 0 0,0 21,6Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_chat_white.xml b/core/src/main/res/drawable/ic_chat_white.xml deleted file mode 100644 index 222615bfe..000000000 --- a/core/src/main/res/drawable/ic_chat_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M15,4V11H5.17L4,12.17V4H15M16,2H3A1,1 0 0,0 2,3V17L6,13H16A1,1 0 0,0 17,12V3A1,1 0 0,0 16,2M21,6H19V15H6V17A1,1 0 0,0 7,18H18L22,22V7A1,1 0 0,0 21,6Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_check_white.xml b/core/src/main/res/drawable/ic_check.xml index 80651f6ee..4338bd156 100644 --- a/core/src/main/res/drawable/ic_check_white.xml +++ b/core/src/main/res/drawable/ic_check.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/> </vector> diff --git a/core/src/main/res/drawable/ic_check_multiple.xml b/core/src/main/res/drawable/ic_check_multiple.xml new file mode 100644 index 000000000..0522009ba --- /dev/null +++ b/core/src/main/res/drawable/ic_check_multiple.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M20,16V10H22V16A2,2 0 0,1 20,18H8C6.89,18 6,17.1 6,16V4C6,2.89 6.89,2 8,2H16V4H8V16H20M10.91,7.08L14,10.17L20.59,3.58L22,5L14,13L9.5,8.5L10.91,7.08M16,20V22H4A2,2 0 0,1 2,20V7H4V20H16Z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_check_multiple_black.xml b/core/src/main/res/drawable/ic_check_multiple_black.xml deleted file mode 100644 index a0a79299d..000000000 --- a/core/src/main/res/drawable/ic_check_multiple_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,16V10H22V16A2,2 0 0,1 20,18H8C6.89,18 6,17.1 6,16V4C6,2.89 6.89,2 8,2H16V4H8V16H20M10.91,7.08L14,10.17L20.59,3.58L22,5L14,13L9.5,8.5L10.91,7.08M16,20V22H4A2,2 0 0,1 2,20V7H4V20H16Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_check_multiple_white.xml b/core/src/main/res/drawable/ic_check_multiple_white.xml deleted file mode 100644 index 777f6eb59..000000000 --- a/core/src/main/res/drawable/ic_check_multiple_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M20,16V10H22V16A2,2 0 0,1 20,18H8C6.89,18 6,17.1 6,16V4C6,2.89 6.89,2 8,2H16V4H8V16H20M10.91,7.08L14,10.17L20.59,3.58L22,5L14,13L9.5,8.5L10.91,7.08M16,20V22H4A2,2 0 0,1 2,20V7H4V20H16Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_contribute_black.xml b/core/src/main/res/drawable/ic_contribute.xml index 101ca0962..b934453b1 100644 --- a/core/src/main/res/drawable/ic_contribute_black.xml +++ b/core/src/main/res/drawable/ic_contribute.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="#FF000000" + android:fillColor="?attr/action_icon_color" android:pathData="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z"/> </vector> diff --git a/core/src/main/res/drawable/ic_contribute_white.xml b/core/src/main/res/drawable/ic_contribute_white.xml deleted file mode 100644 index 5f25c892f..000000000 --- a/core/src/main/res/drawable/ic_contribute_white.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M12,21.35L10.55,20.03C5.4,15.36 2,12.27 2,8.5C2,5.41 4.42,3 7.5,3C9.24,3 10.91,3.81 12,5.08C13.09,3.81 14.76,3 16.5,3C19.58,3 22,5.41 22,8.5C22,12.27 18.6,15.36 13.45,20.03L12,21.35Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_delete.xml b/core/src/main/res/drawable/ic_delete.xml new file mode 100644 index 000000000..6d3cb6a27 --- /dev/null +++ b/core/src/main/res/drawable/ic_delete.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" 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/core/src/main/res/drawable/ic_delete_black.xml b/core/src/main/res/drawable/ic_delete_black.xml deleted file mode 100644 index a4d94b247..000000000 --- a/core/src/main/res/drawable/ic_delete_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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/core/src/main/res/drawable/ic_delete_white.xml b/core/src/main/res/drawable/ic_delete_white.xml deleted file mode 100644 index 1f2b6e734..000000000 --- a/core/src/main/res/drawable/ic_delete_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" 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/core/src/main/res/drawable/ic_add_white.xml b/core/src/main/res/drawable/ic_download.xml index 3052692a0..ebc50613f 100644 --- a/core/src/main/res/drawable/ic_add_white.xml +++ b/core/src/main/res/drawable/ic_download.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/> </vector> diff --git a/core/src/main/res/drawable/ic_download_black.xml b/core/src/main/res/drawable/ic_download_black.xml deleted file mode 100644 index 0e0b47c88..000000000 --- a/core/src/main/res/drawable/ic_download_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_download_white.xml b/core/src/main/res/drawable/ic_download_white.xml deleted file mode 100644 index 8a9cfa3cd..000000000 --- a/core/src/main/res/drawable/ic_download_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_drag_darktheme.xml b/core/src/main/res/drawable/ic_drag_darktheme.xml index b2ef2e5ec..20c7db484 100644 --- a/core/src/main/res/drawable/ic_drag_darktheme.xml +++ b/core/src/main/res/drawable/ic_drag_darktheme.xml @@ -4,6 +4,6 @@ android:viewportWidth="3" android:viewportHeight="4.5"> <path - android:pathData="M0.74983,0.25011A0.5,0.5 0,0 0,0.25011 0.74983A0.5,0.5 135,0 0,0.74983 1.25005A0.5,0.5 0,0 0,1.25005 0.74983A0.5,0.5 45,0 0,0.74983 0.25011zM2.24999,0.25011A0.5,0.5 0,0 0,1.74976 0.74983A0.5,0.5 0,0 0,2.24999 1.25005A0.5,0.5 0,0 0,2.75022 0.74983A0.5,0.5 0,0 0,2.24999 0.25011zM0.74983,1.74976A0.5,0.5 0,0 0,0.25011 2.24999A0.5,0.5 0,0 0,0.74983 2.75022A0.5,0.5 0,0 0,1.25005 2.24999A0.5,0.5 0,0 0,0.74983 1.74976zM2.24999,1.74976A0.5,0.5 0,0 0,1.74976 2.24999A0.5,0.5 0,0 0,2.24999 2.75022A0.5,0.5 0,0 0,2.75022 2.24999A0.5,0.5 0,0 0,2.24999 1.74976zM0.74983,3.24993A0.5,0.5 0,0 0,0.25011 3.75016A0.5,0.5 45,0 0,0.74983 4.24987A0.5,0.5 45,0 0,1.25005 3.75016A0.5,0.5 0,0 0,0.74983 3.24993zM2.24999,3.24993A0.5,0.5 0,0 0,1.74976 3.75016A0.5,0.5 45,0 0,2.24999 4.24987A0.5,0.5 45,0 0,2.75022 3.75016A0.5,0.5 0,0 0,2.24999 3.24993z" + android:pathData="M 0.75 0.25 A 0.5 0.5 0 0 0 0.25 0.75 A 0.5 0.5 135 0 0 0.75 1.25 A 0.5 0.5 0 0 0 1.25 0.75 A 0.5 0.5 45 0 0 0.75 0.25 z M 2.25 0.25 A 0.5 0.5 0 0 0 1.75 0.75 A 0.5 0.5 0 0 0 2.25 1.25 A 0.5 0.5 0 0 0 2.75 0.75 A 0.5 0.5 0 0 0 2.25 0.25 z M 0.75 1.75 A 0.5 0.5 0 0 0 0.25 2.25 A 0.5 0.5 0 0 0 0.75 2.75 A 0.5 0.5 0 0 0 1.25 2.25 A 0.5 0.5 0 0 0 0.75 1.75 z M 2.25 1.75 A 0.5 0.5 0 0 0 1.75 2.25 A 0.5 0.5 0 0 0 2.25 2.75 A 0.5 0.5 0 0 0 2.75 2.25 A 0.5 0.5 0 0 0 2.25 1.75 z M 0.75 3.25 A 0.5 0.5 0 0 0 0.25 3.75 A 0.5 0.5 45 0 0 0.75 4.25 A 0.5 0.5 45 0 0 1.25 3.75 A 0.5 0.5 0 0 0 0.75 3.25 z M 2.25 3.25 A 0.5 0.5 0 0 0 1.75 3.75 A 0.5 0.5 45 0 0 2.25 4.25 A 0.5 0.5 45 0 0 2.75 3.75 A 0.5 0.5 0 0 0 2.25 3.25 z" android:fillColor="#a9a9a9"/> </vector> diff --git a/core/src/main/res/drawable/ic_drag_lighttheme.xml b/core/src/main/res/drawable/ic_drag_lighttheme.xml index 42714d5db..46ff2f495 100644 --- a/core/src/main/res/drawable/ic_drag_lighttheme.xml +++ b/core/src/main/res/drawable/ic_drag_lighttheme.xml @@ -4,6 +4,6 @@ android:viewportWidth="3" android:viewportHeight="4.5"> <path - android:pathData="M0.74983,0.25011A0.5,0.5 0,0 0,0.25011 0.74983A0.5,0.5 135,0 0,0.74983 1.25005A0.5,0.5 0,0 0,1.25005 0.74983A0.5,0.5 45,0 0,0.74983 0.25011zM2.24999,0.25011A0.5,0.5 0,0 0,1.74976 0.74983A0.5,0.5 0,0 0,2.24999 1.25005A0.5,0.5 0,0 0,2.75022 0.74983A0.5,0.5 0,0 0,2.24999 0.25011zM0.74983,1.74976A0.5,0.5 0,0 0,0.25011 2.24999A0.5,0.5 0,0 0,0.74983 2.75022A0.5,0.5 0,0 0,1.25005 2.24999A0.5,0.5 0,0 0,0.74983 1.74976zM2.24999,1.74976A0.5,0.5 0,0 0,1.74976 2.24999A0.5,0.5 0,0 0,2.24999 2.75022A0.5,0.5 0,0 0,2.75022 2.24999A0.5,0.5 0,0 0,2.24999 1.74976zM0.74983,3.24993A0.5,0.5 0,0 0,0.25011 3.75016A0.5,0.5 45,0 0,0.74983 4.24987A0.5,0.5 45,0 0,1.25005 3.75016A0.5,0.5 0,0 0,0.74983 3.24993zM2.24999,3.24993A0.5,0.5 0,0 0,1.74976 3.75016A0.5,0.5 45,0 0,2.24999 4.24987A0.5,0.5 45,0 0,2.75022 3.75016A0.5,0.5 0,0 0,2.24999 3.24993z" + android:pathData="M 0.75 0.25 A 0.5 0.5 0 0 0 0.25 0.75 A 0.5 0.5 135 0 0 0.75 1.25 A 0.5 0.5 0 0 0 1.25 0.75 A 0.5 0.5 45 0 0 0.75 0.25 z M 2.25 0.25 A 0.5 0.5 0 0 0 1.75 0.75 A 0.5 0.5 0 0 0 2.25 1.25 A 0.5 0.5 0 0 0 2.75 0.75 A 0.5 0.5 0 0 0 2.25 0.25 z M 0.75 1.75 A 0.5 0.5 0 0 0 0.25 2.25 A 0.5 0.5 0 0 0 0.75 2.75 A 0.5 0.5 0 0 0 1.25 2.25 A 0.5 0.5 0 0 0 0.75 1.75 z M 2.25 1.75 A 0.5 0.5 0 0 0 1.75 2.25 A 0.5 0.5 0 0 0 2.25 2.75 A 0.5 0.5 0 0 0 2.75 2.25 A 0.5 0.5 0 0 0 2.25 1.75 z M 0.75 3.25 A 0.5 0.5 0 0 0 0.25 3.75 A 0.5 0.5 45 0 0 0.75 4.25 A 0.5 0.5 45 0 0 1.25 3.75 A 0.5 0.5 0 0 0 0.75 3.25 z M 2.25 3.25 A 0.5 0.5 0 0 0 1.75 3.75 A 0.5 0.5 45 0 0 2.25 4.25 A 0.5 0.5 45 0 0 2.75 3.75 A 0.5 0.5 0 0 0 2.25 3.25 z" android:fillColor="#9d9d9d"/> </vector> diff --git a/core/src/main/res/drawable/ic_fab_edit.xml b/core/src/main/res/drawable/ic_fab_edit.xml new file mode 100644 index 000000000..6fd80e29f --- /dev/null +++ b/core/src/main/res/drawable/ic_fab_edit.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/colorOnPrimary" 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/core/src/main/res/drawable/ic_fab_edit_white.xml b/core/src/main/res/drawable/ic_fab_edit_white.xml deleted file mode 100644 index cb2e394b0..000000000 --- a/core/src/main/res/drawable/ic_fab_edit_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" 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/core/src/main/res/drawable/ic_av_fast_rewind_black_48dp.xml b/core/src/main/res/drawable/ic_fast_forward.xml index e97e29955..29a607074 100644 --- a/core/src/main/res/drawable/ic_av_fast_rewind_black_48dp.xml +++ b/core/src/main/res/drawable/ic_fast_forward.xml @@ -3,5 +3,5 @@ android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - <path android:fillColor="#FF000000" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/> </vector> diff --git a/core/src/main/res/drawable/ic_av_fast_forward_white_80dp.xml b/core/src/main/res/drawable/ic_fast_forward_video_white.xml index a60145f1d..a60145f1d 100644 --- a/core/src/main/res/drawable/ic_av_fast_forward_white_80dp.xml +++ b/core/src/main/res/drawable/ic_fast_forward_video_white.xml diff --git a/core/src/main/res/drawable/ic_av_fast_forward_black_48dp.xml b/core/src/main/res/drawable/ic_fast_rewind.xml index f55701e95..634bae8e8 100644 --- a/core/src/main/res/drawable/ic_av_fast_forward_black_48dp.xml +++ b/core/src/main/res/drawable/ic_fast_rewind.xml @@ -3,5 +3,5 @@ android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - <path android:fillColor="#FF000000" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/> </vector> diff --git a/core/src/main/res/drawable/ic_av_fast_rewind_white_80dp.xml b/core/src/main/res/drawable/ic_fast_rewind_video_white.xml index 4609e0c3e..4609e0c3e 100644 --- a/core/src/main/res/drawable/ic_av_fast_rewind_white_80dp.xml +++ b/core/src/main/res/drawable/ic_fast_rewind_video_white.xml diff --git a/core/src/main/res/drawable/ic_feed.xml b/core/src/main/res/drawable/ic_feed.xml new file mode 100644 index 000000000..e1d650aba --- /dev/null +++ b/core/src/main/res/drawable/ic_feed.xml @@ -0,0 +1,6 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M6.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M4,4.44v2.83c7.03,0 12.73,5.7 12.73,12.73h2.83c0,-8.59 -6.97,-15.56 -15.56,-15.56zM4,10.1v2.83c3.9,0 7.07,3.17 7.07,7.07h2.83c0,-5.47 -4.43,-9.9 -9.9,-9.9z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_feed_black.xml b/core/src/main/res/drawable/ic_feed_black.xml index 54c9286de..1d64ff5f8 100644 --- a/core/src/main/res/drawable/ic_feed_black.xml +++ b/core/src/main/res/drawable/ic_feed_black.xml @@ -1,6 +1,6 @@ <vector android:height="24dp" 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.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0"/> - <path android:fillColor="#FF000000" android:pathData="M4,4.44v2.83c7.03,0 12.73,5.7 12.73,12.73h2.83c0,-8.59 -6.97,-15.56 -15.56,-15.56zM4,10.1v2.83c3.9,0 7.07,3.17 7.07,7.07h2.83c0,-5.47 -4.43,-9.9 -9.9,-9.9z"/> + <path android:fillColor="#000000" android:pathData="M6.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0"/> + <path android:fillColor="#000000" android:pathData="M4,4.44v2.83c7.03,0 12.73,5.7 12.73,12.73h2.83c0,-8.59 -6.97,-15.56 -15.56,-15.56zM4,10.1v2.83c3.9,0 7.07,3.17 7.07,7.07h2.83c0,-5.47 -4.43,-9.9 -9.9,-9.9z"/> </vector> diff --git a/core/src/main/res/drawable/ic_feed_white.xml b/core/src/main/res/drawable/ic_feed_white.xml deleted file mode 100644 index da0139ff5..000000000 --- a/core/src/main/res/drawable/ic_feed_white.xml +++ /dev/null @@ -1,6 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M6.18,17.82m-2.18,0a2.18,2.18 0,1 1,4.36 0a2.18,2.18 0,1 1,-4.36 0"/> - <path android:fillColor="#FFFFFFFF" android:pathData="M4,4.44v2.83c7.03,0 12.73,5.7 12.73,12.73h2.83c0,-8.59 -6.97,-15.56 -15.56,-15.56zM4,10.1v2.83c3.9,0 7.07,3.17 7.07,7.07h2.83c0,-5.47 -4.43,-9.9 -9.9,-9.9z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_filter.xml b/core/src/main/res/drawable/ic_filter.xml new file mode 100644 index 000000000..d634fe7a0 --- /dev/null +++ b/core/src/main/res/drawable/ic_filter.xml @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="24dp" + android:width="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M15,19.88C15.04,20.18 14.94,20.5 14.71,20.71C14.32,21.1 13.69,21.1 13.3,20.71L9.29,16.7C9.06,16.47 8.96,16.16 9,15.87V10.75L4.21,4.62C3.87,4.19 3.95,3.56 4.38,3.22C4.57,3.08 4.78,3 5,3V3H19V3C19.22,3 19.43,3.08 19.62,3.22C20.05,3.56 20.13,4.19 19.79,4.62L15,10.75V19.88M7.04,5L11,10.06V15.58L13,17.58V10.05L16.96,5H7.04Z" /> +</vector> diff --git a/core/src/main/res/drawable/ic_filter_black_24dp.xml b/core/src/main/res/drawable/ic_filter_black_24dp.xml deleted file mode 100644 index 54c5123d7..000000000 --- a/core/src/main/res/drawable/ic_filter_black_24dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:height="24dp" - android:width="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path android:fillColor="#FF000000" android:pathData="M15,19.88C15.04,20.18 14.94,20.5 14.71,20.71C14.32,21.1 13.69,21.1 13.3,20.71L9.29,16.7C9.06,16.47 8.96,16.16 9,15.87V10.75L4.21,4.62C3.87,4.19 3.95,3.56 4.38,3.22C4.57,3.08 4.78,3 5,3V3H19V3C19.22,3 19.43,3.08 19.62,3.22C20.05,3.56 20.13,4.19 19.79,4.62L15,10.75V19.88M7.04,5L11,10.06V15.58L13,17.58V10.05L16.96,5H7.04Z" /> -</vector> diff --git a/core/src/main/res/drawable/ic_filter_white_24dp.xml b/core/src/main/res/drawable/ic_filter_white_24dp.xml deleted file mode 100644 index 4b1b88581..000000000 --- a/core/src/main/res/drawable/ic_filter_white_24dp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:height="24dp" - android:width="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path android:fillColor="#FFFFFFFF" android:pathData="M15,19.88C15.04,20.18 14.94,20.5 14.71,20.71C14.32,21.1 13.69,21.1 13.3,20.71L9.29,16.7C9.06,16.47 8.96,16.16 9,15.87V10.75L4.21,4.62C3.87,4.19 3.95,3.56 4.38,3.22C4.57,3.08 4.78,3 5,3V3H19V3C19.22,3 19.43,3.08 19.62,3.22C20.05,3.56 20.13,4.19 19.79,4.62L15,10.75V19.88M7.04,5L11,10.06V15.58L13,17.58V10.05L16.96,5H7.04Z" /> -</vector> diff --git a/core/src/main/res/drawable/ic_folder.xml b/core/src/main/res/drawable/ic_folder.xml new file mode 100644 index 000000000..5b0e845e7 --- /dev/null +++ b/core/src/main/res/drawable/ic_folder.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_folder_black.xml b/core/src/main/res/drawable/ic_folder_black.xml index b1b259ba4..8096fa582 100644 --- a/core/src/main/res/drawable/ic_folder_black.xml +++ b/core/src/main/res/drawable/ic_folder_black.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" 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,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/> + <path android:fillColor="#000000" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/> </vector> diff --git a/core/src/main/res/drawable/ic_folder_white.xml b/core/src/main/res/drawable/ic_folder_white.xml deleted file mode 100644 index 91506ec4d..000000000 --- a/core/src/main/res/drawable/ic_folder_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_history.xml b/core/src/main/res/drawable/ic_history.xml new file mode 100644 index 000000000..bfa35267c --- /dev/null +++ b/core/src/main/res/drawable/ic_history.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" 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/core/src/main/res/drawable/ic_history_black.xml b/core/src/main/res/drawable/ic_history_black.xml deleted file mode 100644 index d7130c9a8..000000000 --- a/core/src/main/res/drawable/ic_history_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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="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/core/src/main/res/drawable/ic_history_white.xml b/core/src/main/res/drawable/ic_history_white.xml deleted file mode 100644 index 1ffb08b91..000000000 --- a/core/src/main/res/drawable/ic_history_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" 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/core/src/main/res/drawable/ic_info.xml b/core/src/main/res/drawable/ic_info.xml new file mode 100644 index 000000000..3fd641ec3 --- /dev/null +++ b/core/src/main/res/drawable/ic_info.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" 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/core/src/main/res/drawable/ic_info_black.xml b/core/src/main/res/drawable/ic_info_black.xml deleted file mode 100644 index f52a15fb6..000000000 --- a/core/src/main/res/drawable/ic_info_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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/core/src/main/res/drawable/ic_key_black.xml b/core/src/main/res/drawable/ic_key.xml index 2c78e7c39..cae7afb97 100644 --- a/core/src/main/res/drawable/ic_key_black.xml +++ b/core/src/main/res/drawable/ic_key.xml @@ -1,6 +1,6 @@ <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp"> - <path android:fillColor="#FF000000" + <path android:fillColor="?attr/action_icon_color" android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/> </vector> diff --git a/core/src/main/res/drawable/ic_check_black.xml b/core/src/main/res/drawable/ic_load_more.xml index c4654dd52..bd88f5c11 100644 --- a/core/src/main/res/drawable/ic_check_black.xml +++ b/core/src/main/res/drawable/ic_load_more.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" 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"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/> </vector> diff --git a/core/src/main/res/drawable/ic_load_more_black.xml b/core/src/main/res/drawable/ic_load_more_black.xml deleted file mode 100644 index 534478772..000000000 --- a/core/src/main/res/drawable/ic_load_more_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_load_more_white.xml b/core/src/main/res/drawable/ic_load_more_white.xml deleted file mode 100644 index c47933164..000000000 --- a/core/src/main/res/drawable/ic_load_more_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_lock_closed.xml b/core/src/main/res/drawable/ic_lock_closed.xml new file mode 100644 index 000000000..5610eb7be --- /dev/null +++ b/core/src/main/res/drawable/ic_lock_closed.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_lock_closed_black.xml b/core/src/main/res/drawable/ic_lock_closed_black.xml deleted file mode 100644 index 63ea6d78d..000000000 --- a/core/src/main/res/drawable/ic_lock_closed_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_lock_closed_white.xml b/core/src/main/res/drawable/ic_lock_closed_white.xml deleted file mode 100644 index 8c923f1d1..000000000 --- a/core/src/main/res/drawable/ic_lock_closed_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1s3.1,1.39 3.1,3.1v2L8.9,8L8.9,6zM18,20L6,20L6,10h12v10z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_lock_open.xml b/core/src/main/res/drawable/ic_lock_open.xml new file mode 100644 index 000000000..64be87b48 --- /dev/null +++ b/core/src/main/res/drawable/ic_lock_open.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_lock_open_black.xml b/core/src/main/res/drawable/ic_lock_open_black.xml deleted file mode 100644 index e91724c22..000000000 --- a/core/src/main/res/drawable/ic_lock_open_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_lock_open_white.xml b/core/src/main/res/drawable/ic_lock_open_white.xml deleted file mode 100644 index 87d5cf09a..000000000 --- a/core/src/main/res/drawable/ic_lock_open_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M12,17c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6h1.9c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM18,20L6,20L6,10h12v10z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_network.xml b/core/src/main/res/drawable/ic_network.xml new file mode 100644 index 000000000..52f5889b8 --- /dev/null +++ b/core/src/main/res/drawable/ic_network.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M16,17.01V10h-2v7.01h-3L15,21l4,-3.99h-3zM9,3L5,6.99h3V14h2V6.99h3L9,3z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_network_black.xml b/core/src/main/res/drawable/ic_network_black.xml deleted file mode 100644 index d9be81776..000000000 --- a/core/src/main/res/drawable/ic_network_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,17.01V10h-2v7.01h-3L15,21l4,-3.99h-3zM9,3L5,6.99h3V14h2V6.99h3L9,3z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_network_white.xml b/core/src/main/res/drawable/ic_network_white.xml deleted file mode 100644 index cb90ee547..000000000 --- a/core/src/main/res/drawable/ic_network_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M16,17.01V10h-2v7.01h-3L15,21l4,-3.99h-3zM9,3L5,6.99h3V14h2V6.99h3L9,3z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_notifications.xml b/core/src/main/res/drawable/ic_notifications.xml new file mode 100644 index 000000000..927a72d4a --- /dev/null +++ b/core/src/main/res/drawable/ic_notifications.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_notifications_black.xml b/core/src/main/res/drawable/ic_notifications_black.xml deleted file mode 100644 index 7009a6763..000000000 --- a/core/src/main/res/drawable/ic_notifications_black.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_notifications_white.xml b/core/src/main/res/drawable/ic_notifications_white.xml deleted file mode 100644 index 10239aadd..000000000 --- a/core/src/main/res/drawable/ic_notifications_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector 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="#FFFFFFFF" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_av_fast_rewind_white_48dp.xml b/core/src/main/res/drawable/ic_pause.xml index ba2b8ae4f..9132bb8b4 100644 --- a/core/src/main/res/drawable/ic_av_fast_rewind_white_48dp.xml +++ b/core/src/main/res/drawable/ic_pause.xml @@ -3,5 +3,5 @@ android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - <path android:fillColor="#FFFFFFFF" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/> </vector> diff --git a/core/src/main/res/drawable/ic_av_pause_white_80dp.xml b/core/src/main/res/drawable/ic_pause_video_white.xml index ad8847cb7..ad8847cb7 100644 --- a/core/src/main/res/drawable/ic_av_pause_white_80dp.xml +++ b/core/src/main/res/drawable/ic_pause_video_white.xml diff --git a/core/src/main/res/drawable/ic_av_play_white_24dp.xml b/core/src/main/res/drawable/ic_play_24dp.xml index 0e896a8d4..515996b3d 100644 --- a/core/src/main/res/drawable/ic_av_play_white_24dp.xml +++ b/core/src/main/res/drawable/ic_play_24dp.xml @@ -3,5 +3,5 @@ android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - <path android:fillColor="#FFFFFFFF" android:pathData="M8,5v14l11,-7z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M8,5v14l11,-7z"/> </vector> diff --git a/core/src/main/res/drawable/ic_av_play_black_48dp.xml b/core/src/main/res/drawable/ic_play_48dp.xml index 2e0d011aa..01c156e02 100644 --- a/core/src/main/res/drawable/ic_av_play_black_48dp.xml +++ b/core/src/main/res/drawable/ic_play_48dp.xml @@ -3,5 +3,5 @@ android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - <path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M8,5v14l11,-7z"/> </vector> diff --git a/core/src/main/res/drawable/ic_av_play_white_80dp.xml b/core/src/main/res/drawable/ic_play_video_white.xml index 9f9dbb1b1..9f9dbb1b1 100644 --- a/core/src/main/res/drawable/ic_av_play_white_80dp.xml +++ b/core/src/main/res/drawable/ic_play_video_white.xml diff --git a/core/src/main/res/drawable/ic_playback_speed.xml b/core/src/main/res/drawable/ic_playback_speed.xml new file mode 100644 index 000000000..2813532cf --- /dev/null +++ b/core/src/main/res/drawable/ic_playback_speed.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="24dp" + android:width="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M 12 15.98 A 2.98 2.98 0 0 1 9.02 12.99 c 0 -1.11 0.61 -2.09 1.49 -2.6 L 20.17 4.81 L 14.67 14.34 C 14.17 15.31 13.16 15.98 12 15.98 M 12 3.05 c 1.8 0 3.48 0.5 4.94 1.31 l -2.09 1.2 C 13.99 5.22 12.99 5.04 12 5.04 a 7.96 7.96 0 0 0 -7.96 7.96 c 0 2.2 0.89 4.19 2.33 5.62 h 0.01 c 0.39 0.39 0.39 1.01 0 1.4 c -0.39 0.39 -1.02 0.39 -1.41 0.01 v 0 C 3.17 18.22 2.05 15.74 2.05 12.99 A 9.95 9.95 0 0 1 12 3.05 m 9.95 9.95 c 0 2.75 -1.11 5.23 -2.91 7.03 v 0 c -0.39 0.38 -1.01 0.38 -1.4 -0.01 c -0.39 -0.39 -0.39 -1.01 0 -1.4 v 0 c 1.44 -1.44 2.33 -3.42 2.33 -5.62 c 0 -0.99 -0.19 -1.99 -0.54 -2.88 L 20.62 8.02 c 0.83 1.49 1.32 3.16 1.32 4.97 z" /> +</vector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/ic_playback_speed_black.xml b/core/src/main/res/drawable/ic_playback_speed_black.xml deleted file mode 100644 index 81b1bdd5c..000000000 --- a/core/src/main/res/drawable/ic_playback_speed_black.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:height="24dp" - android:width="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path android:fillColor="#FF000000" android:pathData="M 12,15.976673 A 2.9838134,2.9838134 0 0 1 9.0161867,12.992861 c 0,-1.113957 0.6067085,-2.08867 1.4919063,-2.595918 L 20.165701,4.8072659 14.66554,14.335576 C 14.168238,15.310289 13.163688,15.976673 12,15.976673 M 12,3.0468162 c 1.800234,0 3.481116,0.4973021 4.943185,1.3128776 l -2.08867,1.2034715 C 13.989209,5.2249998 12.994606,5.036025 12,5.036025 a 7.9568354,7.9568354 0 0 0 -7.9568354,7.956836 c 0,2.198075 0.885198,4.187283 2.3273743,5.619514 h 0.00995 c 0.3878957,0.387896 0.3878957,1.014497 0,1.402393 -0.3878958,0.387895 -1.0244427,0.387895 -1.4123384,0.01 v 0 C 3.1679127,18.224479 2.0539558,15.737969 2.0539558,12.992861 A 9.9460442,9.9460442 0 0 1 12,3.0468162 m 9.946045,9.9460448 c 0,2.745108 -1.113958,5.231618 -2.914192,7.031853 v 0 c -0.387896,0.377949 -1.014497,0.377949 -1.402392,-0.01 -0.387896,-0.387897 -0.387896,-1.014497 0,-1.402392 v 0 c 1.442176,-1.442178 2.327374,-3.421439 2.327374,-5.619515 0,-0.994605 -0.188974,-1.989209 -0.537086,-2.884354 L 20.62322,8.0197843 c 0.825522,1.4919063 1.322825,3.1628417 1.322825,4.9730227 z" /> -</vector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/ic_playback_speed_white.xml b/core/src/main/res/drawable/ic_playback_speed_white.xml deleted file mode 100644 index 183bb595a..000000000 --- a/core/src/main/res/drawable/ic_playback_speed_white.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:height="24dp" - android:width="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path android:fillColor="#ffffffff" android:pathData="M 12,15.976673 A 2.9838134,2.9838134 0 0 1 9.0161867,12.992861 c 0,-1.113957 0.6067085,-2.08867 1.4919063,-2.595918 L 20.165701,4.8072659 14.66554,14.335576 C 14.168238,15.310289 13.163688,15.976673 12,15.976673 M 12,3.0468162 c 1.800234,0 3.481116,0.4973021 4.943185,1.3128776 l -2.08867,1.2034715 C 13.989209,5.2249998 12.994606,5.036025 12,5.036025 a 7.9568354,7.9568354 0 0 0 -7.9568354,7.956836 c 0,2.198075 0.885198,4.187283 2.3273743,5.619514 h 0.00995 c 0.3878957,0.387896 0.3878957,1.014497 0,1.402393 -0.3878958,0.387895 -1.0244427,0.387895 -1.4123384,0.01 v 0 C 3.1679127,18.224479 2.0539558,15.737969 2.0539558,12.992861 A 9.9460442,9.9460442 0 0 1 12,3.0468162 m 9.946045,9.9460448 c 0,2.745108 -1.113958,5.231618 -2.914192,7.031853 v 0 c -0.387896,0.377949 -1.014497,0.377949 -1.402392,-0.01 -0.387896,-0.387897 -0.387896,-1.014497 0,-1.402392 v 0 c 1.442176,-1.442178 2.327374,-3.421439 2.327374,-5.619515 0,-0.994605 -0.188974,-1.989209 -0.537086,-2.884354 L 20.62322,8.0197843 c 0.825522,1.4919063 1.322825,3.1628417 1.322825,4.9730227 z" /> -</vector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/ic_playlist.xml b/core/src/main/res/drawable/ic_playlist.xml new file mode 100644 index 000000000..c609f9fb3 --- /dev/null +++ b/core/src/main/res/drawable/ic_playlist.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M19,9L2,9v2h17L19,9zM19,5L2,5v2h17L19,5zM2,15h13v-2L2,13v2zM17,13v6l5,-3 -5,-3z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_playlist_black.xml b/core/src/main/res/drawable/ic_playlist_black.xml index 8516d8a36..c7b0a356c 100644 --- a/core/src/main/res/drawable/ic_playlist_black.xml +++ b/core/src/main/res/drawable/ic_playlist_black.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" 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,9L2,9v2h17L19,9zM19,5L2,5v2h17L19,5zM2,15h13v-2L2,13v2zM17,13v6l5,-3 -5,-3z"/> + <path android:fillColor="#000000" android:pathData="M19,9L2,9v2h17L19,9zM19,5L2,5v2h17L19,5zM2,15h13v-2L2,13v2zM17,13v6l5,-3 -5,-3z"/> </vector> diff --git a/core/src/main/res/drawable/ic_playlist_white.xml b/core/src/main/res/drawable/ic_playlist_white.xml deleted file mode 100644 index f1554b9e5..000000000 --- a/core/src/main/res/drawable/ic_playlist_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M19,9L2,9v2h17L19,9zM19,5L2,5v2h17L19,5zM2,15h13v-2L2,13v2zM17,13v6l5,-3 -5,-3z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_questionmark.xml b/core/src/main/res/drawable/ic_questionmark.xml new file mode 100644 index 000000000..d00e3ae0d --- /dev/null +++ b/core/src/main/res/drawable/ic_questionmark.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_questionmark_black.xml b/core/src/main/res/drawable/ic_questionmark_black.xml deleted file mode 100644 index 8a187e813..000000000 --- a/core/src/main/res/drawable/ic_questionmark_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_questionmark_white.xml b/core/src/main/res/drawable/ic_questionmark_white.xml deleted file mode 100644 index d7a5ba7bf..000000000 --- a/core/src/main/res/drawable/ic_questionmark_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M11,18H13V16H11V18M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2M12,20C7.59,20 4,16.41 4,12C4,7.59 7.59,4 12,4C16.41,4 20,7.59 20,12C20,16.41 16.41,20 12,20M12,6A4,4 0 0,0 8,10H10A2,2 0 0,1 12,8A2,2 0 0,1 14,10C14,12 11,11.75 11,15H13C13,12.75 16,12.5 16,10A4,4 0 0,0 12,6Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_refresh.xml b/core/src/main/res/drawable/ic_refresh.xml new file mode 100644 index 000000000..487ceb3a1 --- /dev/null +++ b/core/src/main/res/drawable/ic_refresh.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_refresh_black.xml b/core/src/main/res/drawable/ic_refresh_black.xml index 59d1caca4..3d96b1739 100644 --- a/core/src/main/res/drawable/ic_refresh_black.xml +++ b/core/src/main/res/drawable/ic_refresh_black.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" 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="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> + <path android:fillColor="#000000" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> </vector> diff --git a/core/src/main/res/drawable/ic_refresh_white.xml b/core/src/main/res/drawable/ic_refresh_white.xml deleted file mode 100644 index c6e841f57..000000000 --- a/core/src/main/res/drawable/ic_refresh_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_remove_black.xml b/core/src/main/res/drawable/ic_remove.xml index c988cb5f3..da2ea9f1a 100644 --- a/core/src/main/res/drawable/ic_remove_black.xml +++ b/core/src/main/res/drawable/ic_remove.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" 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,13H5v-2h14v2z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M19,13H5v-2h14v2z"/> </vector> diff --git a/core/src/main/res/drawable/ic_remove_white.xml b/core/src/main/res/drawable/ic_remove_white.xml deleted file mode 100644 index d812091fb..000000000 --- a/core/src/main/res/drawable/ic_remove_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M19,13H5v-2h14v2z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_av_replay_black_48dp.xml b/core/src/main/res/drawable/ic_replay.xml index 1446ae48b..b7442ff27 100644 --- a/core/src/main/res/drawable/ic_av_replay_black_48dp.xml +++ b/core/src/main/res/drawable/ic_replay.xml @@ -5,5 +5,5 @@ android:height="48dp"> <path android:pathData="M12 5V1L7 6l5 5V7c3.31 0 6 2.69 6 6s-2.69 6 -6 6 -6 -2.69 -6 -6H4c0 4.42 3.58 8 8 8s8 -3.58 8 -8 -3.58 -8 -8 -8z" - android:fillColor="#000000" /> + android:fillColor="?attr/action_icon_color" /> </vector> diff --git a/core/src/main/res/drawable/ic_search.xml b/core/src/main/res/drawable/ic_search.xml new file mode 100644 index 000000000..d21ba4894 --- /dev/null +++ b/core/src/main/res/drawable/ic_search.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" 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"/> +</vector> diff --git a/core/src/main/res/drawable/ic_search_black.xml b/core/src/main/res/drawable/ic_search_black.xml deleted file mode 100644 index 272c0e746..000000000 --- a/core/src/main/res/drawable/ic_search_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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.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"/> -</vector> diff --git a/core/src/main/res/drawable/ic_search_white.xml b/core/src/main/res/drawable/ic_search_white.xml deleted file mode 100644 index 7d86ce939..000000000 --- a/core/src/main/res/drawable/ic_search_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" 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"/> -</vector> diff --git a/core/src/main/res/drawable/ic_select_all_black.xml b/core/src/main/res/drawable/ic_select_all.xml index 68702c1fe..29e4dbfff 100644 --- a/core/src/main/res/drawable/ic_select_all_black.xml +++ b/core/src/main/res/drawable/ic_select_all.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FF000000" + android:fillColor="?attr/action_icon_color" android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/> </vector> diff --git a/core/src/main/res/drawable/ic_select_all_white.xml b/core/src/main/res/drawable/ic_select_all_white.xml deleted file mode 100644 index 0fc49c923..000000000 --- a/core/src/main/res/drawable/ic_select_all_white.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FFFFFFFF" - android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_select_none_white.xml b/core/src/main/res/drawable/ic_select_none.xml index 3e1f6b884..c2b3cd481 100644 --- a/core/src/main/res/drawable/ic_select_none_white.xml +++ b/core/src/main/res/drawable/ic_select_none.xml @@ -4,8 +4,8 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="#FFFFFFFF" + android:fillColor="?attr/action_icon_color" android:pathData="m3,5l2,0l0,-2c-1.1,0 -2,0.9 -2,2zm0,8l2,0l0,-2l-2,0l0,2zm4,8l2,0l0,-2l-2,0l0,2zm-4,-12l2,0l0,-2l-2,0l0,2zm10,-6l-2,0l0,2l2,0l0,-2zm6,0l0,2l2,0c0,-1.1 -0.9,-2 -2,-2zm-14,18l0,-2l-2,0c0,1.1 0.9,2 2,2zm-2,-4l2,0l0,-2l-2,0l0,2zm6,-14l-2,0l0,2l2,0l0,-2zm2,18l2,0l0,-2l-2,0l0,2zm8,-8l2,0l0,-2l-2,0l0,2zm0,8c1.1,0 2,-0.9 2,-2l-2,0l0,2zm0,-12l2,0l0,-2l-2,0l0,2zm0,8l2,0l0,-2l-2,0l0,2zm-4,4l2,0l0,-2l-2,0l0,2zm0,-16l2,0l0,-2l-2,0l0,2z"/> - <path android:fillColor="#FFFFFFFF" + <path android:fillColor="?attr/action_icon_color" android:pathData="M17,8.41L15.59,7 12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12z"/> </vector> diff --git a/core/src/main/res/drawable/ic_select_none_black.xml b/core/src/main/res/drawable/ic_select_none_black.xml deleted file mode 100644 index 6d4ff62fa..000000000 --- a/core/src/main/res/drawable/ic_select_none_black.xml +++ /dev/null @@ -1,11 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="m3,5l2,0l0,-2c-1.1,0 -2,0.9 -2,2zm0,8l2,0l0,-2l-2,0l0,2zm4,8l2,0l0,-2l-2,0l0,2zm-4,-12l2,0l0,-2l-2,0l0,2zm10,-6l-2,0l0,2l2,0l0,-2zm6,0l0,2l2,0c0,-1.1 -0.9,-2 -2,-2zm-14,18l0,-2l-2,0c0,1.1 0.9,2 2,2zm-2,-4l2,0l0,-2l-2,0l0,2zm6,-14l-2,0l0,2l2,0l0,-2zm2,18l2,0l0,-2l-2,0l0,2zm8,-8l2,0l0,-2l-2,0l0,2zm0,8c1.1,0 2,-0.9 2,-2l-2,0l0,2zm0,-12l2,0l0,-2l-2,0l0,2zm0,8l2,0l0,-2l-2,0l0,2zm-4,4l2,0l0,-2l-2,0l0,2zm0,-16l2,0l0,-2l-2,0l0,2z"/> - <path android:fillColor="#FF000000" - android:pathData="M17,8.41L15.59,7 12,10.59 8.41,7 7,8.41 10.59,12 7,15.59 8.41,17 12,13.41 15.59,17 17,15.59 13.41,12z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_settings.xml b/core/src/main/res/drawable/ic_settings.xml new file mode 100644 index 000000000..ea655eaa9 --- /dev/null +++ b/core/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M12,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M10,22C9.75,22 9.54,21.82 9.5,21.58L9.13,18.93C8.5,18.68 7.96,18.34 7.44,17.94L4.95,18.95C4.73,19.03 4.46,18.95 4.34,18.73L2.34,15.27C2.21,15.05 2.27,14.78 2.46,14.63L4.57,12.97L4.5,12L4.57,11L2.46,9.37C2.27,9.22 2.21,8.95 2.34,8.73L4.34,5.27C4.46,5.05 4.73,4.96 4.95,5.05L7.44,6.05C7.96,5.66 8.5,5.32 9.13,5.07L9.5,2.42C9.54,2.18 9.75,2 10,2H14C14.25,2 14.46,2.18 14.5,2.42L14.87,5.07C15.5,5.32 16.04,5.66 16.56,6.05L19.05,5.05C19.27,4.96 19.54,5.05 19.66,5.27L21.66,8.73C21.79,8.95 21.73,9.22 21.54,9.37L19.43,11L19.5,12L19.43,13L21.54,14.63C21.73,14.78 21.79,15.05 21.66,15.27L19.66,18.73C19.54,18.95 19.27,19.04 19.05,18.95L16.56,17.95C16.04,18.34 15.5,18.68 14.87,18.93L14.5,21.58C14.46,21.82 14.25,22 14,22H10M11.25,4L10.88,6.61C9.68,6.86 8.62,7.5 7.85,8.39L5.44,7.35L4.69,8.65L6.8,10.2C6.4,11.37 6.4,12.64 6.8,13.8L4.68,15.36L5.43,16.66L7.86,15.62C8.63,16.5 9.68,17.14 10.87,17.38L11.24,20H12.76L13.13,17.39C14.32,17.14 15.37,16.5 16.14,15.62L18.57,16.66L19.32,15.36L17.2,13.81C17.6,12.64 17.6,11.37 17.2,10.2L19.31,8.65L18.56,7.35L16.15,8.39C15.38,7.5 14.32,6.86 13.12,6.62L12.75,4H11.25Z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_settings_black.xml b/core/src/main/res/drawable/ic_settings_black.xml deleted file mode 100644 index 8b2b9f733..000000000 --- a/core/src/main/res/drawable/ic_settings_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,8A4,4 0 0,1 16,12A4,4 0 0,1 12,16A4,4 0 0,1 8,12A4,4 0 0,1 12,8M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M10,22C9.75,22 9.54,21.82 9.5,21.58L9.13,18.93C8.5,18.68 7.96,18.34 7.44,17.94L4.95,18.95C4.73,19.03 4.46,18.95 4.34,18.73L2.34,15.27C2.21,15.05 2.27,14.78 2.46,14.63L4.57,12.97L4.5,12L4.57,11L2.46,9.37C2.27,9.22 2.21,8.95 2.34,8.73L4.34,5.27C4.46,5.05 4.73,4.96 4.95,5.05L7.44,6.05C7.96,5.66 8.5,5.32 9.13,5.07L9.5,2.42C9.54,2.18 9.75,2 10,2H14C14.25,2 14.46,2.18 14.5,2.42L14.87,5.07C15.5,5.32 16.04,5.66 16.56,6.05L19.05,5.05C19.27,4.96 19.54,5.05 19.66,5.27L21.66,8.73C21.79,8.95 21.73,9.22 21.54,9.37L19.43,11L19.5,12L19.43,13L21.54,14.63C21.73,14.78 21.79,15.05 21.66,15.27L19.66,18.73C19.54,18.95 19.27,19.04 19.05,18.95L16.56,17.95C16.04,18.34 15.5,18.68 14.87,18.93L14.5,21.58C14.46,21.82 14.25,22 14,22H10M11.25,4L10.88,6.61C9.68,6.86 8.62,7.5 7.85,8.39L5.44,7.35L4.69,8.65L6.8,10.2C6.4,11.37 6.4,12.64 6.8,13.8L4.68,15.36L5.43,16.66L7.86,15.62C8.63,16.5 9.68,17.14 10.87,17.38L11.24,20H12.76L13.13,17.39C14.32,17.14 15.37,16.5 16.14,15.62L18.57,16.66L19.32,15.36L17.2,13.81C17.6,12.64 17.6,11.37 17.2,10.2L19.31,8.65L18.56,7.35L16.15,8.39C15.38,7.5 14.32,6.86 13.12,6.62L12.75,4H11.25Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_share_white.xml b/core/src/main/res/drawable/ic_share.xml index ae1b3d12b..574707dd9 100644 --- a/core/src/main/res/drawable/ic_share_white.xml +++ b/core/src/main/res/drawable/ic_share.xml @@ -2,6 +2,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> <path - android:fillColor="#FFFFFFFF" + android:fillColor="?attr/action_icon_color" 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/core/src/main/res/drawable/ic_share_black.xml b/core/src/main/res/drawable/ic_share_black.xml deleted file mode 100644 index f396c50de..000000000 --- a/core/src/main/res/drawable/ic_share_black.xml +++ /dev/null @@ -1,7 +0,0 @@ -<vector android:height="24dp" - 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,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/core/src/main/res/drawable/ic_av_play_black_24dp.xml b/core/src/main/res/drawable/ic_skip_24dp.xml index a93221fb6..76d0976f0 100644 --- a/core/src/main/res/drawable/ic_av_play_black_24dp.xml +++ b/core/src/main/res/drawable/ic_skip_24dp.xml @@ -3,5 +3,5 @@ android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - <path android:fillColor="#FF000000" android:pathData="M8,5v14l11,-7z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/> </vector> diff --git a/core/src/main/res/drawable/ic_av_pause_black_48dp.xml b/core/src/main/res/drawable/ic_skip_48dp.xml index c5bf76f38..9e4b00ef0 100644 --- a/core/src/main/res/drawable/ic_av_pause_black_48dp.xml +++ b/core/src/main/res/drawable/ic_skip_48dp.xml @@ -3,5 +3,5 @@ android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - <path android:fillColor="#FF000000" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/> </vector> diff --git a/core/src/main/res/drawable/ic_sleep.xml b/core/src/main/res/drawable/ic_sleep.xml new file mode 100644 index 000000000..e0ef41607 --- /dev/null +++ b/core/src/main/res/drawable/ic_sleep.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_sleep_black.xml b/core/src/main/res/drawable/ic_sleep_black.xml deleted file mode 100644 index f30d5209f..000000000 --- a/core/src/main/res/drawable/ic_sleep_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_sleep_off.xml b/core/src/main/res/drawable/ic_sleep_off.xml new file mode 100644 index 000000000..a9a6f78d0 --- /dev/null +++ b/core/src/main/res/drawable/ic_sleep_off.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M2,5.27L3.28,4L20,20.72L18.73,22L12.73,16H9V14L9.79,13.06L2,5.27M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M9.82,8H15V10L13.54,11.72L9.82,8M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_sleep_off_black.xml b/core/src/main/res/drawable/ic_sleep_off_black.xml deleted file mode 100644 index a45f2b91d..000000000 --- a/core/src/main/res/drawable/ic_sleep_off_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,5.27L3.28,4L20,20.72L18.73,22L12.73,16H9V14L9.79,13.06L2,5.27M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M9.82,8H15V10L13.54,11.72L9.82,8M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_sleep_off_white.xml b/core/src/main/res/drawable/ic_sleep_off_white.xml deleted file mode 100644 index e06505a9f..000000000 --- a/core/src/main/res/drawable/ic_sleep_off_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M2,5.27L3.28,4L20,20.72L18.73,22L12.73,16H9V14L9.79,13.06L2,5.27M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M9.82,8H15V10L13.54,11.72L9.82,8M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_sleep_white.xml b/core/src/main/res/drawable/ic_sleep_white.xml deleted file mode 100644 index 11678c89b..000000000 --- a/core/src/main/res/drawable/ic_sleep_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M23,12H17V10L20.39,6H17V4H23V6L19.62,10H23V12M15,16H9V14L12.39,10H9V8H15V10L11.62,14H15V16M7,20H1V18L4.39,14H1V12H7V14L3.62,18H7V20Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_sliders.xml b/core/src/main/res/drawable/ic_sliders.xml new file mode 100644 index 000000000..c6f3de7b4 --- /dev/null +++ b/core/src/main/res/drawable/ic_sliders.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M3,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_sliders_black.xml b/core/src/main/res/drawable/ic_sliders_black.xml deleted file mode 100644 index fe3a3476f..000000000 --- a/core/src/main/res/drawable/ic_sliders_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_sliders_white.xml b/core/src/main/res/drawable/ic_sliders_white.xml deleted file mode 100644 index c74b7e494..000000000 --- a/core/src/main/res/drawable/ic_sliders_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M3,17V19H9V17H3M3,5V7H13V5H3M13,21V19H21V17H13V15H11V21H13M7,9V11H3V13H7V15H9V9H7M21,13V11H11V13H21M15,9H17V7H21V5H17V3H15V9Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_bookmark_black_24dp.xml b/core/src/main/res/drawable/ic_sort.xml index 6af633f12..5a43ea587 100644 --- a/core/src/main/res/drawable/ic_bookmark_black_24dp.xml +++ b/core/src/main/res/drawable/ic_sort.xml @@ -1,5 +1,5 @@ <vector android:height="24dp" 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="M17,3H7c-1.1,0 -1.99,0.9 -1.99,2L5,21l7,-3 7,3V5c0,-1.1 -0.9,-2 -2,-2z"/> + <path android:fillColor="?attr/action_icon_color" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/> </vector> diff --git a/core/src/main/res/drawable/ic_sort_black.xml b/core/src/main/res/drawable/ic_sort_black.xml deleted file mode 100644 index f3f46335d..000000000 --- a/core/src/main/res/drawable/ic_sort_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_sort_white.xml b/core/src/main/res/drawable/ic_sort_white.xml deleted file mode 100644 index 9b76aab9f..000000000 --- a/core/src/main/res/drawable/ic_sort_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_star.xml b/core/src/main/res/drawable/ic_star.xml new file mode 100644 index 000000000..66cba0557 --- /dev/null +++ b/core/src/main/res/drawable/ic_star.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_star_black.xml b/core/src/main/res/drawable/ic_star_black.xml deleted file mode 100644 index d0f1012ca..000000000 --- a/core/src/main/res/drawable/ic_star_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_star_border.xml b/core/src/main/res/drawable/ic_star_border.xml new file mode 100644 index 000000000..d4f68de44 --- /dev/null +++ b/core/src/main/res/drawable/ic_star_border.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_star_border_black.xml b/core/src/main/res/drawable/ic_star_border_black.xml deleted file mode 100644 index 5e9f484c4..000000000 --- a/core/src/main/res/drawable/ic_star_border_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_star_border_white.xml b/core/src/main/res/drawable/ic_star_border_white.xml deleted file mode 100644 index 6df0e2919..000000000 --- a/core/src/main/res/drawable/ic_star_border_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_star_white.xml b/core/src/main/res/drawable/ic_star_white.xml deleted file mode 100644 index c8a628241..000000000 --- a/core/src/main/res/drawable/ic_star_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_statistics.xml b/core/src/main/res/drawable/ic_statistics.xml new file mode 100644 index 000000000..77272a527 --- /dev/null +++ b/core/src/main/res/drawable/ic_statistics.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M13,2.05V5.08C16.39,5.57 19,8.47 19,12C19,12.9 18.82,13.75 18.5,14.54L21.12,16.07C21.68,14.83 22,13.45 22,12C22,6.82 18.05,2.55 13,2.05M12,19A7,7 0 0,1 5,12C5,8.47 7.61,5.57 11,5.08V2.05C5.94,2.55 2,6.81 2,12A10,10 0 0,0 12,22C15.3,22 18.23,20.39 20.05,17.91L17.45,16.38C16.17,18 14.21,19 12,19Z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_statistics_black.xml b/core/src/main/res/drawable/ic_statistics_black.xml deleted file mode 100644 index f5e7f7153..000000000 --- a/core/src/main/res/drawable/ic_statistics_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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="M13,2.05V5.08C16.39,5.57 19,8.47 19,12C19,12.9 18.82,13.75 18.5,14.54L21.12,16.07C21.68,14.83 22,13.45 22,12C22,6.82 18.05,2.55 13,2.05M12,19A7,7 0 0,1 5,12C5,8.47 7.61,5.57 11,5.08V2.05C5.94,2.55 2,6.81 2,12A10,10 0 0,0 12,22C15.3,22 18.23,20.39 20.05,17.91L17.45,16.38C16.17,18 14.21,19 12,19Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_statistics_white.xml b/core/src/main/res/drawable/ic_statistics_white.xml deleted file mode 100644 index 7d180b568..000000000 --- a/core/src/main/res/drawable/ic_statistics_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M13,2.05V5.08C16.39,5.57 19,8.47 19,12C19,12.9 18.82,13.75 18.5,14.54L21.12,16.07C21.68,14.83 22,13.45 22,12C22,6.82 18.05,2.55 13,2.05M12,19A7,7 0 0,1 5,12C5,8.47 7.61,5.57 11,5.08V2.05C5.94,2.55 2,6.81 2,12A10,10 0 0,0 12,22C15.3,22 18.23,20.39 20.05,17.91L17.45,16.38C16.17,18 14.21,19 12,19Z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_storage.xml b/core/src/main/res/drawable/ic_storage.xml new file mode 100644 index 000000000..8b0c76c11 --- /dev/null +++ b/core/src/main/res/drawable/ic_storage.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_storage_black.xml b/core/src/main/res/drawable/ic_storage_black.xml deleted file mode 100644 index 89a6417f5..000000000 --- a/core/src/main/res/drawable/ic_storage_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_storage_white.xml b/core/src/main/res/drawable/ic_storage_white.xml deleted file mode 100644 index db7e76bd5..000000000 --- a/core/src/main/res/drawable/ic_storage_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M18,2h-8L4.02,8 4,20c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM12,8h-2L10,4h2v4zM15,8h-2L13,4h2v4zM18,8h-2L16,4h2v4z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_stream_black.xml b/core/src/main/res/drawable/ic_stream.xml index 26b473a35..cbc40701a 100644 --- a/core/src/main/res/drawable/ic_stream_black.xml +++ b/core/src/main/res/drawable/ic_stream.xml @@ -4,11 +4,11 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="#FF000000" + android:fillColor="?attr/action_icon_color" android:pathData="m20.5099,12.0219c0,-1.41 -1.143,-2.553 -2.553,-2.553h-1.2765v-0.4255c0,-2.5849 -2.0955,-4.6804 -4.6804,-4.6804 -2.1275,0 -3.9401,1.4382 -4.5017,3.4039H6.8941c-1.8799,0 -3.4039,1.524 -3.4039,3.4039 0,1.8799 1.524,3.4039 3.4039,3.4039h2.553v1.702H6.8941c-2.8199,0 -5.1059,-2.286 -5.1059,-5.1059 0,-2.6381 1.9913,-4.7996 4.5528,-5.0719C7.4047,4.0566 9.5407,2.661 12,2.661c3.0976,0 5.6761,2.2041 6.2633,5.14 2.2041,0.1532 3.9486,1.9743 3.9486,4.2209 0,1.4041 -0.6445,2.3463 -1.5471,3.1885 -0.4185,-0.2876 -0.8313,-0.5368 -1.3724,-0.8908 1.092,-0.8808 1.2175,-1.8722 1.2175,-2.2977z" android:strokeWidth="0.85098612"/> <path - android:fillColor="#FF000000" + android:fillColor="?attr/action_icon_color" android:pathData="m12.2085,13.3476v9.4907l7.4569,-4.7453z" android:strokeWidth="0.67790419"/> </vector> diff --git a/core/src/main/res/drawable/ic_videocam_black_24dp.xml b/core/src/main/res/drawable/ic_videocam.xml index 86283557e..fd4adb0e4 100644 --- a/core/src/main/res/drawable/ic_videocam_black_24dp.xml +++ b/core/src/main/res/drawable/ic_videocam.xml @@ -3,6 +3,6 @@ android:width="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - <path android:fillColor="#FF000000" + <path android:fillColor="?attr/action_icon_color" android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/> </vector> diff --git a/core/src/main/res/drawable/ic_videocam_white_24dp.xml b/core/src/main/res/drawable/ic_videocam_white_24dp.xml deleted file mode 100644 index a8cfd71e3..000000000 --- a/core/src/main/res/drawable/ic_videocam_white_24dp.xml +++ /dev/null @@ -1,8 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:height="24dp" - android:width="24dp" - android:viewportHeight="24.0" - android:viewportWidth="24.0"> - <path android:fillColor="#FFFFFFFF" - android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_volume_adaption_white.xml b/core/src/main/res/drawable/ic_volume_adaption.xml index 27d7c6e7b..0ebaceea2 100644 --- a/core/src/main/res/drawable/ic_volume_adaption_white.xml +++ b/core/src/main/res/drawable/ic_volume_adaption.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> <path - android:fillColor="#FFFFFFFF" + android:fillColor="?attr/action_icon_color" android:pathData="M14,3.23V5.29C16.89,6.15 19,8.83 19,12C19,15.17 16.89,17.84 14,18.7V20.77C18,19.86 21,16.28 21,12C21,7.72 18,4.14 14,3.23M16.5,12C16.5,10.23 15.5,8.71 14,7.97V16C15.5,15.29 16.5,13.76 16.5,12M3,9V15H7L12,20V4L7,9H3Z" /> </vector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/ic_volume_adaption_black.xml b/core/src/main/res/drawable/ic_volume_adaption_black.xml deleted file mode 100644 index 5aac62e0a..000000000 --- a/core/src/main/res/drawable/ic_volume_adaption_black.xml +++ /dev/null @@ -1,9 +0,0 @@ -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24" - android:viewportHeight="24"> - <path - android:fillColor="#FF000000" - android:pathData="M14,3.23V5.29C16.89,6.15 19,8.83 19,12C19,15.17 16.89,17.84 14,18.7V20.77C18,19.86 21,16.28 21,12C21,7.72 18,4.14 14,3.23M16.5,12C16.5,10.23 15.5,8.71 14,7.97V16C15.5,15.29 16.5,13.76 16.5,12M3,9V15H7L12,20V4L7,9H3Z" /> -</vector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/ic_web.xml b/core/src/main/res/drawable/ic_web.xml new file mode 100644 index 000000000..2212102a2 --- /dev/null +++ b/core/src/main/res/drawable/ic_web.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" + android:viewportHeight="24.0" android:viewportWidth="24.0" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="?attr/action_icon_color" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_web_black.xml b/core/src/main/res/drawable/ic_web_black.xml deleted file mode 100644 index 0ad45e031..000000000 --- a/core/src/main/res/drawable/ic_web_black.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - 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,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/> -</vector> diff --git a/core/src/main/res/drawable/ic_web_white.xml b/core/src/main/res/drawable/ic_web_white.xml deleted file mode 100644 index 02dab111c..000000000 --- a/core/src/main/res/drawable/ic_web_white.xml +++ /dev/null @@ -1,5 +0,0 @@ -<vector android:height="24dp" - android:viewportHeight="24.0" android:viewportWidth="24.0" - android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> - <path android:fillColor="#FFFFFFFF" android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/> -</vector> diff --git a/core/src/main/res/layout/more_content_list_footer.xml b/core/src/main/res/layout/more_content_list_footer.xml index f6d6a313c..2869ef7de 100644 --- a/core/src/main/res/layout/more_content_list_footer.xml +++ b/core/src/main/res/layout/more_content_list_footer.xml @@ -16,7 +16,7 @@ android:layout_height="16dp" android:layout_gravity="center" android:contentDescription="@string/load_next_page_label" - app:srcCompat="?attr/ic_load_more" /> + app:srcCompat="@drawable/ic_load_more" /> <ProgressBar android:id="@+id/progBar" diff --git a/core/src/main/res/layout/player_widget.xml b/core/src/main/res/layout/player_widget.xml index ab42e4cb4..ec8472517 100644 --- a/core/src/main/res/layout/player_widget.xml +++ b/core/src/main/res/layout/player_widget.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" @@ -23,7 +24,7 @@ android:background="?android:attr/selectableItemBackground" android:scaleType="fitCenter" android:padding="8dp" - android:src="@drawable/ic_av_play_white_24dp" /> + app:srcCompat="@drawable/ic_play_24dp" /> <LinearLayout android:id="@+id/layout_left" @@ -41,7 +42,7 @@ android:id="@+id/imgvCover" android:layout_width="@android:dimen/app_icon_size" android:layout_height="match_parent" - android:src="@mipmap/ic_launcher_round" + app:srcCompat="@mipmap/ic_launcher_round" android:importantForAccessibility="no" android:layout_margin="12dp" /> @@ -98,7 +99,7 @@ android:layout_marginRight="2dp" android:layout_marginEnd="2dp" android:scaleType="fitXY" - android:src="@drawable/ic_av_fast_rewind_white_48dp"/> + app:srcCompat="@drawable/ic_fast_rewind"/> <ImageButton android:id="@+id/butPlayExtended" @@ -109,7 +110,7 @@ android:layout_marginRight="2dp" android:layout_marginEnd="2dp" android:scaleType="fitXY" - android:src="@drawable/ic_av_play_white_48dp"/> + app:srcCompat="@drawable/ic_play_48dp"/> <ImageButton android:id="@+id/butFastForward" @@ -120,7 +121,7 @@ android:layout_marginRight="2dp" android:layout_marginEnd="2dp" android:scaleType="fitXY" - android:src="@drawable/ic_av_fast_forward_white_48dp"/> + app:srcCompat="@drawable/ic_fast_forward"/> <ImageButton android:id="@+id/butSkip" @@ -131,7 +132,7 @@ android:layout_marginRight="2dp" android:layout_marginEnd="2dp" android:scaleType="fitXY" - android:src="@drawable/ic_av_skip_white_24dp"/> + app:srcCompat="@drawable/ic_skip_24dp"/> </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 545fe2c93..baab3be7a 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -1,68 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <attr name="action_about" format="reference"/> - <attr name="action_search" format="reference"/> - <attr name="action_stream" format="reference"/> - <attr name="av_download" format="reference"/> - <attr name="av_fast_forward" format="reference"/> - <attr name="av_pause" format="reference"/> - <attr name="av_play" format="reference"/> - <attr name="av_replay" format="reference"/> - <attr name="av_skip" format="reference"/> - <attr name="av_rewind" format="reference"/> - <attr name="ic_delete" format="reference"/> - <attr name="content_new" format="reference"/> - <attr name="content_remove_from_queue" format="reference"/> - <attr name="storage" format="reference"/> - <attr name="statistics" format="reference"/> - <attr name="feed" format="reference"/> - <attr name="location_web_site" format="reference"/> - <attr name="navigation_accept" format="reference"/> - <attr name="navigation_cancel" format="reference"/> - <attr name="ic_load_more" format="reference"/> - <attr name="navigation_refresh" format="reference"/> <attr name="navigation_up" format="reference"/> - <attr name="stat_playlist" format="reference"/> - <attr name="ic_folder" format="reference"/> - <attr name="type_video" format="reference"/> <attr name="dragview_background" format="reference"/> - <attr name="ic_history" format="reference"/> - <attr name="ic_sliders" format="reference"/> - <attr name="ic_settings_playback" format="reference"/> - <attr name="ic_settings" format="reference"/> - <attr name="ic_lock_open" format="reference"/> - <attr name="ic_lock_closed" format="reference"/> - <attr name="ic_filter" format="reference"/> <attr name="progressBarTheme" format="reference"/> - <attr name="ic_fav" format="reference"/> - <attr name="ic_unfav" format="reference"/> - <attr name="ic_sleep" format="reference"/> - <attr name="ic_sleep_off" format="reference"/> - <attr name="checkbox_multiple" format="reference"/> - <attr name="ic_select_all" format="reference"/> - <attr name="ic_select_none" format="reference"/> - <attr name="ic_sort" format="reference"/> - <attr name="ic_key" format="reference"/> - <attr name="ic_volume_adaption" format="reference"/> - <attr name="ic_network" format="reference"/> - <attr name="ic_appearance" format="reference"/> - <attr name="ic_questionmark" format="reference" /> - <attr name="ic_chat" format="reference"/> - <attr name="ic_bug" format="reference" /> <attr name="master_switch_background" format="color"/> <attr name="currently_playing_background" format="color"/> - <attr name="ic_bookmark" format="reference"/> - <attr name="ic_settings_speed" format="reference" /> - <attr name="ic_settings_skip" format="reference" /> <attr name="drawer_activated_color" format="color"/> - <attr name="batch_edit_fab_icon" format="reference"/> <attr name="action_icon_color" format="color"/> <attr name="scrollbar_thumb" format="reference"/> <attr name="background_elevated" format="color"/> <attr name="filter_dialog_clear" format="color"/> <attr name="filter_dialog_button_background" format="reference"/> - <attr name="ic_notifications" format="reference"/> <attr name="seek_background" format="color" /> - <attr name="ic_share" format="reference"/> - <attr name="ic_contribute" format="reference" /> </resources> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index 7e6a5cd1f..2f287155f 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -22,65 +22,11 @@ <item name="android:textAllCaps">false</item> <item name="android:textColorHint">@color/grey600</item> <item name="seek_background">@color/seek_background_light</item> - - <item name="storage">@drawable/ic_storage_black</item> - <item name="ic_network">@drawable/ic_network_black</item> - <item name="statistics">@drawable/ic_statistics_black</item> - <item name="action_about">@drawable/ic_info_black</item> - <item name="checkbox_multiple">@drawable/ic_check_multiple_black</item> - <item name="action_search">@drawable/ic_search_black</item> - <item name="action_stream">@drawable/ic_stream_black</item> - <item name="av_download">@drawable/ic_download_black</item> - <item name="av_pause">@drawable/ic_av_pause_black_48dp</item> - <item name="av_play">@drawable/ic_av_play_black_48dp</item> - <item name="av_replay">@drawable/ic_av_replay_black_48dp</item> - <item name="av_rewind">@drawable/ic_av_fast_rewind_black_48dp</item> - <item name="av_fast_forward">@drawable/ic_av_fast_forward_black_48dp</item> - <item name="av_skip">@drawable/ic_av_skip_black_48dp</item> - <item name="ic_settings_speed">@drawable/ic_playback_speed_black</item> - <item name="ic_settings_skip">@drawable/ic_av_skip_black_24dp</item> - <item name="ic_delete">@drawable/ic_delete_black</item> - <item name="content_new">@drawable/ic_add_black</item> - <item name="content_remove_from_queue">@drawable/ic_remove_black</item> - <item name="feed">@drawable/ic_feed_black</item> - <item name="location_web_site">@drawable/ic_web_black</item> - <item name="navigation_accept">@drawable/ic_check_black</item> - <item name="navigation_cancel">@drawable/ic_cancel_black</item> - <item name="ic_load_more">@drawable/ic_load_more_black</item> - <item name="navigation_refresh">@drawable/ic_refresh_black</item> <item name="navigation_up">@drawable/navigation_up</item> - <item name="stat_playlist">@drawable/ic_playlist_black</item> - <item name="type_video">@drawable/ic_videocam_black_24dp</item> <item name="dragview_background">@drawable/ic_drag_lighttheme</item> - <item name="ic_history">@drawable/ic_history_black</item> - <item name="ic_folder">@drawable/ic_folder_black</item> - <item name="ic_settings_playback">@drawable/ic_av_play_black_24dp</item> - <item name="ic_fav">@drawable/ic_star_border_black</item> - <item name="ic_unfav">@drawable/ic_star_black</item> - <item name="ic_settings">@drawable/ic_settings_black</item> - <item name="ic_lock_open">@drawable/ic_lock_open_black</item> - <item name="ic_lock_closed">@drawable/ic_lock_closed_black</item> - <item name="ic_filter">@drawable/ic_filter_black_24dp</item> - <item name="ic_sleep">@drawable/ic_sleep_black</item> - <item name="ic_sleep_off">@drawable/ic_sleep_off_black</item> - <item name="ic_select_all">@drawable/ic_select_all_black</item> - <item name="ic_select_none">@drawable/ic_select_none_black</item> - <item name="ic_sort">@drawable/ic_sort_black</item> - <item name="ic_sliders">@drawable/ic_sliders_black</item> - <item name="ic_appearance">@drawable/ic_appearance_black</item> - <item name="ic_questionmark">@drawable/ic_questionmark_black</item> - <item name="ic_chat">@drawable/ic_chat_black</item> - <item name="ic_bug">@drawable/ic_bug_black</item> - <item name="ic_bookmark">@drawable/ic_bookmark_black_24dp</item> - <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_white</item> - <item name="ic_key">@drawable/ic_key_black</item> - <item name="ic_volume_adaption">@drawable/ic_volume_adaption_black</item> <item name="scrollbar_thumb">@drawable/scrollbar_thumb_light</item> <item name="filter_dialog_clear">@color/filter_dialog_clear_light</item> <item name="filter_dialog_button_background">@drawable/filter_dialog_background_light</item> - <item name="ic_notifications">@drawable/ic_notifications_black</item> - <item name="ic_share">@drawable/ic_share_black</item> - <item name="ic_contribute">@drawable/ic_contribute_black</item> </style> <style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark"> @@ -105,65 +51,11 @@ <item name="android:textAllCaps">false</item> <item name="android:textColorHint">@color/medium_gray</item> <item name="seek_background">@color/seek_background_dark</item> - - <item name="storage">@drawable/ic_storage_white</item> - <item name="ic_network">@drawable/ic_network_white</item> - <item name="statistics">@drawable/ic_statistics_white</item> - <item name="action_about">@drawable/ic_info_white</item> - <item name="checkbox_multiple">@drawable/ic_check_multiple_white</item> - <item name="action_search">@drawable/ic_search_white</item> - <item name="action_stream">@drawable/ic_stream_white</item> - <item name="av_download">@drawable/ic_download_white</item> - <item name="av_rewind">@drawable/ic_av_fast_rewind_white_48dp</item> - <item name="av_fast_forward">@drawable/ic_av_fast_forward_white_48dp</item> - <item name="av_pause">@drawable/ic_av_pause_white_48dp</item> - <item name="av_play">@drawable/ic_av_play_white_48dp</item> - <item name="av_replay">@drawable/ic_av_replay_white_48dp</item> - <item name="av_skip">@drawable/ic_av_skip_white_48dp</item> - <item name="ic_settings_speed">@drawable/ic_playback_speed_white</item> - <item name="ic_settings_skip">@drawable/ic_av_skip_white_24dp</item> - <item name="ic_delete">@drawable/ic_delete_white</item> - <item name="content_new">@drawable/ic_add_white</item> - <item name="content_remove_from_queue">@drawable/ic_remove_white</item> - <item name="feed">@drawable/ic_feed_white</item> - <item name="location_web_site">@drawable/ic_web_white</item> - <item name="navigation_accept">@drawable/ic_check_white</item> - <item name="navigation_cancel">@drawable/ic_cancel_white</item> - <item name="ic_load_more">@drawable/ic_load_more_white</item> - <item name="navigation_refresh">@drawable/ic_refresh_white</item> <item name="navigation_up">@drawable/navigation_up_dark</item> - <item name="stat_playlist">@drawable/ic_playlist_white</item> - <item name="type_video">@drawable/ic_videocam_white_24dp</item> <item name="dragview_background">@drawable/ic_drag_darktheme</item> - <item name="ic_history">@drawable/ic_history_white</item> - <item name="ic_folder">@drawable/ic_folder_white</item> - <item name="ic_settings_playback">@drawable/ic_av_play_white_24dp</item> - <item name="ic_fav">@drawable/ic_star_border_white</item> - <item name="ic_unfav">@drawable/ic_star_white</item> - <item name="ic_settings">@drawable/ic_settings_white</item> - <item name="ic_lock_open">@drawable/ic_lock_open_white</item> - <item name="ic_lock_closed">@drawable/ic_lock_closed_white</item> - <item name="ic_filter">@drawable/ic_filter_white_24dp</item> - <item name="ic_sleep">@drawable/ic_sleep_white</item> - <item name="ic_sleep_off">@drawable/ic_sleep_off_white</item> - <item name="ic_select_all">@drawable/ic_select_all_white</item> - <item name="ic_select_none">@drawable/ic_select_none_white</item> - <item name="ic_sort">@drawable/ic_sort_white</item> - <item name="ic_sliders">@drawable/ic_sliders_white</item> - <item name="ic_appearance">@drawable/ic_appearance_white</item> - <item name="ic_questionmark">@drawable/ic_questionmark_white</item> - <item name="ic_chat">@drawable/ic_chat_white</item> - <item name="ic_bug">@drawable/ic_bug_white</item> - <item name="ic_bookmark">@drawable/ic_bookmark_white_24dp</item> - <item name="batch_edit_fab_icon">@drawable/ic_fab_edit_white</item> - <item name="ic_key">@drawable/ic_key_white</item> - <item name="ic_volume_adaption">@drawable/ic_volume_adaption_white</item> <item name="scrollbar_thumb">@drawable/scrollbar_thumb_dark</item> <item name="filter_dialog_clear">@color/filter_dialog_clear_dark</item> <item name="filter_dialog_button_background">@drawable/filter_dialog_background_dark</item> - <item name="ic_notifications">@drawable/ic_notifications_white</item> - <item name="ic_share">@drawable/ic_share_white</item> - <item name="ic_contribute">@drawable/ic_contribute_white</item> </style> <style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack"> diff --git a/settings.gradle b/settings.gradle index a87de1afa..d171277a4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,3 +3,4 @@ include ':core' include ':net:ssl' include ':ui:app-start-intent' include ':ui:common' +include ':ui:png-icons' diff --git a/ui/png-icons/README.md b/ui/png-icons/README.md new file mode 100644 index 000000000..c05a5348f --- /dev/null +++ b/ui/png-icons/README.md @@ -0,0 +1,3 @@ +# :ui:png-icons + +This module provides icon resources. It is necessary to support old Android versions that do not support VectorDrawables. The module generates png versions of all contained icons automatically. This is only needed for notification icons - for the icons within the app, appcompat handles drawing the vectors. diff --git a/ui/png-icons/build.gradle b/ui/png-icons/build.gradle new file mode 100644 index 000000000..cf13d882d --- /dev/null +++ b/ui/png-icons/build.gradle @@ -0,0 +1,52 @@ +apply plugin: "com.android.library" + +android { + compileSdkVersion rootProject.ext.compileSdkVersion + + defaultConfig { + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + + vectorDrawables.useSupportLibrary false + multiDexEnabled false + + testApplicationId "de.danoeh.antennapod.core.tests" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile("proguard-android.txt") + } + debug { + // debug build has method count over 64k single-dex threshold. + // For building debug build to use on Android < 21 (pre-Android 5) devices, + // you need to manually change class + // de.danoeh.antennapod.PodcastApp to extend MultiDexApplication . + // See Issue #2813 + multiDexEnabled true + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + testOptions { + unitTests { + includeAndroidResources = true + } + } + + lintOptions { + disable 'GradleDependency' + warningsAsErrors true + abortOnError true + } +} + +dependencies { + annotationProcessor "androidx.annotation:annotation:$annotationVersion" + implementation "androidx.appcompat:appcompat:$appcompatVersion" +} diff --git a/ui/png-icons/src/main/AndroidManifest.xml b/ui/png-icons/src/main/AndroidManifest.xml new file mode 100644 index 000000000..782f0aa5f --- /dev/null +++ b/ui/png-icons/src/main/AndroidManifest.xml @@ -0,0 +1 @@ +<manifest package="de.danoeh.antennapod.ui.pngicons" /> diff --git a/core/src/main/res/drawable/ic_notification_cast_off.xml b/ui/png-icons/src/main/res/drawable/ic_notification_cast_off.xml index 3e3accd0b..3e3accd0b 100644 --- a/core/src/main/res/drawable/ic_notification_cast_off.xml +++ b/ui/png-icons/src/main/res/drawable/ic_notification_cast_off.xml diff --git a/core/src/main/res/drawable/ic_notification_fast_forward.xml b/ui/png-icons/src/main/res/drawable/ic_notification_fast_forward.xml index 8ee82f4ed..8ee82f4ed 100644 --- a/core/src/main/res/drawable/ic_notification_fast_forward.xml +++ b/ui/png-icons/src/main/res/drawable/ic_notification_fast_forward.xml diff --git a/core/src/main/res/drawable/ic_notification_fast_rewind.xml b/ui/png-icons/src/main/res/drawable/ic_notification_fast_rewind.xml index 261ed7e6f..261ed7e6f 100644 --- a/core/src/main/res/drawable/ic_notification_fast_rewind.xml +++ b/ui/png-icons/src/main/res/drawable/ic_notification_fast_rewind.xml diff --git a/core/src/main/res/drawable/ic_key_white.xml b/ui/png-icons/src/main/res/drawable/ic_notification_key.xml index c8a817eeb..c8a817eeb 100644 --- a/core/src/main/res/drawable/ic_key_white.xml +++ b/ui/png-icons/src/main/res/drawable/ic_notification_key.xml diff --git a/core/src/main/res/drawable/ic_notification_pause.xml b/ui/png-icons/src/main/res/drawable/ic_notification_pause.xml index 16ebd4eab..16ebd4eab 100644 --- a/core/src/main/res/drawable/ic_notification_pause.xml +++ b/ui/png-icons/src/main/res/drawable/ic_notification_pause.xml diff --git a/core/src/main/res/drawable/ic_notification_play.xml b/ui/png-icons/src/main/res/drawable/ic_notification_play.xml index eb4acd983..eb4acd983 100644 --- a/core/src/main/res/drawable/ic_notification_play.xml +++ b/ui/png-icons/src/main/res/drawable/ic_notification_play.xml diff --git a/core/src/main/res/drawable/ic_notification_skip.xml b/ui/png-icons/src/main/res/drawable/ic_notification_skip.xml index 6bf03002a..6bf03002a 100644 --- a/core/src/main/res/drawable/ic_notification_skip.xml +++ b/ui/png-icons/src/main/res/drawable/ic_notification_skip.xml diff --git a/core/src/main/res/drawable/ic_stream_white.xml b/ui/png-icons/src/main/res/drawable/ic_notification_stream.xml index aca761365..aca761365 100644 --- a/core/src/main/res/drawable/ic_stream_white.xml +++ b/ui/png-icons/src/main/res/drawable/ic_notification_stream.xml diff --git a/core/src/main/res/drawable/ic_notification_sync.xml b/ui/png-icons/src/main/res/drawable/ic_notification_sync.xml index c42a78d7d..c42a78d7d 100644 --- a/core/src/main/res/drawable/ic_notification_sync.xml +++ b/ui/png-icons/src/main/res/drawable/ic_notification_sync.xml diff --git a/core/src/main/res/drawable/ic_notification_sync_error.xml b/ui/png-icons/src/main/res/drawable/ic_notification_sync_error.xml index b5be1b747..b5be1b747 100644 --- a/core/src/main/res/drawable/ic_notification_sync_error.xml +++ b/ui/png-icons/src/main/res/drawable/ic_notification_sync_error.xml |