tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed the small appwidget to classic.

Browse source
This commit is contained in:
Karim Abou Zeid 2016-04-04 13:18:48 +02:00
commit ae84866e04
7 changed files with 33 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetSmall.java → app/src/main/java/com/kabouzeid/gramophone/appwidgets/AppWidgetClassic.java
View file

@ -27,14 +27,14 @@ import com.kabouzeid.gramophone.util.Util;
/**
* @author Karim Abou Zeid (kabouzeid)
*/
public class AppWidgetSmall extends BaseAppWidget {
public static final String NAME = "app_widget_small";
public class AppWidgetClassic extends BaseAppWidget {
public static final String NAME = "app_widget_classic";
private static AppWidgetSmall mInstance;
private static AppWidgetClassic mInstance;
public static synchronized AppWidgetSmall getInstance() {
public static synchronized AppWidgetClassic getInstance() {
if (mInstance == null) {
mInstance = new AppWidgetSmall();
mInstance = new AppWidgetClassic();
}
return mInstance;
}
@ -58,7 +58,7 @@ public class AppWidgetSmall extends BaseAppWidget {
* default click and hide actions if service not running.
*/
private void defaultAppWidget(final Context context, final int[] appWidgetIds) {
final RemoteViews appWidgetView = new RemoteViews(context.getPackageName(), R.layout.app_widget_small);
final RemoteViews appWidgetView = new RemoteViews(context.getPackageName(), R.layout.app_widget_classic);
appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE);
appWidgetView.setViewVisibility(R.id.image, View.INVISIBLE);
@ -106,7 +106,7 @@ public class AppWidgetSmall extends BaseAppWidget {
* Update all active widget instances by pushing changes
*/
public void performUpdate(final MusicService service, final int[] appWidgetIds) {
final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(), R.layout.app_widget_small);
final RemoteViews appWidgetView = new RemoteViews(service.getPackageName(), R.layout.app_widget_classic);
final boolean isPlaying = service.isPlaying();
final Song song = service.getCurrentSong();
@ -124,12 +124,16 @@ public class AppWidgetSmall extends BaseAppWidget {
int playPauseRes = isPlaying ? R.drawable.ic_pause_white_24dp : R.drawable.ic_play_arrow_white_24dp;
appWidgetView.setImageViewBitmap(R.id.button_toggle_play_pause, createBitmap(Util.getTintedDrawable(service, playPauseRes, MaterialValueHelper.getPrimaryTextColor(service, true)), 1f));
// set prev/next button drawables
appWidgetView.setImageViewBitmap(R.id.button_next, createBitmap(Util.getTintedDrawable(service, R.drawable.ic_skip_next_white_24dp, MaterialValueHelper.getPrimaryTextColor(service, true)), 1f));
appWidgetView.setImageViewBitmap(R.id.button_prev, createBitmap(Util.getTintedDrawable(service, R.drawable.ic_skip_previous_white_24dp, MaterialValueHelper.getPrimaryTextColor(service, true)), 1f));
// Link actions buttons to intents
linkButtons(service, appWidgetView);
// load the album cover async and push the update on completion
final Context appContext = service.getApplicationContext();
final int widgetImageSize = service.getResources().getDimensionPixelSize(R.dimen.app_widget_small_image_size);
final int widgetImageSize = service.getResources().getDimensionPixelSize(R.dimen.app_widget_classic_image_size);
service.runOnUiThread(new Runnable() {
@Override
public void run() {

10
app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
View file

@ -37,7 +37,7 @@ import com.bumptech.glide.Glide;
import com.bumptech.glide.request.animation.GlideAnimation;
import com.bumptech.glide.request.target.SimpleTarget;
import com.kabouzeid.gramophone.R;
import com.kabouzeid.gramophone.appwidgets.AppWidgetSmall;
import com.kabouzeid.gramophone.appwidgets.AppWidgetClassic;
import com.kabouzeid.gramophone.glide.BlurTransformation;
import com.kabouzeid.gramophone.glide.SongGlideRequest;
import com.kabouzeid.gramophone.helper.PlayingNotificationHelper;
@ -112,7 +112,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private final IBinder musicBind = new MusicBinder();
private AppWidgetSmall appWidgetSmall = AppWidgetSmall.getInstance();
private AppWidgetClassic appWidgetClassic = AppWidgetClassic.getInstance();
private Playback playback;
private ArrayList<Song> playingQueue = new ArrayList<>();
@ -936,7 +936,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
private void sendChangeInternal(final String what) {
sendBroadcast(new Intent(what));
appWidgetSmall.notifyChange(this, what);
appWidgetClassic.notifyChange(this, what);
}
private void handleChangeInternal(@NonNull final String what) {
@ -1158,9 +1158,9 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
public void onReceive(final Context context, final Intent intent) {
final String command = intent.getStringExtra(EXTRA_APP_WIDGET_NAME);
if (AppWidgetSmall.NAME.equals(command)) {
if (AppWidgetClassic.NAME.equals(command)) {
final int[] small = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
appWidgetSmall.performUpdate(MusicService.this, small);
appWidgetClassic.performUpdate(MusicService.this, small);
}
}
};