summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/MediaplayerActivity.java31
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java1
-rw-r--r--app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/adapter/actionbutton/DeleteActionButton.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/view/CircularProgressBar.java13
-rw-r--r--app/src/main/res/layout/all_episodes_fragment.xml8
-rw-r--r--app/src/main/res/layout/empty_view_layout.xml10
-rw-r--r--app/src/main/res/layout/feeditemlist_header.xml5
-rw-r--r--app/src/main/res/layout/feeditemlist_item.xml6
-rw-r--r--app/src/main/res/layout/fragment_subscriptions.xml2
-rw-r--r--app/src/main/res/layout/mediaplayerinfo_activity.xml2
-rw-r--r--app/src/main/res/layout/storage_error.xml3
-rw-r--r--app/src/main/res/menu/directory_chooser.xml8
-rw-r--r--app/src/main/res/menu/downloads_completed.xml5
-rw-r--r--app/src/main/res/menu/episodes_apply_action_speeddial.xml2
-rw-r--r--app/src/main/res/menu/feedlist.xml2
-rw-r--r--app/src/main/res/menu/mediaplayer.xml4
-rw-r--r--app/src/main/res/xml/feed_settings.xml2
-rw-r--r--app/src/main/res/xml/preferences.xml4
21 files changed, 49 insertions, 67 deletions
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/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 @@
<ImageView
android:id="@+id/emptyViewIcon"
- android:layout_width="40dp"
- android:layout_height="40dp"
- android:paddingBottom="8dp"
+ android:layout_width="32dp"
+ android:layout_height="32dp"
android:visibility="gone"
- tools:src="@drawable/ic_feed_grey600_24dp"
+ tools:src="@drawable/ic_feed_black"
tools:visibility="visible"/>
<TextView
@@ -25,8 +24,7 @@
android:layout_height="wrap_content"
tools:text="Title"
android:textSize="16sp"
- android:textStyle="bold"
- android:paddingBottom="8dp"/>
+ android:textColor="?android:attr/textColorPrimary"/>
<TextView
android:id="@+id/emptyViewMessage"
diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml
index 50ef20a06..f00fb349b 100644
--- a/app/src/main/res/layout/feeditemlist_header.xml
+++ b/app/src/main/res/layout/feeditemlist_header.xml
@@ -2,6 +2,7 @@
<LinearLayout
xmlns:tools="http://schemas.android.com/tools"
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">
@@ -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"/>
<ImageView
android:layout_width="14sp"
android:layout_height="14sp"
app:srcCompat="?attr/ic_unfav"
- tools:srcCompat="@drawable/ic_star_grey600_24dp"
+ tools:srcCompat="@drawable/ic_star_black"
android:id="@+id/isFavorite"/>
<ImageView
android:layout_width="14sp"
android:layout_height="14sp"
app:srcCompat="?attr/stat_playlist"
- tools:srcCompat="@drawable/ic_list_grey600_24dp"
+ tools:srcCompat="@drawable/ic_playlist_black"
android:id="@+id/ivInPlaylist"/>
<TextView
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index d16331a10..4cfd369a7 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -35,5 +35,5 @@
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:contentDescription="@string/add_feed_label"
- android:src="@drawable/ic_add_white_24dp"/>
+ app:srcCompat="@drawable/ic_add_white"/>
</RelativeLayout>
diff --git a/app/src/main/res/layout/mediaplayerinfo_activity.xml b/app/src/main/res/layout/mediaplayerinfo_activity.xml
index 212d8b9d8..667e0c72a 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" />
diff --git a/app/src/main/res/layout/storage_error.xml b/app/src/main/res/layout/storage_error.xml
index 8ff28b3c1..7b0579927 100644
--- a/app/src/main/res/layout/storage_error.xml
+++ b/app/src/main/res/layout/storage_error.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="match_parent"
android:orientation="vertical"
@@ -13,7 +14,7 @@
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_margin="8dp"
- android:src="?attr/ic_sd_storage" />
+ app:srcCompat="?attr/storage" />
<TextView
android:id="@+id/textView1"
diff --git a/app/src/main/res/menu/directory_chooser.xml b/app/src/main/res/menu/directory_chooser.xml
index 3f860d636..e6150ac20 100644
--- a/app/src/main/res/menu/directory_chooser.xml
+++ b/app/src/main/res/menu/directory_chooser.xml
@@ -1,16 +1,16 @@
<?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">
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/new_folder_item"
android:title="@string/create_folder_label"
- android:icon="?attr/ic_create_new_folder"
- custom:showAsAction="ifRoom|withText" />
+ app:icon="?attr/content_new"
+ app:showAsAction="ifRoom|withText" />
<item
android:id="@+id/set_to_default_folder_item"
android:title="@string/set_to_default_folder"
- custom:showAsAction="collapseActionView" />
+ app:showAsAction="collapseActionView" />
</menu>
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 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/episode_actions"
android:menuCategory="container"
android:title="@string/multi_select"
android:icon="?attr/checkbox_multiple"
- android:showAsAction="ifRoom" />
+ app:showAsAction="ifRoom" />
</menu>
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.
-->
<item android:id="@+id/delete_batch"
- android:icon="?attr/content_discard"
+ android:icon="?attr/ic_delete"
android:title="@string/delete_episode_label"
/>
<item android:id="@+id/download_batch"
diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml
index 7f32ef744..939a51ab2 100644
--- a/app/src/main/res/menu/feedlist.xml
+++ b/app/src/main/res/menu/feedlist.xml
@@ -73,7 +73,7 @@
<item
android:id="@+id/remove_item"
- android:icon="?attr/content_discard"
+ android:icon="?attr/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 055951760..a61616ce9 100644
--- a/app/src/main/res/menu/mediaplayer.xml
+++ b/app/src/main/res/menu/mediaplayer.xml
@@ -30,6 +30,7 @@
<item
android:id="@+id/audio_controls"
+ android:icon="?attr/ic_sliders"
android:title="@string/audio_controls"
custom:showAsAction="always">
</item>
@@ -59,9 +60,8 @@
<item
android:id="@+id/share_item"
- android:icon="?attr/social_share"
android:menuCategory="container"
- custom:showAsAction="ifRoom"
+ custom:showAsAction="never"
android:title="@string/share_label">
<menu>
<item
diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml
index 08e7572af..d65280061 100644
--- a/app/src/main/res/xml/feed_settings.xml
+++ b/app/src/main/res/xml/feed_settings.xml
@@ -23,7 +23,7 @@
<ListPreference
android:entries="@array/spnAutoDeleteItems"
android:entryValues="@array/spnAutoDeleteValues"
- android:icon="?attr/content_discard"
+ android:icon="?attr/ic_delete"
android:title="@string/auto_delete_label"
android:summary="@string/feed_auto_download_global"
android:key="autoDelete"/>
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" />
<Preference
android:key="prefScreenPlayback"
@@ -25,7 +25,7 @@
android:key="prefScreenNetwork"
android:title="@string/network_pref"
android:summary="@string/network_pref_sum"
- android:icon="?attr/ic_swap" />
+ android:icon="?attr/ic_network" />
<Preference
android:key="prefScreenIntegrations"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-17 12:39:20 +0000