From 6ae12746341abde4e0c3c429f99d39b73025d0c7 Mon Sep 17 00:00:00 2001 From: Rodrigo Moran Date: Sun, 1 Jul 2018 00:36:14 -0400 Subject: [PATCH 1/3] feature-28: Wake backgrounds update on nextSong --- .../mrb/vivify/View/Wake/WakeActivity.java | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java b/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java index a9d38fb..8572b2d 100644 --- a/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java +++ b/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java @@ -7,6 +7,7 @@ import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; +import android.nfc.Tag; import android.os.Bundle; import android.os.Vibrator; import android.preference.PreferenceManager; @@ -43,6 +44,7 @@ import java.util.Date; import java.util.List; import java.util.concurrent.TimeUnit; +import java.util.logging.Logger; import javax.inject.Inject; @@ -78,6 +80,7 @@ public class WakeActivity extends BaseActivity implements ConnectionStateCallbac private static final int REQUEST_CODE = 5123; private static final String REDIRECT_URI = "vivify://callback"; private Player mPlayer; + private Metadata metadata; private Config playerConfig; private ApplicationModule applicationModule = new ApplicationModule((AlarmApplication) getApplication()); private String trackId; @@ -156,12 +159,7 @@ public void onError(Error error) { // mediaInfo.setText(alarm.getArtistName()+": " + alarm.getTrackName()); //Use Glide to load image URL - trackIV.setScaleType(ImageView.ScaleType.FIT_XY); - Glide.with(this) - .load(trackImage) - .diskCacheStrategy(DiskCacheStrategy.SOURCE) - .centerCrop() - .into(trackIV); + updateBackgroundImage(trackImage); Log.d("trackImage", "Traack Image Url: " + trackImage); @@ -191,6 +189,15 @@ public void onError(Error error) { } + private void updateBackgroundImage(String imageUri) { + trackIV.setScaleType(ImageView.ScaleType.FIT_XY); + Glide.with(this) + .load(imageUri) + .diskCacheStrategy(DiskCacheStrategy.SOURCE) + .centerCrop() + .into(trackIV); + } + private void attachAdaptersToRecyclerview() { nextMediaListener = () -> onNextSongClick(); wakeAdapterRecyclerViewAdapter = new WakeRecyclerViewAdapter(alarm, nextMediaListener); @@ -644,7 +651,20 @@ protected void onDestroy() { @Override public void onPlaybackEvent(PlayerEvent event) { + switch (event) { + case kSpPlaybackNotifyTrackChanged: + Log.d(TAG, "Track Changed"); + metadata = mPlayer.getMetadata(); + Log.d(TAG, "Current track: " + metadata.currentTrack.name); + updateView(); + break; + default: + break; + } + } + private void updateView() { + updateBackgroundImage(mPlayer.getMetadata().currentTrack.albumCoverWebUrl); } From 96558d79560b0689a5a931aec2a7d768a9dd0823 Mon Sep 17 00:00:00 2001 From: Rodrigo Moran Date: Sun, 1 Jul 2018 21:05:14 -0400 Subject: [PATCH 2/3] feature-28: Track/artist text updates on next track - needs cleaning --- .../com/rva/mrb/vivify/Model/Data/Alarm.java | 21 ------------------- .../View/Adapter/WakeRecyclerViewAdapter.java | 21 +++++++++++++++++-- .../mrb/vivify/View/Wake/WakeActivity.java | 4 ++++ 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/rva/mrb/vivify/Model/Data/Alarm.java b/app/src/main/java/com/rva/mrb/vivify/Model/Data/Alarm.java index ddc87c8..2e7434d 100644 --- a/app/src/main/java/com/rva/mrb/vivify/Model/Data/Alarm.java +++ b/app/src/main/java/com/rva/mrb/vivify/Model/Data/Alarm.java @@ -262,27 +262,6 @@ public int mapToAlarmDays(int calendarDay) { } } -// public int mapToCalendarDays(int alarmDay) { -// switch (alarmDay) { -// case 1: -// return Calendar.SUNDAY; -// case 2: -// return Calendar.MONDAY; -// case 4: -// return Calendar.TUESDAY; -// case 8: -// return Calendar.WEDNESDAY; -// case 16: -// return Calendar.THURSDAY; -// case 32: -// return Calendar.FRIDAY; -// case 64: -// return Calendar.SATURDAY; -// default: -// return 0; -// } -// } - public int getDecDaysOfWeek() { return (daysOfWeek != null) ? Integer.parseInt(daysOfWeek, 2) : 0; } diff --git a/app/src/main/java/com/rva/mrb/vivify/View/Adapter/WakeRecyclerViewAdapter.java b/app/src/main/java/com/rva/mrb/vivify/View/Adapter/WakeRecyclerViewAdapter.java index 1077ca2..7063c41 100644 --- a/app/src/main/java/com/rva/mrb/vivify/View/Adapter/WakeRecyclerViewAdapter.java +++ b/app/src/main/java/com/rva/mrb/vivify/View/Adapter/WakeRecyclerViewAdapter.java @@ -21,6 +21,8 @@ public class WakeRecyclerViewAdapter extends RecyclerView.Adapter nextMediaListener.onNextSong()); } @@ -60,6 +71,12 @@ public void onAlarmSnooze(int position) { notifyItemRemoved(position); } + public void updateMediaInfo(String track, String artist) { + this.artistName = artist; + this.trackName = track; + this.notifyDataSetChanged(); + } + public class ViewHolder extends RecyclerView.ViewHolder { @BindView(R.id.wake_card) CardView cardView; @BindView(R.id.wake_media_name) TextView mediaName; diff --git a/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java b/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java index 8572b2d..b12f457 100644 --- a/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java +++ b/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java @@ -211,6 +211,8 @@ public void onAlarmDismissed() { public void onAlarmSnoozed() { onSnooze(); } + + }; ItemTouchHelper.Callback callback = new WakeTouchAdapter(touchListener); ItemTouchHelper touchHelper = new ItemTouchHelper(callback); @@ -656,6 +658,8 @@ public void onPlaybackEvent(PlayerEvent event) { Log.d(TAG, "Track Changed"); metadata = mPlayer.getMetadata(); Log.d(TAG, "Current track: " + metadata.currentTrack.name); + Log.d(TAG, "Current artist: " + metadata.currentTrack.artistName); + wakeAdapterRecyclerViewAdapter.updateMediaInfo(metadata.currentTrack.name, metadata.currentTrack.artistName); updateView(); break; default: From d35c949c06a3bc199801056d1300b1dff88bafc8 Mon Sep 17 00:00:00 2001 From: Rodrigo Moran Date: Sun, 8 Jul 2018 21:49:54 -0400 Subject: [PATCH 3/3] feature-28: Cleaned up wake activity --- .../rva/mrb/vivify/View/Wake/WakeActivity.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java b/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java index b12f457..a5779e3 100644 --- a/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java +++ b/app/src/main/java/com/rva/mrb/vivify/View/Wake/WakeActivity.java @@ -655,25 +655,21 @@ protected void onDestroy() { public void onPlaybackEvent(PlayerEvent event) { switch (event) { case kSpPlaybackNotifyTrackChanged: - Log.d(TAG, "Track Changed"); - metadata = mPlayer.getMetadata(); - Log.d(TAG, "Current track: " + metadata.currentTrack.name); - Log.d(TAG, "Current artist: " + metadata.currentTrack.artistName); - wakeAdapterRecyclerViewAdapter.updateMediaInfo(metadata.currentTrack.name, metadata.currentTrack.artistName); - updateView(); + updateView(mPlayer.getMetadata()); break; default: break; } } - private void updateView() { - updateBackgroundImage(mPlayer.getMetadata().currentTrack.albumCoverWebUrl); + private void updateView(Metadata metadata) { + updateBackgroundImage(metadata.currentTrack.albumCoverWebUrl); + wakeAdapterRecyclerViewAdapter + .updateMediaInfo(metadata.currentTrack.name, metadata.currentTrack.artistName); } - @Override public void onPlaybackError(com.spotify.sdk.android.player.Error error) { - + Log.d(TAG, "Error: " + error); } }