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

Refactor and rename metadata pref/util

Browse source
This commit is contained in:
Eugene Cheung 2017-07-05 12:36:22 -04:00
commit 0bd8e4292d
No known key found for this signature in database
GPG key ID: E1FD745328866B0A
37 changed files with 133 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

96
app/src/main/java/com/kabouzeid/gramophone/ui/activities/AlbumDetailActivity.java
View file

@ -257,45 +257,44 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
}
private void loadWiki() {
final Callback<LastFmAlbum> wikiCallback = new Callback<LastFmAlbum>(){
@Override
public void onResponse(Call<LastFmAlbum> call, Response<LastFmAlbum> response) {
LastFmAlbum lastFmAlbum = response.body();
if (lastFmAlbum.getAlbum().getWiki() != null) {
String wik = lastFmAlbum.getAlbum().getWiki().getContent();
if (wik != null && !wik.trim().equals("")) {
wiki = Html.fromHtml(wik);
wikiReady();
return;
}
}
if(call.request().url().queryParameter("lang") != null) {
//If the "lang" parameter is set and no wiki is given, retry with default language
lastFMRestClient.getApiService().getAlbumInfo(getAlbum().getTitle(), getAlbum().getArtistName(), null).enqueue(this);
return;
}
wiki = null;
wikiReady();
}
@Override
public void onFailure(Call<LastFmAlbum> call, Throwable t) {
t.printStackTrace();
wiki = null;
}
};
lastFMRestClient.getApiService().getAlbumInfo(getAlbum().getTitle(), getAlbum().getArtistName(), Locale.getDefault().getLanguage()).enqueue(wikiCallback);
loadWiki(Locale.getDefault().getLanguage());
}
private void wikiReady(){
if(!Util.isAllowedToAutoDownload(AlbumDetailActivity.this)) {
if(wiki != null) {
wikiDialog.setContent(wiki);
} else {
wikiDialog.dismiss();
Toast.makeText(AlbumDetailActivity.this, getResources().getString(R.string.wiki_unavailable), Toast.LENGTH_SHORT).show();
}
}
private void loadWiki(@Nullable final String lang) {
wiki = null;
lastFMRestClient.getApiService()
.getAlbumInfo(getAlbum().getTitle(), getAlbum().getArtistName(), lang)
.enqueue(new Callback<LastFmAlbum>() {
@Override
public void onResponse(@NonNull Call<LastFmAlbum> call, @NonNull Response<LastFmAlbum> response) {
final LastFmAlbum lastFmAlbum = response.body();
if (lastFmAlbum != null && lastFmAlbum.getAlbum().getWiki() != null) {
final String wikiContent = lastFmAlbum.getAlbum().getWiki().getContent();
if (wikiContent != null && !wikiContent.trim().isEmpty()) {
wiki = Html.fromHtml(wikiContent);
} else if (lang != null) {
// If the "lang" parameter is set and no wiki is given, retry with default language
loadWiki(null);
return;
}
}
if (!Util.isAllowedToDownloadMetadata(AlbumDetailActivity.this)) {
if (wiki != null) {
wikiDialog.setContent(wiki);
} else {
wikiDialog.dismiss();
Toast.makeText(AlbumDetailActivity.this, getResources().getString(R.string.wiki_unavailable), Toast.LENGTH_SHORT).show();
}
}
}
@Override
public void onFailure(@NonNull Call<LastFmAlbum> call, @NonNull Throwable t) {
t.printStackTrace();
}
});
}
@Override
@ -323,15 +322,20 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
NavigationUtil.goToArtist(this, getAlbum().getArtistId());
return true;
case R.id.action_wiki:
if(Util.isAllowedToAutoDownload(AlbumDetailActivity.this)) {
if (wikiDialog == null) {
wikiDialog = new MaterialDialog.Builder(this)
.title(album.getTitle())
.positiveText(android.R.string.ok)
.build();
}
if (Util.isAllowedToDownloadMetadata(this)) {
if (wiki != null) {
wikiDialog.setContent(wiki);
wikiDialog.show();
} else {
Toast.makeText(AlbumDetailActivity.this, getResources().getString(R.string.wiki_unavailable), Toast.LENGTH_SHORT).show();
Toast.makeText(this, getResources().getString(R.string.wiki_unavailable), Toast.LENGTH_SHORT).show();
}
}
else {
} else {
wikiDialog.show();
loadWiki();
}
@ -402,13 +406,11 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements
private void setAlbum(Album album) {
this.album = album;
loadAlbumCover();
if(Util.isAllowedToAutoDownload(AlbumDetailActivity.this))
if (Util.isAllowedToDownloadMetadata(this)) {
loadWiki();
wikiDialog=new MaterialDialog.Builder(AlbumDetailActivity.this)
.title(album.getTitle())
.content("")
.positiveText(android.R.string.ok)
.build();
}
albumTitleView.setText(album.getTitle());
adapter.swapDataSet(album.songs);
}

97
app/src/main/java/com/kabouzeid/gramophone/ui/activities/ArtistDetailActivity.java
View file

@ -117,7 +117,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
supportPostponeEnterTransition();
lastFMRestClient = new LastFMRestClient(this);
usePalette=PreferenceUtil.getInstance(this).albumArtistColoredFooters();
usePalette = PreferenceUtil.getInstance(this).albumArtistColoredFooters();
initViews();
setUpObservableListViewParams();
@ -226,45 +226,45 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
}
private void loadBiography() {
final Callback<LastFmArtist> bioCallback = new Callback<LastFmArtist>(){
@Override
public void onResponse(Call<LastFmArtist> call, Response<LastFmArtist> response) {
LastFmArtist lastFmArtist = response.body();
if (lastFmArtist.getArtist() != null) {
String bio = lastFmArtist.getArtist().getBio().getContent();
if (bio != null && !bio.trim().equals("")) {
biography = Html.fromHtml(bio);
biographyReady();
return;
}
else if(call.request().url().queryParameter("lang") != null) {
//If the "lang" parameter is set and no biography is given, retry with default language
lastFMRestClient.getApiService().getArtistInfo(getArtist().getName(), null, null).enqueue(this);
return;
}
}
biography = null;
biographyReady();
}
@Override
public void onFailure(Call<LastFmArtist> call, Throwable t) {
t.printStackTrace();
biography = null;
}
};
lastFMRestClient.getApiService().getArtistInfo(getArtist().getName(), Locale.getDefault().getLanguage(), null).enqueue(bioCallback);
loadBiography(Locale.getDefault().getLanguage());
}
private void biographyReady() {
if(!Util.isAllowedToAutoDownload(ArtistDetailActivity.this)) {
if(biography != null) {
biographyDialog.setContent(biography);
} else {
biographyDialog.dismiss();
Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.biography_unavailable), Toast.LENGTH_SHORT).show();
}
}
private void loadBiography(@Nullable final String lang) {
biography = null;
lastFMRestClient.getApiService()
.getArtistInfo(getArtist().getName(), lang, null)
.enqueue(new Callback<LastFmArtist>() {
@Override
public void onResponse(@NonNull Call<LastFmArtist> call, @NonNull Response<LastFmArtist> response) {
final LastFmArtist lastFmArtist = response.body();
if (lastFmArtist != null && lastFmArtist.getArtist() != null) {
String bio = lastFmArtist.getArtist().getBio().getContent();
if (bio != null && !bio.trim().isEmpty()) {
biography = Html.fromHtml(bio);
} else if (lang != null) {
// If the "lang" parameter is set and no biography is given, retry with default language
loadBiography(null);
return;
}
}
if (!Util.isAllowedToDownloadMetadata(ArtistDetailActivity.this)) {
if (biography != null) {
biographyDialog.setContent(biography);
} else {
biographyDialog.dismiss();
Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.biography_unavailable), Toast.LENGTH_SHORT).show();
}
}
}
@Override
public void onFailure(@NonNull Call<LastFmArtist> call, @NonNull Throwable t) {
t.printStackTrace();
biography = null;
}
});
}
private void loadArtistImage(final boolean forceDownload) {
@ -357,15 +357,20 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
super.onBackPressed();
return true;
case R.id.action_biography:
if(Util.isAllowedToAutoDownload(ArtistDetailActivity.this)) {
if (biographyDialog == null) {
biographyDialog = new MaterialDialog.Builder(this)
.title(artist.getName())
.positiveText(android.R.string.ok)
.build();
}
if (Util.isAllowedToDownloadMetadata(ArtistDetailActivity.this)) {
if (biography != null) {
biographyDialog.setContent(biography);
biographyDialog.show();
} else {
Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.biography_unavailable), Toast.LENGTH_SHORT).show();
}
}
else {
} else {
biographyDialog.show();
loadBiography();
}
@ -435,13 +440,11 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement
private void setArtist(Artist artist) {
this.artist = artist;
loadArtistImage(false);
if(Util.isAllowedToAutoDownload(ArtistDetailActivity.this))
if (Util.isAllowedToDownloadMetadata(this)) {
loadBiography();
biographyDialog=new MaterialDialog.Builder(ArtistDetailActivity.this)
.title(artist.getName())
.content("")
.positiveText(android.R.string.ok)
.build();
}
artistName.setText(artist.getName());
songAdapter.swapDataSet(artist.getSongs());
albumAdapter.swapDataSet(artist.albums);