Merge pull request #1432 from TomHennen/widget

Widget improvements

3 files changed, 252 insertions, 190 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
index 7ab386edf..6048ffb1a 100644
--- a/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
+++ b/app/src/main/java/de/danoeh/antennapod/receiver/PlayerWidget.java
@@ -4,6 +4,7 @@ import android.appwidget.AppWidgetManager;
 import android.appwidget.AppWidgetProvider;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.util.Log;
 
 import org.apache.commons.lang3.StringUtils;
@@ -13,37 +14,67 @@ import de.danoeh.antennapod.core.service.playback.PlaybackService;
 import de.danoeh.antennapod.service.PlayerWidgetService;
 
 public class PlayerWidget extends AppWidgetProvider {
-	private static final String TAG = "PlayerWidget";
+    private static final String TAG = "PlayerWidget";
+    private static final String PREFS_NAME = "PlayerWidgetPrefs";
+    private static final String KEY_ENABLED = "WidgetEnabled";
 
     @Override
-	public void onReceive(Context context, Intent intent) {
-		if (StringUtils.equals(intent.getAction(), PlaybackService.FORCE_WIDGET_UPDATE)) {
-			startUpdate(context);
-		} else if (StringUtils.equals(intent.getAction(), PlaybackService.STOP_WIDGET_UPDATE)) {
-			stopUpdate(context);
-		}
-
-	}
-
-	@Override
-	public void onEnabled(Context context) {
-		super.onEnabled(context);
-		if (BuildConfig.DEBUG)
-			Log.d(TAG, "Widget enabled");
-	}
-
-	@Override
-	public void onUpdate(Context context, AppWidgetManager appWidgetManager,
-			int[] appWidgetIds) {
-		startUpdate(context);
-	}
-
-	private void startUpdate(Context context) {
-		context.startService(new Intent(context, PlayerWidgetService.class));
-	}
-
-	private void stopUpdate(Context context) {
-		context.stopService(new Intent(context, PlayerWidgetService.class));
-	}
+    public void onReceive(Context context, Intent intent) {
+        Log.d(TAG, "onReceive");
+        super.onReceive(context, intent);
+        // don't do anything if we're not enabled
+        if (!isEnabled(context)) {
+            return;
+        }
 
+        // these come from the PlaybackService when things should get updated
+        if (StringUtils.equals(intent.getAction(), PlaybackService.FORCE_WIDGET_UPDATE)) {
+            startUpdate(context);
+        } else if (StringUtils.equals(intent.getAction(), PlaybackService.STOP_WIDGET_UPDATE)) {
+            stopUpdate(context);
+        }
+    }
+
+    @Override
+    public void onEnabled(Context context) {
+        super.onEnabled(context);
+        Log.d(TAG, "Widget enabled");
+        setEnabled(context, true);
+        startUpdate(context);
+    }
+
+    @Override
+    public void onUpdate(Context context, AppWidgetManager appWidgetManager,
+                         int[] appWidgetIds) {
+        Log.d(TAG, "onUpdate() called with: " + "context = [" + context + "], appWidgetManager = [" + appWidgetManager + "], appWidgetIds = [" + appWidgetIds + "]");
+        startUpdate(context);
+    }
+
+    @Override
+    public void onDisabled(Context context) {
+        super.onDisabled(context);
+        Log.d(TAG, "Widet disabled");
+        setEnabled(context, false);
+        stopUpdate(context);
+    }
+
+    private void startUpdate(Context context) {
+        Log.d(TAG, "startUpdate() called with: " + "context = [" + context + "]");
+        context.startService(new Intent(context, PlayerWidgetService.class));
+    }
+
+    private void stopUpdate(Context context) {
+        Log.d(TAG, "stopUpdate() called with: " + "context = [" + context + "]");
+        context.stopService(new Intent(context, PlayerWidgetService.class));
+    }
+
+    private boolean isEnabled(Context context) {
+        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        return prefs.getBoolean(KEY_ENABLED, false);
+    }
+
+    private void setEnabled(Context context, boolean enabled) {
+        SharedPreferences prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        prefs.edit().putBoolean(KEY_ENABLED, enabled).apply();
+    }
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
index d7a049a32..d61a189c2 100644
--- a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
+++ b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java
@@ -14,6 +14,7 @@ import android.view.View;
 import android.widget.RemoteViews;
 
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.MainActivity;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.receiver.MediaButtonReceiver;
@@ -22,197 +23,220 @@ import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.Converter;
 import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.fragment.QueueFragment;
 import de.danoeh.antennapod.receiver.PlayerWidget;
 
-/** Updates the state of the player widget */
+/**
+ * Updates the state of the player widget
+ */
 public class PlayerWidgetService extends Service {
-	private static final String TAG = "PlayerWidgetService";
+    private static final String TAG = "PlayerWidgetService";
 
-	private PlaybackService playbackService;
+    private PlaybackService playbackService;
 
-    /** Controls write access to playbackservice reference */
+    /**
+     * Controls write access to playbackservice reference
+     */
     private Object psLock;
 
-	/** True while service is updating the widget */
-	private volatile boolean isUpdating;
+    /**
+     * True while service is updating the widget
+     */
+    private volatile boolean isUpdating;
 
-	public PlayerWidgetService() {
-	}
+    public PlayerWidgetService() {
+    }
 
-	@Override
-	public void onCreate() {
-		super.onCreate();
-		Log.d(TAG, "Service created");
-		isUpdating = false;
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        Log.d(TAG, "Service created");
+        isUpdating = false;
         psLock = new Object();
-	}
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		Log.d(TAG, "Service is about to be destroyed");
-		if (playbackService != null) {
-			Playable playable = playbackService.getPlayable();
-			if (playable != null && playable instanceof FeedMedia) {
-				FeedMedia media = (FeedMedia) playable;
-				if (media.hasAlmostEnded()) {
-					Log.d(TAG, "smart mark as read");
-					FeedItem item = media.getItem();
-					DBWriter.markItemPlayed(item, FeedItem.PLAYED, false);
-					DBWriter.removeQueueItem(this, item, false);
-					DBWriter.addItemToPlaybackHistory(media);
-					if (item.getFeed().getPreferences().getCurrentAutoDelete()) {
-						Log.d(TAG, "Delete " + media.toString());
-						DBWriter.deleteFeedMediaOfItem(this, media.getId());
-					}
-				}
-			}
-		}
-
-		try {
-			unbindService(mConnection);
-		} catch (IllegalArgumentException e) {
-			Log.w(TAG, "IllegalArgumentException when trying to unbind service");
-		}
-	}
-
-	@Override
-	public IBinder onBind(Intent intent) {
-		return null;
-	}
-
-	@Override
-	public int onStartCommand(Intent intent, int flags, int startId) {
-		if (!isUpdating) {
-			if (playbackService == null && PlaybackService.isRunning) {
-				bindService(new Intent(this, PlaybackService.class),
-						mConnection, 0);
-			} else {
-				startViewUpdaterIfNotRunning();
-			}
-		} else {
-			Log.d(TAG, "Service was called while updating. Ignoring update request");
-		}
-		return Service.START_NOT_STICKY;
-	}
-
-	private void updateViews() {
-        if (playbackService == null) {
-            return;
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+        Log.d(TAG, "Service is about to be destroyed");
+        if (playbackService != null) {
+            Playable playable = playbackService.getPlayable();
+            if (playable != null && playable instanceof FeedMedia) {
+                FeedMedia media = (FeedMedia) playable;
+                if (media.hasAlmostEnded()) {
+                    Log.d(TAG, "smart mark as read");
+                    FeedItem item = media.getItem();
+                    DBWriter.markItemPlayed(item, FeedItem.PLAYED, false);
+                    DBWriter.removeQueueItem(this, item, false);
+                    DBWriter.addItemToPlaybackHistory(media);
+                    if (item.getFeed().getPreferences().getCurrentAutoDelete()) {
+                        Log.d(TAG, "Delete " + media.toString());
+                        DBWriter.deleteFeedMediaOfItem(this, media.getId());
+                    }
+                }
+            }
+        }
+
+        try {
+            unbindService(mConnection);
+        } catch (IllegalArgumentException e) {
+            Log.w(TAG, "IllegalArgumentException when trying to unbind service");
+        }
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (!isUpdating) {
+            if (playbackService == null && PlaybackService.isRunning) {
+                bindService(new Intent(this, PlaybackService.class),
+                        mConnection, 0);
+            } else {
+                startViewUpdaterIfNotRunning();
+            }
+        } else {
+            Log.d(TAG, "Service was called while updating. Ignoring update request");
         }
-		isUpdating = true;
-
-		ComponentName playerWidget = new ComponentName(this, PlayerWidget.class);
-		AppWidgetManager manager = AppWidgetManager.getInstance(this);
-		RemoteViews views = new RemoteViews(getPackageName(),
-				R.layout.player_widget);
-		PendingIntent startMediaplayer = PendingIntent.getActivity(this, 0,
-				PlaybackService.getPlayerActivityIntent(this), 0);
-
-		views.setOnClickPendingIntent(R.id.layout_left, startMediaplayer);
-        final Playable media = playbackService.getPlayable();
-        if (playbackService != null && media != null) {
-			PlayerStatus status = playbackService.getStatus();
-
-			views.setTextViewText(R.id.txtvTitle, media.getEpisodeTitle());
-
-			String progressString = getProgressString(media);
-			if (progressString != null) {
-				views.setTextViewText(R.id.txtvProgress, progressString);
-			}
-
-			if (status == PlayerStatus.PLAYING) {
-				views.setImageViewResource(R.id.butPlay, R.drawable.ic_pause_white_24dp);
-                if (Build.VERSION.SDK_INT >= 15) {
-                    views.setContentDescription(R.id.butPlay, getString(R.string.pause_label));
+        return Service.START_NOT_STICKY;
+    }
+
+    private void updateViews() {
+        isUpdating = true;
+
+        ComponentName playerWidget = new ComponentName(this, PlayerWidget.class);
+        AppWidgetManager manager = AppWidgetManager.getInstance(this);
+        RemoteViews views = new RemoteViews(getPackageName(),
+                R.layout.player_widget);
+        PendingIntent startMediaplayer = PendingIntent.getActivity(this, 0,
+                PlaybackService.getPlayerActivityIntent(this), 0);
+
+        Intent startApp = new Intent(getBaseContext(), MainActivity.class);
+        startApp.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startApp.putExtra(MainActivity.EXTRA_FRAGMENT_TAG, QueueFragment.TAG);
+        PendingIntent startAppPending = PendingIntent.getActivity(getBaseContext(), 0, startApp, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        boolean nothingPlaying = false;
+        if (playbackService != null) {
+            final Playable media = playbackService.getPlayable();
+            if (media != null) {
+                PlayerStatus status = playbackService.getStatus();
+                views.setOnClickPendingIntent(R.id.layout_left, startMediaplayer);
+
+                views.setTextViewText(R.id.txtvTitle, media.getEpisodeTitle());
+
+                String progressString = getProgressString(media);
+                if (progressString != null) {
+                    views.setViewVisibility(R.id.txtvProgress, View.VISIBLE);
+                    views.setTextViewText(R.id.txtvProgress, progressString);
                 }
-			} else {
-				views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
-                if (Build.VERSION.SDK_INT >= 15) {
-                    views.setContentDescription(R.id.butPlay, getString(R.string.play_label));
+
+                if (status == PlayerStatus.PLAYING) {
+                    views.setImageViewResource(R.id.butPlay, R.drawable.ic_pause_white_24dp);
+                    if (Build.VERSION.SDK_INT >= 15) {
+                        views.setContentDescription(R.id.butPlay, getString(R.string.pause_label));
+                    }
+                } else {
+                    views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
+                    if (Build.VERSION.SDK_INT >= 15) {
+                        views.setContentDescription(R.id.butPlay, getString(R.string.play_label));
+                    }
                 }
-			}
-			views.setOnClickPendingIntent(R.id.butPlay,
-					createMediaButtonIntent());
-		} else {
-			views.setViewVisibility(R.id.txtvProgress, View.INVISIBLE);
-			views.setTextViewText(R.id.txtvTitle,
-					this.getString(R.string.no_media_playing_label));
-			views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
-
-		}
-
-		manager.updateAppWidget(playerWidget, views);
-		isUpdating = false;
-	}
-
-	/** Creates an intent which fakes a mediabutton press */
-	private PendingIntent createMediaButtonIntent() {
-		KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN,
-				KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
-		Intent startingIntent = new Intent(
-				MediaButtonReceiver.NOTIFY_BUTTON_RECEIVER);
-		startingIntent.putExtra(Intent.EXTRA_KEY_EVENT, event);
-
-		return PendingIntent.getBroadcast(this, 0, startingIntent, 0);
-	}
-
-	private String getProgressString(Playable media) {
-		int position = media.getPosition();
-		int duration = media.getDuration();
-		if (position > 0 && duration > 0) {
-			return Converter.getDurationStringLong(position) + " / "
-					+ Converter.getDurationStringLong(duration);
-		} else {
-			return null;
-		}
-	}
-
-	private ServiceConnection mConnection = new ServiceConnection() {
-		public void onServiceConnected(ComponentName className, IBinder service) {
-			Log.d(TAG, "Connection to service established");
+                views.setOnClickPendingIntent(R.id.butPlay,
+                        createMediaButtonIntent());
+            } else {
+                nothingPlaying = true;
+            }
+        } else {
+            nothingPlaying = true;
+        }
+
+        if (nothingPlaying) {
+            // start the app if they click anything
+            views.setOnClickPendingIntent(R.id.layout_left, startAppPending);
+            views.setOnClickPendingIntent(R.id.butPlay, startAppPending);
+            views.setViewVisibility(R.id.txtvProgress, View.INVISIBLE);
+            views.setTextViewText(R.id.txtvTitle,
+                    this.getString(R.string.no_media_playing_label));
+            views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp);
+        }
+
+        manager.updateAppWidget(playerWidget, views);
+        isUpdating = false;
+    }
+
+    /**
+     * Creates an intent which fakes a mediabutton press
+     */
+    private PendingIntent createMediaButtonIntent() {
+        KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN,
+                KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE);
+        Intent startingIntent = new Intent(
+                MediaButtonReceiver.NOTIFY_BUTTON_RECEIVER);
+        startingIntent.putExtra(Intent.EXTRA_KEY_EVENT, event);
+
+        return PendingIntent.getBroadcast(this, 0, startingIntent, 0);
+    }
+
+    private String getProgressString(Playable media) {
+        int position = media.getPosition();
+        int duration = media.getDuration();
+        if (position > 0 && duration > 0) {
+            return Converter.getDurationStringLong(position) + " / "
+                    + Converter.getDurationStringLong(duration);
+        } else {
+            return null;
+        }
+    }
+
+    private ServiceConnection mConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder service) {
+            Log.d(TAG, "Connection to service established");
             synchronized (psLock) {
                 playbackService = ((PlaybackService.LocalBinder) service)
                         .getService();
                 startViewUpdaterIfNotRunning();
             }
-		}
+        }
 
-		@Override
-		public void onServiceDisconnected(ComponentName name) {
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
             synchronized (psLock) {
                 playbackService = null;
                 Log.d(TAG, "Disconnected from service");
             }
-		}
+        }
 
-	};
+    };
 
