Castopod/AntennaPod
1
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-02-07 05:54:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5242 from ByteHamster/widget-drawable

Browse Source 
Fix widget not showing icons
This commit is contained in:
ByteHamster 2021-06-25 19:14:35 +02:00 committed by GitHub
commit 0462a22cf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java
View File

@ -122,14 +122,14 @@ public abstract class WidgetUpdater {
}
if (widgetState.status == PlayerStatus.PLAYING) {
views.setImageViewResource(R.id.butPlay, R.drawable.ic_pause);
views.setImageViewResource(R.id.butPlay, R.drawable.ic_widget_pause);
views.setContentDescription(R.id.butPlay, context.getString(R.string.pause_label));
views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_pause);
views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_widget_pause);
views.setContentDescription(R.id.butPlayExtended, context.getString(R.string.pause_label));
} else {
views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_48dp);
views.setImageViewResource(R.id.butPlay, R.drawable.ic_widget_play);
views.setContentDescription(R.id.butPlay, context.getString(R.string.play_label));
views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_play_48dp);
views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_widget_play);
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_play_48dp);
views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_play_48dp);
views.setImageViewResource(R.id.butPlay, R.drawable.ic_widget_play);
views.setImageViewResource(R.id.butPlayExtended, R.drawable.ic_widget_play);
}
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {

32
core/src/main/res/layout/player_widget.xml
View File

@ -1,10 +1,11 @@
<?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"
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/widget_margin" >
android:padding="@dimen/widget_margin"
tools:ignore="VectorDrawableCompat">
<RelativeLayout
android:id="@+id/widgetLayout"
@ -15,16 +16,16 @@
<ImageButton
android:id="@+id/butPlay"
android:contentDescription="@string/play_label"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="match_parent"
android:contentDescription="@string/play_label"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_margin="12dp"
android:background="?android:attr/selectableItemBackground"
android:scaleType="fitCenter"
android:padding="8dp"
app:srcCompat="@drawable/ic_play_24dp" />
android:src="@drawable/ic_widget_play" />
<LinearLayout
android:id="@+id/layout_left"
@ -36,13 +37,13 @@
android:layout_toStartOf="@id/butPlay"
android:background="@android:color/transparent"
android:gravity="fill_horizontal"
android:orientation="horizontal" >
android:orientation="horizontal">
<ImageView
android:id="@+id/imgvCover"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="match_parent"
app:srcCompat="@mipmap/ic_launcher_round"
android:src="@mipmap/ic_launcher_round"
android:importantForAccessibility="no"
android:layout_margin="12dp" />
@ -51,7 +52,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical" >
android:orientation="vertical">
<TextView
android:id="@+id/txtNoPlaying"
@ -99,7 +100,7 @@
android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_fast_rewind"/>
android:src="@drawable/ic_widget_fast_rewind" />
<ImageButton
android:id="@+id/butPlayExtended"
@ -110,7 +111,7 @@
android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_play_48dp"/>
android:src="@drawable/ic_widget_play" />
<ImageButton
android:id="@+id/butFastForward"
@ -121,7 +122,7 @@
android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_fast_forward"/>
android:src="@drawable/ic_widget_fast_forward" />
<ImageButton
android:id="@+id/butSkip"
@ -132,9 +133,14 @@
android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_skip_24dp"/>
android:src="@drawable/ic_widget_skip" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</FrameLayout>
</FrameLayout>

7
ui/png-icons/src/main/res/drawable/ic_widget_fast_forward.xml Normal file
View File

@ -0,0 +1,7 @@
<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="#ffffff" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
</vector>

7
ui/png-icons/src/main/res/drawable/ic_widget_fast_rewind.xml Normal file
View File

@ -0,0 +1,7 @@
<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="#ffffff" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
</vector>

7
ui/png-icons/src/main/res/drawable/ic_widget_pause.xml Normal file
View File

@ -0,0 +1,7 @@
<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="#ffffff" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
</vector>

7
ui/png-icons/src/main/res/drawable/ic_widget_play.xml Normal file
View File

@ -0,0 +1,7 @@
<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="#ffffff" android:pathData="M8,5v14l11,-7z"/>
</vector>

7
ui/png-icons/src/main/res/drawable/ic_widget_skip.xml Normal file
View File

@ -0,0 +1,7 @@
<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="#ffffff" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
</vector>