Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3869 from ByteHamster/remove-unused-attrs 

Remove unused attrs
This commit is contained in:
H. Lehmann 2020-02-18 14:20:09 +01:00 committed by GitHub
parent 4845da64a0 3281ba77de
commit 3e51442560
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 9 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java
View File

@ -7,7 +7,6 @@ import android.content.res.TypedArray;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.preference.PreferenceManager;
import androidx.appcompat.app.AlertDialog;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
@ -16,33 +15,28 @@ import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
import com.joanzapata.iconify.Iconify;
import com.joanzapata.iconify.widget.IconTextView;
import org.apache.commons.lang3.ArrayUtils;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.core.feed.Feed;
import de.danoeh.antennapod.core.glide.ApGlideSettings;
import de.danoeh.antennapod.core.preferences.UserPreferences;
import de.danoeh.antennapod.fragment.AddFeedFragment;
import de.danoeh.antennapod.fragment.AllEpisodesFragment;
import de.danoeh.antennapod.fragment.DownloadsFragment;
import de.danoeh.antennapod.fragment.EpisodesFragment;
import de.danoeh.antennapod.fragment.NewEpisodesFragment;
import de.danoeh.antennapod.fragment.PlaybackHistoryFragment;
import de.danoeh.antennapod.fragment.QueueFragment;
import de.danoeh.antennapod.fragment.SubscriptionFragment;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.ArrayUtils;
/**
* BaseAdapter for the navigation drawer
@ -112,7 +106,7 @@ public class NavListAdapter extends BaseAdapter
private Drawable getDrawable(String tag) {
Activity context = activity.get();
if(context == null) {
if (context == null) {
return null;
}
int icon;
@ -120,15 +114,9 @@ public class NavListAdapter extends BaseAdapter
case QueueFragment.TAG:
icon = R.attr.stat_playlist;
break;
case NewEpisodesFragment.TAG:
icon = R.attr.ic_new;
break;
case EpisodesFragment.TAG:
icon = R.attr.feed;
break;
case AllEpisodesFragment.TAG:
icon = R.attr.feed;
break;
case DownloadsFragment.TAG:
icon = R.attr.av_download;
break;

2
app/src/main/res/layout/nav_listitem.xml
View File

@ -24,7 +24,7 @@
android:layout_marginStart="@dimen/listitem_icon_leftpadding"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
tools:src="@drawable/ic_new_releases_white_24dp"
tools:src="@drawable/ic_file_download_grey600_24dp"
tools:background="@android:color/holo_green_dark"/>

BIN
core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 399 B

BIN
core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 381 B

BIN
core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 288 B

BIN
core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 277 B

BIN
core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 496 B

BIN
core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 464 B

BIN
core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 718 B

BIN
core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 679 B

20
core/src/main/res/drawable/overlay_drawable.xml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#F0BABABA" />
</shape>
</item>
<item android:top="1dp">
<shape android:shape="rectangle" >
<solid android:color="#D2D2D2" />
</shape>
</item>
<item android:top="2dp">
<shape android:shape="rectangle" >
<solid android:color="@color/overlay_light" />
</shape>
</item>
</layer-list>

15
core/src/main/res/drawable/overlay_drawable_dark.xml
View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#45B3E1" />
</shape>
</item>
<item android:top="1dp">
<shape android:shape="rectangle" >
<solid android:color="@color/overlay_dark" />
</shape>
</item>
</layer-list>

15
core/src/main/res/drawable/overlay_drawable_dark_trueblack.xml
View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item>
<shape android:shape="rectangle" >
<solid android:color="#45B3E1" />
</shape>
</item>
<item android:top="1dp">
<shape android:shape="rectangle" >
<solid android:color="@color/black" />
</shape>
</item>
</layer-list>

13
core/src/main/res/values/attrs.xml
View File

@ -28,10 +28,7 @@
<attr name="stat_playlist" format="reference"/>
<attr name="ic_folder" format="reference"/>
<attr name="type_video" format="reference"/>
<attr name="overlay_drawable" format="reference"/>
<attr name="dragview_background" format="reference"/>
<attr name="dragview_float_background" format="reference"/>
<attr name="ic_new" format="reference"/>
<attr name="ic_history" format="reference"/>
<attr name="ic_settings_playback" format="reference"/>
<attr name="ic_settings" format="reference"/>
@ -61,18 +58,8 @@
<attr name="currently_playing_background" format="color"/>
<attr name="ic_bookmark" format="reference"/>
<attr name="ic_settings_speed" format="reference" />
<!-- Used in itemdescription -->
<attr name="non_transparent_background" format="reference"/>
<attr name="overlay_background" format="color"/>
<attr name="nav_drawer_background" format="color"/>
<attr name="drawer_activated_color" format="color"/>
<attr name="about_screen_background" format="color"/>
<attr name="about_screen_card_background" format="color"/>
<attr name="about_screen_card_border" format="color"/>
<attr name="about_screen_font_color" format="color"/>
<attr name="batch_edit_fab_icon" format="reference"/>
<declare-styleable name="SquareImageView">

24
core/src/main/res/values/styles.xml
View File

@ -40,14 +40,9 @@
<item name="social_share">@drawable/ic_share_grey600_24dp</item>
<item name="stat_playlist">@drawable/ic_list_grey600_24dp</item>
<item name="type_video">@drawable/ic_videocam_grey600_24dp</item>
<item name="non_transparent_background">@color/white</item>
<item name="overlay_background">@color/overlay_light</item>
<item name="overlay_drawable">@drawable/overlay_drawable</item>
<item name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
<item name="dragview_float_background">@color/white</item>
<item name="nav_drawer_background">@color/white</item>
<item name="drawer_activated_color">@color/highlight_light</item>
<item name="ic_new">@drawable/ic_new_releases_grey600_24dp</item>
<item name="ic_history">@drawable/ic_history_grey600_24dp</item>
<item name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
<item name="ic_settings_playback">@drawable/ic_av_play_dark_24dp</item>
@ -77,11 +72,6 @@
<item name="currently_playing_background">@color/highlight_light</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="about_screen_background">#e5e5e5</item>
<item name="about_screen_card_background">#ffffff</item>
<item name="about_screen_card_border">#d2d2d2</item>
<item name="about_screen_font_color">#000000</item>
</style>
<style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@ -125,14 +115,9 @@
<item name="social_share">@drawable/ic_share_white_24dp</item>
<item name="stat_playlist">@drawable/ic_list_white_24dp</item>
<item name="type_video">@drawable/ic_videocam_white_24dp</item>
<item name="non_transparent_background">@color/black</item>
<item name="overlay_background">@color/overlay_dark</item>
<item name="overlay_drawable">@drawable/overlay_drawable_dark</item>
<item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
<item name="dragview_float_background">@color/black</item>
<item name="nav_drawer_background">@color/nav_drawer_background_dark</item>
<item name="drawer_activated_color">@color/nav_drawer_highlighted_dark</item>
<item name="ic_new">@drawable/ic_new_releases_white_24dp</item>
<item name="ic_history">@drawable/ic_history_white_24dp</item>
<item name="ic_folder">@drawable/ic_folder_white_24dp</item>
<item name="ic_settings_playback">@drawable/ic_av_play_white_24dp</item>
@ -161,11 +146,6 @@
<item name="master_switch_background">@color/master_switch_background_dark</item>
<item name="currently_playing_background">@color/highlight_dark</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="about_screen_background">#303030</item>
<item name="about_screen_card_background">#424242</item>
<item name="about_screen_card_border">#262626</item>
<item name="about_screen_font_color">#ffffff</item>
</style>
<style name="Theme.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.TrueBlack">
@ -174,12 +154,8 @@
<style name="Theme.Base.AntennaPod.TrueBlack" parent="Theme.Base.AntennaPod.Dark">
<item name="progressBarTheme">@style/ProgressBarTrueBlack</item>
<item name="non_transparent_background">@color/black</item>
<item name="overlay_background">@color/black</item>
<item name="overlay_drawable">@drawable/overlay_drawable_dark_trueblack</item>
<item name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
<item name="batch_edit_fab_icon">@drawable/ic_fab_edit_black</item>
<item name="dragview_float_background">@color/black</item>
<item name="nav_drawer_background">@color/black</item>
<item name="drawer_activated_color">@color/highlight_trueblack</item>
<item name="android:textColorPrimary">@color/white</item>