-	private void startViewUpdaterIfNotRunning() {
-		if (!isUpdating) {
-			ViewUpdater updateThread = new ViewUpdater(this);
-			updateThread.start();
-		}
-	}
+    private void startViewUpdaterIfNotRunning() {
+        if (!isUpdating) {
+            ViewUpdater updateThread = new ViewUpdater(this);
+            updateThread.start();
+        }
+    }
 
-	class ViewUpdater extends Thread {
-		private static final String THREAD_NAME = "ViewUpdater";
-		private PlayerWidgetService service;
+    class ViewUpdater extends Thread {
+        private static final String THREAD_NAME = "ViewUpdater";
+        private PlayerWidgetService service;
 
-		public ViewUpdater(PlayerWidgetService service) {
-			super();
-			setName(THREAD_NAME);
-			this.service = service;
+        public ViewUpdater(PlayerWidgetService service) {
+            super();
+            setName(THREAD_NAME);
+            this.service = service;
 
-		}
+        }
 
-		@Override
-		public void run() {
+        @Override
+        public void run() {
             synchronized (psLock) {
                 service.updateViews();
             }
-		}
+        }
 
-	}
+    }
 
 }
diff --git a/app/src/main/res/xml/player_widget_info.xml b/app/src/main/res/xml/player_widget_info.xml
index 831f6daf0..1dbfabcd6 100644
--- a/app/src/main/res/xml/player_widget_info.xml
+++ b/app/src/main/res/xml/player_widget_info.xml
@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android" android:resizeMode="none" android:initialLayout="@layout/player_widget" android:minHeight="40dp" android:minWidth="250dp">
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+                    android:resizeMode="horizontal"
+                    android:initialLayout="@layout/player_widget"
+                    android:updatePeriodMillis="86400000"
+                    android:previewImage="@drawable/ic_widget_preview"
+                    android:minHeight="40dp"
+                    android:minWidth="250dp"
+                    android:minResizeWidth="40dp">
 
 </appwidget-provider>
\ No newline at end of file