diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java index 2a747bc9e..ae8634516 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java @@ -93,9 +93,6 @@ public class AudioplayerActivity extends MediaplayerInfoActivity { return; } super.setupGUI(); - if (butCastDisconnect != null) { - butCastDisconnect.setVisibility(View.GONE); - } if (butPlaybackSpeed != null) { butPlaybackSpeed.setOnClickListener(v -> { if (controller == null) { diff --git a/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java index c60c7b769..bbab235c8 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/CastplayerActivity.java @@ -51,10 +51,6 @@ public class CastplayerActivity extends MediaplayerInfoActivity { butPlaybackSpeed.setVisibility(View.GONE); txtvPlaybackSpeed.setVisibility(View.GONE); } -// if (butCastDisconnect != null) { -// butCastDisconnect.setOnClickListener(v -> castManager.disconnect()); -// butCastDisconnect.setVisibility(View.VISIBLE); -// } } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java index a5ae5e58c..c0ba75ba6 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java @@ -6,17 +6,9 @@ import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.content.res.TypedArray; -import android.graphics.Color; import android.graphics.PixelFormat; import android.os.Build; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.core.app.ActivityCompat; -import androidx.core.app.ActivityOptionsCompat; -import androidx.core.content.ContextCompat; -import androidx.appcompat.app.AlertDialog; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -27,11 +19,13 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; import android.widget.Toast; - +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.core.app.ActivityCompat; +import androidx.core.app.ActivityOptionsCompat; +import androidx.core.content.ContextCompat; import com.bumptech.glide.Glide; -import com.joanzapata.iconify.IconDrawable; -import com.joanzapata.iconify.fonts.FontAwesomeIcons; - import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.event.PlaybackPositionEvent; import de.danoeh.antennapod.core.feed.FeedItem; @@ -360,19 +354,6 @@ public abstract class MediaplayerActivity extends CastEnabledActivity implements menu.findItem(R.id.set_sleeptimer_item).setVisible(!controller.sleepTimerActive()); menu.findItem(R.id.disable_sleeptimer_item).setVisible(controller.sleepTimerActive()); - - if (this instanceof AudioplayerActivity) { - int[] attrs = {R.attr.action_bar_icon_color}; - TypedArray ta = obtainStyledAttributes(UserPreferences.getTheme(), attrs); - int textColor = ta.getColor(0, Color.GRAY); - ta.recycle(); - menu.findItem(R.id.audio_controls).setIcon(new IconDrawable(this, - FontAwesomeIcons.fa_sliders).color(textColor).actionBarSize()); - } else { - menu.findItem(R.id.audio_controls).setIcon(new IconDrawable(this, - FontAwesomeIcons.fa_sliders).color(0xffffffff).actionBarSize()); - } - return true; } diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java index 1e1aad712..162d4e489 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MediaplayerInfoActivity.java @@ -94,7 +94,6 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem PlaybackSpeedIndicatorView butPlaybackSpeed; TextView txtvPlaybackSpeed; - ImageButton butCastDisconnect; private DrawerLayout drawerLayout; private NavListAdapter navAdapter; private ListView navList; @@ -251,7 +250,6 @@ public abstract class MediaplayerInfoActivity extends MediaplayerActivity implem butPlaybackSpeed = findViewById(R.id.butPlaybackSpeed); txtvPlaybackSpeed = findViewById(R.id.txtvPlaybackSpeed); - butCastDisconnect = findViewById(R.id.butCastDisconnect); pager = findViewById(R.id.pager); pager.setOffscreenPageLimit(3); 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 8fb7aa73f..a1a4e0374 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -382,6 +382,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); return true; } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java index 307dabf14..b34963574 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java @@ -50,7 +50,7 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter { final FeedItem item = getItem(position); holder.bind(item); holder.dragHandle.setVisibility(View.GONE); - holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(activity, R.attr.content_discard)); + holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(activity, R.attr.ic_delete)); holder.secondaryActionButton.setOnClickListener(v -> itemAccess.onFeedItemSecondaryAction(item)); holder.hideSeparatorIfNecessary(); 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 7831c6450..4d1ae76a2 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 @@ -24,7 +24,7 @@ public class DeleteActionButton extends ItemActionButton { @Override @AttrRes public int getDrawable() { - return R.attr.content_discard; + return R.attr.ic_delete; } @Override 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 16337b00d..0305a7d48 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java @@ -153,7 +153,7 @@ public class DownloadLogFragment extends ListFragment { super.onCreateOptionsMenu(menu, inflater); MenuItem clearHistory = menu.add(Menu.NONE, R.id.clear_history_item, Menu.CATEGORY_CONTAINER, R.string.clear_history_label); MenuItemCompat.setShowAsAction(clearHistory, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); - TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.content_discard}); + TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.ic_delete}); clearHistory.setIcon(drawables.getDrawable(0)); drawables.recycle(); } 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 f57b83bb8..f9bc6642e 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java @@ -114,7 +114,7 @@ public class PlaybackHistoryFragment extends Fragment implements AdapterView.OnI super.onCreateOptionsMenu(menu, inflater); MenuItem clearHistory = menu.add(Menu.NONE, R.id.clear_history_item, Menu.CATEGORY_CONTAINER, R.string.clear_history_label); MenuItemCompat.setShowAsAction(clearHistory, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); - TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.content_discard}); + TypedArray drawables = getActivity().obtainStyledAttributes(new int[]{R.attr.ic_delete}); clearHistory.setIcon(drawables.getDrawable(0)); drawables.recycle(); } diff --git a/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java b/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java index 4b3c51cfc..c6b50e728 100644 --- a/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java +++ b/app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java @@ -1,13 +1,14 @@ package de.danoeh.antennapod.view; import android.content.Context; -import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.RectF; import android.util.AttributeSet; import android.view.View; import androidx.annotation.Nullable; +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.core.util.ThemeUtils; public class CircularProgressBar extends View { private static final float EPSILON = 0.005f; @@ -41,11 +42,9 @@ public class CircularProgressBar extends View { paintProgress.setStyle(Paint.Style.STROKE); paintProgress.setStrokeCap(Paint.Cap.ROUND); - int[] colorAttrs = new int[] { android.R.attr.textColorPrimary, android.R.attr.textColorSecondary }; - TypedArray a = getContext().obtainStyledAttributes(colorAttrs); - paintProgress.setColor(a.getColor(0, 0xffffffff)); - paintBackground.setColor(a.getColor(1, 0xffffffff)); - a.recycle(); + int color = ThemeUtils.getColorFromAttr(getContext(), R.attr.action_icon_color); + paintProgress.setColor(color); + paintBackground.setColor(color); } /** @@ -68,7 +67,7 @@ public class CircularProgressBar extends View { protected void onDraw(Canvas canvas) { super.onDraw(canvas); - float padding = getHeight() * 0.06f; + float padding = getHeight() * 0.07f; paintBackground.setStrokeWidth(getHeight() * 0.02f); paintProgress.setStrokeWidth(padding); RectF bounds = new RectF(padding, padding, getWidth() - padding, getHeight() - padding); diff --git a/app/src/main/res/layout/all_episodes_fragment.xml b/app/src/main/res/layout/all_episodes_fragment.xml index 2ccfe2494..ca84439da 100644 --- a/app/src/main/res/layout/all_episodes_fragment.xml +++ b/app/src/main/res/layout/all_episodes_fragment.xml @@ -29,10 +29,10 @@ android:paddingBottom="@dimen/list_vertical_padding" android:layout_above="@id/loadingMore" app:fastScrollEnabled="true" - app:fastScrollHorizontalThumbDrawable="@drawable/thumb_drawable" - app:fastScrollHorizontalTrackDrawable="@drawable/line_drawable" - app:fastScrollVerticalThumbDrawable="@drawable/thumb_drawable" - app:fastScrollVerticalTrackDrawable="@drawable/line_drawable" + app:fastScrollHorizontalThumbDrawable="@drawable/scrollbar_thumb_drawable" + app:fastScrollHorizontalTrackDrawable="@drawable/scrollbar_line_drawable" + app:fastScrollVerticalThumbDrawable="@drawable/scrollbar_thumb_drawable" + app:fastScrollVerticalTrackDrawable="@drawable/scrollbar_line_drawable" tools:itemCount="13" tools:listitem="@layout/feeditemlist_item" /> diff --git a/app/src/main/res/layout/empty_view_layout.xml b/app/src/main/res/layout/empty_view_layout.xml index 4ccbf45db..768f74c41 100644 --- a/app/src/main/res/layout/empty_view_layout.xml +++ b/app/src/main/res/layout/empty_view_layout.xml @@ -12,11 +12,10 @@ + android:textColor="?android:attr/textColorPrimary"/> @@ -65,7 +66,7 @@ android:layout_height="40dp" android:background="?attr/selectableItemBackground" android:contentDescription="@string/show_info_label" - android:src="@drawable/ic_info_white_24dp" + app:srcCompat="@drawable/ic_info_white" tools:background="@android:color/holo_green_dark" android:layout_marginLeft="-8dp" android:layout_marginStart="-8dp" @@ -78,7 +79,7 @@ android:layout_height="40dp" android:background="?attr/selectableItemBackground" android:contentDescription="@string/show_feed_settings_label" - android:src="@drawable/ic_settings_white_24dp" + app:srcCompat="@drawable/ic_settings_white" tools:background="@android:color/holo_green_dark" android:scaleType="fitXY" android:padding="8dp"/> diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index 6e2f2c43c..1bc18dc0a 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -99,21 +99,21 @@ android:layout_width="14sp" android:layout_height="14sp" app:srcCompat="?attr/type_video" - tools:srcCompat="@drawable/ic_videocam_grey600_24dp" + tools:srcCompat="@drawable/ic_videocam_black_24dp" android:id="@+id/ivIsVideo"/> + app:srcCompat="@drawable/ic_add_white"/> diff --git a/app/src/main/res/layout/mediaplayerinfo_activity.xml b/app/src/main/res/layout/mediaplayerinfo_activity.xml index 212d8b9d8..c46672ceb 100644 --- a/app/src/main/res/layout/mediaplayerinfo_activity.xml +++ b/app/src/main/res/layout/mediaplayerinfo_activity.xml @@ -167,7 +167,7 @@ android:layout_centerVertical="true" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/set_playback_speed_label" - tools:srcCompat="@drawable/ic_playback_speed_white_48dp" + tools:srcCompat="@drawable/ic_playback_speed_white" tools:visibility="gone" tools:background="@android:color/holo_green_dark" /> @@ -186,22 +186,6 @@ android:textColor="?android:attr/textColorSecondary" android:clickable="false" /> - - + app:srcCompat="?attr/storage" /> + xmlns:app="http://schemas.android.com/apk/res-auto"> + app:icon="?attr/content_new" + app:showAsAction="ifRoom|withText" /> + app:showAsAction="collapseActionView" /> diff --git a/app/src/main/res/menu/downloads_completed.xml b/app/src/main/res/menu/downloads_completed.xml index 9f297988d..8badc4927 100644 --- a/app/src/main/res/menu/downloads_completed.xml +++ b/app/src/main/res/menu/downloads_completed.xml @@ -1,9 +1,10 @@ - + + app:showAsAction="ifRoom" /> 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 39083e41b..370cedd90 100644 --- a/app/src/main/res/menu/episodes_apply_action_speeddial.xml +++ b/app/src/main/res/menu/episodes_apply_action_speeddial.xml @@ -6,7 +6,7 @@ visually it will be shown at the bottom of the list of actions. --> @@ -59,9 +60,8 @@ diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index ef7b9357f..8cd1b8be0 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -13,7 +13,7 @@ android:key="prefScreenInterface" android:title="@string/user_interface_label" android:summary="@string/user_interface_sum" - android:icon="?attr/ic_cellphone_text" /> + android:icon="?attr/ic_appearance" /> + android:icon="?attr/ic_network" /> + + diff --git a/core/src/main/res/drawable/ic_add_white.xml b/core/src/main/res/drawable/ic_add_white.xml new file mode 100644 index 000000000..3052692a0 --- /dev/null +++ b/core/src/main/res/drawable/ic_add_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_appearance_black.xml b/core/src/main/res/drawable/ic_appearance_black.xml new file mode 100644 index 000000000..7c574b336 --- /dev/null +++ b/core/src/main/res/drawable/ic_appearance_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_appearance_white.xml b/core/src/main/res/drawable/ic_appearance_white.xml new file mode 100644 index 000000000..882f47937 --- /dev/null +++ b/core/src/main/res/drawable/ic_appearance_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_av_fast_forward_dark_48dp.xml b/core/src/main/res/drawable/ic_av_fast_forward_black_48dp.xml similarity index 78% rename from core/src/main/res/drawable/ic_av_fast_forward_dark_48dp.xml rename to core/src/main/res/drawable/ic_av_fast_forward_black_48dp.xml index cf0faa33e..f55701e95 100644 --- a/core/src/main/res/drawable/ic_av_fast_forward_dark_48dp.xml +++ b/core/src/main/res/drawable/ic_av_fast_forward_black_48dp.xml @@ -3,5 +3,5 @@ android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - + diff --git a/core/src/main/res/drawable/ic_av_fast_rewind_dark_48dp.xml b/core/src/main/res/drawable/ic_av_fast_rewind_black_48dp.xml similarity index 79% rename from core/src/main/res/drawable/ic_av_fast_rewind_dark_48dp.xml rename to core/src/main/res/drawable/ic_av_fast_rewind_black_48dp.xml index 47d1189cb..e97e29955 100644 --- a/core/src/main/res/drawable/ic_av_fast_rewind_dark_48dp.xml +++ b/core/src/main/res/drawable/ic_av_fast_rewind_black_48dp.xml @@ -3,5 +3,5 @@ android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - + diff --git a/core/src/main/res/drawable/ic_av_pause_dark_48dp.xml b/core/src/main/res/drawable/ic_av_pause_black_48dp.xml similarity index 78% rename from core/src/main/res/drawable/ic_av_pause_dark_48dp.xml rename to core/src/main/res/drawable/ic_av_pause_black_48dp.xml index 61fdd4b5b..c5bf76f38 100644 --- a/core/src/main/res/drawable/ic_av_pause_dark_48dp.xml +++ b/core/src/main/res/drawable/ic_av_pause_black_48dp.xml @@ -3,5 +3,5 @@ android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - + diff --git a/core/src/main/res/drawable/ic_av_play_dark_24dp.xml b/core/src/main/res/drawable/ic_av_play_black_24dp.xml similarity index 76% rename from core/src/main/res/drawable/ic_av_play_dark_24dp.xml rename to core/src/main/res/drawable/ic_av_play_black_24dp.xml index 5bc12c0e1..a93221fb6 100644 --- a/core/src/main/res/drawable/ic_av_play_dark_24dp.xml +++ b/core/src/main/res/drawable/ic_av_play_black_24dp.xml @@ -3,5 +3,5 @@ android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - + diff --git a/core/src/main/res/drawable/ic_av_play_dark_48dp.xml b/core/src/main/res/drawable/ic_av_play_black_48dp.xml similarity index 76% rename from core/src/main/res/drawable/ic_av_play_dark_48dp.xml rename to core/src/main/res/drawable/ic_av_play_black_48dp.xml index dbe5e7104..2e0d011aa 100644 --- a/core/src/main/res/drawable/ic_av_play_dark_48dp.xml +++ b/core/src/main/res/drawable/ic_av_play_black_48dp.xml @@ -3,5 +3,5 @@ android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - + diff --git a/core/src/main/res/drawable/ic_av_skip_dark_48dp.xml b/core/src/main/res/drawable/ic_av_skip_black_48dp.xml similarity index 78% rename from core/src/main/res/drawable/ic_av_skip_dark_48dp.xml rename to core/src/main/res/drawable/ic_av_skip_black_48dp.xml index 2552f8d73..24a795dbc 100644 --- a/core/src/main/res/drawable/ic_av_skip_dark_48dp.xml +++ b/core/src/main/res/drawable/ic_av_skip_black_48dp.xml @@ -3,5 +3,5 @@ android:height="48dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - + diff --git a/core/src/main/res/drawable/ic_bookmark_grey600_24dp.xml b/core/src/main/res/drawable/ic_bookmark_black_24dp.xml similarity index 65% rename from core/src/main/res/drawable/ic_bookmark_grey600_24dp.xml rename to core/src/main/res/drawable/ic_bookmark_black_24dp.xml index d665d42a5..6af633f12 100644 --- a/core/src/main/res/drawable/ic_bookmark_grey600_24dp.xml +++ b/core/src/main/res/drawable/ic_bookmark_black_24dp.xml @@ -1,5 +1,5 @@ - - + diff --git a/core/src/main/res/drawable/ic_bookmark_white_24dp.xml b/core/src/main/res/drawable/ic_bookmark_white_24dp.xml index 02728b731..798df2d24 100644 --- a/core/src/main/res/drawable/ic_bookmark_white_24dp.xml +++ b/core/src/main/res/drawable/ic_bookmark_white_24dp.xml @@ -1,4 +1,4 @@ - diff --git a/core/src/main/res/drawable/ic_bug_black.xml b/core/src/main/res/drawable/ic_bug_black.xml new file mode 100644 index 000000000..59d6fa653 --- /dev/null +++ b/core/src/main/res/drawable/ic_bug_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_bug_white.xml b/core/src/main/res/drawable/ic_bug_white.xml new file mode 100644 index 000000000..c22514bfe --- /dev/null +++ b/core/src/main/res/drawable/ic_bug_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_cancel_black.xml b/core/src/main/res/drawable/ic_cancel_black.xml new file mode 100644 index 000000000..e254218af --- /dev/null +++ b/core/src/main/res/drawable/ic_cancel_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_cancel_white.xml b/core/src/main/res/drawable/ic_cancel_white.xml new file mode 100644 index 000000000..a5480c71f --- /dev/null +++ b/core/src/main/res/drawable/ic_cancel_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_chat_black.xml b/core/src/main/res/drawable/ic_chat_black.xml new file mode 100644 index 000000000..3f2692d39 --- /dev/null +++ b/core/src/main/res/drawable/ic_chat_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_chat_grey600.xml b/core/src/main/res/drawable/ic_chat_grey600.xml deleted file mode 100644 index ebae2dbed..000000000 --- a/core/src/main/res/drawable/ic_chat_grey600.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/core/src/main/res/drawable/ic_chat_white.xml b/core/src/main/res/drawable/ic_chat_white.xml index 45691c525..222615bfe 100644 --- a/core/src/main/res/drawable/ic_chat_white.xml +++ b/core/src/main/res/drawable/ic_chat_white.xml @@ -1,5 +1,5 @@ - + diff --git a/core/src/main/res/drawable/ic_check_black.xml b/core/src/main/res/drawable/ic_check_black.xml new file mode 100644 index 000000000..c4654dd52 --- /dev/null +++ b/core/src/main/res/drawable/ic_check_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_check_multiple_black.xml b/core/src/main/res/drawable/ic_check_multiple_black.xml new file mode 100644 index 000000000..a0a79299d --- /dev/null +++ b/core/src/main/res/drawable/ic_check_multiple_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_check_multiple_white.xml b/core/src/main/res/drawable/ic_check_multiple_white.xml new file mode 100644 index 000000000..777f6eb59 --- /dev/null +++ b/core/src/main/res/drawable/ic_check_multiple_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_check_white.xml b/core/src/main/res/drawable/ic_check_white.xml new file mode 100644 index 000000000..80651f6ee --- /dev/null +++ b/core/src/main/res/drawable/ic_check_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_delete_black.xml b/core/src/main/res/drawable/ic_delete_black.xml new file mode 100644 index 000000000..a4d94b247 --- /dev/null +++ b/core/src/main/res/drawable/ic_delete_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_delete_white.xml b/core/src/main/res/drawable/ic_delete_white.xml new file mode 100644 index 000000000..1f2b6e734 --- /dev/null +++ b/core/src/main/res/drawable/ic_delete_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_download_black.xml b/core/src/main/res/drawable/ic_download_black.xml new file mode 100644 index 000000000..0e0b47c88 --- /dev/null +++ b/core/src/main/res/drawable/ic_download_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_download_white.xml b/core/src/main/res/drawable/ic_download_white.xml new file mode 100644 index 000000000..8a9cfa3cd --- /dev/null +++ b/core/src/main/res/drawable/ic_download_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_feed_black.xml b/core/src/main/res/drawable/ic_feed_black.xml new file mode 100644 index 000000000..54c9286de --- /dev/null +++ b/core/src/main/res/drawable/ic_feed_black.xml @@ -0,0 +1,6 @@ + + + + diff --git a/core/src/main/res/drawable/ic_feed_white.xml b/core/src/main/res/drawable/ic_feed_white.xml new file mode 100644 index 000000000..da0139ff5 --- /dev/null +++ b/core/src/main/res/drawable/ic_feed_white.xml @@ -0,0 +1,6 @@ + + + + diff --git a/core/src/main/res/drawable/ic_filter_grey600_24dp.xml b/core/src/main/res/drawable/ic_filter_black_24dp.xml similarity index 88% rename from core/src/main/res/drawable/ic_filter_grey600_24dp.xml rename to core/src/main/res/drawable/ic_filter_black_24dp.xml index dc164504c..54c5123d7 100644 --- a/core/src/main/res/drawable/ic_filter_grey600_24dp.xml +++ b/core/src/main/res/drawable/ic_filter_black_24dp.xml @@ -3,5 +3,5 @@ android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + diff --git a/core/src/main/res/drawable/ic_folder_black.xml b/core/src/main/res/drawable/ic_folder_black.xml new file mode 100644 index 000000000..b1b259ba4 --- /dev/null +++ b/core/src/main/res/drawable/ic_folder_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_folder_white.xml b/core/src/main/res/drawable/ic_folder_white.xml new file mode 100644 index 000000000..91506ec4d --- /dev/null +++ b/core/src/main/res/drawable/ic_folder_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_history_black.xml b/core/src/main/res/drawable/ic_history_black.xml new file mode 100644 index 000000000..d7130c9a8 --- /dev/null +++ b/core/src/main/res/drawable/ic_history_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_history_white.xml b/core/src/main/res/drawable/ic_history_white.xml new file mode 100644 index 000000000..1ffb08b91 --- /dev/null +++ b/core/src/main/res/drawable/ic_history_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_info_black.xml b/core/src/main/res/drawable/ic_info_black.xml new file mode 100644 index 000000000..f52a15fb6 --- /dev/null +++ b/core/src/main/res/drawable/ic_info_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_info_white.xml b/core/src/main/res/drawable/ic_info_white.xml new file mode 100644 index 000000000..3abb510bb --- /dev/null +++ b/core/src/main/res/drawable/ic_info_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_key_grey600.xml b/core/src/main/res/drawable/ic_key_black.xml similarity index 90% rename from core/src/main/res/drawable/ic_key_grey600.xml rename to core/src/main/res/drawable/ic_key_black.xml index 71cc98f2f..2c78e7c39 100644 --- a/core/src/main/res/drawable/ic_key_grey600.xml +++ b/core/src/main/res/drawable/ic_key_black.xml @@ -1,6 +1,6 @@ - diff --git a/core/src/main/res/drawable/ic_load_more_black.xml b/core/src/main/res/drawable/ic_load_more_black.xml new file mode 100644 index 000000000..534478772 --- /dev/null +++ b/core/src/main/res/drawable/ic_load_more_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_load_more_white.xml b/core/src/main/res/drawable/ic_load_more_white.xml new file mode 100644 index 000000000..c47933164 --- /dev/null +++ b/core/src/main/res/drawable/ic_load_more_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_lock_closed_black.xml b/core/src/main/res/drawable/ic_lock_closed_black.xml new file mode 100644 index 000000000..63ea6d78d --- /dev/null +++ b/core/src/main/res/drawable/ic_lock_closed_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_lock_closed_white.xml b/core/src/main/res/drawable/ic_lock_closed_white.xml new file mode 100644 index 000000000..8c923f1d1 --- /dev/null +++ b/core/src/main/res/drawable/ic_lock_closed_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_lock_open_black.xml b/core/src/main/res/drawable/ic_lock_open_black.xml new file mode 100644 index 000000000..e91724c22 --- /dev/null +++ b/core/src/main/res/drawable/ic_lock_open_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_lock_open_white.xml b/core/src/main/res/drawable/ic_lock_open_white.xml new file mode 100644 index 000000000..87d5cf09a --- /dev/null +++ b/core/src/main/res/drawable/ic_lock_open_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_network_black.xml b/core/src/main/res/drawable/ic_network_black.xml new file mode 100644 index 000000000..d9be81776 --- /dev/null +++ b/core/src/main/res/drawable/ic_network_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_network_white.xml b/core/src/main/res/drawable/ic_network_white.xml new file mode 100644 index 000000000..cb90ee547 --- /dev/null +++ b/core/src/main/res/drawable/ic_network_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_playback_speed_dark_24dp.xml b/core/src/main/res/drawable/ic_playback_speed_black.xml similarity index 94% rename from core/src/main/res/drawable/ic_playback_speed_dark_24dp.xml rename to core/src/main/res/drawable/ic_playback_speed_black.xml index 456aeba71..81b1bdd5c 100644 --- a/core/src/main/res/drawable/ic_playback_speed_dark_24dp.xml +++ b/core/src/main/res/drawable/ic_playback_speed_black.xml @@ -4,5 +4,5 @@ android:width="24dp" android:viewportWidth="24" android:viewportHeight="24"> - + \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml b/core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml deleted file mode 100644 index de7ca9d78..000000000 --- a/core/src/main/res/drawable/ic_playback_speed_dark_48dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_playback_speed_white_24dp.xml b/core/src/main/res/drawable/ic_playback_speed_white.xml similarity index 100% rename from core/src/main/res/drawable/ic_playback_speed_white_24dp.xml rename to core/src/main/res/drawable/ic_playback_speed_white.xml diff --git a/core/src/main/res/drawable/ic_playback_speed_white_48dp.xml b/core/src/main/res/drawable/ic_playback_speed_white_48dp.xml deleted file mode 100644 index cc6af0d55..000000000 --- a/core/src/main/res/drawable/ic_playback_speed_white_48dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_playlist_black.xml b/core/src/main/res/drawable/ic_playlist_black.xml new file mode 100644 index 000000000..3cd963836 --- /dev/null +++ b/core/src/main/res/drawable/ic_playlist_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_playlist_white.xml b/core/src/main/res/drawable/ic_playlist_white.xml new file mode 100644 index 000000000..2b97e9d2b --- /dev/null +++ b/core/src/main/res/drawable/ic_playlist_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_questionmark_black.xml b/core/src/main/res/drawable/ic_questionmark_black.xml new file mode 100644 index 000000000..8a187e813 --- /dev/null +++ b/core/src/main/res/drawable/ic_questionmark_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_questionmark_grey600.xml b/core/src/main/res/drawable/ic_questionmark_grey600.xml deleted file mode 100644 index 0907fcdec..000000000 --- a/core/src/main/res/drawable/ic_questionmark_grey600.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/core/src/main/res/drawable/ic_questionmark_white.xml b/core/src/main/res/drawable/ic_questionmark_white.xml index 69b42fef8..d7a5ba7bf 100644 --- a/core/src/main/res/drawable/ic_questionmark_white.xml +++ b/core/src/main/res/drawable/ic_questionmark_white.xml @@ -1,5 +1,5 @@ - + diff --git a/core/src/main/res/drawable/ic_refresh_black.xml b/core/src/main/res/drawable/ic_refresh_black.xml new file mode 100644 index 000000000..59d1caca4 --- /dev/null +++ b/core/src/main/res/drawable/ic_refresh_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_refresh_white.xml b/core/src/main/res/drawable/ic_refresh_white.xml new file mode 100644 index 000000000..c6e841f57 --- /dev/null +++ b/core/src/main/res/drawable/ic_refresh_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_remove_grey600.xml b/core/src/main/res/drawable/ic_remove_black.xml similarity index 76% rename from core/src/main/res/drawable/ic_remove_grey600.xml rename to core/src/main/res/drawable/ic_remove_black.xml index 5a6b2af6b..c988cb5f3 100644 --- a/core/src/main/res/drawable/ic_remove_grey600.xml +++ b/core/src/main/res/drawable/ic_remove_black.xml @@ -1,5 +1,5 @@ - + diff --git a/core/src/main/res/drawable/ic_search_black.xml b/core/src/main/res/drawable/ic_search_black.xml new file mode 100644 index 000000000..272c0e746 --- /dev/null +++ b/core/src/main/res/drawable/ic_search_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_search_white.xml b/core/src/main/res/drawable/ic_search_white.xml new file mode 100644 index 000000000..7d86ce939 --- /dev/null +++ b/core/src/main/res/drawable/ic_search_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_select_all_grey600.xml b/core/src/main/res/drawable/ic_select_all_black.xml similarity index 94% rename from core/src/main/res/drawable/ic_select_all_grey600.xml rename to core/src/main/res/drawable/ic_select_all_black.xml index 96e9a2de5..68702c1fe 100644 --- a/core/src/main/res/drawable/ic_select_all_grey600.xml +++ b/core/src/main/res/drawable/ic_select_all_black.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/core/src/main/res/drawable/ic_select_none_grey600.xml b/core/src/main/res/drawable/ic_select_none_black.xml similarity index 91% rename from core/src/main/res/drawable/ic_select_none_grey600.xml rename to core/src/main/res/drawable/ic_select_none_black.xml index 8057f73ca..6d4ff62fa 100644 --- a/core/src/main/res/drawable/ic_select_none_grey600.xml +++ b/core/src/main/res/drawable/ic_select_none_black.xml @@ -4,8 +4,8 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> - diff --git a/core/src/main/res/drawable/ic_settings_black.xml b/core/src/main/res/drawable/ic_settings_black.xml new file mode 100644 index 000000000..8b2b9f733 --- /dev/null +++ b/core/src/main/res/drawable/ic_settings_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_settings_white.xml b/core/src/main/res/drawable/ic_settings_white.xml new file mode 100644 index 000000000..63b5c79ef --- /dev/null +++ b/core/src/main/res/drawable/ic_settings_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_sleep_black.xml b/core/src/main/res/drawable/ic_sleep_black.xml new file mode 100644 index 000000000..f30d5209f --- /dev/null +++ b/core/src/main/res/drawable/ic_sleep_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_sleep_off_black.xml b/core/src/main/res/drawable/ic_sleep_off_black.xml new file mode 100644 index 000000000..a45f2b91d --- /dev/null +++ b/core/src/main/res/drawable/ic_sleep_off_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_sleep_off_white.xml b/core/src/main/res/drawable/ic_sleep_off_white.xml new file mode 100644 index 000000000..e06505a9f --- /dev/null +++ b/core/src/main/res/drawable/ic_sleep_off_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_sleep_white.xml b/core/src/main/res/drawable/ic_sleep_white.xml new file mode 100644 index 000000000..11678c89b --- /dev/null +++ b/core/src/main/res/drawable/ic_sleep_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_sliders_black.xml b/core/src/main/res/drawable/ic_sliders_black.xml new file mode 100644 index 000000000..fe3a3476f --- /dev/null +++ b/core/src/main/res/drawable/ic_sliders_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_sliders_white.xml b/core/src/main/res/drawable/ic_sliders_white.xml new file mode 100644 index 000000000..c74b7e494 --- /dev/null +++ b/core/src/main/res/drawable/ic_sliders_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_sort_black.xml b/core/src/main/res/drawable/ic_sort_black.xml new file mode 100644 index 000000000..f3f46335d --- /dev/null +++ b/core/src/main/res/drawable/ic_sort_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_sort_white.xml b/core/src/main/res/drawable/ic_sort_white.xml new file mode 100644 index 000000000..9b76aab9f --- /dev/null +++ b/core/src/main/res/drawable/ic_sort_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_star_black.xml b/core/src/main/res/drawable/ic_star_black.xml new file mode 100644 index 000000000..d0f1012ca --- /dev/null +++ b/core/src/main/res/drawable/ic_star_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_star_border_black.xml b/core/src/main/res/drawable/ic_star_border_black.xml new file mode 100644 index 000000000..5e9f484c4 --- /dev/null +++ b/core/src/main/res/drawable/ic_star_border_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_star_border_white.xml b/core/src/main/res/drawable/ic_star_border_white.xml new file mode 100644 index 000000000..6df0e2919 --- /dev/null +++ b/core/src/main/res/drawable/ic_star_border_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_star_white.xml b/core/src/main/res/drawable/ic_star_white.xml new file mode 100644 index 000000000..c8a628241 --- /dev/null +++ b/core/src/main/res/drawable/ic_star_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_statistics_black.xml b/core/src/main/res/drawable/ic_statistics_black.xml new file mode 100644 index 000000000..f5e7f7153 --- /dev/null +++ b/core/src/main/res/drawable/ic_statistics_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_statistics_white.xml b/core/src/main/res/drawable/ic_statistics_white.xml new file mode 100644 index 000000000..7d180b568 --- /dev/null +++ b/core/src/main/res/drawable/ic_statistics_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_storage_black.xml b/core/src/main/res/drawable/ic_storage_black.xml new file mode 100644 index 000000000..89a6417f5 --- /dev/null +++ b/core/src/main/res/drawable/ic_storage_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_storage_white.xml b/core/src/main/res/drawable/ic_storage_white.xml new file mode 100644 index 000000000..db7e76bd5 --- /dev/null +++ b/core/src/main/res/drawable/ic_storage_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_stream_grey600.xml b/core/src/main/res/drawable/ic_stream_black.xml similarity index 93% rename from core/src/main/res/drawable/ic_stream_grey600.xml rename to core/src/main/res/drawable/ic_stream_black.xml index da9636f8c..26b473a35 100644 --- a/core/src/main/res/drawable/ic_stream_grey600.xml +++ b/core/src/main/res/drawable/ic_stream_black.xml @@ -4,11 +4,11 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/core/src/main/res/drawable/ic_videocam_grey600_24dp.xml b/core/src/main/res/drawable/ic_videocam_black_24dp.xml similarity index 90% rename from core/src/main/res/drawable/ic_videocam_grey600_24dp.xml rename to core/src/main/res/drawable/ic_videocam_black_24dp.xml index 40c893883..86283557e 100644 --- a/core/src/main/res/drawable/ic_videocam_grey600_24dp.xml +++ b/core/src/main/res/drawable/ic_videocam_black_24dp.xml @@ -3,6 +3,6 @@ android:width="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0"> - diff --git a/core/src/main/res/drawable/ic_volume_adaption_grey.xml b/core/src/main/res/drawable/ic_volume_adaption_black.xml similarity index 89% rename from core/src/main/res/drawable/ic_volume_adaption_grey.xml rename to core/src/main/res/drawable/ic_volume_adaption_black.xml index fe39e1c70..5aac62e0a 100644 --- a/core/src/main/res/drawable/ic_volume_adaption_grey.xml +++ b/core/src/main/res/drawable/ic_volume_adaption_black.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> \ No newline at end of file diff --git a/core/src/main/res/drawable/ic_web_black.xml b/core/src/main/res/drawable/ic_web_black.xml new file mode 100644 index 000000000..0ad45e031 --- /dev/null +++ b/core/src/main/res/drawable/ic_web_black.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/ic_web_white.xml b/core/src/main/res/drawable/ic_web_white.xml new file mode 100644 index 000000000..02dab111c --- /dev/null +++ b/core/src/main/res/drawable/ic_web_white.xml @@ -0,0 +1,5 @@ + + + diff --git a/core/src/main/res/drawable/line.xml b/core/src/main/res/drawable/scrollbar_line.xml similarity index 100% rename from core/src/main/res/drawable/line.xml rename to core/src/main/res/drawable/scrollbar_line.xml diff --git a/core/src/main/res/drawable/line_drawable.xml b/core/src/main/res/drawable/scrollbar_line_drawable.xml similarity index 61% rename from core/src/main/res/drawable/line_drawable.xml rename to core/src/main/res/drawable/scrollbar_line_drawable.xml index 503179b12..1339fa4a4 100644 --- a/core/src/main/res/drawable/line_drawable.xml +++ b/core/src/main/res/drawable/scrollbar_line_drawable.xml @@ -2,8 +2,8 @@ + android:drawable="@drawable/scrollbar_line"/> + android:drawable="@drawable/scrollbar_line"/> diff --git a/core/src/main/res/drawable/thumb.xml b/core/src/main/res/drawable/scrollbar_thumb.xml similarity index 100% rename from core/src/main/res/drawable/thumb.xml rename to core/src/main/res/drawable/scrollbar_thumb.xml diff --git a/core/src/main/res/drawable/thumb_drawable.xml b/core/src/main/res/drawable/scrollbar_thumb_drawable.xml similarity index 60% rename from core/src/main/res/drawable/thumb_drawable.xml rename to core/src/main/res/drawable/scrollbar_thumb_drawable.xml index 37e7c4896..efed1748c 100644 --- a/core/src/main/res/drawable/thumb_drawable.xml +++ b/core/src/main/res/drawable/scrollbar_thumb_drawable.xml @@ -2,8 +2,8 @@ + android:drawable="@drawable/scrollbar_thumb"/> + android:drawable="@drawable/scrollbar_thumb"/> 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 b9947dc33..bfe9e89b6 100644 --- a/core/src/main/res/layout/more_content_list_footer.xml +++ b/core/src/main/res/layout/more_content_list_footer.xml @@ -1,5 +1,7 @@ - + app:srcCompat="?attr/ic_load_more" /> - - @@ -10,9 +8,8 @@ - - + @@ -21,15 +18,15 @@ - + - + @@ -46,11 +43,8 @@ - - - - - + + diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index 377347ebd..bbfd4eee5 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -12,66 +12,61 @@ @style/Widget.AntennaPod.Button @color/primary_light @style/AntennaPod.Dialog.Light - @color/grey600 - @drawable/ic_sd_grey600_24dp - @drawable/ic_swap_vertical_grey600_24dp - @drawable/ic_poll_box_grey600_24dp - @drawable/ic_info_grey600_24dp - @drawable/ic_checkbox_multiple_marked_outline_grey600_24dp - @drawable/ic_search_grey600_24dp - @drawable/ic_stream_grey600 - @drawable/ic_file_download_grey600_24dp - @drawable/ic_av_pause_dark_48dp - @drawable/ic_av_play_dark_48dp - @drawable/ic_av_fast_rewind_dark_48dp - @drawable/ic_av_fast_forward_dark_48dp - @drawable/ic_av_skip_dark_48dp - @drawable/ic_playback_speed_dark_48dp - @drawable/ic_playback_speed_dark_24dp - @drawable/ic_delete_grey600_24dp - @drawable/ic_add_grey600_24dp - @drawable/ic_remove_grey600 - @drawable/ic_feed_grey600_24dp - @drawable/ic_web_grey600_24dp - @drawable/ic_done_grey600_24dp - @drawable/ic_cancel_grey600_24dp - @drawable/ic_expand_more_grey600_36dp - @drawable/ic_refresh_grey600_24dp + @drawable/ic_storage_black + @drawable/ic_network_black + @drawable/ic_statistics_black + @drawable/ic_info_black + @drawable/ic_check_multiple_black + @drawable/ic_search_black + @drawable/ic_stream_black + @drawable/ic_download_black + @drawable/ic_av_pause_black_48dp + @drawable/ic_av_play_black_48dp + @drawable/ic_av_fast_rewind_black_48dp + @drawable/ic_av_fast_forward_black_48dp + @drawable/ic_av_skip_black_48dp + @drawable/ic_playback_speed_black + @drawable/ic_delete_black + @drawable/ic_add_black + @drawable/ic_remove_black + @drawable/ic_feed_black + @drawable/ic_web_black + @drawable/ic_check_black + @drawable/ic_cancel_black + @drawable/ic_load_more_black + @drawable/ic_refresh_black @drawable/navigation_up - @drawable/ic_share_grey600_24dp - @drawable/ic_list_grey600_24dp - @drawable/ic_videocam_grey600_24dp + @drawable/ic_playlist_black + @drawable/ic_videocam_black_24dp @drawable/ic_drag_vertical_grey600_48dp @color/highlight_light - @drawable/ic_history_grey600_24dp - @drawable/ic_folder_grey600_24dp - @drawable/ic_av_play_dark_24dp - @drawable/ic_star_border_grey600_24dp - @drawable/ic_star_grey600_24dp - @drawable/ic_settings_grey600_24dp - @drawable/ic_lock_open_grey600_24dp - @drawable/ic_lock_closed_grey600_24dp - @drawable/ic_filter_grey600_24dp - @drawable/ic_sleep_grey600_24dp - @drawable/ic_sleep_off_grey600_24dp - @drawable/ic_select_all_grey600 - @drawable/ic_select_none_grey600 - @drawable/ic_sort_grey600_24dp - @drawable/ic_sd_storage_grey600_36dp - @drawable/ic_create_new_folder_grey600_24dp - @drawable/ic_cast_disconnect_grey600_36dp - @drawable/ic_cellphone_text_grey600_24dp - @drawable/ic_questionmark_grey600 - @drawable/ic_chat_grey600 - @drawable/ic_bug_grey600_24dp - @drawable/ic_bookmark_grey600_24dp + @drawable/ic_history_black + @drawable/ic_folder_black + @drawable/ic_av_play_black_24dp + @drawable/ic_star_border_black + @drawable/ic_star_black + @drawable/ic_settings_black + @drawable/ic_lock_open_black + @drawable/ic_lock_closed_black + @drawable/ic_filter_black_24dp + @drawable/ic_sleep_black + @drawable/ic_sleep_off_black + @drawable/ic_select_all_black + @drawable/ic_select_none_black + @drawable/ic_sort_black + @drawable/ic_sliders_black + @drawable/ic_appearance_black + @drawable/ic_questionmark_black + @drawable/ic_chat_black + @drawable/ic_bug_black + @drawable/ic_bookmark_black_24dp @drawable/ic_fab_edit_white - @drawable/ic_key_grey600 - @drawable/ic_volume_adaption_grey + @drawable/ic_key_black + @drawable/ic_volume_adaption_black @color/master_switch_background_light @color/highlight_light @style/PreferenceThemeOverlay.v14.Material - #FF757575 + @color/black