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); }