From 7c83b5017951337f3594391d70c211f69472995c Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 18 Jul 2019 03:54:31 -0700 Subject: [PATCH] overhaul existing preferences --- .../adapter/AlbumCoverPagerAdapter.java | 28 +-- .../adapter/MusicLibraryPagerAdapter.java | 2 +- .../gramophone/adapter/SearchAdapter.java | 2 +- .../adapter/album/AlbumAdapter.java | 1 - .../adapter/album/HorizontalAlbumAdapter.java | 1 - .../adapter/song/ArtistSongAdapter.java | 2 +- .../gramophone/adapter/song/SongAdapter.java | 1 - .../gramophone/glide/SongGlideRequest.java | 27 +-- .../glide/artistimage/ArtistImageFetcher.java | 37 +--- .../glide/artistimage/ArtistImageLoader.java | 6 +- .../gramophone/helper/MusicPlayerRemote.java | 2 +- .../preferences/LibraryPreferenceDialog.java | 6 +- .../gramophone/service/MultiPlayer.java | 2 +- .../gramophone/service/MusicService.java | 13 +- .../notification/PlayingNotificationImpl.java | 1 - .../PlayingNotificationImpl24.java | 1 - .../ui/activities/AlbumDetailActivity.java | 1 - .../ui/activities/ArtistDetailActivity.java | 2 +- .../ui/activities/MainActivity.java | 2 +- .../ui/activities/SettingsActivity.java | 13 +- .../mainactivity/library/LibraryFragment.java | 10 +- .../library/pager/AlbumsFragment.java | 2 +- .../library/pager/ArtistsFragment.java | 2 +- .../library/pager/SongsFragment.java | 2 +- .../kabouzeid/gramophone/util/MusicUtil.java | 7 - .../gramophone/util/PreferenceUtil.java | 168 ++++++------------ .../gramophone/widgets/AppWidgetBig.java | 1 - .../gramophone/widgets/AppWidgetCard.java | 1 - .../gramophone/widgets/AppWidgetClassic.java | 1 - .../gramophone/widgets/AppWidgetSmall.java | 1 - app/src/main/res/values-ar/strings.xml | 8 - app/src/main/res/values-bg/strings.xml | 7 - app/src/main/res/values-cs/strings.xml | 8 - app/src/main/res/values-de/strings.xml | 8 - app/src/main/res/values-el/strings.xml | 8 - app/src/main/res/values-en-rCA/strings.xml | 8 - app/src/main/res/values-en-rGB/strings.xml | 8 - app/src/main/res/values-es-rES/strings.xml | 8 - app/src/main/res/values-es-rUS/strings.xml | 8 - app/src/main/res/values-fi/strings.xml | 8 - app/src/main/res/values-fr/strings.xml | 8 - app/src/main/res/values-he/strings.xml | 8 - app/src/main/res/values-hr/strings.xml | 8 - app/src/main/res/values-hu/strings.xml | 8 - app/src/main/res/values-id/strings.xml | 8 - app/src/main/res/values-in/strings.xml | 8 - app/src/main/res/values-it/strings.xml | 8 - app/src/main/res/values-iw/strings.xml | 8 - app/src/main/res/values-ja/strings.xml | 8 - app/src/main/res/values-ko/strings.xml | 10 -- app/src/main/res/values-nl/strings.xml | 8 - app/src/main/res/values-nn/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 8 - app/src/main/res/values-pt-rBR/strings.xml | 8 - app/src/main/res/values-pt-rPT/strings.xml | 7 - app/src/main/res/values-ro/strings.xml | 8 - app/src/main/res/values-ru/strings.xml | 8 - app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 8 - app/src/main/res/values-uk/strings.xml | 8 - app/src/main/res/values-vi/strings.xml | 8 - app/src/main/res/values-zh-rCN/strings.xml | 8 - app/src/main/res/values-zh-rTW/strings.xml | 8 - app/src/main/res/values/arrays.xml | 12 -- app/src/main/res/values/strings.xml | 8 - app/src/main/res/xml/pref_images.xml | 26 --- 66 files changed, 98 insertions(+), 543 deletions(-) delete mode 100644 app/src/main/res/xml/pref_images.xml diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java index bbb69f5a..72c6b812 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/AlbumCoverPagerAdapter.java @@ -59,9 +59,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter { return o; } - /** - * Only the latest passed {@link AlbumCoverFragment.ColorReceiver} is guaranteed to receive a response - */ + // only the latest ColorReceiver is guaranteed a response public void receiveColor(AlbumCoverFragment.ColorReceiver colorReceiver, int position) { AlbumCoverFragment fragment = (AlbumCoverFragment) getFragment(position); if (fragment != null) { @@ -74,7 +72,7 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter { } } - public static class AlbumCoverFragment extends Fragment implements SharedPreferences.OnSharedPreferenceChangeListener { + public static class AlbumCoverFragment extends Fragment { private static final String SONG_ARG = "song"; private Unbinder unbinder; @@ -112,24 +110,18 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter { @Override public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - forceSquareAlbumCover(false); - // TODO -// forceSquareAlbumCover(PreferenceUtil.getInstance(getContext()).forceSquareAlbumCover()); - PreferenceUtil.getInstance(getActivity()).registerOnSharedPreferenceChangedListener(this); loadAlbumCover(); } @Override public void onDestroyView() { super.onDestroyView(); - PreferenceUtil.getInstance(getActivity()).unregisterOnSharedPreferenceChangedListener(this); unbinder.unbind(); colorReceiver = null; } private void loadAlbumCover() { - SongGlideRequest.Builder.from(Glide.with(this), song) - .checkIgnoreMediaStore(getActivity()) + SongGlideRequest.Builder.from(Glide.with(getContext()), song) .generatePalette(getActivity()).build() .into(new CustomPaletteTarget(albumCover) { @Override @@ -139,20 +131,6 @@ public class AlbumCoverPagerAdapter extends CustomFragmentStatePagerAdapter { }); } - @Override - public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { - switch (key) { - case PreferenceUtil.FORCE_SQUARE_ALBUM_COVER: - // TODO -// forceSquareAlbumCover(PreferenceUtil.getInstance(getActivity()).forceSquareAlbumCover()); - break; - } - } - - public void forceSquareAlbumCover(boolean forceSquareAlbumCover) { - albumCover.setScaleType(forceSquareAlbumCover ? ImageView.ScaleType.FIT_CENTER : ImageView.ScaleType.CENTER_CROP); - } - private void setColor(int color) { this.color = color; isColorReady = true; diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/MusicLibraryPagerAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/MusicLibraryPagerAdapter.java index 6c9b45f6..534f27be 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/MusicLibraryPagerAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/MusicLibraryPagerAdapter.java @@ -35,7 +35,7 @@ public class MusicLibraryPagerAdapter extends FragmentPagerAdapter { public MusicLibraryPagerAdapter(@NonNull final Context context, final FragmentManager fragmentManager) { super(fragmentManager); mContext = context; - setCategoryInfos(PreferenceUtil.getInstance(context).getLibraryCategoryInfos()); + setCategoryInfos(PreferenceUtil.getInstance(context).getLibraryCategories()); } public void setCategoryInfos(@NonNull List categoryInfos) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java index d8bc4947..51e6cc1f 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/SearchAdapter.java @@ -74,7 +74,7 @@ public class SearchAdapter extends RecyclerView.Adapter implements MaterialCab songInfo.setText(song.albumName); SongGlideRequest.Builder.from(Glide.with(activity), song) - .checkIgnoreMediaStore(activity).build() + .build() .into(albumArt); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java index 15ae399c..84006e68 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java +++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/song/SongAdapter.java @@ -134,7 +134,6 @@ public class SongAdapter extends AbsMultiSelectAdapter build() { //noinspection unchecked - return createBaseRequest(requestManager, song, ignoreMediaStore) + return createBaseRequest(requestManager, song) .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) .error(DEFAULT_ERROR_IMAGE) .animate(DEFAULT_ANIMATION) @@ -79,7 +66,7 @@ public class SongGlideRequest { public BitmapRequestBuilder build() { //noinspection unchecked - return createBaseRequest(builder.requestManager, builder.song, builder.ignoreMediaStore) + return createBaseRequest(builder.requestManager, builder.song) .asBitmap() .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) .error(DEFAULT_ERROR_IMAGE) @@ -99,7 +86,7 @@ public class SongGlideRequest { public BitmapRequestBuilder build() { //noinspection unchecked - return createBaseRequest(builder.requestManager, builder.song, builder.ignoreMediaStore) + return createBaseRequest(builder.requestManager, builder.song) .asBitmap() .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class) .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) @@ -109,12 +96,8 @@ public class SongGlideRequest { } } - public static DrawableTypeRequest createBaseRequest(RequestManager requestManager, Song song, boolean ignoreMediaStore) { - if (ignoreMediaStore) { - return requestManager.load(new AudioFileCover(song.data)); - } else { - return requestManager.loadFromMediaStore(MusicUtil.getMediaStoreAlbumCoverUri(song.albumId)); - } + public static DrawableTypeRequest createBaseRequest(RequestManager requestManager, Song song) { + return requestManager.load(new AudioFileCover(song.data)); } public static Key createSignature(Song song) { 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 2cba8cee..f38663a0 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 @@ -19,31 +19,25 @@ import com.bumptech.glide.Priority; import com.bumptech.glide.load.data.DataFetcher; import com.kabouzeid.gramophone.glide.audiocover.AudioFileCoverUtils; import com.kabouzeid.gramophone.util.ImageUtil; -import com.kabouzeid.gramophone.util.PreferenceUtil; /** * @author Karim Abou Zeid (kabouzeid) */ public class ArtistImageFetcher implements DataFetcher { - private final ArtistImage model; - + private ArtistImage model; private InputStream stream; - private boolean ignoreMediaStore; - - public ArtistImageFetcher(final ArtistImage model, boolean ignoreMediaStore) { + public ArtistImageFetcher(final ArtistImage model) { this.model = model; - this.ignoreMediaStore = ignoreMediaStore; } @Override public String getId() { Log.d("MOSAIC", "get id for" + model.artistName); - // never return NULL here! // this id is used to determine whether the image is already cached // we use the artist name as well as the album years + file paths - return model.toIdString() + "ignoremediastore:" + ignoreMediaStore; + return model.toIdString(); } @Override @@ -65,18 +59,7 @@ public class ArtistImageFetcher implements DataFetcher { try { for (final AlbumCover cover : albumCovers) { - byte[] picture = null; - if (!ignoreMediaStore) { - retriever.setDataSource(cover.getFilePath()); - picture = retriever.getEmbeddedPicture(); - } - final InputStream stream; - if (picture != null) { - stream = new ByteArrayInputStream(picture); - } else { - stream = AudioFileCoverUtils.fallback(cover.getFilePath()); - } - + InputStream stream = AudioFileCoverUtils.fallback(cover.getFilePath()); if (stream != null) { images.put(stream, cover.getYear()); } @@ -120,14 +103,11 @@ public class ArtistImageFetcher implements DataFetcher { final ByteArrayOutputStream bos = new ByteArrayOutputStream(); bitmap.compress(Bitmap.CompressFormat.PNG, 0, bos); result = new ByteArrayInputStream(bos.toByteArray()); - } else if (nbImages > 0) { // we return the last cover album of the artist Map.Entry maxEntryYear = null; - for (final Map.Entry entry : images.entrySet()) { - if (maxEntryYear == null || entry.getValue() - .compareTo(maxEntryYear.getValue()) > 0) { + if (maxEntryYear == null || entry.getValue().compareTo(maxEntryYear.getValue()) > 0) { maxEntryYear = entry; } } @@ -135,12 +115,8 @@ public class ArtistImageFetcher implements DataFetcher { if (maxEntryYear != null) { result = maxEntryYear.getKey(); } else { - result = images.entrySet() - .iterator() - .next() - .getKey(); + result = images.entrySet().iterator().next().getKey(); } - } } finally { retriever.release(); @@ -151,7 +127,6 @@ public class ArtistImageFetcher implements DataFetcher { } catch (IOException e) { e.printStackTrace(); } - } return result; } diff --git a/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageLoader.java b/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageLoader.java index ea600803..3f0d0983 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageLoader.java +++ b/app/src/main/java/com/kabouzeid/gramophone/glide/artistimage/ArtistImageLoader.java @@ -24,12 +24,10 @@ public class ArtistImageLoader implements StreamModelLoader { @Override public DataFetcher getResourceFetcher(final ArtistImage model, int width, int height) { - - return new ArtistImageFetcher(model, PreferenceUtil.getInstance(context).ignoreMediaStoreArtwork()); + return new ArtistImageFetcher(model); } public static class Factory implements ModelLoaderFactory { - @Override public ModelLoader build(Context context, GenericLoaderFactory factories) { return new ArtistImageLoader(context); @@ -37,8 +35,6 @@ public class ArtistImageLoader implements StreamModelLoader { @Override public void teardown() { - } } } - diff --git a/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java b/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java index d642fcdb..a9d16f0f 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java +++ b/app/src/main/java/com/kabouzeid/gramophone/helper/MusicPlayerRemote.java @@ -178,7 +178,7 @@ public class MusicPlayerRemote { public static void openQueue(final List queue, final int startPosition, final boolean startPlaying) { if (!tryToHandleOpenPlayingQueue(queue, startPosition, startPlaying) && musicService != null) { musicService.openQueue(queue, startPosition, startPlaying); - if (!PreferenceUtil.getInstance(musicService).rememberShuffle()){ + if (!PreferenceUtil.getInstance(musicService).getRememberShuffle()){ setShuffleMode(MusicService.SHUFFLE_MODE_NONE); } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/preferences/LibraryPreferenceDialog.java b/app/src/main/java/com/kabouzeid/gramophone/preferences/LibraryPreferenceDialog.java index 9c3ad92b..81fc3b17 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/preferences/LibraryPreferenceDialog.java +++ b/app/src/main/java/com/kabouzeid/gramophone/preferences/LibraryPreferenceDialog.java @@ -34,7 +34,7 @@ public class LibraryPreferenceDialog extends DialogFragment { if (savedInstanceState != null) { categoryInfos = savedInstanceState.getParcelableArrayList(PreferenceUtil.LIBRARY_CATEGORIES); } else { - categoryInfos = PreferenceUtil.getInstance(getContext()).getLibraryCategoryInfos(); + categoryInfos = PreferenceUtil.getInstance(getContext()).getLibraryCategories(); } adapter = new CategoryInfoAdapter(categoryInfos); @@ -51,7 +51,7 @@ public class LibraryPreferenceDialog extends DialogFragment { .negativeText(android.R.string.cancel) .neutralText(R.string.reset_action) .autoDismiss(false) - .onNeutral((dialog, action) -> adapter.setCategoryInfos(PreferenceUtil.getInstance(getContext()).getDefaultLibraryCategoryInfos())) + .onNeutral((dialog, action) -> adapter.setCategoryInfos(PreferenceUtil.getInstance(getContext()).getDefaultLibraryCategories())) .onNegative((dialog, action) -> dismiss()) .onPositive((dialog, action) -> { updateCategories(adapter.getCategoryInfos()); @@ -69,7 +69,7 @@ public class LibraryPreferenceDialog extends DialogFragment { private void updateCategories(List categories) { if (getSelected(categories) == 0) return; - PreferenceUtil.getInstance(getContext()).setLibraryCategoryInfos(categories); + PreferenceUtil.getInstance(getContext()).setLibraryCategories(categories); } private int getSelected(List categories) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MultiPlayer.java b/app/src/main/java/com/kabouzeid/gramophone/service/MultiPlayer.java index 1cb3e15e..c20ad748 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/service/MultiPlayer.java +++ b/app/src/main/java/com/kabouzeid/gramophone/service/MultiPlayer.java @@ -115,7 +115,7 @@ public class MultiPlayer implements Playback, MediaPlayer.OnErrorListener, Media if (path == null) { return; } - if (PreferenceUtil.getInstance(context).gaplessPlayback()) { + if (PreferenceUtil.getInstance(context).getGaplessPlayback()) { mNextMediaPlayer = new MediaPlayer(); mNextMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK); mNextMediaPlayer.setAudioSessionId(getAudioSessionId()); diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java index 17437ba1..9ebbc897 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java +++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java @@ -587,12 +587,11 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP metaData.putLong(MediaMetadataCompat.METADATA_KEY_NUM_TRACKS, getPlayingQueue().size()); } - if (PreferenceUtil.getInstance(this).albumArtOnLockscreen()) { + if (PreferenceUtil.getInstance(this).getShowAlbumCover()) { final Point screenSize = Util.getScreenSize(MusicService.this); final BitmapRequestBuilder request = SongGlideRequest.Builder.from(Glide.with(MusicService.this), song) - .checkIgnoreMediaStore(MusicService.this) .asBitmap().build(); - if (PreferenceUtil.getInstance(this).blurredAlbumArt()) { + if (PreferenceUtil.getInstance(this).getBlurAlbumCover()) { request.transform(new BlurTransformation.Builder(MusicService.this).build()); } runOnUiThread(new Runnable() { @@ -1118,8 +1117,8 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP playback.setNextDataSource(null); } break; - case PreferenceUtil.ALBUM_ART_ON_LOCKSCREEN: - case PreferenceUtil.BLURRED_ALBUM_ART: + case PreferenceUtil.SHOW_ALBUM_COVER: + case PreferenceUtil.BLUR_ALBUM_COVER: updateMediaSessionMetaData(); break; case PreferenceUtil.COLORED_NOTIFICATION: @@ -1162,7 +1161,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP switch (msg.what) { case DUCK: - if (PreferenceUtil.getInstance(service).audioDucking()) { + if (PreferenceUtil.getInstance(service).getAudioDucking()) { currentDuckVolume -= .05f; if (currentDuckVolume > .2f) { sendEmptyMessageDelayed(DUCK, 10); @@ -1176,7 +1175,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP break; case UNDUCK: - if (PreferenceUtil.getInstance(service).audioDucking()) { + if (PreferenceUtil.getInstance(service).getAudioDucking()) { currentDuckVolume += .03f; if (currentDuckVolume < 1f) { sendEmptyMessageDelayed(UNDUCK, 10); diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java index 2d9233db..5eb4a8aa 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java +++ b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl.java @@ -89,7 +89,6 @@ public class PlayingNotificationImpl extends PlayingNotification { Glide.clear(target); } target = SongGlideRequest.Builder.from(Glide.with(service), song) - .checkIgnoreMediaStore(service) .generatePalette(service).build() .into(new SimpleTarget(bigNotificationImageSize, bigNotificationImageSize) { @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl24.java b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl24.java index fc9fce7d..e0c2930c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl24.java +++ b/app/src/main/java/com/kabouzeid/gramophone/service/notification/PlayingNotificationImpl24.java @@ -51,7 +51,6 @@ public class PlayingNotificationImpl24 extends PlayingNotification { final int bigNotificationImageSize = service.getResources().getDimensionPixelSize(R.dimen.notification_big_image_size); service.runOnUiThread(() -> SongGlideRequest.Builder.from(Glide.with(service), song) - .checkIgnoreMediaStore(service) .generatePalette(service).build() .into(new SimpleTarget(bigNotificationImageSize, bigNotificationImageSize) { @Override 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 2a729892..1c83d907 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 @@ -140,7 +140,6 @@ public class AlbumDetailActivity extends AbsSlidingMusicPanelActivity implements private void loadAlbumCover() { SongGlideRequest.Builder.from(Glide.with(this), getAlbum().safeGetFirstSong()) - .checkIgnoreMediaStore(this) .generatePalette(this).build() .dontAnimate() .into(new CustomPaletteTarget(albumArtImageView) { 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 1b0dfd62..05b68994 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 @@ -112,7 +112,7 @@ public class ArtistDetailActivity extends AbsSlidingMusicPanelActivity implement setDrawUnderStatusbar(); ButterKnife.bind(this); - usePalette = PreferenceUtil.getInstance(this).albumArtistColoredFooters(); + usePalette = PreferenceUtil.getInstance(this).getAlbumArtistColoredFooters(); initViews(); setUpObservableListViewParams(); diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java index 0b742af2..444e6057 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/MainActivity.java @@ -128,7 +128,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity { ((TextView) navigationDrawerHeader.findViewById(R.id.title)).setText(song.title); ((TextView) navigationDrawerHeader.findViewById(R.id.text)).setText(MusicUtil.getSongInfoString(song)); SongGlideRequest.Builder.from(Glide.with(this), song) - .checkIgnoreMediaStore(this).build() + .build() .into(((ImageView) navigationDrawerHeader.findViewById(R.id.image))); } else { if (navigationDrawerHeader != null) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java index 091e215e..2fc75fa6 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/SettingsActivity.java @@ -1,6 +1,5 @@ package com.kabouzeid.gramophone.ui.activities; -import android.content.Intent; import android.content.SharedPreferences; import android.os.Build; import android.os.Bundle; @@ -15,14 +14,12 @@ import androidx.preference.TwoStatePreference; import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; -import android.widget.Toast; import com.afollestad.materialdialogs.color.ColorChooserDialog; import com.kabouzeid.appthemehelper.ThemeStore; import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEColorPreference; import com.kabouzeid.appthemehelper.common.prefs.supportv7.ATEPreferenceFragmentCompat; import com.kabouzeid.appthemehelper.util.ColorUtil; -import com.kabouzeid.gramophone.App; import com.kabouzeid.gramophone.R; import com.kabouzeid.gramophone.shortcuts.DynamicShortcutManager; import com.kabouzeid.gramophone.preferences.LibraryPreference; @@ -123,7 +120,6 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia addPreferencesFromResource(R.xml.pref_colors); addPreferencesFromResource(R.xml.pref_notification); addPreferencesFromResource(R.xml.pref_now_playing_screen); - addPreferencesFromResource(R.xml.pref_images); addPreferencesFromResource(R.xml.pref_lockscreen); addPreferencesFromResource(R.xml.pref_audio); addPreferencesFromResource(R.xml.pref_playlists); @@ -172,13 +168,6 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia return true; }); - final Preference autoDownloadImagesPolicy = findPreference("auto_download_images_policy"); - setSummary(autoDownloadImagesPolicy); - autoDownloadImagesPolicy.setOnPreferenceChangeListener((preference, o) -> { - setSummary(autoDownloadImagesPolicy, o); - return true; - }); - final ATEColorPreference primaryColorPref = (ATEColorPreference) findPreference("primary_color"); final int primaryColor = ThemeStore.primaryColor(getActivity()); primaryColorPref.setColor(primaryColor, ColorUtil.darkenColor(primaryColor)); @@ -265,7 +254,7 @@ public class SettingsActivity extends AbsBaseActivity implements ColorChooserDia @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { switch (key) { - case PreferenceUtil.NOW_PLAYING_SCREEN_ID: + case PreferenceUtil.NOW_PLAYING_SCREEN: updateNowPlayingScreenSummary(); break; case PreferenceUtil.CLASSIC_NOTIFICATION: diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java index e36801a8..2b330647 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/LibraryFragment.java @@ -101,12 +101,12 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde public void onSharedPreferenceChanged(SharedPreferences preferences, String key) { if (PreferenceUtil.LIBRARY_CATEGORIES.equals(key)) { Fragment current = getCurrentFragment(); - pagerAdapter.setCategoryInfos(PreferenceUtil.getInstance(getActivity()).getLibraryCategoryInfos()); + pagerAdapter.setCategoryInfos(PreferenceUtil.getInstance(getActivity()).getLibraryCategories()); pager.setOffscreenPageLimit(pagerAdapter.getCount() - 1); int position = pagerAdapter.getItemPosition(current); if (position < 0) position = 0; pager.setCurrentItem(position); - PreferenceUtil.getInstance(getContext()).setLastPage(position); + PreferenceUtil.getInstance(getContext()).setLastTab(position); updateTabVisibility(); } @@ -137,8 +137,8 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde updateTabVisibility(); - if (PreferenceUtil.getInstance(getContext()).rememberLastTab()) { - pager.setCurrentItem(PreferenceUtil.getInstance(getContext()).getLastPage()); + if (PreferenceUtil.getInstance(getContext()).getRememberLastTab()) { + pager.setCurrentItem(PreferenceUtil.getInstance(getContext()).getLastTab()); } pager.addOnPageChangeListener(this); } @@ -443,7 +443,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde @Override public void onPageSelected(int position) { - PreferenceUtil.getInstance(getActivity()).setLastPage(position); + PreferenceUtil.getInstance(getActivity()).setLastTab(position); } @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java index ad8a7595..96f76b6c 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/AlbumsFragment.java @@ -72,7 +72,7 @@ public class AlbumsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFra @Override public boolean loadUsePalette() { - return PreferenceUtil.getInstance(getActivity()).albumColoredFooters(); + return PreferenceUtil.getInstance(getActivity()).getAlbumColoredFooters(); } @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java index 8437cbf9..ed476dfb 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/ArtistsFragment.java @@ -103,7 +103,7 @@ public class ArtistsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFr @Override public boolean loadUsePalette() { - return PreferenceUtil.getInstance(getActivity()).artistColoredFooters(); + return PreferenceUtil.getInstance(getActivity()).getArtistColoredFooters(); } @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java index 8477b047..dd966793 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/fragments/mainactivity/library/pager/SongsFragment.java @@ -114,7 +114,7 @@ public class SongsFragment extends AbsLibraryPagerRecyclerViewCustomGridSizeFrag @Override public boolean loadUsePalette() { - return PreferenceUtil.getInstance(getActivity()).songColoredFooters(); + return PreferenceUtil.getInstance(getActivity()).getSongColoredFooters(); } @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java index 82d9d897..06f7b2c0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/MusicUtil.java @@ -37,13 +37,6 @@ import java.util.Locale; * @author Karim Abou Zeid (kabouzeid) */ public class MusicUtil { - - public static Uri getMediaStoreAlbumCoverUri(int albumId) { - final Uri sArtworkUri = Uri.parse("content://media/external/audio/albumart"); - - return ContentUris.withAppendedId(sArtworkUri, albumId); - } - public static Uri getSongFileUri(int songId) { return ContentUris.withAppendedId(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, songId); } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java index 01c44523..5a6a5166 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java @@ -1,10 +1,7 @@ package com.kabouzeid.gramophone.util; -import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; import android.preference.PreferenceManager; import androidx.annotation.StyleRes; @@ -22,10 +19,11 @@ import java.util.ArrayList; import java.util.List; public final class PreferenceUtil { - public static final String GENERAL_THEME = "general_theme"; + public static final String LIBRARY_CATEGORIES = "library_categories"; public static final String REMEMBER_LAST_TAB = "remember_last_tab"; - public static final String LAST_PAGE = "last_start_page"; - public static final String NOW_PLAYING_SCREEN_ID = "now_playing_screen_id"; + public static final String LAST_TAB = "last_tab"; + + public static final String NOW_PLAYING_SCREEN = "now_playing_screen"; public static final String ARTIST_SORT_ORDER = "artist_sort_order"; public static final String ARTIST_SONG_SORT_ORDER = "artist_song_sort_order"; @@ -49,35 +47,25 @@ public final class PreferenceUtil { public static final String ARTIST_COLORED_FOOTERS = "artist_colored_footers"; public static final String ALBUM_ARTIST_COLORED_FOOTERS = "album_artist_colored_footers"; - public static final String FORCE_SQUARE_ALBUM_COVER = "force_square_album_art"; - public static final String COLORED_NOTIFICATION = "colored_notification"; public static final String CLASSIC_NOTIFICATION = "classic_notification"; + public static final String GENERAL_THEME = "general_theme"; public static final String COLORED_APP_SHORTCUTS = "colored_app_shortcuts"; public static final String AUDIO_DUCKING = "audio_ducking"; public static final String GAPLESS_PLAYBACK = "gapless_playback"; + public static final String REMEMBER_SHUFFLE = "remember_shuffle"; public static final String LAST_ADDED_CUTOFF = "last_added_interval"; - public static final String ALBUM_ART_ON_LOCKSCREEN = "album_art_on_lockscreen"; - public static final String BLURRED_ALBUM_ART = "blurred_album_art"; + public static final String SHOW_ALBUM_COVER = "show_album_cover"; + public static final String BLUR_ALBUM_COVER = "blur_album_cover"; public static final String LAST_SLEEP_TIMER_VALUE = "last_sleep_timer_value"; public static final String NEXT_SLEEP_TIMER_ELAPSED_REALTIME = "next_sleep_timer_elapsed_real_time"; public static final String SLEEP_TIMER_FINISH_SONG = "sleep_timer_finish_music"; - public static final String IGNORE_MEDIA_STORE_ARTWORK = "ignore_media_store_artwork"; - - public static final String AUTO_DOWNLOAD_IMAGES_POLICY = "auto_download_images_policy"; - - public static final String SYNCHRONIZED_LYRICS_SHOW = "synchronized_lyrics_show"; - - public static final String LIBRARY_CATEGORIES = "library_categories"; - - private static final String REMEMBER_SHUFFLE = "remember_shuffle"; - private static PreferenceUtil sInstance; private final SharedPreferences mPreferences; @@ -93,20 +81,6 @@ public final class PreferenceUtil { return sInstance; } - public static boolean isAllowedToDownloadMetadata(final Context context) { - switch (getInstance(context).autoDownloadImagesPolicy()) { - case "always": - return true; - case "only_wifi": - final ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); - NetworkInfo netInfo = connectivityManager.getActiveNetworkInfo(); - return netInfo != null && netInfo.getType() == ConnectivityManager.TYPE_WIFI && netInfo.isConnectedOrConnecting(); - case "never": - default: - return false; - } - } - public void registerOnSharedPreferenceChangedListener(SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener) { mPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); } @@ -120,12 +94,6 @@ public final class PreferenceUtil { return getThemeResFromPrefValue(mPreferences.getString(GENERAL_THEME, "light")); } - public void setGeneralTheme(String theme) { - final SharedPreferences.Editor editor = mPreferences.edit(); - editor.putString(GENERAL_THEME, theme); - editor.commit(); - } - @StyleRes public static int getThemeResFromPrefValue(String themePrefValue) { switch (themePrefValue) { @@ -139,33 +107,32 @@ public final class PreferenceUtil { } } - public final boolean rememberLastTab() { + public final boolean getRememberLastTab() { return mPreferences.getBoolean(REMEMBER_LAST_TAB, true); } - public void setLastPage(final int value) { + public final int getLastTab() { + return mPreferences.getInt(LAST_TAB, 0); + } + + public void setLastTab(final int value) { final SharedPreferences.Editor editor = mPreferences.edit(); - editor.putInt(LAST_PAGE, value); + editor.putInt(LAST_TAB, value); editor.apply(); } - public final int getLastPage() { - return mPreferences.getInt(LAST_PAGE, 0); - } - public final NowPlayingScreen getNowPlayingScreen() { - int id = mPreferences.getInt(NOW_PLAYING_SCREEN_ID, 0); + int id = mPreferences.getInt(NOW_PLAYING_SCREEN, 0); for (NowPlayingScreen nowPlayingScreen : NowPlayingScreen.values()) { if (nowPlayingScreen.id == id) return nowPlayingScreen; } return NowPlayingScreen.CARD; } - @SuppressLint("CommitPrefEdits") public void setNowPlayingScreen(NowPlayingScreen nowPlayingScreen) { final SharedPreferences.Editor editor = mPreferences.edit(); - editor.putInt(NOW_PLAYING_SCREEN_ID, nowPlayingScreen.id); - editor.commit(); + editor.putInt(NOW_PLAYING_SCREEN, nowPlayingScreen.id); + editor.apply(); } public final boolean getColoredNotification() { @@ -198,24 +165,20 @@ public final class PreferenceUtil { editor.apply(); } - public final boolean gaplessPlayback() { + public final boolean getGaplessPlayback() { return mPreferences.getBoolean(GAPLESS_PLAYBACK, true); } - public final boolean audioDucking() { + public final boolean getAudioDucking() { return mPreferences.getBoolean(AUDIO_DUCKING, true); } - public final boolean albumArtOnLockscreen() { - return mPreferences.getBoolean(ALBUM_ART_ON_LOCKSCREEN, true); + public final boolean getShowAlbumCover() { + return mPreferences.getBoolean(SHOW_ALBUM_COVER, true); } - public final boolean blurredAlbumArt() { - return mPreferences.getBoolean(BLURRED_ALBUM_ART, true); - } - - public final boolean ignoreMediaStoreArtwork() { - return mPreferences.getBoolean(IGNORE_MEDIA_STORE_ARTWORK, false); + public final boolean getBlurAlbumCover() { + return mPreferences.getBoolean(BLUR_ALBUM_COVER, true); } public final String getArtistSortOrder() { @@ -267,34 +230,27 @@ public final class PreferenceUtil { public long getLastAddedCutoff() { final CalendarUtil calendarUtil = new CalendarUtil(); long interval; - switch (mPreferences.getString(LAST_ADDED_CUTOFF, "")) { case "today": interval = calendarUtil.getElapsedToday(); break; - case "this_week": interval = calendarUtil.getElapsedWeek(); break; - case "past_seven_days": interval = calendarUtil.getElapsedDays(7); break; - case "past_three_months": interval = calendarUtil.getElapsedMonths(3); break; - case "this_year": interval = calendarUtil.getElapsedYear(); break; - case "this_month": default: interval = calendarUtil.getElapsedMonth(); break; } - return (System.currentTimeMillis() - interval) / 1000; } @@ -328,14 +284,18 @@ public final class PreferenceUtil { editor.apply(); } + public final int getAlbumGridSize(Context context) { + return mPreferences.getInt(ALBUM_GRID_SIZE, context.getResources().getInteger(R.integer.default_grid_columns)); + } + public void setAlbumGridSize(final int gridSize) { final SharedPreferences.Editor editor = mPreferences.edit(); editor.putInt(ALBUM_GRID_SIZE, gridSize); editor.apply(); } - public final int getAlbumGridSize(Context context) { - return mPreferences.getInt(ALBUM_GRID_SIZE, context.getResources().getInteger(R.integer.default_grid_columns)); + public final int getSongGridSize(Context context) { + return mPreferences.getInt(SONG_GRID_SIZE, context.getResources().getInteger(R.integer.default_list_columns)); } public void setSongGridSize(final int gridSize) { @@ -344,8 +304,8 @@ public final class PreferenceUtil { editor.apply(); } - public final int getSongGridSize(Context context) { - return mPreferences.getInt(SONG_GRID_SIZE, context.getResources().getInteger(R.integer.default_list_columns)); + public final int getArtistGridSize(Context context) { + return mPreferences.getInt(ARTIST_GRID_SIZE, context.getResources().getInteger(R.integer.default_list_columns)); } public void setArtistGridSize(final int gridSize) { @@ -354,8 +314,8 @@ public final class PreferenceUtil { editor.apply(); } - public final int getArtistGridSize(Context context) { - return mPreferences.getInt(ARTIST_GRID_SIZE, context.getResources().getInteger(R.integer.default_list_columns)); + public final int getAlbumGridSizeLand(Context context) { + return mPreferences.getInt(ALBUM_GRID_SIZE_LAND, context.getResources().getInteger(R.integer.default_grid_columns_land)); } public void setAlbumGridSizeLand(final int gridSize) { @@ -364,8 +324,8 @@ public final class PreferenceUtil { editor.apply(); } - public final int getAlbumGridSizeLand(Context context) { - return mPreferences.getInt(ALBUM_GRID_SIZE_LAND, context.getResources().getInteger(R.integer.default_grid_columns_land)); + public final int getSongGridSizeLand(Context context) { + return mPreferences.getInt(SONG_GRID_SIZE_LAND, context.getResources().getInteger(R.integer.default_list_columns_land)); } public void setSongGridSizeLand(final int gridSize) { @@ -374,8 +334,8 @@ public final class PreferenceUtil { editor.apply(); } - public final int getSongGridSizeLand(Context context) { - return mPreferences.getInt(SONG_GRID_SIZE_LAND, context.getResources().getInteger(R.integer.default_list_columns_land)); + public final int getArtistGridSizeLand(Context context) { + return mPreferences.getInt(ARTIST_GRID_SIZE_LAND, context.getResources().getInteger(R.integer.default_list_columns_land)); } public void setArtistGridSizeLand(final int gridSize) { @@ -384,8 +344,8 @@ public final class PreferenceUtil { editor.apply(); } - public final int getArtistGridSizeLand(Context context) { - return mPreferences.getInt(ARTIST_GRID_SIZE_LAND, context.getResources().getInteger(R.integer.default_list_columns_land)); + public final boolean getAlbumColoredFooters() { + return mPreferences.getBoolean(ALBUM_COLORED_FOOTERS, true); } public void setAlbumColoredFooters(final boolean value) { @@ -394,8 +354,8 @@ public final class PreferenceUtil { editor.apply(); } - public final boolean albumColoredFooters() { - return mPreferences.getBoolean(ALBUM_COLORED_FOOTERS, true); + public final boolean getAlbumArtistColoredFooters() { + return mPreferences.getBoolean(ALBUM_ARTIST_COLORED_FOOTERS, true); } public void setAlbumArtistColoredFooters(final boolean value) { @@ -404,8 +364,8 @@ public final class PreferenceUtil { editor.apply(); } - public final boolean albumArtistColoredFooters() { - return mPreferences.getBoolean(ALBUM_ARTIST_COLORED_FOOTERS, true); + public final boolean getSongColoredFooters() { + return mPreferences.getBoolean(SONG_COLORED_FOOTERS, true); } public void setSongColoredFooters(final boolean value) { @@ -414,8 +374,8 @@ public final class PreferenceUtil { editor.apply(); } - public final boolean songColoredFooters() { - return mPreferences.getBoolean(SONG_COLORED_FOOTERS, true); + public final boolean getArtistColoredFooters() { + return mPreferences.getBoolean(ARTIST_COLORED_FOOTERS, true); } public void setArtistColoredFooters(final boolean value) { @@ -424,23 +384,11 @@ public final class PreferenceUtil { editor.apply(); } - public final boolean artistColoredFooters() { - return mPreferences.getBoolean(ARTIST_COLORED_FOOTERS, true); - } - - public final boolean rememberShuffle() { + public final boolean getRememberShuffle() { return mPreferences.getBoolean(REMEMBER_SHUFFLE, true); } - public final String autoDownloadImagesPolicy() { - return mPreferences.getString(AUTO_DOWNLOAD_IMAGES_POLICY, "only_wifi"); - } - - public final boolean synchronizedLyricsShow() { - return mPreferences.getBoolean(SYNCHRONIZED_LYRICS_SHOW, true); - } - - public void setLibraryCategoryInfos(List categories) { + public void setLibraryCategories(List categories) { Gson gson = new Gson(); Type collectionType = new TypeToken>() { }.getType(); @@ -450,7 +398,7 @@ public final class PreferenceUtil { editor.apply(); } - public List getLibraryCategoryInfos() { + public List getLibraryCategories() { String data = mPreferences.getString(LIBRARY_CATEGORIES, null); if (data != null) { Gson gson = new Gson(); @@ -464,16 +412,16 @@ public final class PreferenceUtil { } } - return getDefaultLibraryCategoryInfos(); + return getDefaultLibraryCategories(); } - public List getDefaultLibraryCategoryInfos() { - List defaultCategoryInfos = new ArrayList<>(5); - defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.SONGS, true)); - defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.ALBUMS, true)); - defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.ARTISTS, true)); - defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.GENRES, true)); - defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.PLAYLISTS, true)); - return defaultCategoryInfos; + public List getDefaultLibraryCategories() { + List defaultCategories = new ArrayList<>(5); + defaultCategories.add(new CategoryInfo(CategoryInfo.Category.SONGS, true)); + defaultCategories.add(new CategoryInfo(CategoryInfo.Category.ALBUMS, true)); + defaultCategories.add(new CategoryInfo(CategoryInfo.Category.ARTISTS, true)); + defaultCategories.add(new CategoryInfo(CategoryInfo.Category.GENRES, true)); + defaultCategories.add(new CategoryInfo(CategoryInfo.Category.PLAYLISTS, true)); + return defaultCategories; } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java index d0f4ef69..f69fcfba 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java +++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetBig.java @@ -96,7 +96,6 @@ public class AppWidgetBig extends BaseAppWidget { Glide.clear(target); } target = SongGlideRequest.Builder.from(Glide.with(appContext), song) - .checkIgnoreMediaStore(appContext) .asBitmap().build() .into(new SimpleTarget(widgetImageSize, widgetImageSize) { @Override diff --git a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java index 9af1c793..be90ffb3 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java +++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetCard.java @@ -100,7 +100,6 @@ public class AppWidgetCard extends BaseAppWidget { Glide.clear(target); } target = SongGlideRequest.Builder.from(Glide.with(service), song) - .checkIgnoreMediaStore(service) .generatePalette(service).build() .centerCrop() .into(new SimpleTarget(imageSize, imageSize) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java index 039edce5..9fbd998e 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java +++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetClassic.java @@ -93,7 +93,6 @@ public class AppWidgetClassic extends BaseAppWidget { Glide.clear(target); } target = SongGlideRequest.Builder.from(Glide.with(appContext), song) - .checkIgnoreMediaStore(appContext) .generatePalette(service).build() .centerCrop() .into(new SimpleTarget(imageSize, imageSize) { diff --git a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java index 306c4c56..b64ce8a0 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java +++ b/app/src/main/java/com/kabouzeid/gramophone/widgets/AppWidgetSmall.java @@ -99,7 +99,6 @@ public class AppWidgetSmall extends BaseAppWidget { Glide.clear(target); } target = SongGlideRequest.Builder.from(Glide.with(appContext), song) - .checkIgnoreMediaStore(appContext) .generatePalette(service).build() .centerCrop() .into(new SimpleTarget(imageSize, imageSize) { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 04fa47c4..c05e2960 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -76,9 +76,6 @@ خلط قائمة التشغيل فاتح غامق - دائماً - فقط على Wi-Fi - أبداً اليوم هذا الأسبوع هذا الشهر @@ -90,23 +87,19 @@ التنسيق العام الصوت المكتبة - الصور شاشة القفل قوائم التشغيل الإشعار شريط تنقل ملون اختصارات تطبيق ملونة عرض غلاف الألبوم - تحميل البيانات الوصفية تلقائياً تغييم صورة الألبوم إشعار ملون تصميم الإشعار الكلاسيكي - تجاهل أغلفة مخزن الوسائط تشغيل بدون فواصل خفض الصوت عند فقدان التركيز فترة قائمة تشغيل المضافة مؤخراً تذكر آخر لسان - "شغل أغنية أولاً، ثم حاول مرة أخرى." حذف مسح إزالة @@ -132,7 +125,6 @@ استعمال تصميم الإشعار الكلاسيكي. "\u062a\u0644\u0648\u064a\u0646 \u0627\u0644\u0625\u0634\u0639\u0627\u0631 \u0628\u0644\u0648\u0646 \u063a\u0644\u0627\u0641 \u0627\u0644\u0623\u0644\u0628\u0648\u0645 \u0627\u0644\u0628\u0627\u0631\u0632." "قد يسبب مشاكل في التشغيل على بعض الأجهزة." - قد يرفع جودة أغلفة الألبومات لكنه يسبب بطئاً في زمن تحميل الصور. قم بتفعيل هذا الخيار إذا كانت لديك مشاكل مع الصور منخفضة الدقة. تلوين شريط التنقل باللون الأساسي. تلوين اختصارات التطبيق باللون الأساسي. الإشعارات، التنقل، إلخ. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 424c15b5..6fc82e30 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -73,25 +73,19 @@ Разбъркай този плейлист Светъл изглед Тъмен изглед - Винаги - Само чрез Wi-Fi - Никога Еквилайзер Цветове Текуща песен Главна тема Аудио - Изображения Заключен екран Оцветени навигационни бутони Оцветяване на бутоните Покажи обложката на албум Размажи обложката Оцвети известията - Игнорирай вградените обложки Непрекъснато звучене Намалявай звукът при известия - "Първо пусни песен, тогава пробвай отново" Изтрий Изчисти Премахни @@ -114,7 +108,6 @@ Замъглява обложката при заключен екран. Би могло да създаде проблеми с апликации и известия създадени от трети лица. "\u041e\u0446\u0432\u0435\u0442\u044f\u0432\u0430 \u0438\u0437\u0432\u0435\u0441\u0442\u0438\u0435\u0442\u043e \u0432 \u0433\u043b\u0430\u0432\u043d\u0438\u044f \u0446\u0432\u044f\u0442 \u043e\u0442 \u043e\u0431\u043b\u043e\u0436\u043a\u0430\u0442\u0430." "Би могло да създаде проблеми с възпроизвеждането при някои устройства." - Може да увеличи качеството на обложките, но също така и забави времето за зареждане. Включете това, само ако имате проблеми с ниско качество на обложките. Оцветява навигационната лента в главният цвят на апликацията. Оцветява бутоните в главният цвят на апликацията. Известия, навигация etc. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index a8335a83..de0cca1f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -76,9 +76,6 @@ Přehrát playlist náhodně Světlý Tmavý - Vždy - Jenom na Wi-Fi - Nikdy Dnes Tento týden Tento měsíc @@ -90,23 +87,19 @@ Motiv Zvuk Knihovna - Obrázky Odemykací obrazovka Seznamy skladeb Oznámení Barevné záhlaví Barevné zkratky aplikace Zobrazit obal alba - Automaticky stahovat metadata Rozostřit obal alba Barevné notifikace Klasický vzhled oznámení - Ignorovat obaly Media Storu Přehrávání bez mezer Snížit hlasitost při ztrátě priority zvuku Poslední přidaný interval playlistu Pamatovat poslední kartu - "Nejdříve přehrajte píseň, poté zkuste znovu. " Smazat Vyčistit Odstranit @@ -132,7 +125,6 @@ Použije klasický vzhled oznámení. "Zbarv\u00ed ozn\u00e1men\u00ed do barev podle obalu alba." "Může způsobit problémy s přehráváním u některých zařízení." - "Může zvýšit kvalitu obalu alba, ale způsobí pomalejší načítání. Povolte pouze pokud máte problémy s nízkým rozlišením obalu. " Barvy navigačního panelu v primární barvě Zbarví zkratky aplikace primární barvou Oznámení, navigace atd. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2870f1cb..5d611ff7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -77,9 +77,6 @@ Wiedergabeliste zufällig wiedergeben Hell Dunkel - Immer - Nur über WLAN - Niemals Heute Diese Woche Letzte 7 Tage @@ -92,24 +89,20 @@ Generelles Design Audio Bibliothek - Bilder Sperrbildschirm Wiedergabelisten Benachrichtigung Farbige Navigationsleiste Gefärbte App-Shortcuts Album Cover anzeigen - Meta-Daten automatisch herunterladen Album Cover weichzeichnen Gefärbte Benachrichtigung Klassisches Benachrichtigungsdesign - Media Store Cover ignorieren Lückenlose Wiedergabe Lautstärke bei Fokusverlust verringern Intervall der \"Zuletzt hinzugefügt\"-Wiedergabeliste Letzten Tab merken Shuffle-Einstellung merken - "Keine Audio ID, spiele etwas ab und versuche es erneut." Löschen Leeren Entfernen @@ -135,7 +128,6 @@ Das klassische Benachrichtigungsdesign verwenden. "Die Benachrichtigung ist in der Farbe des Album Covers gef\u00e4rbt." "Kann bei einigen Geräten Wiedergabeprobleme verursachen." - Kann die Album Cover Qualität verbessern was jedoch die Ladezeit beeinträchtigt. Nur aktivieren falls Probleme mit niedrig aufgelösten Album Covern auftreten. Färbt die Navigationsleiste mit der Hauptfarbe. Färbt die App-Shortcuts mit der Hauptfarbe. Benachrichtigungen, Navigation etc. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index b79f0c68..c680e257 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -77,9 +77,6 @@ Τυχαία λίστα αναπαραγωγής Ανοιχτό Σκούρο - Πάντα - Μόνο σε Wi-Fi - Ποτέ Σήμερα Αυτή την εβδομάδα Αυτόν τον μήνα @@ -91,21 +88,17 @@ Γενικό θέμα Ήχος Βιβλιοθήκη - Εικόνες Οθόνη κλειδώματος Λίστες αναπαραγωγής Ειδοποιήσεις Έγχρωμη μπάρα πλοήγησης Χρωματιστές συντομεύσεις εφαρμογής Εμφάνιση album art - Αυτόματο κατέβασμα metadata Θάμπωμα πορτρέτων καλλιτεχνών Χρωματισμένη ειδοποίηση Κλασικός σχεδιασμός ειδοποιήσεων - Παράληψη των Media Store εξωφύλλων. Εναλλαγή χωρίς παύση Μειώστε την ένταση στην απώλεια εστίασης - "Αναπαράγετε ένα τραγούδι πρώτα και δοκιμάστε ξανά." Διαγραφή Εκκαθάρηση Αφαίρεση @@ -128,7 +121,6 @@ Το θωριασμένο album εξώφυλλο στην οθόνη κλειδώματος μπορεί να δημιουργήσει προβλήματα με τρίτες εφαρμογές και συντομιεύσεις. "\u03a7\u03c1\u03c9\u03bc\u03b1\u03c4\u03af\u03b6\u03b5\u03b9 \u03c4\u03b7\u03bd \u03bc\u03c0\u03ac\u03c1\u03b1 \u03b5\u03b9\u03b4\u03bf\u03c0\u03bf\u03b9\u03ae\u03c3\u03b5\u03c9\u03bd \u03c3\u03c4\u03bf \u03c7\u03c1\u03ce\u03bc\u03b1 \u03c4\u03bf\u03c5 album art \u03c4\u03bf\u03c5 \u03c4\u03c1\u03b1\u03b3\u03bf\u03c5\u03b4\u03b9\u03bf\u03cd" "Μπορεί να δημιουργίσει θέματα αναπαραγωγής σε μερικές συσκευές." - Μπορεί να αυξήσει την ποιότητα του εξώφυλλου του άλμπουμ, αλλά προκαλεί αργούς χρόνους φόρτωσης της εικόνας. Ενεργοποιήστε το μόνο αν έχετε προβλήματα με εξώφυλλα χαμηλής ανάλυσης. Χρωματίζει την μπάρα πλοήγησης στο πρωτεύον χρώμα Χρωματίζει τις συντομεύσεις της εφαρμογής στο κυρίως χρώμα. Ειδοποιήσεις, πλοήγηση κ.λπ. diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml index b10d3792..c62c6b8e 100644 --- a/app/src/main/res/values-en-rCA/strings.xml +++ b/app/src/main/res/values-en-rCA/strings.xml @@ -74,9 +74,6 @@ Shuffle playlist Light Dark - Always - Only on Wi-Fi - Never Today This week This month @@ -87,22 +84,18 @@ Now playing General theme Audio - Images Lockscreen Playlists Notification Colored navigation bar Coloured app shortcuts Show album cover - Auto download metadata Blur album cover Colored notification Classic notification design - Ignore Media Store covers Gapless playback Reduce volume on focus loss Last added playlist interval - "Play a song first, then try again." Delete Clear Remove @@ -126,7 +119,6 @@ Use the classic notification design. "Colors the notification in the album cover\u2019s vibrant color." "Can cause playback issues on some devices." - Can increase the album cover quality but causes slower image loading times. Only enable this if you have problems with low resolution artworks. Colors the navigation bar in the primary color. Colors the app shortcuts in the primary color. Notifications, navigation etc. diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index ab3af775..3e929c36 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -75,9 +75,6 @@ Shuffle playlist Light Dark - Always - Only on Wi-Fi - Never Today This week This month @@ -89,23 +86,19 @@ General theme Audio Library - Images Lockscreen Playlists Notification Coloured navigation bar Coloured app shortcuts Show album cover - Auto download metadata Blur album cover Coloured notification Classic notification design - Ignore Media Store covers Gapless playback Reduce volume on focus loss Last added playlist interval Remember last tab - "Play a song first, then try again." Delete Clear Remove @@ -131,7 +124,6 @@ Use the classic notification design. "Colours the notification in the album cover\u2019s vibrant colour." "Can cause playback issues on some devices." - Can increase the album cover quality but causes slower image loading times. Only enable this if you have problems with low resolution artworks. Colours the navigation bar in the primary colour. Colours the app shortcuts in the primary colour. Notifications, navigation etc. diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 3b6432d5..6b35b007 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -77,9 +77,6 @@ Reproducción aleatoria de la lista de reproducción Claro Oscuro - Siempre - Solo en Wi-Fi - Nunca Hoy Esta semana Últimos 7 días @@ -92,24 +89,20 @@ Tema general Audio Biblioteca - Imágenes Pantalla de bloqueo Listas de reproducción Notificación Barra de navegación coloreada Atajos coloreados de la aplicación Mostrar carátula del álbum - Descargar metadatos automáticamente Desenfocar carátula de álbum Notificación coloreada Diseño clásico de la notificación - Ignorar carátulas provenientes del almacenamiento local Reproducción sin interrupciones Reducir volumen en la pérdida del enfoque Intervalo de la última lista de reproducción Recordar la última pestaña Recordar aleatorio - "Reproduce una canción primero, luego intentalo otra vez." Borrar Limpiar Eliminar @@ -135,7 +128,6 @@ Utilizar el diseño clásico de notificación. "Colorea la notificaci\u00f3n con el color vibrante de la car\u00e1tula del \u00e1lbum." "Puede causar problemas durante la reproducción en algunos dispositivos." - Puede aumentar la calidad de la carátula del álbum pero causa que las imágenes carguen mas lento. Sólo activalo si tienes problemas con carátulas de baja resolución. Colorea la barra de navegación con el color principal. Colorea los accesos directos con el color principal Notificaciones, navegación etc. diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml index d3c06680..c504cdc9 100644 --- a/app/src/main/res/values-es-rUS/strings.xml +++ b/app/src/main/res/values-es-rUS/strings.xml @@ -76,9 +76,6 @@ Reproducción aleatoria de la lista de reproducción Claro Oscuro - Siempre - Sólo con WiFi - Nunca Hoy Esta semana Este mes @@ -90,23 +87,19 @@ Tema general Audio Biblioteca - Imágenes Pantalla de bloqueo Listas de reproducción Notificación Barra de navegación coloreada Accesos directos coloreados Mostrar carátula del álbum - Auto descargar metadata Desenfocar imagen de álbum Notificación coloreada Diseño de notificación clásico - Ignorar imágenes de la librería del sistema Reproducción sin pausas Reducir volumen al recibir notificaciones Último intervalo de lista de reproducción añadido Recordar la última pestaña - "Reproduce una canción primero, e intenta de nuevo." Eliminar Limpiar Eliminar @@ -132,7 +125,6 @@ Usar el diseño de notificación clásico. "Colorea la notificaci\u00f3n con el color vibrante de la car\u00e1tula del \u00e1lbum." "Puede causar problemas durante la reproducción en algunos dispositivos." - Puede aumentar la calidad de la carátula del álbum pero a veces puede tardar en cargar. Sólo actívalo si tienes problemas con carátulas de baja resolución. Colorea la barra de navegación con el color principal. Colorea los accesos directos con el color principal. Notificaciones, navegación, etc. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index eab7a712..96dee331 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -77,9 +77,6 @@ Sekoita soittolistat Vaalea Tumma - Aina - Vain Wi-Fi-yhteydellä - Ei koskaan 1 päivä 1 viikko Edelliset 7 päivää @@ -92,24 +89,20 @@ Yleinen teema Ääni Kirjasto - Kuvat Lukitusnäyttö Soittolistat Ilmoitukset Värillinen navigaatiopalkki Värilliset sovelluksen pikavalinnat Näytä albumin kansi - Metatietojen automaattinen lataus Sumenna albumin kansi Värillinen ilmoitus Klassinen ilmoituksen ulkonäkö - Sivuuta Media Storen albumikannet Tauoton toisto Hiljennä ääntä, kun kohdistus menetetään Viimeksi lisätyt -soittolistan aikaväli Muista viimeisin välilehti Muista sekoitus - "Toista jokin kappale ensin, koita sitten uudelleen." Poista Tyhjennä Poista @@ -135,7 +128,6 @@ Käytä klassista ilmoituksen ulkonäköä. "V\u00e4ritt\u00e4\u00e4 ilmoituksen albumin eloisalla v\u00e4rill\u00e4." "Saattaa aiheuttaa toisto-ongelmia joillain laitteilla." - Saattaa nostaa albumin kannen laatua, mutta aiheuttaa hitaampaa kuvien latausaikaa. Käytä tätä vain, jos sinulla on ongelmia huonolaatuisten taideteosten kanssa. Värittää navigaatiopalkin päävärillä. Värittää sovelluksen pikavalinnat päävärillä. Ilmoitukset, liikkuminen jne. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 638b2345..c2a51d55 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -76,9 +76,6 @@ Lecture aléatoire Clair Sombre - Toujours - Wi-Fi uniquement - Jamais Aujourd\'hui Cette semaine Ce mois-ci @@ -90,23 +87,19 @@ Thème général Audio Bibliothèque - Images Écran de verrouillage Listes de lecture Notification Barre de navigation colorée Raccourcis de l\'application colorés Afficher la pochette d\'album - Télécharger automatiquement les métadonnées Flouter la pochette d\'album Notification colorée Style de notification classic - Ignorer le stockage des pochettes Lecture sans coupure Réduire le volume lorse que le focus est interrompu Intervalle de la playlist \"Derniers ajouts\" Se souvenir de la dernière fenêtre - "Faire jouer un titre d'abord, puis réessayer." Supprimer Effacer Retirer @@ -132,7 +125,6 @@ Utiliser le style de notification classic "Colore la notification en fonction de la pochette de l'album." "Peut causer des problèmes de lecture sur certains appareils." - Peut augmenter la qualité des pochettes d\'albums, mais peut causer des temps de chargement plus longs. N\'activez cette option que si vous avez des problèmes de basse résolution des pochettes. Colore la barre de navigation en fonction de la couleur principale. Colore les raccourcis de l\'application selon la couleur primaire. Notifications, navigation, etc. diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index e980d0e4..deaa91b0 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -76,9 +76,6 @@ ערבב רשימת השמעה בהיר כהה - תמיד - רק עם WI-FI - אף פעם היום השבוע החודש @@ -90,23 +87,19 @@ ערכת נושא כללית שמע ספרייה - תמונות מסך נעילה רשימת השמעה התראות סרגל ניווט צבעוני קיצורי אפליקציה צבעוניים הצג עטיפת אלבום - הורד מידע שיר אוטומטית טשטוש עטיפת האלבום התראה צבעונית עיצוב התראה קלאיסי - התעלם מעיצוב עטיפת חנות מדיה ניגון ללא מרווחים בין השירים הפחת את עוצמת הקול באובדן מיקוד הפסקת רשימת השמעה אחרונה שהוספה זכור את הכרטיסיה האחרונה - "נגן/י שיר ואז נסה/י שנית." מחיקה ניקוי הסרה @@ -132,7 +125,6 @@ השתמש בעיצוב התראות קלאסי. "\u05e6\u05d5\u05d1\u05e2 \u05d0\u05ea \u05d4\u05ea\u05e8\u05d0\u05ea \u05d4\u05e0\u05d2\u05df \u05d1\u05e6\u05d1\u05e2 \u05d4\u05de\u05e8\u05db\u05d6\u05d9 \u05e9\u05dc \u05ea\u05de\u05d5\u05e0\u05ea \u05d4\u05d0\u05dc\u05d1\u05d5\u05dd." "עלול לגרום לבעיות בהשמעה בחלק מן המכשירים." - יכול להעלות את איכות תמונות האלבומים, אך גם גורם לטעינה איטית יותר של התמונות. הפעל אפשרות זו רק אם יש לך בעיות עם תמונות באיכות נמוכה. צובע את שורת הניווט בצבע הראשי. צובע את קיצורי האפליקציה בצבע הראשי. התראות, ניווט וכו\' diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index c6283ee6..fc832f3c 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -76,9 +76,6 @@ Izmiješaj popis naslova Svijetla Tamna - Uvijek - Samo na Wifi-ju - Nikad Danas Ovaj tjedan Ovaj mjesec @@ -90,23 +87,19 @@ Općenita tema Zvuk Biblioteka - Slike Zaključani zaslon Popisi naslova Obavijest Obojena navigacijska traka Obojani prečaci Prikaži omot albuma na zaklj. zaslonu - Automatski preuzmi meta podatke Zamagli omot albuma Obojene obavijesti Klasični dizajn obavijesti - Ignoriraj Media Store omote Reprodukcija bez prekida Smanji glasn. prilikom drugih zvukova Interval nedavnog popisa Zapamti zadnju karticu - "Reproducirajte nešto i pokušajte opet." Izbriši Očisti Ukloni @@ -132,7 +125,6 @@ Koristi klasični dizajn obavijesti. "Obavijesti su obojene istaknutom bojom omota albuma." "Na nekim uređajima može uzrokovati probleme s reproduciranjem." - Može povećati kvalitetu omota albuma, ali povećava vrijeme učitavanja. Omogućite ovo samo ako imate problema s omotima niske rezolucije. Boja navigacijsku traku primarnom bojom. Boja prečace aplikacije u primarnu boju. Obavijesti, navigacija itd. diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 8eb26339..f8ec8afc 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -76,9 +76,6 @@ Lejátszási lista keverése Világos Sötét - Mindig - Csak WIFI-n keresztül - Soha Ma Ezen a héten Ebben a hónapban @@ -90,23 +87,19 @@ Téma Hang Könyvtár - Képek Zárképernyő Lejátszási listák Értesítés Színezett navigációs sáv Színezett alkalmazás hivatkozások Albumborító megjelenítése - Automatikus letöltés metaadatok Albumborító elhomályosítása Színezett értesítés Klasszikus értesítési dízájn - A médiatár albumborítók figyelmen kívül hagyása Áttűnéses lejátszás Hangerő csökkentése Utoljára hozzáadott lejátszási lista intervallum Emlékezz az utolsó fülre - "Először játsszon le egy dalt, majd próbálja újra." Törlés Kiürítés Eltávolítás @@ -132,7 +125,6 @@ Használja a klasszikus értesítési dizájn. "\u00c9rtes\u00edt\u00e9sek sz\u00ednez\u00e9se az albumbor\u00edt\u00f3 sz\u00edn\u00e9vel." "Lejátszási problémákat okozhat néhány eszközön." - Növelheti az albumborítók minőségét, de lassabban tölti be a képeket. Csak akkor engedélyezze, ha az albumborítók rossz minőségben jelennek meg. Navigációs sáv színezése az alapértelmezett színnel. Az alkalmazás hivatkozások színezése az elsődleges szín szerint. Beérkező értesítéskor a lejátszás hangereje lecsökken, majd az értesítés végén visszaáll az eredeti hangerőre. diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index fa976201..c7f04cdf 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -77,9 +77,6 @@ Putar daftar putar secara acak Terang Gelap - Selalu - Hanya pada Wi-Fi - Tidak pernah Hari ini Minggu ini 7 hari terakhir @@ -92,24 +89,20 @@ Tema umum Suara Pustaka - Gambar Layar kunci Daftar putar Notifikasi Alat Navigasi Berwarna Pintasan Berwarna Tampilkan sampul album - Otomatis mengunduh metadata Buramkan sampul album Notifikasi berwarna Desain notifikasi klasik - Abaikan sampul-sampul pada Media Penyimpanan Pemutaran tanpa jeda Kurangi suara saat ada pemberitahuan Sela daftar putar yang terakhir ditambahkan Ingat tab terakhir Ingat putar acak - "Silahkan mainkan sebuah lagu dan coba lagi. " Hapus Kosongkan Hapus @@ -135,7 +128,6 @@ Gunakan desain notifikasi klasik. "Mewarnai notifikasi putar dengan warna yang cerah dari album." "Dapat menyebabkan masalah pemutaran pada beberapa perangkat." - "Dapat meningkatkan kualitas sampul album, namun menyebabkan waktu pemuatan lebih lambat. Aktifkan jika Anda bermasalah dengan resolusi gambar album yang rendah. " "Mewarnai bilah navigasi dengan warna primer. " Mewarnai pintasan-pintasan dengan warna utama. Pemberitahuan, navigasi dll. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index fa976201..c7f04cdf 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -77,9 +77,6 @@ Putar daftar putar secara acak Terang Gelap - Selalu - Hanya pada Wi-Fi - Tidak pernah Hari ini Minggu ini 7 hari terakhir @@ -92,24 +89,20 @@ Tema umum Suara Pustaka - Gambar Layar kunci Daftar putar Notifikasi Alat Navigasi Berwarna Pintasan Berwarna Tampilkan sampul album - Otomatis mengunduh metadata Buramkan sampul album Notifikasi berwarna Desain notifikasi klasik - Abaikan sampul-sampul pada Media Penyimpanan Pemutaran tanpa jeda Kurangi suara saat ada pemberitahuan Sela daftar putar yang terakhir ditambahkan Ingat tab terakhir Ingat putar acak - "Silahkan mainkan sebuah lagu dan coba lagi. " Hapus Kosongkan Hapus @@ -135,7 +128,6 @@ Gunakan desain notifikasi klasik. "Mewarnai notifikasi putar dengan warna yang cerah dari album." "Dapat menyebabkan masalah pemutaran pada beberapa perangkat." - "Dapat meningkatkan kualitas sampul album, namun menyebabkan waktu pemuatan lebih lambat. Aktifkan jika Anda bermasalah dengan resolusi gambar album yang rendah. " "Mewarnai bilah navigasi dengan warna primer. " Mewarnai pintasan-pintasan dengan warna utama. Pemberitahuan, navigasi dll. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 25900f0d..a520af5e 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -77,9 +77,6 @@ Riproduzione casuale playlist Chiaro Scuro - Sempre - Solo se connessi a Wi-Fi - Mai Oggi Questa settimana Ultimi 7 giorni @@ -92,24 +89,20 @@ Tema generale Audio Libreria - Immagini Schermata di blocco Playlist Notifica Barra di navigazione colorata Scorciatoie app colorate Mostra copertina album nella schermata di blocco - Ottieni automaticamente i metadati Sfoca la copertina Notifica colorata Design di notifica classico - Ignora le copertine del Media Store Riproduzione senza intervalli Riduci volume in caso di perdita di focus audio Ultimo intervallo di playlist aggiunto Ricorda ultima scheda Ricorda casuale - "Riproduci un brano e prova di nuovo." Elimina Svuota Rimuovi @@ -135,7 +128,6 @@ Usa il design di notifica classico. "La notifica \u00e8 colorata secondo la gamma di colori della copertina." "Può causare problemi di riproduzione su alcuni dispositivi." - Può incrementare la qualità delle copertine, ma causa rallentamenti nei tempi di caricamento delle immagini. Abilita soltanto se hai problemi con copertine a bassa risoluzione. Colora la barra di navigazione del colore principale. Colora le scorciatoie dell\'app con il colore principale. Notifiche, navigazione ecc. diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index e980d0e4..deaa91b0 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -76,9 +76,6 @@ ערבב רשימת השמעה בהיר כהה - תמיד - רק עם WI-FI - אף פעם היום השבוע החודש @@ -90,23 +87,19 @@ ערכת נושא כללית שמע ספרייה - תמונות מסך נעילה רשימת השמעה התראות סרגל ניווט צבעוני קיצורי אפליקציה צבעוניים הצג עטיפת אלבום - הורד מידע שיר אוטומטית טשטוש עטיפת האלבום התראה צבעונית עיצוב התראה קלאיסי - התעלם מעיצוב עטיפת חנות מדיה ניגון ללא מרווחים בין השירים הפחת את עוצמת הקול באובדן מיקוד הפסקת רשימת השמעה אחרונה שהוספה זכור את הכרטיסיה האחרונה - "נגן/י שיר ואז נסה/י שנית." מחיקה ניקוי הסרה @@ -132,7 +125,6 @@ השתמש בעיצוב התראות קלאסי. "\u05e6\u05d5\u05d1\u05e2 \u05d0\u05ea \u05d4\u05ea\u05e8\u05d0\u05ea \u05d4\u05e0\u05d2\u05df \u05d1\u05e6\u05d1\u05e2 \u05d4\u05de\u05e8\u05db\u05d6\u05d9 \u05e9\u05dc \u05ea\u05de\u05d5\u05e0\u05ea \u05d4\u05d0\u05dc\u05d1\u05d5\u05dd." "עלול לגרום לבעיות בהשמעה בחלק מן המכשירים." - יכול להעלות את איכות תמונות האלבומים, אך גם גורם לטעינה איטית יותר של התמונות. הפעל אפשרות זו רק אם יש לך בעיות עם תמונות באיכות נמוכה. צובע את שורת הניווט בצבע הראשי. צובע את קיצורי האפליקציה בצבע הראשי. התראות, ניווט וכו\' diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 590682f5..06e28551 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -76,9 +76,6 @@ プレイリストをシャッフル ライト ダーク - いつでも - Wi-Fi 接続時のみ - しない 今日 今週 今月 @@ -90,23 +87,19 @@ テーマカラー オーディオ ライブラリ - 画像 ロック画面 プレイリスト 通知 ナビゲーションバーに色を付ける アプリのショートカットに色を付ける アルバムアートを表示する - 楽曲情報の自動ダウンロード アルバムアートにぼかし効果をかける 通知に色を付ける 古い通知デザイン - メディアストアのアートを無視する ギャップレス再生 音声フォーカス喪失時に音量を下げる 最近追加された曲に含まれる期間 最後のタブの記憶 - "何か曲を再生してもう一度お試しください" 削除 消去 除去 @@ -132,7 +125,6 @@ 旧式の通知デザインを使用します。 "\u901a\u77e5\u306e\u8272\u3092\u30a2\u30eb\u30d0\u30e0\u30a2\u30fc\u30c8\u304b\u3089\u62bd\u51fa\u3057\u305f\u8272\u306b\u5909\u66f4\u3057\u307e\u3059\u3002" "一部の端末では再生に問題が生じる可能性があります。" - アルバムアートの画質を上げることが出来ますが、画像の読み込みは遅くなる可能性があります。低画質のアルバムアートで問題がある場合に限り有効にしてください。 ナビゲーションバーの背景色をメインカラーに変更します。 アプリのショートカットの色をメインカラーに変更します。 通知やナビなどです。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e798225c..5d4192ed 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -76,9 +76,6 @@ 재생 목록 랜덤 재생 밝은 테마 어두운 테마 - 항상 - Wi-Fi 환경에서만 - 사용 안 함 오늘 이번 주 이번 달 @@ -90,23 +87,19 @@ 전체 테마 오디오 보관함 - 이미지 잠금 화면 재생목록 알림 내비게이션 바 색상 틴트 앱 바로가기 색칠 앨범 커버 보이기 - 메타데이터 자동 다운로드 앨범 커버 블러 효과 알림 색상 틴트 클래식 알림 디자인 - 미디어 스토어 앨범 커버 무시 갭리스 재생 포커스 상실 시 볼륨 감소하기 최근 추가된 재생 목록 간격 마지막 탭 기억 - "먼저 노래를 재생한 후 다시 시도해 주세요." 삭제 비우기 제거 @@ -132,9 +125,6 @@ 클래식 알림 디자인 사용 "\uc54c\ub9bc \ucee8\ud2b8\ub864\uc744 \uc568\ubc94 \uc544\ud2b8\uc758 \uc8fc \uc0c9\uc0c1\uc73c\ub85c \uce60\ud569\ub2c8\ub2e4." "일부 기기에서 곡 전환 관련 문제가 발생할 수 있습니다." - 앨범 아트 이미지의 질이 높아지지만 로딩 시간이 -길어질 수 있습니다. 저화질 앨범 아트를 원하지 - 않으실 경우에만 이 기능을 사용하십시오. 하단바가 색깔을 주 색상으로 색칠합니다. 주 색상으로 앱 바로가기 색칠 알림 소리, 버튼음 등 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e87267c1..dbf64a19 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -76,9 +76,6 @@ Shuffle afspeellijst Licht Donker - Altijd - Alleen over wifi - Nooit Vandaag Deze week Deze maand @@ -90,23 +87,19 @@ Algemeen thema Audio Bibliotheek - Illustraties Vergrendelscherm Afspeellijst Melding Gekleurde navigatiebalk Gekleurde app-snelkoppelingen Toon albumhoes - Metadata autom. downloaden Vervaag albumhoes Gekleurde melding Klassieke meldingsweergave - Negeer Mediaopslag illustraties Afspelen zonder pauzes Verminder volume bij focusverlies Laatst toegevoegd afspeellijst tussenpoos Laatste tabblad onthouden - "Speel eerst iets af, probeer dan opnieuw." Verwijderen Legen Verwijderen @@ -132,7 +125,6 @@ Gebruik de klassieke meldingsweergave. "Kleurt de melding met het palet van de albumhoes." "Verwijdert de pauzes tussen nummers. Dit kan afspeelfouten veroorzaken." - Dit kan de albumhoes kwaliteit doen toenemen, maar langere laadtijden veroorzaken. Gebruik dit alleen als je problemen hebt met lage resolutie illustraties. Kleurt de navigatiebalk in de primaire kleur. Kleurt de app-snelkoppelingen in de primaire kleur. Notificaties, navigatie, etc. diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml index d5f14398..be83b4bd 100644 --- a/app/src/main/res/values-nn/strings.xml +++ b/app/src/main/res/values-nn/strings.xml @@ -51,7 +51,6 @@ Generelt tema Audio Farga navigasjonslinje - "Ingen audio-ID, spel noko og prøv igjen" Slett Gje nytt namn Primærfarge diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 5987d264..8a3ce866 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -76,9 +76,6 @@ Losowa lista odtwarzania Jasny Ciemny - Zawsze - Tylko na WiFi - Nigdy Dzisiaj Ten tydzień Ten miesiąc @@ -90,23 +87,19 @@ Styl tła motywu Dźwięk Biblioteka - Obrazy Ekran blokady Lista odtwarzania Powiadomienie Kolorowy pasek nawigacyjny Kolorowe skróty aplikacji Pokazuj okładki albumów - Automatycznie pobieraj dane Rozmywanie okładki albumu Kolorowy odtwarzacz w pasku powiadomień Klasyczny wygląd powiadomienia - Ignoruj okładki z Media Store Odtwarzanie bez przerw Zmniejszaj głośność przy powiadomieniach Okres ostatnio dodanych list odtwarzania "Zapamiętaj ostatnią zakładkę " - "Odegraj utwór, następnie ponów próbę" Usuń Wyczyść Usuń @@ -132,7 +125,6 @@ Używaj klasycznego stylu powiadomienia. "Odtwarzacz w pasku powiadomie\u0144 ma tonacj\u0119 ok\u0142adki albumu" "Na niektórych urządzeniach mogą wystąpić problemy z odtwarzaniem" - Polepszy to jakość okładek, ale może spowodować ich wolniejsze ładowanie. Zaznacz tylko wtedy, gdy masz kłopoty z niską jakością grafik Kolory paska nawigacyjnego będą odpowiadały kolorowi podstawowemu Kolory skrótów aplikacji w kolorze podstawowym Notyfikacje, nawigacja, itp. diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 10e6f350..8631e251 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -77,9 +77,6 @@ Misturar playlist Claro Escuro - Sempre - Apenas no Wi-Fi - Nunca Hoje Essa semana Última semana @@ -92,24 +89,20 @@ Tema geral Áudio Biblioteca - Imagens Bloqueio de tela Listas de Reprodução Notificação Barra de navegação colorida Atalhos de app coloridos Visualizar capa do álbum - Baixar automaticamente os metadados Capa de álbum esmaecida Notificação colorida Design de classificação clássico - Ignorar capas Media Store Reprodução contínua Reduzir o volume de perda de foco Intervalo de adição das playlists mais recentes Lembrar última aba Memorizar aleatorização - "Sem identificação de áudio, reproduza algo e tente novamente." Excluir Limpar Remover @@ -135,7 +128,6 @@ Usar o design de notificação clássico. "A notifica\u00e7\u00e3o \u00e9 colorida com a cor mais vibrante do \u00e1lbum." "Pode causar problemas de reprodução em alguns dispositivos." - Pode aumentar a qualidade da capa do álbum, mas a carrega mais devagar. Só habilite esta opção se você tiver problemas com obras de arte de baixa resolução. Cores da barra de navegação na cor primária. Colore os atalhos do app com a cor primária. Notificações, navegação, etc. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index ac01ae4a..31e61d0f 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -70,23 +70,17 @@ Embaralhar lista de reprodução Claro Escuro - Sempre - Apenas com Wi-Fi - Nunca Equalizador Cores A reproduzir Tema geral Áudio - Imagens Ecrã de Bloqueio Barra de navegação colorida Mostrar capa do álbum Desfocar capa do álbum Notificação colorida - Ignorar capas Media Store Reprodução contínua - "Reproduza uma faixa primeiro, e tente outra vez." Eliminar Limpar Remover @@ -109,7 +103,6 @@ Desfoca a capa do álbum no ecrã de bloqueio. Pode causar problemas com aplicações de terceiros e widgets. "Colorir a notifica\u00e7\u00e3o na cor viva da capa de \u00e1lbum." "Pode causar problemas na reprodução em alguns dispositivos." - Pode aumentar a qualidade da capa do album, mas aumenta o tempo de carregamento. Ative isto somente se tiver problemas com capas de baixa resolução. Colorir a barra de navegação na cor primária. Notificações, navegação etc. Favoritos diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 51eb66c3..3e822cc1 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -76,9 +76,6 @@ Amestecare listă de redare Light (Alb) Dark (Negru) - Mereu - Doar cu Wi-Fi - Niciodată Astăzi Săptămâna aceasta Luna aceasta @@ -90,23 +87,19 @@ Temă generală Audio Bibliotecă - Imagini Ecran blocat Liste de redare Notificare Bară de navigare colorată Comenzi rapide colorate Arată coperta de album - Descărcare automată metadate Blurează coperta de album Notificare colorată Design clasic de notificare - Ignoră coperțile Media Store Redare fără întreruperi Se reduce volumul la pierderea focalizării Ultimul interval al listei de redare adăugate Rețineți ultima filă - "Redă o melodie mai întâi, apoi încearcă din nou." Șterge Eliberați Ștergeți @@ -132,7 +125,6 @@ Utilizați designul clasic de notificare. "Coloreaz\u0103 bara de notificare cu cea mai vibrant\u0103 culoare a copertei de album." "Poate cauza probleme de redare pe unele dispozitive." - Poate mări calitatea coperții de album, dar cauzează încărcarea mai lentă a imaginilor. Activați doar dacă aveți probleme cu imaginile de rezoluție mică. Colorare bară de navigare în culoarea primară. Colorarea comenzilor rapide ale aplicației în culoarea primară. Notificări, navigație etc. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index b59483aa..84f5019d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -77,9 +77,6 @@ Перемешать плейлист Светлая Тёмная - Всегда - Только по Wi-Fi - Никогда Сегодня Эта неделя Последние 7 дней @@ -92,24 +89,20 @@ Главная тема Аудио Библиотека - Изображения Экран блокировки Плейлисты Уведомления Цветная панель управления Цветные шорткаты Показывать обложку альбома - Автозагрузка метаданных Размытая обложка альбома Окрашенное уведомление Стандартный дизайн уведомления - Игнорировать хранилище обложек альбомов Воспроизведение без пауз Уменьшить громкость при уведомлениях Интервал последнего добавленного плейлиста Запомнить последнюю вкладку Запомнить перемешивание - "Сначала воспроизведите песню, а затем попробуйте снова." Удалить Очистить Убрать @@ -135,7 +128,6 @@ Использовать классический дизайн уведомления. "\u041e\u043a\u0440\u0430\u0448\u0438\u0432\u0430\u0435\u0442 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u0432 \u0442\u043e\u043d \u043e\u0431\u043b\u043e\u0436\u043a\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430." "Может вызвать проблемы с воспроизведением на некоторых устройствах." - Может увеличить качество обложки, но также увеличивает время её отрисовки. Влючайте только, если вы имеете проблемы с низким разрешением обложек альбомов. Окрашивает панель навигации в основной цвет. Окрашивает шорткаты в основной цвет. Уведомления, навигация, т.д. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 002be08c..a1d75e92 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -61,7 +61,6 @@ Vill du radera %1$d låtar? Allmänt tema Ljud Färgad navigeringslist - "Inget ljud-ID, spela något annat och försök igen." Radera Döp om Grundfärg diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ab34a41b..f30e9a3a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -76,9 +76,6 @@ Çalma listesini karıştır Açık Koyu - Her zaman - Yalnızca Wİ-Fİ - Asla Bugün Bu hafta Bu ay @@ -90,23 +87,19 @@ Genel tema Ses Kitaplık - Görüntüler Kilit ekranı Çalma listeleri Bildirim Renkli gezinme çubuğu Renkli uygulama kısayolları Albüm kapağını göster - Otomatik indirilen meta veriler Bulanık albüm kapağı Renkli bildirim Klasik bildirim tasarımı - Medya Deposu albüm kapağını yoksay Aralıksız çalma Odak kaybına neden olacak sesi azalt Son eklenen çalma listesi süresi Son sekmeyi hatırla - "ilk şarkıyı çalın, daha sonra tekrar deneyin." Sil Temizle Kaldır @@ -132,7 +125,6 @@ Klasik bildirim tasarımını kullan. "Bildirimler alb\u00fcm kapa\u011f\u0131n\u0131n canl\u0131 renkleriyle renklendirilir." "Bazı cihazlarda oynatma sorunlarına neden olabilir." - Albüm kapağı kalitesinin artırılması daha yavaş görüntü yükleme sürelerine neden olabilir. Düşük çözünürlükte olan albüm kapakları ile ilgili sorunlar varsa bunu etkinleştirin. Gezinme çubuğunu ana renk ile renklendir. Uygulama kısayollarını ana renk ile renklendir. Bildirimler, gezinme vb. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index ee7fabd7..a01f8d55 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -75,9 +75,6 @@ Перемішати список відтворення Світла Темна - Завжди - Тільки через Wi-Fi - Ніколи Сьогодні Цього тижня Цього місяця @@ -89,23 +86,19 @@ Загальна тема Аудіо Бібліотека - Зображення Екран блокування Списки відтворення Сповіщення Кольорова панель навігації Кольорові ярлики додатків Показати обкладинку альбому - Автоматично завантажені метадані Розмити обкладинку альбому Кольорове сповіщення Класичне оформлення сповіщення - Ігнорувати обкладинки з Медіасховища. Безперервне відтворення Зменшити гучнiсть при отриманнi повiдомлення Інтервал останнього доданого списку відтворення Запам‘ятати останню вкладку - "Спочатку відтворіть пісню, потім спробуйте ще раз." Видалити Очистити Видалити @@ -131,7 +124,6 @@ Використовувати класичне оформлення сповіщення. "\u0424\u0430\u0440\u0431\u0443\u0454 \u043f\u043e\u0432\u0456\u0434\u043e\u043c\u043b\u0435\u043d\u043d\u044f \u0432 \u043f\u0435\u0440\u0435\u0432\u0430\u0436\u043d\u0438\u0439 \u043a\u043e\u043b\u0456\u0440 \u043e\u0431\u043a\u043b\u0430\u0434\u0438\u043d\u043a\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0443." "Може викликати проблеми з відтворенням на деяких пристроях." - Може збільшити якість обкладинки альбому, але збільшує час завантаження зображення. Використовуйте тільки якщо у вас проблеми з обкладинками низької роздільної здатності. Фарбує панель навігації у переважний колір. Фарбує ярлики додатків у переважний колір. Повiдомлення, навiгацiя, т.д. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 2094f8fa..71b588d5 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -73,9 +73,6 @@ Trộn danh sách nhạc Sáng Tối - Luôn luôn - Chỉ dùng Wi-Fi - Không bao giờ Hôm nay Tuần này Tháng này @@ -86,22 +83,18 @@ Đang phát Chủ đề chung Âm thanh - Hình ảnh Màn hình khóa Danh sách nhạc Thông báo Màu thanh điều hướng Màu sắc biểu tượng ứng dụng Hiện bìa album - Tự động tải xuống siêu dữ liệu Làm mờ bìa album Màu thông báo Thiết kế thông báo cổ điển - Bỏ qua kho ảnh bìa trong Kho Phương tiện Phát lại quãng lặng Giảm âm lượng khi mất tập trung Thời gian danh sách nhạc được thêm vào sau cùng - "Phát một bài hát đầu tiên, sau đó thử lại." Xóa Dọn Di chuyển @@ -125,7 +118,6 @@ Sử dụng thiết kế thông báo cổ điển. "M\u00e0u s\u1eafc r\u1ef1c r\u1ee1 cho c\u00e1c th\u00f4ng b\u00e1o trong b\u00eca album." "Có thể gây ra các vấn đề phát trên một số thiết bị." - Có thể làm tăng chất lượng bìa album nhưng làm chậm quá trình tải hình ảnh. Chỉ cho phép điều này nếu bạn có vấn đề với hình ảnh có độ phân giải thấp. Màu sắc thanh điều hướng trong các màu cơ bản. Màu sắc chủ đạo của biểu tượng ứng dụng. Thông báo, điều hướng, vv. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3e835467..0f0ca95e 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -77,9 +77,6 @@ 随机播放此播放列表 浅色 暗色 - 总是 - 仅在 WiFi 下 - 从不 今日 本周 过去7天 @@ -92,23 +89,19 @@ 全局主题 声音 媒体库 - 图片 锁屏 播放列表 通知 着色导航栏 着色应用快捷方式 显示专辑封面 - 自动下载元数据 专辑封面模糊化 启用通知背景着色 经典通知样式 - 忽略媒体储存中的专辑封面 无缝播放 音频焦点丢失时降低音量 最近添加播放列表间隔 记住最后打开页面 - "请在播放歌曲后再次尝试此操作。" 删除 清空 移除 @@ -134,7 +127,6 @@ 使用经典通知样式。 "\u4f7f\u7528\u4e0e\u4e13\u8f91\u5c01\u9762\u76f8\u5339\u914d\u7684\u989c\u8272\u7740\u8272\u901a\u77e5\u80cc\u666f\u8272\u3002" "在某些设备上会造成播放问题。" - 可以提高专辑封面图片的质量但加载时间也会更长。仅当遇到专辑封面像素过低时建议开启。 用主色调着色导航栏。 用主色调着色应用快捷方式。 通知、导航等 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8bd5d293..3352b92f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -78,9 +78,6 @@ 隨機播放清單 明亮 暗沉 - 永遠 - 只在有 Wi-Fi 連接時 - 永不 今日 本周 過去7天 @@ -93,24 +90,20 @@ 主題 音訊 音樂庫 - 圖片 鎖定螢幕 播放清單 通知 彩色的導航列 彩色的應用快捷方式 顯示專輯封面 - 自動下載元數據 將專輯圖片模糊化 彩色的狀態列 經典通知樣式 - 忽略音訊檔內嵌的專輯封面 無縫播放 在焦點音訊響起時降低音量 最後新增列表的時間範圍 記住最後開啟的頁面 記住隨機播放 - "請先播放一首歌後再重試一遍。" 刪除 清除 移除 @@ -136,7 +129,6 @@ 使用經典通知樣式 "\u72c0\u614b\u5217\u984f\u8272\u8207\u5c08\u8f2f\u5716\u7247\u984f\u8272\u4e00\u81f4" "可能會在某些裝置上出現播放問題。" - 提高專輯封面的成像品質，但會造成較長的讀取時間。建議只有在您對低畫質的專輯封面有問題時才開啟此選項。 將專輯封面的主色調設為導航列的顏色。 將主色調設為應用快捷方式的顏色 通知鈴聲、導航語音等。 diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index e877f40f..31bda0f6 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -12,18 +12,6 @@ black - - @string/always - @string/only_on_wifi - @string/never - - - - always - only_wifi - never - - @string/today @string/this_week diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d1a31e95..f809e43f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -86,9 +86,6 @@ Light Dark Black - Always - Only on Wi-Fi - Never Today This week Past 7 days @@ -101,24 +98,20 @@ General theme Audio Library - Images Lockscreen Playlists Notification Colored navigation bar Colored app shortcuts Show album cover - Auto download metadata Blur album cover Colored notification Classic notification design - Ignore Media Store covers Gapless playback Reduce volume on focus loss Last added playlist interval Remember last tab Remember shuffle - "Play a song first, then try again." Delete Clear Remove @@ -144,7 +137,6 @@ Use the classic notification design. "Colors the notification in the album cover\u2019s vibrant color." "Can cause playback issues on some devices." - Can increase the album cover quality but causes slower image loading times. Only enable this if you have problems with low resolution artworks. Colors the navigation bar in the primary color. Colors the app shortcuts in the primary color. Notifications, navigation etc. diff --git a/app/src/main/res/xml/pref_images.xml b/app/src/main/res/xml/pref_images.xml deleted file mode 100644 index 61013b08..00000000 --- a/app/src/main/res/xml/pref_images.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file