diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java b/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java index e504e849..1a49230f 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java +++ b/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageFetcher.java @@ -48,8 +48,8 @@ public class ArtistImageFetcher implements DataFetcher { @Override public InputStream loadData(Priority priority) throws Exception { - if (!MusicUtil.isArtistNameUnknown(model.artistName) && Util.isAllowedToAutoDownload(context)) { - Response response = lastFMRestClient.getApiService().getArtistInfo(model.artistName, model.skipOkHttpCache ? "no-cache" : null).execute(); + if (!MusicUtil.isArtistNameUnknown(model.artistName) && Util.isAllowedToDownloadMetadata(context)) { + Response response = lastFMRestClient.getApiService().getArtistInfo(model.artistName, null, model.skipOkHttpCache ? "no-cache" : null).execute(); if (!response.isSuccessful()) { throw new IOException("Request failed with code: " + response.code()); diff --git a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java index 77cac50a..9d556c08 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/LastFMRestClient.java @@ -18,7 +18,6 @@ import okhttp3.Response; import retrofit2.Retrofit; import retrofit2.converter.gson.GsonConverterFactory; - /** * @author Karim Abou Zeid (kabouzeid) */ diff --git a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmAlbum.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmAlbum.java index 1992b7e3..fd4e833a 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmAlbum.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmAlbum.java @@ -1,4 +1,3 @@ - package com.kabouzeid.gramophone.lastfm.rest.model; import com.google.gson.annotations.Expose; @@ -8,7 +7,6 @@ import java.util.ArrayList; import java.util.List; public class LastFmAlbum { - @Expose private Album album; @@ -21,9 +19,10 @@ public class LastFmAlbum { } public static class Album { - @Expose private List image = new ArrayList<>(); + @Expose + private Wiki wiki; public List getImage() { return image; @@ -33,8 +32,26 @@ public class LastFmAlbum { this.image = image; } - public static class Image { + public Wiki getWiki() { return wiki; } + public void setWiki(Wiki wiki) { + this.wiki = wiki; + } + + public class Wiki { + @Expose + private String content; + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + } + + public static class Image { @SerializedName("#text") @Expose private String Text; @@ -58,5 +75,4 @@ public class LastFmAlbum { } } } - } diff --git a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmArtist.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmArtist.java index 42478cfd..30ca8f37 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmArtist.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/model/LastFmArtist.java @@ -1,4 +1,3 @@ - package com.kabouzeid.gramophone.lastfm.rest.model; import com.google.gson.annotations.Expose; @@ -8,7 +7,6 @@ import java.util.ArrayList; import java.util.List; public class LastFmArtist { - @Expose private Artist artist; @@ -21,7 +19,6 @@ public class LastFmArtist { } public static class Artist { - @Expose private List image = new ArrayList<>(); @Expose @@ -44,7 +41,6 @@ public class LastFmArtist { } public class Bio { - @Expose private String content; @@ -55,11 +51,9 @@ public class LastFmArtist { public void setContent(String content) { this.content = content; } - } public static class Image { - @SerializedName("#text") @Expose private String Text; @@ -81,9 +75,6 @@ public class LastFmArtist { public void setSize(String size) { this.size = size; } - } - } - } diff --git a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/service/LastFMService.java b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/service/LastFMService.java index 7883af74..4a9b33c7 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/service/LastFMService.java +++ b/app/src/main/java/com/kabouzeid/gramophone/lastfm/rest/service/LastFMService.java @@ -18,8 +18,8 @@ public interface LastFMService { String BASE_QUERY_PARAMETERS = "?format=json&autocorrect=1&api_key=" + API_KEY; @GET(BASE_QUERY_PARAMETERS + "&method=album.getinfo") - Call getAlbumInfo(@Query("album") String albumName, @Query("artist") String artistName); + Call getAlbumInfo(@Query("album") String albumName, @Query("artist") String artistName, @Nullable @Query("lang") String language); @GET(BASE_QUERY_PARAMETERS + "&method=artist.getinfo") - Call getArtistInfo(@Query("artist") String artistName, @Nullable @Header("Cache-Control") String cacheControl); + Call getArtistInfo(@Query("artist") String artistName, @Nullable @Query("lang") String language, @Nullable @Header("Cache-Control") String cacheControl); } \ No newline at end of file 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 20de7ebf..eb89aa72 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 @@ -5,18 +5,23 @@ import android.content.Intent; import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.v4.app.LoaderManager; import android.support.v4.content.Loader; import android.support.v7.widget.GridLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.Toolbar; +import android.text.Html; +import android.text.Spanned; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; import com.afollestad.materialcab.MaterialCab; +import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.util.DialogUtils; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestListener; @@ -34,6 +39,8 @@ import com.kabouzeid.gramophone.helper.MusicPlayerRemote; import com.kabouzeid.gramophone.interfaces.CabHolder; import com.kabouzeid.gramophone.interfaces.LoaderIds; import com.kabouzeid.gramophone.interfaces.PaletteColorHolder; +import com.kabouzeid.gramophone.lastfm.rest.LastFMRestClient; +import com.kabouzeid.gramophone.lastfm.rest.model.LastFmAlbum; import com.kabouzeid.gramophone.loader.AlbumLoader; import com.kabouzeid.gramophone.misc.SimpleObservableScrollViewCallbacks; import com.kabouzeid.gramophone.misc.WrappedAsyncTaskLoader; @@ -45,8 +52,13 @@ import com.kabouzeid.gramophone.util.NavigationUtil; import com.kabouzeid.gramophone.util.PhonographColorUtil; import com.kabouzeid.gramophone.util.Util; +import java.util.Locale; + import butterknife.BindView; import butterknife.ButterKnife; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; /** * Be careful when changing things in this Activity! @@ -81,6 +93,11 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements private int toolbarColor; private float toolbarAlpha; + @Nullable + private Spanned wiki; + private MaterialDialog wikiDialog; + private LastFMRestClient lastFMRestClient; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -89,6 +106,8 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements supportPostponeEnterTransition(); + lastFMRestClient = new LastFMRestClient(this); + setUpObservableListViewParams(); setUpToolBar(); setUpViews(); @@ -233,6 +252,49 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements return true; } + private void loadWiki() { + loadWiki(Locale.getDefault().getLanguage()); + } + + private void loadWiki(@Nullable final String lang) { + wiki = null; + + lastFMRestClient.getApiService() + .getAlbumInfo(getAlbum().getTitle(), getAlbum().getArtistName(), lang) + .enqueue(new Callback() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + final LastFmAlbum lastFmAlbum = response.body(); + if (lastFmAlbum != null && lastFmAlbum.getAlbum() != null && lastFmAlbum.getAlbum().getWiki() != null) { + final String wikiContent = lastFmAlbum.getAlbum().getWiki().getContent(); + if (wikiContent != null && !wikiContent.trim().isEmpty()) { + wiki = Html.fromHtml(wikiContent); + } + } + + // If the "lang" parameter is set and no wiki is given, retry with default language + if (wiki == null && lang != null) { + 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 call, @NonNull Throwable t) { + t.printStackTrace(); + } + }); + } + @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { int id = item.getItemId(); @@ -257,6 +319,25 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements case R.id.action_go_to_artist: NavigationUtil.goToArtist(this, getAlbum().getArtistId()); return true; + case R.id.action_wiki: + 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(this, getResources().getString(R.string.wiki_unavailable), Toast.LENGTH_SHORT).show(); + } + } else { + wikiDialog.show(); + loadWiki(); + } + return true; } return super.onOptionsItemSelected(item); } @@ -323,6 +404,11 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements private void setAlbum(Album album) { this.album = album; loadAlbumCover(); + + if (Util.isAllowedToDownloadMetadata(this)) { + loadWiki(); + } + albumTitleView.setText(album.getTitle()); adapter.swapDataSet(album.songs); } 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 08a43d85..48a1fe87 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 @@ -56,6 +56,8 @@ import com.kabouzeid.gramophone.util.PhonographColorUtil; import com.kabouzeid.gramophone.util.PreferenceUtil; import com.kabouzeid.gramophone.util.Util; +import java.util.Locale; + import butterknife.BindView; import butterknife.ButterKnife; import retrofit2.Call; @@ -97,6 +99,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement private Artist artist; @Nullable private Spanned biography; + private MaterialDialog biographyDialog; private HorizontalAlbumAdapter albumAdapter; private ArtistSongAdapter songAdapter; @@ -219,34 +222,47 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement } private void loadBiography() { - lastFMRestClient.getApiService().getArtistInfo(getArtist().getName(), null).enqueue(new Callback() { - @Override - public void onResponse(Call call, Response 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); - return; - } - } - biography = null; - } - - @Override - public void onFailure(Call call, Throwable t) { - t.printStackTrace(); - biography = null; - } - }); + loadBiography(Locale.getDefault().getLanguage()); } - private MaterialDialog getBiographyDialog() { - return new MaterialDialog.Builder(ArtistDetailActivity.this) - .title(getArtist().getName()) - .content(biography != null ? biography : "") - .positiveText(android.R.string.ok) - .build(); + private void loadBiography(@Nullable final String lang) { + biography = null; + + lastFMRestClient.getApiService() + .getArtistInfo(getArtist().getName(), lang, null) + .enqueue(new Callback() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + final LastFmArtist lastFmArtist = response.body(); + if (lastFmArtist != null && lastFmArtist.getArtist() != null) { + final String bioContent = lastFmArtist.getArtist().getBio().getContent(); + if (bioContent != null && !bioContent.trim().isEmpty()) { + biography = Html.fromHtml(bioContent); + } + } + + // If the "lang" parameter is set and no biography is given, retry with default language + if (biography == null && lang != null) { + 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 call, @NonNull Throwable t) { + t.printStackTrace(); + biography = null; + } + }); } private void loadArtistImage(final boolean forceDownload) { @@ -339,10 +355,22 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement super.onBackPressed(); return true; case R.id.action_biography: - if (biography != null) { - getBiographyDialog().show(); + 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 { - Toast.makeText(ArtistDetailActivity.this, getResources().getString(R.string.biography_unavailable), Toast.LENGTH_SHORT).show(); + biographyDialog.show(); + loadBiography(); } return true; case R.id.action_re_download_artist_image: @@ -410,7 +438,11 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement private void setArtist(Artist artist) { this.artist = artist; loadArtistImage(false); - loadBiography(); + + if (Util.isAllowedToDownloadMetadata(this)) { + loadBiography(); + } + artistName.setText(artist.getName()); songAdapter.swapDataSet(artist.getSongs()); albumAdapter.swapDataSet(artist.albums); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java index 7a6fd6ce..ef8ec723 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AlbumTagEditorActivity.java @@ -100,7 +100,7 @@ public class AlbumTagEditorActivity extends AbsTagEditorActivity implements Text Toast.makeText(this, getResources().getString(R.string.album_or_artist_empty), Toast.LENGTH_SHORT).show(); return; } - lastFMRestClient.getApiService().getAlbumInfo(albumTitleStr, albumArtistNameStr).enqueue(new Callback() { + lastFMRestClient.getApiService().getAlbumInfo(albumTitleStr, albumArtistNameStr, null).enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { LastFmAlbum lastFmAlbum = response.body(); diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/Util.java b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java index 156e3642..5d292441 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/Util.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/Util.java @@ -121,7 +121,7 @@ public class Util { } else return false; } - public static boolean isAllowedToAutoDownload(final Context context) { + public static boolean isAllowedToDownloadMetadata(final Context context) { switch (PreferenceUtil.getInstance(context).autoDownloadImagesPolicy()) { case "always": return true; diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml index fb287992..e5be6b4d 100644 --- a/app/src/main/res/menu/menu_album_detail.xml +++ b/app/src/main/res/menu/menu_album_detail.xml @@ -9,6 +9,11 @@ android:title="@string/action_shuffle_album" app:showAsAction="ifRoom" /> + + شريط تنقل ملون صفحة البدء أظهر صورة الألبوم - حمل صور الفنانين تلقائياً + حمل صور الفنانين تلقائياً تغييم صورة الألبوم إشعار ملون تجاهل صور متجر الوسائط diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index c4051650..20c72acf 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -117,7 +117,7 @@ Оцветени навигационни бутони Начална страница Покажи обложката на албум - Автоматично изтегляне на изображения на артист + Автоматично изтегляне на изображения на артист Размажи обложката Оцвети известията Игнорирай вградените обложки diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 7ef41ea4..98219bd8 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -122,7 +122,7 @@ Barevné zkratky aplikace Zvolit výchozí obrazovku Obal alba na odemykací obrazovce - Automaticky stahovat obrázky umělců + Automaticky stahovat obrázky umělců Rozostřit obal alba Barevné notifikace Ignorovat obaly Media Storu diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index a1b5f5a0..91fa40a2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -122,7 +122,7 @@ Gefärbte App-Shortcuts Startseite Album Cover anzeigen - Interpreten Bilder automatisch herunterladen + Interpreten Bilder automatisch herunterladen Album Cover weichzeichnen Gefärbte Benachrichtigung Media Store Cover ignorieren diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 456d9d42..5789a887 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -118,7 +118,7 @@ Έγχρωμη μπάρα πλοήγησης Αρχική σελίδα Εμφάνιση album art - Αυτόματο κατέβασμα πορτρέτων καλλιτεχνών + Αυτόματο κατέβασμα πορτρέτων καλλιτεχνών Θάμπωμα πορτρέτων καλλιτεχνών Χρωματιστή πλοήγηση Παράληψη των album art στην SD diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index d5a81633..6ebe4ace 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -122,7 +122,7 @@ Atajos coloreados de la aplicación Página de inicio Mostrar carátula del álbum - Descargar automaticamente las fotos de los artistas + Descargar automaticamente las fotos de los artistas Desenfocar carátula de álbum Notificación coloreada Ignorar carátulas provenientes del almacenamiento local diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml index 7559f6b5..13496029 100644 --- a/app/src/main/res/values-es-rUS/strings.xml +++ b/app/src/main/res/values-es-rUS/strings.xml @@ -122,7 +122,7 @@ Accesos directos coloreados Sección de inicio Mostrar carátula del álbum - Descarga automática de imágenes de artistas + Descarga automática de imágenes de artistas Desenfocar imagen de álbum Notificación coloreada Ignorar imágenes de la librería del sistema diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index b80e142f..9efc3fcb 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -117,7 +117,7 @@ Värillinen navigointipalkki Aloitussivu Näytä albumin kansi - Lataa automaattisesti artistien kuvat + Lataa automaattisesti artistien kuvat Sumenna albumin kansi Värillinen ilmoitus Sivuuta Media Storen albumikannet diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6642d687..f053ac53 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -122,7 +122,7 @@ Raccourcis de l\'application colorés Page d\'accueil Afficher la pochette d\'album - Télécharger automatiquement les images + Télécharger automatiquement les images Pochette d\'album floue Notification colorée Ignorer le stockage des pochettes diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 2cf98310..493ffb12 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -116,7 +116,7 @@ סרגל ניווט צבעוני עמוד פתיחה הצג עטיפת אלבום - הורדה אוטומטית של תמונות האמן + הורדה אוטומטית של תמונות האמן טשטוש עטיפת האלבום התראה צבעונית ניגון ללא מרווחים בין השירים diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index de198d90..14641b10 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -117,7 +117,7 @@ Obojena navigacijska traka Početna stranica Prikaži omot albuma na zaklj. zaslonu - Automatski preuzmi slike izvođača + Automatski preuzmi slike izvođača Zamagli omot albuma Obojene obavijesti Ignoriraj Media Store omote diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6785878c..b598ab07 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -122,7 +122,7 @@ Színes alkalmazás hivatkozások Kezdő oldal Albumboritó megjelenítése - Előadó képének automatikus letöltése + Előadó képének automatikus letöltése Albumborító elhomályosítása Színezett értesítés A médiában tárolt albumborítók figyelmen kívül hagyása diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 3c20ac73..2418753f 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -117,7 +117,7 @@ Warnai alat navigasi di bagian bawah layar Halaman awal Perlihatkan sampul album pada layar kunci - Unduh otomatis gambar-gambar artis + Unduh otomatis gambar-gambar artis Buramkan sampul album Notifikasi berwarna Abaikan sampul-sampul dari \'Media Store\' android. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 3c20ac73..2418753f 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -117,7 +117,7 @@ Warnai alat navigasi di bagian bawah layar Halaman awal Perlihatkan sampul album pada layar kunci - Unduh otomatis gambar-gambar artis + Unduh otomatis gambar-gambar artis Buramkan sampul album Notifikasi berwarna Abaikan sampul-sampul dari \'Media Store\' android. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index fe87026c..eec0301f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -122,7 +122,7 @@ Scorciatoie app colorate Pagina iniziale Mostra copertina album nella schermata di blocco - Scarica automaticamente le immagini degli artisti + Scarica automaticamente le immagini degli artisti Sfoca la copertina Notifica colorata Ignora le copertine del Media Store diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 2cf98310..493ffb12 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -116,7 +116,7 @@ סרגל ניווט צבעוני עמוד פתיחה הצג עטיפת אלבום - הורדה אוטומטית של תמונות האמן + הורדה אוטומטית של תמונות האמן טשטוש עטיפת האלבום התראה צבעונית ניגון ללא מרווחים בין השירים diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 92fcf380..18aad185 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -107,7 +107,7 @@ ナビゲーションバーの彩色設定 起動時の画面 アルバムアートをロック画面に表示する - アーティスト画像の自動ダウンロード + アーティスト画像の自動ダウンロード アルバムアートにぼかし効果をかける 通知コントロールに色を付ける アルバムアートを直接読み込む diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 7d5819c2..16974e7a 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -112,7 +112,7 @@ 내비게이션 바 색상 틴트 시작 화면 앨범 커버 보이기 - 아티스트 이미지 자동 다운로드 + 아티스트 이미지 자동 다운로드 앨범 커버 블러 효과 알림 색상 틴트 미디어 스토어 앨범 커버 무시 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index aa7c84b9..a8753b80 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -121,7 +121,7 @@ Gekleurde navigatiebalk Startpagina Toon albumhoes - Download artiesten afbeeldingen + Download artiesten afbeeldingen Vervaag albumhoes Gekleurde notificatie Negeer Mediaopslag illustraties diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c098475b..c3a1dc18 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -117,7 +117,7 @@ Kolorowy pasek nawigacyjny Strona startowa Pokazuj okładki albumów - Automatyczne pobieranie zdjęć wykonawców + Automatyczne pobieranie zdjęć wykonawców Rozmywanie okładki albumu Kolorowy odtwarzacz w pasku powiadomień Ignoruj okładki z Media Store diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a05c8914..29791a5b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -117,7 +117,7 @@ Barra de navegação colorida Página inicial Visualizar capa do álbum - Baixar as imagens dos artistas automaticamente + Baixar as imagens dos artistas automaticamente Capa de álbum esmaecida Notificação colorida Ignorar capas Media Store diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index a0a69b33..4063eec4 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -117,7 +117,7 @@ Barra de navegação colorida Página Inicial Mostrar capa do álbum - Download automático das imagens dos artistas + Download automático das imagens dos artistas Desfocar capa do álbum Notificação colorida Ignorar capas Media Store diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3d0d6c51..e0d99525 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -122,7 +122,7 @@ Цветные шорткаты Установить начальную страницу Показывать обложку альбома - Автоматически загружать изображения исполнителей + Автоматически загружать изображения исполнителей "Размытая обложка альбома " Окрашенное уведомление Игнорировать хранилище обложек альбомов diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 7042f1d7..e0b7ec36 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -122,7 +122,7 @@ Renkli uygulama kısayolları Başlangıç sayfası Albüm kapağını göster - Sanatçı resimlerini otomatik indir + Sanatçı resimlerini otomatik indir Bulanık albüm kapağı Renkli bildirim Media Store albüm kapağını yoksay diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 24e4a6f7..441ff1c9 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -117,7 +117,7 @@ Кольорова панель навігації Початкова сторінка Показати обкладинку альбому - Автоматично завантажувати зображення виконавців + Автоматично завантажувати зображення виконавців Розмити обкладинку альбому Кольорове сповіщення Ігнорувати обкладинки з Медіасховища. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index fb3e3d38..9775a7ef 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -122,7 +122,7 @@ Màu sắc biểu tượng ứng dụng Trang bắt đầu Hiện bìa album - Tự động tải về hình ảnh nghệ sĩ + Tự động tải về hình ảnh nghệ sĩ Làm mờ bìa album Màu thông báo Bỏ qua kho ảnh bìa trong Kho Phương tiện diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 96981629..a79e7f24 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -122,7 +122,7 @@ 着色应用快捷方式 起始页 显示专辑封面 - 自动下载艺术家图像 + 自动下载艺术家图像 专辑封面模糊化 启用通知背景着色 忽略媒体储存中的专辑封面 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index a6cb6771..f7216aa7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -123,7 +123,7 @@ 彩色的應用快捷方式 首頁 顯示專輯封面 - 自動下載演出者圖片 + 自動下載演出者圖片 將專輯圖片模糊化 彩色的狀態列 忽略音訊檔內嵌的專輯封面 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9bb49665..95629fcd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -38,8 +38,10 @@ Songs Playlists Couldn\u2019t play this song. - Couldn\u2019t find the artists biography. + Couldn\u2019t find a biography entry for this artist. + Couldn\u2019t find a wiki entry for this album. Biography + Wiki Audio focus denied. Album Artist @@ -129,7 +131,7 @@ Colored app shortcuts Start page Show album cover - Auto download artist images + Auto download metadata Blur album cover Colored notification Classic notification design diff --git a/app/src/main/res/xml/pref_images.xml b/app/src/main/res/xml/pref_images.xml index e4c7e127..e5f407af 100644 --- a/app/src/main/res/xml/pref_images.xml +++ b/app/src/main/res/xml/pref_images.xml @@ -16,7 +16,7 @@ android:key="auto_download_images_policy" android:negativeButtonText="@null" android:positiveButtonText="@null" - android:title="@string/pref_title_auto_download_artist_images" /> + android:title="@string/pref_title_auto_download_metadata" />