From f8d9d5106eb92b1217b84121f76801ff7ae84f3b Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Sun, 19 Apr 2015 00:56:45 -0500 Subject: [PATCH] When you update an album cover from the tag editor, not only will the album detail screen update, the artist detail screen will when you go back to it too. This uses activity results. --- .../gramophone/ui/activities/AlbumDetailActivity.java | 4 +++- .../ui/activities/ArtistDetailActivity.java | 11 ++++++++++- .../com/kabouzeid/gramophone/util/NavigationUtil.java | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java index abde635e..975d188d 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java @@ -314,8 +314,10 @@ public class AlbumDetailActivity extends AbsFabActivity implements PaletteColorH @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == TAG_EDITOR_REQUEST) + if (requestCode == TAG_EDITOR_REQUEST) { setUpAlbumArtAndApplyPalette(); + setResult(RESULT_OK); + } } @Subscribe diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java index d2193026..fac22f54 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java @@ -1,6 +1,7 @@ package com.kabouzeid.gramophone.ui.activities; import android.annotation.TargetApi; +import android.content.Intent; import android.graphics.Bitmap; import android.graphics.Color; import android.os.Build; @@ -78,6 +79,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor private View songListHeader; private RecyclerView albumRecyclerView; private Spanned biography; + private ArtistAlbumAdapter albumAdapter; private final SmallObservableScrollViewCallbacks observableScrollViewCallbacks = new SmallObservableScrollViewCallbacks() { @Override @@ -234,7 +236,7 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor private void setUpAlbumRecyclerView() { albumRecyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)); List albums = ArtistAlbumLoader.getArtistAlbumList(this, artist.id); - ArtistAlbumAdapter albumAdapter = new ArtistAlbumAdapter(this, albums); + albumAdapter = new ArtistAlbumAdapter(this, albums); albumRecyclerView.setAdapter(albumAdapter); } @@ -309,6 +311,13 @@ public class ArtistDetailActivity extends AbsFabActivity implements PaletteColor }); } + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + if (resultCode == RESULT_OK) + albumAdapter.notifyDataSetChanged(); + } + @Override public int getPaletteColor() { return toolbarColor; diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java index fdb2e638..f0409420 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/NavigationUtil.java @@ -61,7 +61,7 @@ public class NavigationUtil { @SuppressWarnings("unchecked") ActivityOptionsCompat optionsCompat = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, sharedViews ); - ActivityCompat.startActivity(activity, intent, optionsCompat.toBundle()); + ActivityCompat.startActivityForResult(activity, intent, 1001, optionsCompat.toBundle()); } else { activity.startActivity(intent); }