From 85436029ff3f8752b9569a7bcb16daeaaf7c55a7 Mon Sep 17 00:00:00 2001
From: TeGaX_Dakkar <63868370+TeGaX@users.noreply.github.com>
Date: Mon, 12 Oct 2020 18:58:11 +0700
Subject: [PATCH 01/26] Deleted a second action_album_artists_only string
---
app/src/main/res/values-ru-rRU/strings.xml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 2bfa82871..7f659c0f6 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -519,8 +519,7 @@
Эффект снегопада
- Только альбомы исполнителей
- Использовать обложку альбома текущей песни в качестве обоев на экране блокировки.
+ Использовать обложку альбома текущей песни в качестве обоев на экране блокировки.
Снизить громкость воспроизведения когда приходит звуковое уведомление
Содержимое черного списка скрыто из вашей библиотеки.
Начать воспроизведение сразу же после подключения Bluetooth-устройства
@@ -550,7 +549,7 @@
Если доступно достаточно места, показывать регулировку громкости на экране воспроизведения
Показывать обложку альбома в разделе исполнители
- Показать обложку альбома
+ Показать обложку альбома
Тема обложки альбома
Стиль смены обложки альбома
Сетка альбомов
@@ -573,7 +572,7 @@
Показать вкладку жанра
Сетка исполнителя на Главной странице
Сетка альбома на Главной странице
- Кнопка Домой
+ Кнопка Домой
Игнорировать обложки из хранилища
Дата последнего добавления плейлиста
Полноэкранное управление
@@ -865,7 +864,7 @@
Сейчас не проигрывается
Последние 7 дней
-
+
- Песня
- Песни
@@ -892,7 +891,7 @@
Колличество песен
По возрастанию
Количество композиций по убыванию
- Приложению требуется разрешение на доступ к внутренней памяти вашего устройства для воспроизведения музыки.
+ Приложению требуется разрешение на доступ к внутренней памяти вашего устройства для воспроизведения музыки.
Доступ к внутренней памяти
Рингтон
Приложению требуется разрешение на доступ к настройкам вашего устройства, чтобы установить музыку в качестве рингтона.
From 0fe0c2728f7ea0b8d1181e98775e7057ecf22467 Mon Sep 17 00:00:00 2001
From: Hemanth S
Date: Sat, 17 Oct 2020 13:28:13 +0530
Subject: [PATCH 02/26] Removed unesscery ids, res, etc
---
.../retromusic/adapter/SearchAdapter.kt | 9 +-
.../retromusic/adapter/album/AlbumAdapter.kt | 9 --
.../adapter/base/MediaEntryViewHolder.java | 2 -
.../retromusic/extensions/ViewExtensions.kt | 1 +
.../retromusic/fragments/LibraryViewModel.kt | 40 ++---
.../retromusic/repository/SearchRepository.kt | 18 +--
.../monkey/retromusic/util/PreferenceUtil.kt | 117 +-------------
.../res/anim/retro_fragment_fade_enter.xml | 20 ---
.../res/anim/retro_fragment_fade_exit.xml | 20 ---
app/src/main/res/anim/sliding_in_left.xml | 11 --
app/src/main/res/anim/sliding_out_right.xml | 11 --
.../drawable-v24/ic_launcher_foreground.xml | 72 ---------
app/src/main/res/drawable/asld_album.xml | 15 --
app/src/main/res/drawable/asld_home.xml | 15 --
app/src/main/res/drawable/asld_music_note.xml | 15 --
app/src/main/res/drawable/avd_album.xml | 38 -----
app/src/main/res/drawable/avd_home.xml | 95 -----------
app/src/main/res/drawable/avd_music_note.xml | 114 --------------
app/src/main/res/drawable/circle_progress.xml | 35 -----
app/src/main/res/drawable/ic_add_photo.xml | 18 ---
.../res/drawable/ic_app_shortcut_search.xml | 20 ---
.../main/res/drawable/ic_artist_selected.xml | 11 --
.../main/res/drawable/ic_bookmark_music.xml | 9 --
app/src/main/res/drawable/ic_currency_inr.xml | 10 --
.../main/res/drawable/ic_invert_colors.xml | 10 --
app/src/main/res/drawable/ic_menu.xml | 25 ---
.../main/res/drawable/ic_rounded_corner.xml | 10 --
app/src/main/res/drawable/ic_scanner.xml | 12 --
app/src/main/res/drawable/line_button.xml | 9 --
app/src/main/res/drawable/round_window.xml | 5 -
app/src/main/res/drawable/scroll_handler.xml | 21 ---
app/src/main/res/drawable/shadow_down.xml | 9 --
app/src/main/res/drawable/side_gradient.xml | 8 -
app/src/main/res/drawable/square_window.xml | 4 -
app/src/main/res/drawable/tab_indicator.xml | 16 --
.../layout-land/activity_album_tag_editor.xml | 2 -
.../layout-land/fragment_artist_details.xml | 1 -
.../res/layout-land/fragment_card_player.xml | 1 -
.../layout-land/fragment_circle_player.xml | 1 -
.../res/layout-land/fragment_color_player.xml | 1 -
.../main/res/layout-land/fragment_player.xml | 1 -
.../layout-land/fragment_simple_player.xml | 1 -
app/src/main/res/layout-land/pager_item.xml | 62 --------
.../res/layout-xlarge-land/pager_item.xml | 62 --------
app/src/main/res/layout/abs_playlists.xml | 2 -
.../res/layout/activity_album_tag_editor.xml | 1 -
app/src/main/res/layout/activity_donation.xml | 1 -
.../main/res/layout/activity_drive_mode.xml | 1 -
.../main/res/layout/activity_pro_version.xml | 1 -
.../res/layout/activity_song_tag_editor.xml | 1 -
app/src/main/res/layout/app_widget_small.xml | 1 -
app/src/main/res/layout/card_other.xml | 1 -
app/src/main/res/layout/dialog_list_item.xml | 13 --
.../res/layout/fragment_adaptive_player.xml | 2 -
...ment_adaptive_player_playback_controls.xml | 1 -
.../res/layout/fragment_album_card_cover.xml | 1 -
.../layout/fragment_album_material_cover.xml | 1 -
...fragment_blur_player_playback_controls.xml | 1 -
...ent_card_blur_player_playback_controls.xml | 1 -
.../main/res/layout/fragment_card_player.xml | 1 -
...fragment_card_player_playback_controls.xml | 1 -
.../res/layout/fragment_circle_player.xml | 1 -
.../res/layout/fragment_classic_controls.xml | 1 -
...ragment_color_player_playback_controls.xml | 1 -
.../layout/fragment_fit_playback_controls.xml | 1 -
...fragment_flat_player_playback_controls.xml | 1 -
.../layout/fragment_full_player_controls.xml | 1 -
.../res/layout/fragment_gradient_controls.xml | 1 -
...fragment_lock_screen_playback_controls.xml | 1 -
app/src/main/res/layout/fragment_lyrics.xml | 23 ---
.../fragment_material_playback_controls.xml | 1 -
.../main/res/layout/fragment_mini_player.xml | 2 -
.../fragment_player_playback_controls.xml | 1 -
app/src/main/res/layout/fragment_settings.xml | 54 -------
app/src/main/res/layout/fragment_synced.xml | 14 --
app/src/main/res/layout/fragment_volume.xml | 1 -
app/src/main/res/layout/home_content.xml | 1 -
.../res/layout/item_list_quick_actions.xml | 3 -
app/src/main/res/layout/item_option_menu.xml | 47 ------
app/src/main/res/layout/item_suggestions.xml | 1 -
.../layout/layout_notification_collapsed.xml | 2 -
.../layout/layout_notification_expanded.xml | 1 -
app/src/main/res/layout/lyrics_dialog.xml | 60 -------
.../layout/metal_section_recycler_view.xml | 34 ----
app/src/main/res/layout/pager_item.xml | 75 ---------
app/src/main/res/layout/preference_screen.xml | 8 -
.../main/res/layout/section_recycler_view.xml | 1 -
app/src/main/res/menu/menu_folders.xml | 15 --
...nnot_delete_single_songs_playlist_song.xml | 44 ------
.../res/menu/menu_item_smart_playlist.xml | 27 ----
app/src/main/res/menu/menu_layout_types.xml | 25 ---
app/src/main/res/menu/menu_main.xml | 8 +-
.../main/res/menu/menu_playlist_detail.xml | 1 -
.../res/menu/menu_smart_playlist_detail.xml | 30 ----
.../main/res/menu/menu_song_sort_order.xml | 10 --
app/src/main/res/navigation/library_graph.xml | 1 -
app/src/main/res/navigation/main_graph.xml | 1 -
.../main/res/navigation/settings_graph.xml | 1 -
app/src/main/res/transition/change_bounds.xml | 10 --
.../res/transition/grid_exit_transition.xml | 27 ----
app/src/main/res/values-af-rZA/strings.xml | 91 -----------
app/src/main/res/values-ar-rSA/strings.xml | 103 ------------
app/src/main/res/values-bn-rIN/strings.xml | 91 -----------
app/src/main/res/values-ca-rES/strings.xml | 91 -----------
app/src/main/res/values-cs-rCZ/strings.xml | 97 ------------
app/src/main/res/values-da-rDK/strings.xml | 91 -----------
app/src/main/res/values-de-rDE/strings.xml | 91 -----------
app/src/main/res/values-el-rGR/strings.xml | 91 -----------
app/src/main/res/values-en-rHK/strings.xml | 77 ---------
app/src/main/res/values-en-rID/strings.xml | 77 ---------
app/src/main/res/values-en-rIN/strings.xml | 77 ---------
app/src/main/res/values-en-rUS/strings.xml | 91 -----------
app/src/main/res/values-es-rES/strings.xml | 91 -----------
app/src/main/res/values-eu-rES/strings.xml | 91 -----------
app/src/main/res/values-fa-rIR/strings.xml | 91 -----------
app/src/main/res/values-fi-rFI/strings.xml | 91 -----------
app/src/main/res/values-fr-rFR/strings.xml | 91 -----------
app/src/main/res/values-hi-rIN/strings.xml | 91 -----------
app/src/main/res/values-hr-rHR/strings.xml | 94 -----------
app/src/main/res/values-hu-rHU/strings.xml | 91 -----------
app/src/main/res/values-hu/strings.xml | 77 ---------
app/src/main/res/values-in-rID/strings.xml | 88 -----------
app/src/main/res/values-it-rIT/strings.xml | 91 -----------
app/src/main/res/values-iw-rIL/strings.xml | 97 ------------
app/src/main/res/values-ja-rJP/strings.xml | 88 -----------
app/src/main/res/values-kn-rIN/strings.xml | 91 -----------
app/src/main/res/values-ko-rKR/strings.xml | 88 -----------
app/src/main/res/values-ml-rIN/strings.xml | 91 -----------
app/src/main/res/values-ne-rIN/strings.xml | 91 -----------
app/src/main/res/values-nl-rNL/strings.xml | 91 -----------
app/src/main/res/values-no-rNO/strings.xml | 91 -----------
app/src/main/res/values-or-rIN/strings.xml | 91 -----------
app/src/main/res/values-pl-rPL/strings.xml | 97 ------------
app/src/main/res/values-pt-rBR/strings.xml | 91 -----------
app/src/main/res/values-pt-rPT/strings.xml | 91 -----------
app/src/main/res/values-ro-rRO/strings.xml | 94 -----------
app/src/main/res/values-ru-rRU/strings.xml | 148 +-----------------
app/src/main/res/values-sk-rSK/strings.xml | 97 ------------
app/src/main/res/values-sr-rSP/strings.xml | 94 -----------
app/src/main/res/values-sv-rSE/strings.xml | 91 -----------
app/src/main/res/values-ta-rIN/strings.xml | 91 -----------
app/src/main/res/values-te-rIN/strings.xml | 91 -----------
app/src/main/res/values-tr-rTR/strings.xml | 91 -----------
app/src/main/res/values-uk-rUA/strings.xml | 97 ------------
app/src/main/res/values-ur-rIN/strings.xml | 91 -----------
app/src/main/res/values-vi-rVN/strings.xml | 88 -----------
app/src/main/res/values-xlarge/dimens.xml | 1 -
app/src/main/res/values-zh-rCN/strings.xml | 88 -----------
app/src/main/res/values-zh-rHK/strings.xml | 88 -----------
app/src/main/res/values-zh-rTW/strings.xml | 88 -----------
app/src/main/res/values/arrays.xml | 27 ----
app/src/main/res/values/colors.xml | 18 ---
app/src/main/res/values/dimens.xml | 10 --
app/src/main/res/values/font_certs.xml | 17 +-
app/src/main/res/values/ids.xml | 4 +-
app/src/main/res/values/integers.xml | 2 -
app/src/main/res/values/strings.xml | 144 -----------------
app/src/main/res/values/styles.xml | 66 --------
app/src/main/res/values/values.xml | 2 -
.../main/res/layout/ate_preference_custom.xml | 72 ---------
.../layout/ate_preference_custom_support.xml | 76 ---------
.../main/res/layout/ate_preference_list.xml | 23 ---
.../src/main/res/values-large/dimens.xml | 2 -
.../res/values/colors_material_design.xml | 11 --
appthemehelper/src/main/res/values/dimens.xml | 2 -
appthemehelper/src/main/res/values/ids.xml | 5 +-
166 files changed, 38 insertions(+), 6488 deletions(-)
delete mode 100644 app/src/main/res/anim/retro_fragment_fade_enter.xml
delete mode 100644 app/src/main/res/anim/retro_fragment_fade_exit.xml
delete mode 100644 app/src/main/res/anim/sliding_in_left.xml
delete mode 100644 app/src/main/res/anim/sliding_out_right.xml
delete mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml
delete mode 100644 app/src/main/res/drawable/asld_album.xml
delete mode 100644 app/src/main/res/drawable/asld_home.xml
delete mode 100644 app/src/main/res/drawable/asld_music_note.xml
delete mode 100644 app/src/main/res/drawable/avd_album.xml
delete mode 100644 app/src/main/res/drawable/avd_home.xml
delete mode 100644 app/src/main/res/drawable/avd_music_note.xml
delete mode 100644 app/src/main/res/drawable/circle_progress.xml
delete mode 100644 app/src/main/res/drawable/ic_add_photo.xml
delete mode 100644 app/src/main/res/drawable/ic_app_shortcut_search.xml
delete mode 100644 app/src/main/res/drawable/ic_artist_selected.xml
delete mode 100644 app/src/main/res/drawable/ic_bookmark_music.xml
delete mode 100644 app/src/main/res/drawable/ic_currency_inr.xml
delete mode 100644 app/src/main/res/drawable/ic_invert_colors.xml
delete mode 100644 app/src/main/res/drawable/ic_menu.xml
delete mode 100644 app/src/main/res/drawable/ic_rounded_corner.xml
delete mode 100644 app/src/main/res/drawable/ic_scanner.xml
delete mode 100644 app/src/main/res/drawable/line_button.xml
delete mode 100755 app/src/main/res/drawable/round_window.xml
delete mode 100644 app/src/main/res/drawable/scroll_handler.xml
delete mode 100755 app/src/main/res/drawable/shadow_down.xml
delete mode 100644 app/src/main/res/drawable/side_gradient.xml
delete mode 100755 app/src/main/res/drawable/square_window.xml
delete mode 100644 app/src/main/res/drawable/tab_indicator.xml
delete mode 100644 app/src/main/res/layout-land/pager_item.xml
delete mode 100644 app/src/main/res/layout-xlarge-land/pager_item.xml
delete mode 100644 app/src/main/res/layout/dialog_list_item.xml
delete mode 100644 app/src/main/res/layout/fragment_lyrics.xml
delete mode 100644 app/src/main/res/layout/fragment_settings.xml
delete mode 100644 app/src/main/res/layout/fragment_synced.xml
delete mode 100644 app/src/main/res/layout/item_option_menu.xml
delete mode 100644 app/src/main/res/layout/lyrics_dialog.xml
delete mode 100644 app/src/main/res/layout/metal_section_recycler_view.xml
delete mode 100644 app/src/main/res/layout/pager_item.xml
delete mode 100644 app/src/main/res/layout/preference_screen.xml
delete mode 100644 app/src/main/res/menu/menu_folders.xml
delete mode 100644 app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
delete mode 100644 app/src/main/res/menu/menu_item_smart_playlist.xml
delete mode 100644 app/src/main/res/menu/menu_layout_types.xml
delete mode 100644 app/src/main/res/menu/menu_smart_playlist_detail.xml
delete mode 100644 app/src/main/res/menu/menu_song_sort_order.xml
delete mode 100644 app/src/main/res/transition/change_bounds.xml
delete mode 100644 app/src/main/res/transition/grid_exit_transition.xml
delete mode 100755 appthemehelper/src/main/res/layout/ate_preference_custom.xml
delete mode 100755 appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
delete mode 100644 appthemehelper/src/main/res/layout/ate_preference_list.xml
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
index 9c527cccc..71f052dc1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
@@ -26,6 +26,7 @@ import androidx.recyclerview.widget.RecyclerView
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.retromusic.*
import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.db.PlaylistEntity
import code.name.monkey.retromusic.db.PlaylistWithSongs
import code.name.monkey.retromusic.glide.AlbumGlideRequest
import code.name.monkey.retromusic.glide.ArtistGlideRequest
@@ -52,7 +53,7 @@ class SearchAdapter(
if (dataSet[position] is Album) return ALBUM
if (dataSet[position] is Artist) return ARTIST
if (dataSet[position] is Genre) return GENRE
- if (dataSet[position] is PlaylistWithSongs) return PLAYLIST
+ if (dataSet[position] is PlaylistEntity) return PLAYLIST
return if (dataSet[position] is Song) SONG else HEADER
}
@@ -107,9 +108,9 @@ class SearchAdapter(
)
}
PLAYLIST -> {
- val playlist = dataSet[position] as PlaylistWithSongs
- holder.title?.text = playlist.playlistEntity.playlistName
- holder.text?.text = MusicUtil.playlistInfoString(activity, playlist.songs)
+ val playlist = dataSet[position] as PlaylistEntity
+ holder.title?.text = playlist.playlistName
+ //holder.text?.text = MusicUtil.playlistInfoString(activity, playlist.songs)
}
else -> {
holder.title?.text = dataSet[position].toString()
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
index 178d16afd..b95e5f035 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
@@ -89,15 +89,6 @@ open class AlbumAdapter(
holder.itemView.isActivated = isChecked
holder.title?.text = getAlbumTitle(album)
holder.text?.text = getAlbumText(album)
- holder.playSongs?.setOnClickListener {
- album.songs.let { songs ->
- MusicPlayerRemote.openQueue(
- songs,
- 0,
- true
- )
- }
- }
loadAlbumCover(album, holder)
}
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
index 903476163..69b75dd4f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
@@ -51,7 +51,6 @@ public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHold
@Nullable public View paletteColorContainer;
- @Nullable public ImageButton playSongs;
@Nullable public RecyclerView recyclerView;
@@ -83,7 +82,6 @@ public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHold
paletteColorContainer = itemView.findViewById(R.id.paletteColorContainer);
recyclerView = itemView.findViewById(R.id.recycler_view);
mask = itemView.findViewById(R.id.mask);
- playSongs = itemView.findViewById(R.id.playSongs);
dummyContainer = itemView.findViewById(R.id.dummy_view);
if (imageContainerCard != null) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
index d36d10fe9..3e90305fc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
@@ -75,3 +75,4 @@ fun BottomSheetBehavior<*>.peekHeightAnimate(value: Int) {
start()
}
}
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
index b0cb2d55f..2a4bcb816 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
@@ -15,36 +15,19 @@
package code.name.monkey.retromusic.fragments
import android.widget.Toast
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.liveData
-import androidx.lifecycle.viewModelScope
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.RECENT_ALBUMS
-import code.name.monkey.retromusic.RECENT_ARTISTS
-import code.name.monkey.retromusic.TOP_ALBUMS
-import code.name.monkey.retromusic.TOP_ARTISTS
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.SongEntity
-import code.name.monkey.retromusic.db.toSong
-import code.name.monkey.retromusic.db.toSongEntity
+import androidx.lifecycle.*
+import code.name.monkey.retromusic.*
+import code.name.monkey.retromusic.db.*
import code.name.monkey.retromusic.fragments.ReloadType.*
import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Contributor
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.model.Home
-import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.model.*
import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.state.NowPlayingPanelState
import code.name.monkey.retromusic.util.PreferenceUtil
import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
class LibraryViewModel(
private val repository: RealRepository
@@ -152,9 +135,11 @@ class LibraryViewModel(
}
}
- fun search(query: String?) = viewModelScope.launch(IO) {
- val result = repository.search(query)
- searchResults.postValue(result)
+ fun search(query: String?) {
+ viewModelScope.launch(IO) {
+ val result = repository.search(query)
+ withContext(Main) { searchResults.postValue(result) }
+ }
}
fun forceReload(reloadType: ReloadType) = viewModelScope.launch {
@@ -322,7 +307,8 @@ class LibraryViewModel(
viewModelScope.launch(IO) {
val playlists = checkPlaylistExists(playlistName)
if (playlists.isEmpty()) {
- val playlistId: Long = createPlaylist(PlaylistEntity(playlistName = playlistName))
+ val playlistId: Long =
+ createPlaylist(PlaylistEntity(playlistName = playlistName))
insertSongs(songs.map { it.toSongEntity(playlistId) })
forceReload(Playlists)
} else {
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
index 555ead5eb..d8bb7b06d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
@@ -26,7 +26,7 @@ class RealSearchRepository(
private val roomRepository: RoomRepository,
private val genreRepository: GenreRepository,
) {
- suspend fun searchAll(context: Context, query: String?): MutableList {
+ fun searchAll(context: Context, query: String?): MutableList {
val results = mutableListOf()
query?.let { searchString ->
val songs = songRepository.songs(searchString)
@@ -53,14 +53,14 @@ class RealSearchRepository(
results.add(context.resources.getString(R.string.genres))
results.addAll(genres)
}
- val playlist = roomRepository.playlistWithSongs().filter { playlist ->
- playlist.playlistEntity.playlistName.toLowerCase(Locale.getDefault())
- .contains(searchString.toLowerCase(Locale.getDefault()))
- }
- if (playlist.isNotEmpty()) {
- results.add(context.getString(R.string.playlists))
- results.addAll(playlist)
- }
+ /* val playlist = roomRepository.playlists().filter { playlist ->
+ playlist.playlistName.toLowerCase(Locale.getDefault())
+ .contains(searchString.toLowerCase(Locale.getDefault()))
+ }
+ if (playlist.isNotEmpty()) {
+ results.add(context.getString(R.string.playlists))
+ results.addAll(playlist)
+ }*/
}
return results
}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
index d0dd3bebb..e02be328a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
@@ -1,6 +1,5 @@
package code.name.monkey.retromusic.util
-import android.content.Context
import android.content.SharedPreferences.OnSharedPreferenceChangeListener
import android.net.ConnectivityManager
import android.net.NetworkInfo
@@ -8,75 +7,7 @@ import androidx.core.content.ContextCompat
import androidx.core.content.edit
import androidx.preference.PreferenceManager
import androidx.viewpager.widget.ViewPager
-import code.name.monkey.retromusic.ADAPTIVE_COLOR_APP
-import code.name.monkey.retromusic.ALBUM_ARTISTS_ONLY
-import code.name.monkey.retromusic.ALBUM_ART_ON_LOCK_SCREEN
-import code.name.monkey.retromusic.ALBUM_COVER_STYLE
-import code.name.monkey.retromusic.ALBUM_COVER_TRANSFORM
-import code.name.monkey.retromusic.ALBUM_DETAIL_SONG_SORT_ORDER
-import code.name.monkey.retromusic.ALBUM_GRID_SIZE
-import code.name.monkey.retromusic.ALBUM_GRID_SIZE_LAND
-import code.name.monkey.retromusic.ALBUM_GRID_STYLE
-import code.name.monkey.retromusic.ALBUM_SONG_SORT_ORDER
-import code.name.monkey.retromusic.ALBUM_SORT_ORDER
-import code.name.monkey.retromusic.ARTIST_ALBUM_SORT_ORDER
-import code.name.monkey.retromusic.ARTIST_GRID_SIZE
-import code.name.monkey.retromusic.ARTIST_GRID_SIZE_LAND
-import code.name.monkey.retromusic.ARTIST_GRID_STYLE
-import code.name.monkey.retromusic.ARTIST_SONG_SORT_ORDER
-import code.name.monkey.retromusic.ARTIST_SORT_ORDER
-import code.name.monkey.retromusic.AUDIO_DUCKING
-import code.name.monkey.retromusic.AUTO_DOWNLOAD_IMAGES_POLICY
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.BLACK_THEME
-import code.name.monkey.retromusic.BLUETOOTH_PLAYBACK
-import code.name.monkey.retromusic.BLURRED_ALBUM_ART
-import code.name.monkey.retromusic.CAROUSEL_EFFECT
-import code.name.monkey.retromusic.CHOOSE_EQUALIZER
-import code.name.monkey.retromusic.CLASSIC_NOTIFICATION
-import code.name.monkey.retromusic.COLORED_APP_SHORTCUTS
-import code.name.monkey.retromusic.COLORED_NOTIFICATION
-import code.name.monkey.retromusic.DESATURATED_COLOR
-import code.name.monkey.retromusic.EXPAND_NOW_PLAYING_PANEL
-import code.name.monkey.retromusic.EXTRA_SONG_INFO
-import code.name.monkey.retromusic.FILTER_SONG
-import code.name.monkey.retromusic.GAP_LESS_PLAYBACK
-import code.name.monkey.retromusic.GENERAL_THEME
-import code.name.monkey.retromusic.GENRE_SORT_ORDER
-import code.name.monkey.retromusic.HOME_ALBUM_GRID_STYLE
-import code.name.monkey.retromusic.HOME_ARTIST_GRID_STYLE
-import code.name.monkey.retromusic.IGNORE_MEDIA_STORE_ARTWORK
-import code.name.monkey.retromusic.INITIALIZED_BLACKLIST
-import code.name.monkey.retromusic.KEEP_SCREEN_ON
-import code.name.monkey.retromusic.LANGUAGE_NAME
-import code.name.monkey.retromusic.LAST_ADDED_CUTOFF
-import code.name.monkey.retromusic.LAST_CHANGELOG_VERSION
-import code.name.monkey.retromusic.LAST_PAGE
-import code.name.monkey.retromusic.LAST_SLEEP_TIMER_VALUE
-import code.name.monkey.retromusic.LIBRARY_CATEGORIES
-import code.name.monkey.retromusic.LOCK_SCREEN
-import code.name.monkey.retromusic.LYRICS_OPTIONS
-import code.name.monkey.retromusic.NEXT_SLEEP_TIMER_ELAPSED_REALTIME
-import code.name.monkey.retromusic.NOW_PLAYING_SCREEN_ID
-import code.name.monkey.retromusic.PAUSE_ON_ZERO_VOLUME
-import code.name.monkey.retromusic.PLAYLIST_SORT_ORDER
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.RECENTLY_PLAYED_CUTOFF
-import code.name.monkey.retromusic.SAF_SDCARD_URI
-import code.name.monkey.retromusic.SLEEP_TIMER_FINISH_SONG
-import code.name.monkey.retromusic.SONG_GRID_SIZE
-import code.name.monkey.retromusic.SONG_GRID_SIZE_LAND
-import code.name.monkey.retromusic.SONG_GRID_STYLE
-import code.name.monkey.retromusic.SONG_SORT_ORDER
-import code.name.monkey.retromusic.START_DIRECTORY
-import code.name.monkey.retromusic.TAB_TEXT_MODE
-import code.name.monkey.retromusic.TOGGLE_ADD_CONTROLS
-import code.name.monkey.retromusic.TOGGLE_FULL_SCREEN
-import code.name.monkey.retromusic.TOGGLE_HEADSET
-import code.name.monkey.retromusic.TOGGLE_HOME_BANNER
-import code.name.monkey.retromusic.TOGGLE_SHUFFLE
-import code.name.monkey.retromusic.TOGGLE_VOLUME
-import code.name.monkey.retromusic.USER_NAME
+import code.name.monkey.retromusic.*
import code.name.monkey.retromusic.extensions.getIntRes
import code.name.monkey.retromusic.extensions.getStringOrDefault
import code.name.monkey.retromusic.fragments.AlbumCoverStyle
@@ -84,13 +15,7 @@ import code.name.monkey.retromusic.fragments.NowPlayingScreen
import code.name.monkey.retromusic.fragments.folder.FoldersFragment
import code.name.monkey.retromusic.helper.SortOrder.*
import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.transform.CascadingPageTransformer
-import code.name.monkey.retromusic.transform.DepthTransformation
-import code.name.monkey.retromusic.transform.HingeTransformation
-import code.name.monkey.retromusic.transform.HorizontalFlipTransformation
-import code.name.monkey.retromusic.transform.NormalPageTransformer
-import code.name.monkey.retromusic.transform.VerticalFlipTransformation
-import code.name.monkey.retromusic.transform.VerticalStackTransformer
+import code.name.monkey.retromusic.transform.*
import code.name.monkey.retromusic.util.theme.ThemeMode
import com.google.android.material.bottomnavigation.LabelVisibilityMode
import com.google.gson.Gson
@@ -183,13 +108,6 @@ object PreferenceUtil {
putString(SAF_SDCARD_URI, value)
}
-
- val selectedEqualizer
- get() = sharedPreferences.getStringOrDefault(
- CHOOSE_EQUALIZER,
- "system"
- )
-
val autoDownloadImagesPolicy
get() = sharedPreferences.getStringOrDefault(
AUTO_DOWNLOAD_IMAGES_POLICY,
@@ -458,11 +376,6 @@ object PreferenceUtil {
putInt(LAST_SLEEP_TIMER_VALUE, value)
}
- var lastPage
- get() = sharedPreferences.getInt(LAST_PAGE, R.id.action_song)
- set(value) = sharedPreferences.edit {
- putInt(LAST_PAGE, value)
- }
var nextSleepTimerElapsedRealTime
get() = sharedPreferences.getInt(
@@ -639,32 +552,9 @@ object PreferenceUtil {
}
fun getRecentlyPlayedCutoffTimeMillis(): Long {
- return getCutoffTimeMillis(RECENTLY_PLAYED_CUTOFF)
- }
-
- fun getRecentlyPlayedCutoffText(context: Context): String? {
- return getCutoffText(RECENTLY_PLAYED_CUTOFF, context)
- }
-
- private fun getCutoffText(
- cutoff: String,
- context: Context
- ): String? {
- return when (sharedPreferences.getString(cutoff, "")) {
- "today" -> context.getString(R.string.today)
- "this_week" -> context.getString(R.string.this_week)
- "past_seven_days" -> context.getString(R.string.past_seven_days)
- "past_three_months" -> context.getString(R.string.past_three_months)
- "this_year" -> context.getString(R.string.this_year)
- "this_month" -> context.getString(R.string.this_month)
- else -> context.getString(R.string.this_month)
- }
- }
-
- private fun getCutoffTimeMillis(cutoff: String): Long {
val calendarUtil = CalendarUtil()
val interval: Long
- interval = when (sharedPreferences.getString(cutoff, "")) {
+ interval = when (sharedPreferences.getString(RECENTLY_PLAYED_CUTOFF, "")) {
"today" -> calendarUtil.elapsedToday
"this_week" -> calendarUtil.elapsedWeek
"past_seven_days" -> calendarUtil.getElapsedDays(7)
@@ -690,5 +580,4 @@ object PreferenceUtil {
}
return (System.currentTimeMillis() - interval) / 1000
}
-
}
diff --git a/app/src/main/res/anim/retro_fragment_fade_enter.xml b/app/src/main/res/anim/retro_fragment_fade_enter.xml
deleted file mode 100644
index 508ca43e2..000000000
--- a/app/src/main/res/anim/retro_fragment_fade_enter.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/anim/retro_fragment_fade_exit.xml b/app/src/main/res/anim/retro_fragment_fade_exit.xml
deleted file mode 100644
index 52b95e860..000000000
--- a/app/src/main/res/anim/retro_fragment_fade_exit.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/anim/sliding_in_left.xml b/app/src/main/res/anim/sliding_in_left.xml
deleted file mode 100644
index 5b01fc740..000000000
--- a/app/src/main/res/anim/sliding_in_left.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/anim/sliding_out_right.xml b/app/src/main/res/anim/sliding_out_right.xml
deleted file mode 100644
index 964d042f7..000000000
--- a/app/src/main/res/anim/sliding_out_right.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2417b12d2..000000000
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/asld_album.xml b/app/src/main/res/drawable/asld_album.xml
deleted file mode 100644
index 5102b289a..000000000
--- a/app/src/main/res/drawable/asld_album.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/asld_home.xml b/app/src/main/res/drawable/asld_home.xml
deleted file mode 100644
index fc93ed370..000000000
--- a/app/src/main/res/drawable/asld_home.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/asld_music_note.xml b/app/src/main/res/drawable/asld_music_note.xml
deleted file mode 100644
index 4297185ea..000000000
--- a/app/src/main/res/drawable/asld_music_note.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/avd_album.xml b/app/src/main/res/drawable/avd_album.xml
deleted file mode 100644
index db1c37dec..000000000
--- a/app/src/main/res/drawable/avd_album.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/avd_home.xml b/app/src/main/res/drawable/avd_home.xml
deleted file mode 100644
index 3580af4ae..000000000
--- a/app/src/main/res/drawable/avd_home.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/avd_music_note.xml b/app/src/main/res/drawable/avd_music_note.xml
deleted file mode 100644
index 6f693e167..000000000
--- a/app/src/main/res/drawable/avd_music_note.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/circle_progress.xml b/app/src/main/res/drawable/circle_progress.xml
deleted file mode 100644
index d79498911..000000000
--- a/app/src/main/res/drawable/circle_progress.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_add_photo.xml b/app/src/main/res/drawable/ic_add_photo.xml
deleted file mode 100644
index 8326f2d4c..000000000
--- a/app/src/main/res/drawable/ic_add_photo.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_app_shortcut_search.xml b/app/src/main/res/drawable/ic_app_shortcut_search.xml
deleted file mode 100644
index 4e05cab7a..000000000
--- a/app/src/main/res/drawable/ic_app_shortcut_search.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_artist_selected.xml b/app/src/main/res/drawable/ic_artist_selected.xml
deleted file mode 100644
index 4e865f47c..000000000
--- a/app/src/main/res/drawable/ic_artist_selected.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bookmark_music.xml b/app/src/main/res/drawable/ic_bookmark_music.xml
deleted file mode 100644
index 0674f00c8..000000000
--- a/app/src/main/res/drawable/ic_bookmark_music.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_currency_inr.xml b/app/src/main/res/drawable/ic_currency_inr.xml
deleted file mode 100644
index 3fa26770a..000000000
--- a/app/src/main/res/drawable/ic_currency_inr.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_invert_colors.xml b/app/src/main/res/drawable/ic_invert_colors.xml
deleted file mode 100644
index ff8356e28..000000000
--- a/app/src/main/res/drawable/ic_invert_colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_menu.xml b/app/src/main/res/drawable/ic_menu.xml
deleted file mode 100644
index 9a28c405c..000000000
--- a/app/src/main/res/drawable/ic_menu.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_rounded_corner.xml b/app/src/main/res/drawable/ic_rounded_corner.xml
deleted file mode 100644
index aa36e0ce5..000000000
--- a/app/src/main/res/drawable/ic_rounded_corner.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_scanner.xml b/app/src/main/res/drawable/ic_scanner.xml
deleted file mode 100644
index 404f47503..000000000
--- a/app/src/main/res/drawable/ic_scanner.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/line_button.xml b/app/src/main/res/drawable/line_button.xml
deleted file mode 100644
index 60808432e..000000000
--- a/app/src/main/res/drawable/line_button.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_window.xml b/app/src/main/res/drawable/round_window.xml
deleted file mode 100755
index cf357a439..000000000
--- a/app/src/main/res/drawable/round_window.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/scroll_handler.xml b/app/src/main/res/drawable/scroll_handler.xml
deleted file mode 100644
index 5c4f6ce48..000000000
--- a/app/src/main/res/drawable/scroll_handler.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_down.xml b/app/src/main/res/drawable/shadow_down.xml
deleted file mode 100755
index 2cf5263fa..000000000
--- a/app/src/main/res/drawable/shadow_down.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/side_gradient.xml b/app/src/main/res/drawable/side_gradient.xml
deleted file mode 100644
index 733ec817c..000000000
--- a/app/src/main/res/drawable/side_gradient.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/square_window.xml b/app/src/main/res/drawable/square_window.xml
deleted file mode 100755
index 1a50b0556..000000000
--- a/app/src/main/res/drawable/square_window.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_indicator.xml b/app/src/main/res/drawable/tab_indicator.xml
deleted file mode 100644
index 78af14451..000000000
--- a/app/src/main/res/drawable/tab_indicator.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- -
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_album_tag_editor.xml b/app/src/main/res/layout-land/activity_album_tag_editor.xml
index e720b8fbd..8b13076b5 100644
--- a/app/src/main/res/layout-land/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout-land/activity_album_tag_editor.xml
@@ -1,7 +1,6 @@
@@ -64,7 +63,6 @@
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml
index 19654df13..6c6466f60 100644
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@@ -21,7 +21,6 @@
tools:layout="@layout/fragment_album_full_cover" />
diff --git a/app/src/main/res/layout-land/fragment_circle_player.xml b/app/src/main/res/layout-land/fragment_circle_player.xml
index 3b3183684..07d734c6c 100644
--- a/app/src/main/res/layout-land/fragment_circle_player.xml
+++ b/app/src/main/res/layout-land/fragment_circle_player.xml
@@ -114,7 +114,6 @@
app:tint="@color/md_green_500" />
diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml
index 327629b80..a42667398 100755
--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@@ -55,7 +55,6 @@
android:orientation="vertical">
diff --git a/app/src/main/res/layout-land/fragment_simple_player.xml b/app/src/main/res/layout-land/fragment_simple_player.xml
index 7d08dba5a..36a4fa4e6 100644
--- a/app/src/main/res/layout-land/fragment_simple_player.xml
+++ b/app/src/main/res/layout-land/fragment_simple_player.xml
@@ -16,7 +16,6 @@
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout-land/pager_item.xml b/app/src/main/res/layout-land/pager_item.xml
deleted file mode 100644
index 02c76dd95..000000000
--- a/app/src/main/res/layout-land/pager_item.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/pager_item.xml b/app/src/main/res/layout-xlarge-land/pager_item.xml
deleted file mode 100644
index 8a3669255..000000000
--- a/app/src/main/res/layout-xlarge-land/pager_item.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml
index 73df42339..20128735b 100644
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@@ -65,7 +65,6 @@
app:srcCompat="@drawable/ic_library_add" />
diff --git a/app/src/main/res/layout/activity_album_tag_editor.xml b/app/src/main/res/layout/activity_album_tag_editor.xml
index 8123cb55c..85c265b7e 100755
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -36,7 +36,6 @@
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml
index 8e3455005..28e7c6aa7 100644
--- a/app/src/main/res/layout/activity_donation.xml
+++ b/app/src/main/res/layout/activity_donation.xml
@@ -2,7 +2,6 @@
diff --git a/app/src/main/res/layout/activity_drive_mode.xml b/app/src/main/res/layout/activity_drive_mode.xml
index 5e2c17a2e..800b5c4a3 100644
--- a/app/src/main/res/layout/activity_drive_mode.xml
+++ b/app/src/main/res/layout/activity_drive_mode.xml
@@ -63,7 +63,6 @@
app:srcCompat="@drawable/ic_close" />
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml
index 09d45e162..d9d5aba37 100644
--- a/app/src/main/res/layout/fragment_adaptive_player.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player.xml
@@ -25,7 +25,6 @@
@@ -60,7 +59,6 @@
tools:layout="@layout/fragment_album_full_card_cover" />
diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
index 6b617b925..bd9a99616 100644
--- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
@@ -2,7 +2,6 @@
diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
index 90e20e334..917719268 100644
--- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
@@ -2,7 +2,6 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_material_playback_controls.xml b/app/src/main/res/layout/fragment_material_playback_controls.xml
index 72bd9d360..d2b065462 100644
--- a/app/src/main/res/layout/fragment_material_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_material_playback_controls.xml
@@ -2,7 +2,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/fragment_synced.xml b/app/src/main/res/layout/fragment_synced.xml
deleted file mode 100644
index 8ef770eda..000000000
--- a/app/src/main/res/layout/fragment_synced.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_volume.xml b/app/src/main/res/layout/fragment_volume.xml
index ac10acb66..86cc04510 100755
--- a/app/src/main/res/layout/fragment_volume.xml
+++ b/app/src/main/res/layout/fragment_volume.xml
@@ -1,7 +1,6 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_suggestions.xml b/app/src/main/res/layout/item_suggestions.xml
index 046d4dfb0..0d346dc57 100644
--- a/app/src/main/res/layout/item_suggestions.xml
+++ b/app/src/main/res/layout/item_suggestions.xml
@@ -192,7 +192,6 @@
diff --git a/app/src/main/res/layout/lyrics_dialog.xml b/app/src/main/res/layout/lyrics_dialog.xml
deleted file mode 100644
index 47f15438a..000000000
--- a/app/src/main/res/layout/lyrics_dialog.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/metal_section_recycler_view.xml b/app/src/main/res/layout/metal_section_recycler_view.xml
deleted file mode 100644
index 9e154c995..000000000
--- a/app/src/main/res/layout/metal_section_recycler_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml
deleted file mode 100644
index e373a8944..000000000
--- a/app/src/main/res/layout/pager_item.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_screen.xml b/app/src/main/res/layout/preference_screen.xml
deleted file mode 100644
index feadb6004..000000000
--- a/app/src/main/res/layout/preference_screen.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/section_recycler_view.xml b/app/src/main/res/layout/section_recycler_view.xml
index a86a9cc01..1b9b26e77 100644
--- a/app/src/main/res/layout/section_recycler_view.xml
+++ b/app/src/main/res/layout/section_recycler_view.xml
@@ -2,7 +2,6 @@
diff --git a/app/src/main/res/menu/menu_folders.xml b/app/src/main/res/menu/menu_folders.xml
deleted file mode 100644
index 67c5e76b7..000000000
--- a/app/src/main/res/menu/menu_folders.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
deleted file mode 100644
index dd2b985cc..000000000
--- a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_item_smart_playlist.xml b/app/src/main/res/menu/menu_item_smart_playlist.xml
deleted file mode 100644
index 92d8ed725..000000000
--- a/app/src/main/res/menu/menu_item_smart_playlist.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_layout_types.xml b/app/src/main/res/menu/menu_layout_types.xml
deleted file mode 100644
index 2a2a12d35..000000000
--- a/app/src/main/res/menu/menu_layout_types.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index fc06a2b58..54aa74abc 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -22,9 +22,7 @@
android:title="@string/action_grid_size"
app:showAsAction="never">
-
+ android:clipToPadding="false"
+ android:overScrollMode="never"
+ android:scrollbars="none"
+ android:transitionGroup="true"
+ app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
+ tools:listitem="@layout/item_list" />
-
+
+
+ android:layout_marginBottom="16dp"
+ android:text="@string/empty_text_emoji"
+ android:textAppearance="@style/TextViewHeadline3" />
-
-
-
-
-
-
-
-
+ android:text="@string/empty"
+ android:textAppearance="@style/TextViewHeadline5"
+ android:textColor="?android:attr/textColorSecondary"
+ tools:visibility="visible" />
+
\ No newline at end of file
From 2f4632fd675cc6bf9f801a21dade70f1add90719 Mon Sep 17 00:00:00 2001
From: Hemanth S
Date: Sat, 17 Oct 2020 18:00:11 +0530
Subject: [PATCH 13/26] Fix free label showing when Pro is enable #934
---
.../AlbumCoverStylePreferenceDialog.kt | 7 +++---
.../NowPlayingScreenPreferenceDialog.kt | 22 +++++-------------
.../main/res/layout/activity_pro_version.xml | 23 -------------------
.../preference_now_playing_screen_item.xml | 4 ++--
4 files changed, 11 insertions(+), 45 deletions(-)
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
index f74f61d66..5c7e91ba8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
@@ -33,9 +33,7 @@ import androidx.viewpager.widget.ViewPager
import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
+import code.name.monkey.retromusic.extensions.*
import code.name.monkey.retromusic.fragments.AlbumCoverStyle
import code.name.monkey.retromusic.fragments.AlbumCoverStyle.*
import code.name.monkey.retromusic.util.NavigationUtil
@@ -126,9 +124,10 @@ class AlbumCoverStylePreferenceDialog : DialogFragment(),
Glide.with(context).load(albumCoverStyle.drawableResId).into(image)
title.setText(albumCoverStyle.titleRes)
if (isAlbumCoverStyle(albumCoverStyle)) {
+ proText.show()
proText.setText(R.string.pro)
} else {
- proText.setText(R.string.free)
+ proText.hide()
}
return layout
}
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
index d5f364050..e6760195e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
@@ -32,9 +32,7 @@ import androidx.viewpager.widget.ViewPager
import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
+import code.name.monkey.retromusic.extensions.*
import code.name.monkey.retromusic.fragments.NowPlayingScreen
import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
import code.name.monkey.retromusic.util.NavigationUtil
@@ -93,7 +91,7 @@ class NowPlayingScreenPreferenceDialog : DialogFragment(), ViewPager.OnPageChang
val nowPlayingScreen = values()[viewPagerPosition]
if (isNowPlayingThemes(nowPlayingScreen)) {
val result =
- getString(nowPlayingScreen.titleRes) + " theme is Pro version feature."
+ "${getString(nowPlayingScreen.titleRes)} theme is Pro version feature."
Toast.makeText(context, result, Toast.LENGTH_SHORT).show()
NavigationUtil.goToProVersion(requireContext())
} else {
@@ -131,9 +129,10 @@ private class NowPlayingScreenAdapter(private val context: Context) : PagerAdapt
Glide.with(context).load(nowPlayingScreen.drawableResId).into(image)
title.setText(nowPlayingScreen.titleRes)
if (isNowPlayingThemes(nowPlayingScreen)) {
+ proText.show()
proText.setText(R.string.pro)
- } else {
- proText.setText(R.string.free)
+ }else{
+ proText.hide()
}
return layout
}
@@ -160,14 +159,5 @@ private class NowPlayingScreenAdapter(private val context: Context) : PagerAdapt
}
private fun isNowPlayingThemes(screen: NowPlayingScreen): Boolean {
- return (screen == Full ||
- screen == Card ||
- screen == Plain ||
- screen == Blur ||
- screen == Color ||
- screen == Simple ||
- screen == BlurCard ||
- screen == Circle ||
- screen == Adaptive)
- && !App.isProVersion()
+ return (screen == Full || screen == Card || screen == Plain || screen == Blur || screen == Color || screen == Simple || screen == BlurCard || screen == Circle || screen == Adaptive) && !App.isProVersion()
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pro_version.xml b/app/src/main/res/layout/activity_pro_version.xml
index fbcf25167..9c62feeb6 100644
--- a/app/src/main/res/layout/activity_pro_version.xml
+++ b/app/src/main/res/layout/activity_pro_version.xml
@@ -127,29 +127,6 @@
android:textColor="@color/md_white_1000" />
-
-
-
-
-
-
-
-
+ app:layout_constraintStart_toStartOf="parent"
+ tools:text="@string/pro" />
\ No newline at end of file
From f9206dcfdb7f1fc4d57a99dafce88ae0a1b73d3e Mon Sep 17 00:00:00 2001
From: Hemanth S
Date: Sun, 18 Oct 2020 01:30:00 +0530
Subject: [PATCH 14/26] Ringtone permission dialog showing #937
Fix crashing on album edit or artist edit and
---
.../fragments/albums/AlbumDetailsFragment.kt | 10 +++-------
.../fragments/artists/ArtistDetailsFragment.kt | 4 ++--
.../retromusic/fragments/base/AbsPlayerFragment.kt | 2 +-
.../name/monkey/retromusic/glide/SingleColorTarget.kt | 2 +-
.../name/monkey/retromusic/util/RingtoneManager.kt | 4 ++--
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
index f4008bbe2..3f351fe8b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
@@ -17,11 +17,7 @@ package code.name.monkey.retromusic.fragments.albums
import android.app.ActivityOptions
import android.content.Intent
import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.SubMenu
-import android.view.View
+import android.view.*
import androidx.appcompat.app.AppCompatActivity
import androidx.core.os.bundleOf
import androidx.core.text.HtmlCompat
@@ -287,8 +283,8 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
}
private fun setColors(color: Int) {
- shuffleAction.applyColor(color)
- playAction.applyOutlineColor(color)
+ shuffleAction?.applyColor(color)
+ playAction?.applyOutlineColor(color)
}
override fun onAlbumClick(albumId: Long, view: View) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
index e9f001170..503916f3a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
@@ -223,8 +223,8 @@ class ArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_d
}
private fun setColors(color: Int) {
- shuffleAction.applyColor(color)
- playAction.applyOutlineColor(color)
+ shuffleAction?.applyColor(color)
+ playAction?.applyOutlineColor(color)
}
override fun onAlbumClick(albumId: Long, view: View) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
index 7899823f1..43c02dfd1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
@@ -50,13 +50,13 @@ import code.name.monkey.retromusic.model.lyrics.Lyrics
import code.name.monkey.retromusic.repository.RealRepository
import code.name.monkey.retromusic.service.MusicService
import code.name.monkey.retromusic.util.*
-import java.io.FileNotFoundException
import kotlinx.android.synthetic.main.shadow_statusbar_toolbar.*
import kotlinx.coroutines.Dispatchers.IO
import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.koin.android.ext.android.get
+import java.io.FileNotFoundException
abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragment(layout),
Toolbar.OnMenuItemClickListener, IPaletteColorHolder, PlayerAlbumCoverFragment.Callbacks {
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt b/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt
index dbe276248..989419fbf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt
@@ -25,7 +25,7 @@ import com.bumptech.glide.request.animation.GlideAnimation
abstract class SingleColorTarget(view: ImageView) : BitmapPaletteTarget(view) {
- protected val defaultFooterColor: Int
+ private val defaultFooterColor: Int
get() = ATHUtil.resolveColor(view.context, R.attr.colorControlNormal)
abstract fun onColorReady(color: Int)
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt b/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt
index 5a9691054..cf8226d93 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt
@@ -73,7 +73,7 @@ class RingtoneManager(val context: Context) {
return false
}
- fun getDialog(context: Context): AlertDialog {
+ fun getDialog(context: Context) {
return MaterialAlertDialogBuilder(context, R.style.MaterialAlertDialogTheme)
.setTitle(R.string.dialog_title_set_ringtone)
.setMessage(R.string.dialog_message_set_ringtone)
@@ -83,7 +83,7 @@ class RingtoneManager(val context: Context) {
context.startActivity(intent)
}
.setNegativeButton(android.R.string.cancel, null)
- .create()
+ .create().show()
}
}
}
\ No newline at end of file
From 349d4ad5340f09669588a04b340baa05fbd8edee Mon Sep 17 00:00:00 2001
From: Hemanth S
Date: Sun, 18 Oct 2020 01:32:58 +0530
Subject: [PATCH 15/26] Fix not showing song image on search
---
.../java/code/name/monkey/retromusic/adapter/SearchAdapter.kt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
index 71f052dc1..a0e53380b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
@@ -18,6 +18,7 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.os.bundleOf
+import androidx.core.view.isGone
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import androidx.fragment.app.FragmentActivity
@@ -138,6 +139,7 @@ class SearchAdapter(
itemView.setOnLongClickListener(null)
imageTextContainer?.isInvisible = true
if (itemViewType == SONG) {
+ imageTextContainer?.isGone = true
menu?.visibility = View.VISIBLE
menu?.setOnClickListener(object : SongMenuHelper.OnClickSongMenu(activity) {
override val song: Song
From 3fc86582f3d540e751452cc5810e425c90b46f51 Mon Sep 17 00:00:00 2001
From: Hemanth S
Date: Sun, 18 Oct 2020 01:49:47 +0530
Subject: [PATCH 16/26] Add menu for songs when grid size is more than 2 #940
---
.../adapter/base/MediaEntryViewHolder.java | 3 ++-
.../retromusic/adapter/song/SongAdapter.kt | 1 +
app/src/main/res/layout/image.xml | 3 +--
app/src/main/res/layout/item_card.xml | 16 ++++++++++++++--
app/src/main/res/layout/item_card_color.xml | 16 ++++++++++++++--
app/src/main/res/layout/item_grid.xml | 16 ++++++++++++++--
app/src/main/res/layout/item_grid_circle.xml | 1 -
7 files changed, 46 insertions(+), 10 deletions(-)
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
index 69b75dd4f..515a75329 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
@@ -21,6 +21,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
import androidx.recyclerview.widget.RecyclerView;
import code.name.monkey.retromusic.R;
import com.google.android.material.card.MaterialCardView;
@@ -47,7 +48,7 @@ public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHold
@Nullable public View mask;
- @Nullable public View menu;
+ @Nullable public AppCompatImageView menu;
@Nullable public View paletteColorContainer;
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
index 9960c3232..0360e3b57 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
@@ -111,6 +111,7 @@ open class SongAdapter(
holder.title?.setTextColor(color.primaryTextColor)
holder.text?.setTextColor(color.secondaryTextColor)
holder.paletteColorContainer?.setBackgroundColor(color.backgroundColor)
+ holder.menu?.imageTintList= ColorStateList.valueOf(color.primaryTextColor)
}
holder.mask?.backgroundTintList = ColorStateList.valueOf(color.primaryTextColor)
}
diff --git a/app/src/main/res/layout/image.xml b/app/src/main/res/layout/image.xml
index ee8c5fc91..c6af22877 100644
--- a/app/src/main/res/layout/image.xml
+++ b/app/src/main/res/layout/image.xml
@@ -32,6 +32,5 @@
android:padding="12dp"
android:textAppearance="@style/TextViewSubtitle1"
android:textColor="@color/md_white_1000"
- tools:text="@tools:sample/lorem/random" />
-
+ tools:text="@tools:sample/full_names" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index 86037eefe..f2974aab0 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -36,12 +36,13 @@
tools:src="@tools:sample/avatars" />
@@ -62,6 +63,17 @@
android:singleLine="true"
tools:text="@tools:sample/full_names" />
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_card_color.xml b/app/src/main/res/layout/item_card_color.xml
index 438bfde9e..908fe6363 100644
--- a/app/src/main/res/layout/item_card_color.xml
+++ b/app/src/main/res/layout/item_card_color.xml
@@ -34,12 +34,13 @@
tools:src="@tools:sample/avatars" />
@@ -60,6 +61,17 @@
android:singleLine="true"
tools:text="@tools:sample/full_names" />
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index 195d9f223..1e67cd8b0 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -33,12 +33,13 @@
@@ -60,5 +61,16 @@
tools:text="@tools:sample/full_names" />
+
+
diff --git a/app/src/main/res/layout/item_grid_circle.xml b/app/src/main/res/layout/item_grid_circle.xml
index 5308f9a97..7b8944b81 100644
--- a/app/src/main/res/layout/item_grid_circle.xml
+++ b/app/src/main/res/layout/item_grid_circle.xml
@@ -48,7 +48,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
- android:paddingTop="4dp"
android:singleLine="true"
tools:text="@tools:sample/full_names" />
From 9b677573a3592e11c622186f8bc81d382f4ad5e2 Mon Sep 17 00:00:00 2001
From: Hemanth S
Date: Sun, 18 Oct 2020 02:20:40 +0530
Subject: [PATCH 17/26] Update PreferenceUtil.kt
---
.../monkey/retromusic/util/PreferenceUtil.kt | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
index e02be328a..e68590c9d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
@@ -399,8 +399,8 @@ object PreferenceUtil {
val position = sharedPreferences.getStringOrDefault(
HOME_ARTIST_GRID_STYLE, "0"
).toInt()
- val typedArray =
- App.getContext().resources.obtainTypedArray(R.array.pref_home_grid_style_layout)
+ val typedArray = App.getContext()
+ .resources.obtainTypedArray(R.array.pref_home_grid_style_layout)
val layoutRes = typedArray.getResourceId(position, 0)
typedArray.recycle()
return if (layoutRes == 0) {
@@ -410,10 +410,12 @@ object PreferenceUtil {
val homeAlbumGridStyle: Int
get() {
- val position = sharedPreferences.getStringOrDefault(HOME_ALBUM_GRID_STYLE, "4").toInt()
- val typedArray =
- App.getContext().resources.obtainTypedArray(R.array.pref_home_grid_style_layout)
- val layoutRes = typedArray.getResourceId(position, 0)
+ val position = sharedPreferences.getStringOrDefault(
+ HOME_ALBUM_GRID_STYLE, "4"
+ ).toInt()
+ val typedArray = App.getContext()
+ .resources.obtainTypedArray(R.array.pref_home_grid_style_layout)
+ val layoutRes = typedArray.getResourceId(position, 4)
typedArray.recycle()
return if (layoutRes == 0) {
R.layout.item_artist
@@ -423,7 +425,7 @@ object PreferenceUtil {
val tabTitleMode: Int
get() {
return when (sharedPreferences.getStringOrDefault(
- TAB_TEXT_MODE, "0"
+ TAB_TEXT_MODE, "1"
).toInt()) {
1 -> LabelVisibilityMode.LABEL_VISIBILITY_LABELED
0 -> LabelVisibilityMode.LABEL_VISIBILITY_AUTO
From be8ca61c3c9540a63121da0298e917f6017c9b90 Mon Sep 17 00:00:00 2001
From: giwrgosmant <51835189+giwrgosmant@users.noreply.github.com>
Date: Thu, 22 Oct 2020 19:59:58 +0300
Subject: [PATCH 18/26] Update strings.xml
Traslation in Greek. Updates & Fixes.
---
app/src/main/res/values-el-rGR/strings.xml | 398 ++++++++++-----------
1 file changed, 199 insertions(+), 199 deletions(-)
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 38e14a3df..b573bdbc8 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -1,39 +1,39 @@
- About %s
- Team, social links
+ Σχετικά με %s
+ Ομάδα, κοινωνικοί σύνδεσμοι
Χρώμα Τονισμού
Το χρώμα τονισμού του θέματος, η προεπιλογή είναι το πράσινο.
Σχετικά με...
Προσθήκη στα αγαπημένα
- Προσθήκη στην ουρά αναπ/γής
- Προσθήκη σε playlist...
+ Προσθήκη στην ουρά αναπαραγωγής
+ Προσθήκη στη λίστα αναπαραγωγής...
Εκκαθάριση ουράς αναπαραγωγής
- Cycle repeat mode
+ Λειτουργία κυκλικής επανάληψης
Διαγραφή
Διαγραφή από την συσκευή
Λεπτομέρειες
- Πήγαινε στο άλμπουμ
- Πήγαινε στον καλλιτέχνη
- Go to genre
- Αναπήδηση σε κατάλογο εκκίνησης
+ Μετάβαση στο άλμπουμ
+ Μετάβαση στον καλλιτέχνη
+ Μετάβαση στο είδος
+ Μετάβαση σε κατάλογο εκκίνησης
Παραχώρηση
Μέγεθος Πλέγματος
Μέγεθος Πλέγματος (landscape mode)
- New playlist
+ Νέα λίστα αναπαραγωγής
Επόμενο
Αναπαραγωγή
- Play all
+ Αναπαραγωγή όλων
Αναπαραγωγή επόμενου
- Παίξε/Παύση
+ Αναπαραγωγή/Παύση
Προηγούμενο
Αφαίρεση από τα αγαπημένα
- Αφαίρεση από την ουρά αναπ/γής
+ Αφαίρεση από την ουρά αναπαραγωγής
Αφαίρεση από playlist
Μετονομασία
- Αποθήκευση τρέχων ουράς αναπ/γής
+ Αποθήκευση τρέχων ουράς αναπαραγωγής
Σάρωση
Αναζήτηση
Ορισμός
@@ -41,35 +41,35 @@
Ορισμός ως κατάλογο εκκίνησης
"Ρυθμίσεις"
Μοιράσου
- Τυχαία αναπ/γη όλων
- Τυχαία αναπ/γη playlist
+ Τυχαία αναπαραγωγή όλων
+ Τυχαία λίστα αναπαραγωγής
Χρονοδιακόπτης Ύπνου
- Sort order
+ Σειρά ταξινόμησης
Επεξεργασία Ετικετών
- Toggle favorite
- Toggle shuffle mode
+ Εναλλαγή αγαπημένου
+ Εναλλαγή λειτουργίας τυχαίας σειράς
- Adaptive
+ Προσαρμοστικό
Προσθήκη
- "Προσθήκη στη playlist"
+ "Προσθήκη στη λίστα αναπαραγωγής"
- "Προστέθηκε 1 κομμάτι στην ουρά αναπ/γης."
- Προστέθηκαν %1$d κομμάτια στην ουρά αναπ/γης.
+ "Προστέθηκε 1 κομμάτι στην ουρά αναπαραγωγής."
+ Προστέθηκαν %1$d κομμάτια στην ουρά αναπαραγωγής.
Άλμπουμ
- - Song
- - Songs
+ - Κομμάτι
+ - Κομμάτια
Καλλιτέχνης Άλμπουμ
Άλμπουμ
- - Album
- - Albums
+ - Άλμπουμ
+ - Άλμπουμς
Πάντα
@@ -81,16 +81,16 @@
Κάρτα
Κλασσικό
Μικρό
- Text
+ >Κείμενο
Καλλιτέχνης
Καλλιτέχνες
Η εστίαση ήχου απορρίφθηκε.
- Change the sound settings and adjust the equalizer controls
+ Αλλάξτε τις ρυθμίσεις ήχου και προσαρμόστε τα χειριστήρια του ισοσταθμιστή
- Auto
+ Αυτόματο
Βιογραφία
@@ -98,90 +98,90 @@
Blacklist
- Blur
- Blur Card
+ Θολούρα
+ Κάρτα θαμπώματος
- Unable to send report
- Invalid access token. Please contact the app developer.
- Issues are not enabled for the selected repository. Please contact the app developer.
- An unexpected error occurred. Please contact the app developer.
- Wrong username or password
- Issue
- Send manually
- Please enter an issue description
- Please enter your valid GitHub password
- Please enter an issue title
- Please enter your valid GitHub username
- An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email
- Send using GitHub account
+ Δεν είναι δυνατή η αποστολή αναφοράς
+ Μη έγκυρο διακριτικό πρόσβασης. Επικοινωνήστε με τον προγραμματιστή της εφαρμογής.
+ Τα ζητήματα δεν είναι ενεργοποιημένα για το επιλεγμένο αποθετήριο. Επικοινωνήστε με τον προγραμματιστή της εφαρμογής.
+ Προέκυψε ένα μη αναμενόμενο σφάλμα. Επικοινωνήστε με τον προγραμματιστή της εφαρμογής.
+ Λάθος όνομα χρήστη ή κωδικός
+ Ζήτημα
+ Αποστολή χειροκίνητα
+ Παρακαλώ εισαγάγετε μια περιγραφή ζητήματος
+ Παρακαλώ εισαγάγετε τον έγκυρο κωδικό πρόσβασης GitHub
+ Παρακαλώ εισαγάγετε έναν τίτλο ζητήματος
+ Παρακαλώ εισαγάγετε το έγκυρο όνομα χρήστη GitHub
+ Προέκυψε ένα μη αναμενόμενο σφάλμα. Λυπούμαστε που βρήκατε αυτό το σφάλμα, εάν εξακολουθεί να παρουσιάζεται \""Διαγραφή δεδομένων εφαρμογής\" ή στείλτε ένα Email
+ Αποστολή χρησιμοποιώντας λογαριασμό GitHub
- Buy now
+ Αγορά τώρα
Ακύρωση τρέχων χρονοδιακόπτη
- Card
- Colored Card
- Card
+ Κάρτα
+ Έγχρωμη κάρτα
+ Κάρτα
- Carousel effect on the now playing screen
+ Εφέ καρουσέλ στην οθόνη του παίζει τώρα
- Cascading
+ Με υπερχείλιση
Λίστα Αλλαγών
- Η Λίστα Αλλαγών συντηρείται από το Telegram app
+ Η Λίστα Αλλαγών συντηρείται από τη εφαρμογή Telegram
- Circle
+ Κύκλος
- Circular
+ >Κυκλικό
- Classic
+ Κλασσικό
Εκκαθάριση
Εκκαθάριση blacklist
- Clear queue
+ Εκκαθάριση ουράς
- Color
+ Χρώμα
Χρώματα
- Composer
+ Συνθέτης
- Copied device info to clipboard.
+ Οι πληροφοριές συσκευής αντιγράφηκαν στο πρόχειρο.
\u0391\u03b4\u03c5\u03bd\u03b1\u03bc\u03af\u03b1 \u03b4\u03b7\u03bc\u03b9\u03bf\u03c5\u03c1\u03b3\u03af\u03b1\u03c2 playlist.
"\u0391\u03b4\u03c5\u03bd\u03b1\u03bc\u03af\u03b1 \u03bb\u03ae\u03c8\u03b7\u03c2 \u03c4\u03b1\u03b9\u03c1\u03b9\u03b1\u03c3\u03c4\u03bf\u03cd \u03b5\u03be\u03c9\u03c6\u03cd\u03bb\u03bb\u03bf\u03c5 \u03ac\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc."
Could not restore purchase.
- Αδυναμία στο σκανάρισμα %d αρχείων.
+ Αδυναμία στη σάρωση %d αρχείων.
Δημιουργία
- Δημιουργήθηκε η playlist %1$s.
+ Δημιουργήθηκε η λίστα αναπαραγωγής %1$s.
- Members and contributors
+ Μέλη και συνεισφέροντες
Παίζει το %1$s από τους %2$s.
Κάπως Σκούρο
Διαγραφή playlist
- %1$s?]]>
- Διαγραφή αυτών των playlist
+ %1$s?]]>
+ Διαγραφή αυτών των λιστών αναπαραγωγής
Delete song
%1$s?]]>
- Delete songs
- %1$d playlist?]]>
+ Διαγραφή κομματιών
+ %1$d λίστα αναπαραγωγής?]]>
%1$d κομματιών?]]>
Διαγράφηκαν %1$d κομμάτια.
- Depth
+ Βάθος
- Description
+ Περιγραφή
- Device info
+ Πληροφορίες συσκευής
- Allow Retro Music to modify audio settings
- Set ringtone
+ Επιτρέψτε στο Retro Music να τροποποιεί τις ρυθμίσεις ήχου
+ Ορισμός ήχου κλήσης
Εκκαθάριση της blacklist?
%1$s από τη blacklist?]]>
@@ -191,7 +191,7 @@
Αγορασέ μου ένα
- Drive mode
+ Λειτουργία οδήγησης
Κενό
@@ -201,7 +201,7 @@
Αγαπημένα
- Finish last song
+ Τελειώσε το τελευταίο κομμάτι
Fit
@@ -209,23 +209,23 @@
Φάκελοι
- Follow system
+ Βάση του συστήματος
- For you
+ Για σένα
- Free
+ Δωρεάν
Πλήρες
- Full card
+ Πλήρης κάρτα
- Change the theme and colors of the app
- Look and feel
+ Αλλάξτε το θέμα και τα χρώματα της εφαρμογής
+ Eμφάνιση και Αίσθηση
Είδος
- Genres
+ Είδη
- Fork the project on GitHub
+ Fork το έργο στο GitHub
1
2
@@ -235,7 +235,7 @@
6
7
8
- Grid style
+ Στυλ πλέγματος
Hinge
@@ -243,64 +243,64 @@
Αρχική
- Horizontal flip
+ Οριζόντια αναστροφή
- Image
- Gradient image
- Change artist image download settings
+ Εικόνα
+ Διαβαθμισμένη Εικόνα
+ Αλλαγή των ρυθμίσεων λήψης εικόνων καλλιτέχνη
- Προστέθηκαν %1$d κομμάτια στη playlist %2$s.
+ Προστέθηκαν %1$d κομμάτια στη λίστα αναπαραγωγής %2$s.
- Share your Retro Music setup to showcase on Instagram
+ Μοιραστείτε το setup του Retro Music σας για προβολή στο Instagram
- Keyboard
+ Πληκτρολόγιο
Bitrate
Μορφή
Όνομα Αρχείου
Διαδρομή Αρχείου
Μέγεθος
- More from %s
- Συχνότητα δείγματος
+ Περισσότερα από %s
+ Ρυθμός δειγματοληψίας
Μήκος
- Labeled
+ Με ετικέτα
Προστέθηκαν τελευταία
- Last song
+ Τελευταίο κομμάτι
- Library categories
+ Κατηγορίες βιβλιοθήκης
Άδειες
Ξεκάθαρα Λευκό
- Listeners
+ Ακροατές
Καταγραφή αρχείων
Φόρτωση προϊόντων...
- Login
+ Σύνδεση
Στίχοι
- Made with ❤️ in India
+ Φτιαγμένο με ❤️ στην Ινδία
Material
- Error
- Permission error
+ Σφάλμα
+ Σφάλμα άδειας
Το Όνομά μου
Τα Κορυφαία Κομμάτια μου
Ποτέ
- Νέα playlist
+ Νέα λίστα αναπαραγωγής
%s είναι ο νέος κατάλογος εκκίνησης.
- Next Song
+ Επόμενο Κομμάτι
Κανένα άλμπουμ
Κανένας καλλιτέχνης
@@ -308,88 +308,88 @@
Δεν βρέθηκε ισοσταθμιστής.
Κανένα είδος
Δεν βρέθηκαν στίχοι
- No songs playing
- Δεν βρέθηκαν playlists
- No purchase found.
+ Δεν παίζει κανένα κομμάτι
+ Δεν βρέθηκαν λίστες αναπαραγωγής
+ Δεν βρέθηκε αγορά.
Κανένα αποτέλεσμα
Δεν βρέθηκαν κομμάτια
Κανονικό
- Normal lyrics
+ Κανονικοί στίχοι
%s δεν υπάρχει στο media store.]]>
Δεν υπάρχει στοιχείο προς σάρωση.
- Nothing to see
+ Τίποτα για να δείτε
Ειδοποίηση
- Customize the notification style
+ Προσαρμόστε το στυλ ειδοποίησης
- Now playing
+ Παίζει τώρα
Ουρά \"Παίζει Τώρα\"
- Customize the now playing screen
- 9+ now playing themes
+ Προσαρμόστε την οθόνη παίζει τώρα
+ 9+ τώρα παίζει θέματα
Μόνο από Wi-Fi
- Advanced testing features
+ Προηγμένες δοκιμαστικές δυνατότητες
- Other
+ Άλλα
- Password
+ Κωδικός πρόσβασης
Τους περασμένους 3 μήνες
- Peak
+ Κορυφή
Η άδεια για προσπέλαση του external storage δεν παραχωρήθηκε.
Οι άδειες δεν παραχωρήθηκαν.
- Personalize
- Customize your now playing and UI controls
+ Προσωποποιήση
+ Προσαρμόστε τα στοιχεία ελέγχου του παίζετε τώρα και του περιβάλλοντως χρήστη
Επιλογή από Χώρο Αποθήκευσης
Pinterest
- Follow Pinterest page for Retro Music design inspiration
+ Ακολουθήστε τη σελίδα Pinterest για έμπνευση σχεδιασμού του Retro Music
Απλό
- Η ειδοποίηση αναπαραγωγής προσφέρει κουμπιά για play/pause, κλπ.
+ Η ειδοποίηση αναπαραγωγής προσφέρει κουμπιά για αναπαραγωγή/παύση, κλπ.
Ειδοποίηση Αναπαραγωγής
- H Playlist είναι κενή
- Όνομα Playlist
+ H Λίστα αναπαραγωγής είναι κενή
+ Όνομα Λίστα αναπαραγωγής
- Playlists
+ Λίστες αναπαραγωγής
- Amount of blur applied for blur themes, lower is faster
- Blur amount
- Filter songs by length
- Filter song duration
- Advanced
- Album style
+ Η ποσότητα θαμπώματος που εφαρμόζεται για θέματα θαμπάδων, το χαμηλότερο είναι ταχύτερο
+ Ποσότητα θαμπώματος
+ Φιλτράρετε κομμάτια κατά μήκος
+ Φιλτράρετε τη διάρκεια του κομματιού
+ Προηγμένες
+ Στυλ άλμπουμ
Ήχος
Blacklist
Controls
- Theme
+ Θέμα
Εικόνες
- Library
+ Βιβλιοθήκη
Οθόνη Κλειδώματος
- Playlists
- Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app
- Pause on zero
- Keep in mind that enabling this feature may affect battery life
- Keep the screen on
- Select language
+ Λίστες αναπαραγωγής
+ Παύει το τραγούδι όταν η ένταση μειώνεται στο μηδέν και αρχίζει να αναπαράγεται όταν αυξάνεται το επίπεδο έντασης. Λειτουργεί επίσης εκτός της εφαρμογής
+ Παύση στο μηδέν
+ Λάβετε υπόψη ότι η ενεργοποίηση αυτής της λειτουργίας ενδέχεται να επηρεάσει τη διάρκεια ζωής της μπαταρίας
+ Διατηρήστε την οθόνη ενεργή
+ πιλέξτε γλώσσα
Χρησιμοποιεί το εξώφυλλο του τρέχων κομματιού ως φόντο οθόνης κλειδώματος.
Ειδοποιήσεις, πλοήγηση, κλπ.
The content of blacklisted folders is hidden from your library.
- Start playing as soon as connected to bluetooth device
+ Ξεκινά να παίζει μόλις συνδεθείτε με συσκευή Bluetooth
Θολώνει το εξώφυλλο άλμπουμ στην οθόνη κλειδώματος. Μπορεί να προκαλέσει προβλήματα με εφαρμογές και widgets.
- Carousel effect for the album art in the now playing screen. Note that Card and Blur Card themes won\'t work
- Χρήση του κλασσικού design ειδοποιήσεων.
+ Εφέ καρουζέλ για το εξώφυλλο του άλμπουμ στην οθόνη του παίζει τώρα. Σημειώστε ότι τα θέματα Κάρτας και Θαμπές Κάρτες δεν θα λειτουργήσουν
+ Χρήση του κλασσικού σχεδιασμού ειδοποιήσεων.
Το φόντο και το κουμπί ελέγχου αλλάζουν σύμφωνα με το εξώφυλλο άλμπουμ
Χρωματίζει τα app shortcuts με το επιλεγμένο χρώμα τονισμού.
"\u03a7\u03c1\u03c9\u03bc\u03b1\u03c4\u03af\u03b6\u03b5\u03b9 \u03c4\u03b7\u03bd \u03b5\u03b9\u03b4\u03bf\u03c0\u03bf\u03af\u03b7\u03c3\u03b7 \u03bc\u03b5 \u03c4\u03bf \u03b6\u03c9\u03bd\u03c4\u03b1\u03bd\u03cc \u03c7\u03c1\u03ce\u03bc\u03b1 \u03c4\u03bf\u03c5 \u03b5\u03be\u03c9\u03c6\u03cd\u03bb\u03bb\u03bf\u03c5 \u03ac\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc."
@@ -428,7 +428,7 @@
Artist grid
Banner
Παράληψη Media Store για εξώφυλλα
- Χρονικό διάστημα playlist \"Προστέθηκε τελευταία\"
+ Χρονικό διάστημα λίστα αναπαραγωγής \"Προστέθηκε τελευταία\"
Full screen Ρυθμίσεις
Εμφάνιση
Άδειες λογισμικού open source
@@ -436,84 +436,84 @@
Carousel effect
Full screen εφαρμογή
Αυτόματη αναπαραγωγή
- Shuffle mode
+ Τυχαία λειτουργία
Πίνακας Ελέγχου Έντασης
Pro
- Black theme, Now playing themes, Carousel effect and more..
+ Μαύρο θέμα, Θέματα στο Τώρα παίζει, εφέ Καρουσέλ και πολλά άλλα..
- Profile
+ Προφίλ
- Purchase
+ Αγορά
Ουρά
Βαθμολόγησε την εφαρμογή
Σας αρέσει αυτό το app; Γράψτε μας τις εντυπώσεις σας στο Google Play για να σας παρέχουμε μια καλύτερη εμπειρία
- Recent albums
- Recent artists
+ Πρόσφατα άλμπουμ
+ Πρόσφατοι καλλιτέχνες
Αφαίρεση
Αφαίρεση Εξώφυλλου
Αφαίρεση από τη blacklist
- Αφαίρεσε το κομμάτι από την playlist
- %1$s από τη playlist?]]>
- Αφαίρεσε τα κομμάτια από την playlist
- %1$d κομματιών από τη playlist?]]>
+ Αφαίρεσε το κομμάτι από τη λίστα αναπαραγωγής
+ %1$s από τη λίστα αναπαραγωγής?]]>
+ Αφαίρεσε τα κομμάτια από τη λίστα αναπαραγωγής
+ %1$d κομματιών από τη λίστα αναπαραγωγής?]]>
- Μετονόμασε την playlist
+ Μετονόμασε τη λίστα αναπαραγωγής
- Report an issue
- Report bug
+ Αναφέρετε ένα πρόβλημα
+ Αναφορά προβλήματος
- Reset
+ Επαναφορά
Επαναφορά εικόνας καλλιτέχνη
- Restore
+ Επαναφορά
- Restored previous purchase. Please restart the app to make use of all features.
+ Επαναφορά προηγούμενης αγοράς. Επανεκκινήστε την εφαρμογή για να χρησιμοποιήσετε όλες τις δυνατότητες.
Επαναφορά προηγούμενων αγορών επιτυχής.
- Restoring purchase…
+ Επαναφορά αγοράς…
Retro Music Player
Retro Music Pro
- File delete failed: %s
+ Η διαγραφή αρχείου απέτυχε: %s
Can\'t get SAF URI
- Open navigation drawer
+ Ανοίξτε το συρτάρι πλοήγησης
Enable \'Show SD card\' in overflow menu
- %s needs SD card access
- You need to select your SD card root directory
- Select your SD card in navigation drawer
- Do not open any sub-folders
+ %s χρειάζεται πρόσβαση στην κάρτα SD
+ Πρέπει να επιλέξετε τον ριζικό κατάλογο της κάρτας SD
+ Επιλέξτε την κάρτα SD στο συρτάρι πλοήγησης
+ Μην ανοίγετε υποφακέλους
Tap \'select\' button at the bottom of the screen
- File write failed: %s
+ Η εγγραφή αρχείου απέτυχε: %s
- Save
+ Αποθήκευση
Αποθήκευσε ως αρχείο
- Save as files
+ Αποθήκευση ως αρχεία
- Η Playlist αποθηκεύτηκε στο %s.
+ Η Λίστα αναπαραγωγής αποθηκεύτηκε στο %s.
Αποθηκευόνται οι αλλαγές...
- Scan media
+ Σάρωση μέσων
Σαρώθηκαν %1$d από %2$d αρχεία.
Scrobbles
- Select all
+ Επιλογή όλων
- Selected
+ Επιλεγμένα
- Set
+ Ορισμός
Ορισμός εικόνας καλλιτέχνη
Share app
@@ -536,12 +536,12 @@
Σειρά Διάταξης
Ascending
- Album
- Artist
- Composer
- Date added
- Date modified
- Year
+ Άλμπουμ
+ Καλλιτέχνης
+ Συνθέτης
+ Ημερομηνία προσθήκης
+ Ημερομηνία τροποποιήσης
+ Έτος
Descending
Ουπς! Η συσκευή σου δεν υποστηρίζει εισαγωγή φωνής
@@ -549,19 +549,19 @@
Stack
- Start playing music.
+ Ξεκινήστε να παίζετε μουσική.
- Suggestions
+ Προτάσεις
Υποστήριξη ανάπτυξης της εφαρμογής
- Swipe to unlock
+ Σύρετε για ξεκλείδωμα
- Synced lyrics
+ Συγχρονισμένοι στίχοι
Telegram
- Join the Telegram group to discuss bugs, make suggestions, show off and more
+ Γίνετε μέλος της ομάδας Telegram για να συζητήσετε σφάλματα, να κάνετε προτάσεις, να επιδείξετε και άλλα
Σας ευχαριστούμε!
@@ -571,28 +571,28 @@
Αυτή την εβδομάδα
Αυτό το χρόνο
- Tiny
- Tiny card
+ Μικροσκοπική
+ Μικρή κάρτα
- Title
+ Τίτλος
Σήμερα
- Top albums
- Top artists
+ Κορυφαία άλμπουμ
+ Κορυφαίοι καλλιτέχνες
"Κομμάτι (2 για κομμάτι 2, ή 3004 για CD3 κομμάτι 4)"
Αριθμός Κομματιού
Μετάφραση
- Help us translate the app to your language
+ Βοηθήστε μας να μεταφράσουμε την εφαρμογή στη γλώσσα σας
- Try Retro Music Premium
+ Δοκιμάστε το Retro Music Premium
Twitter
- Share your design with Retro Music
+ Μοιραστείτε το σχέδιό σας με το Retro Music
- Unlabeled
+ Χωρίς ετικέτα
\u0394\u03b5\u03bd \u03bc\u03c0\u03bf\u03c1\u03ad\u03c3\u03b1\u03bc\u03b5 \u03bd\u03b1 \u03c0\u03b1\u03af\u03be\u03bf\u03c5\u03bc\u03b5 \u03b1\u03c5\u03c4\u03cc \u03c4\u03bf \u03ba\u03bf\u03bc\u03bc\u03ac\u03c4\u03b9.
@@ -602,32 +602,32 @@
Ενημέρωση σε εξέλιξη...
- Username
+ Όνομα χρήστη
Έκδοση
- Vertical flip
+ Κάθετη αναστροφή
- Volume
+ Ένταση
Αναζήτηση στον ιστό
- Welcome,
+ Καλώς ήρθατε,
Τι θα θέλατε να μοιραστείτε;
What\'s New
- Window
- Rounded corners
+ Παράθυρο
+ Στρογγυλεμένες γωνίες
Ορισμός %1$s ως ήχου κλήσης.
%1$d έχει επιλεγεί
Χρονιά
- You have to select at least one category.
- You will be forwarded to the issue tracker website.
+ Πρέπει να επιλέξετε τουλάχιστον μία κατηγορία.
+ Θα προωθηθείτε στον ιστότοπο παρακολούθησης ζητημάτων.
- Your account data is only used for authentication.
+
From c084e4468196fa76b7c3121e65ad07ffe6158eed Mon Sep 17 00:00:00 2001
From: Aeris One
Date: Sat, 24 Oct 2020 20:30:37 +0200
Subject: [PATCH 19/26] Bad translation
---
app/src/main/res/master/values-fr-rFR/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/master/values-fr-rFR/strings.xml b/app/src/main/res/master/values-fr-rFR/strings.xml
index 78410027c..3a6dbae92 100644
--- a/app/src/main/res/master/values-fr-rFR/strings.xml
+++ b/app/src/main/res/master/values-fr-rFR/strings.xml
@@ -495,7 +495,7 @@
Virtualisateur
Volume
Recherche internet
- Accueillir,
+ Bienvenue,
Que souhaitez-vous partager ?
Quoi de neuf
Fenêtre
From 725e1d11e3baa972d94f8dd010061a2bee9ce03f Mon Sep 17 00:00:00 2001
From: Aeris One
Date: Sat, 24 Oct 2020 20:34:49 +0200
Subject: [PATCH 20/26] Bad translation #2
---
app/src/main/res/values-fr-rFR/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index b0136167f..ac201c507 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -612,7 +612,7 @@
Recherche internet
- Accueillir,
+ Bienvenue,
Que souhaitez-vous partager ?
From de5e9444b79b75b86c94883efbc3df8e955d43dd Mon Sep 17 00:00:00 2001
From: Hemanth S
Date: Wed, 28 Oct 2020 01:37:02 +0530
Subject: [PATCH 21/26] Fix classic theme time frame issue #992
---
.../res/layout/fragment_classic_controls.xml | 54 +++++++++----------
1 file changed, 24 insertions(+), 30 deletions(-)
diff --git a/app/src/main/res/layout/fragment_classic_controls.xml b/app/src/main/res/layout/fragment_classic_controls.xml
index 9262ffe53..2d7ace67f 100644
--- a/app/src/main/res/layout/fragment_classic_controls.xml
+++ b/app/src/main/res/layout/fragment_classic_controls.xml
@@ -9,56 +9,50 @@
android:paddingBottom="8dp"
tools:ignore="MissingPrefix">
-
-
-
+
+
-
-
+
Date: Fri, 30 Oct 2020 23:12:47 +0630
Subject: [PATCH 22/26] added Burmese translation in strings.xml
---
app/src/main/res/values-my/strings.xml | 659 +++++++++++++++++++++++++
1 file changed, 659 insertions(+)
create mode 100644 app/src/main/res/values-my/strings.xml
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
new file mode 100644
index 000000000..776cc1fe4
--- /dev/null
+++ b/app/src/main/res/values-my/strings.xml
@@ -0,0 +1,659 @@
+
+
+ About %s
+ အဖွဲ့နှင့် လူမှုကွန်ယက်လင့်ခ်များ
+
+ Accent Color
+ The theme accent color (ခရမ်းရောင်သည်မူလအရောင်)
+
+ About
+ အကြိုက်ဆုံးသို့ထည့်မည်
+ နားထောင်နေသည့်စာရင်းထဲသို့ထည့်မည်
+ Playlist သို့ထည့်မည်
+ နားထောင်နေသည့်စာရင်းအားရှင်းမည်
+ Cycle repeat mode
+ ဖျက်မည်
+ Device မှဖျက်မည်
+ အသေးစိတ်
+ Album သို့သွားမည်
+ အဆိုတော်သို့သွားမည်
+ အမျိုးအစားသို့သွားမည်
+ Directory အစသို့သွားမည်
+ ခွင့်ပြုမည်
+ အကွက်အရွယ်အစား
+ အကွက်အရွယ်အစား (land)
+ Playlist အသစ်
+ နောက်တစ်ပုဒ်
+ Play မည်
+ အားလုံး play မည်
+ Play next
+ Play/ခေတ္တရပ်
+ ယခင်အပုဒ်
+ အကြိုက်ဆုံးမှထုတ်မည်
+ နားထောင်နေသည့်စာရင်းမှထုတ်မည်
+ Playlist မှထုတ်မည်
+ နာမည်ပြင်မည်
+ နားထောင်နေသည့်စာရင်းအားသိမ်းမည်
+ စကန်ဖတ်မည်
+ ရှာမည်
+ စမည်
+ Ringtone အဖြစ်ထားမည်
+ Directory အစအဖြစ်ထားမည်
+ "Settings"
+ မျှဝေမည်
+ အားလုံး Shuffle play မည်
+ Playlist အား Shuffle play မည်
+ Sleep Timer
+ အထားအသိုပြင်မည်
+ Tag တည်းဖြတ်ခြင်း
+ Toggle favorite
+ Toggle shuffle mode
+
+ Adaptive
+
+ ထည့်မည်
+ "အောက်ပါ Playlist သို့ထည့်မည်"
+
+ "နားထောင်နေသည့်စာရင်းထဲသို့ ၁ ပုဒ်ပေါင်းထည့်ခဲ့သည်"
+ နားထောင်နေသည့်စာရင်းထဲသို့ %1$d ပုဒ်ပေါင်းထည့်ခဲ့သည်
+
+ Album
+
+
+ - သီချင်း
+ - သီချင်းများ
+
+
+ Album အားသီဆိုသူ
+
+ Albums
+
+ - Album
+ - Albums
+
+
+ Always
+
+ ဟေ့ အရမ်းမိုက်တဲ့ဒီ Music Player ကိုတစ်ချက်ကြည့်ကြည့်! https://play.google.com/store/apps/details?id=%s
+ Shuffle
+ ထိပ်ဆုံးသီချင်းများ
+ ပုံအပြည့်
+ ကတ်
+ ရိုးရိုး
+ အသေး
+ စာပါဝင်မှုနည်း
+
+ အဆိုတော်
+
+ အဆိုတော်များ
+
+ အသံအာရုံစိုက်ခြင်းအား ပယ်ဖျက်ခဲ့သည်
+ အသံ Settings များပြောင်းလဲရန်နှင့် Equalizer ချိန်ညှိရန်
+
+ အလိုအလျောက်
+
+ အတ္ထုပတ္တိ
+
+ အနက်ရောင်သာ
+
+ လစ်လျူရှုမည့်စာရင်း
+
+ Blur
+ ကတ်အဝါး
+
+ သတင်းပို့၍မရနိုင်ပါ
+ မမှန်ကန်သော Access token ဖြစ်သည်။ ကျေးဇူးပြု၍ App ရေးသားသူအားဆက်သွယ်ပါ။
+ ရွေးချယ်ထားသော Repository အတွက် Issue ဖွင့်ခွင့်မပေးထားပါ။ ကျေးဇူးပြု၍ App ရေးသားသူအားဆက်သွယ်ပါ။
+ မသိထားသော Error တက်သွားခဲ့သည်။ ကျေးဇူးပြု၍ App ရေးသားသူအားဆက်သွယ်ပါ။
+ Username (သို့မဟုတ်) Password မှားနေသည်
+ အကြောင်းအရာ
+ ကိုယ်တိုင်အသေးစိတ်သတင်းပို့မည်
+ ကျေးဇူးပြု၍ အကြောင်းအရာအသေးစိတ်ကိုဖြည့်သွင်းပါ
+ ကျေးဇူးပြု၍ မှန်ကန်သော Github password ကိုဖြည့်သွင်းပါ
+ ကျေးဇူးပြု၍အကြောင်းအရာခေါင်းစဉ်အားဖြည့်သွင်းပါ
+ ကျေးဇူးပြု၍ မှန်ကန်သော Github username ကိုဖြည့်သွင်းပါ
+ မသိထားတဲ့ Error တစ်ခုတက်ခဲ့တယ်ဆိုပါစို့။ ဆက်ပြီး Crash ဖြစ်နေတယ်ဆိုရင် \"Clear App Data\" လုပ်ပါ (ဒါမှမဟုတ်) အီးမေးလ်ပို့ပါ။
+ GitHub အကောင့်ဖြင့်ပို့မည်
+
+ ယခုဝယ်မည်
+
+ ပယ်ဖျက်မည်
+
+ ကတ်
+ အရောင်ပါသောကတ်
+ လေးထောင့်ကတ်
+ ကတ်
+
+ Now Playing Screen ပေါ်တွင် Carousel effect
+
+ Cascading
+
+ ပြောင်းလဲမှုမှတ်တမ်း
+ Telegram channel ရှိ ပြောင်းလဲမှုမှတ်တမ်း
+
+ အဝိုင်း
+
+ အဝိုင်း
+
+ ရိုးရိုး
+
+ ရှင်းမည်
+ Blacklist အားရှင်းမည်
+ နားထောင်နေသည့်စာရင်းအားရှင်းမည်
+
+ အရောင်
+
+ အရောင်များ
+
+ တေးရေးဆရာ
+
+ Device အချက်အလက်အား Clipboard သို့ ကော်ပီကူးခဲ့ပြီး
+
+ Playlist ဖန်တီး၍မရပါ
+ "ကိုက်ညီသော Album Cover ကို Download မလုပ်နိုင်ပါ"
+ ဝယ်ယူမှုကိုပြန်မရယူနိုင်ပါ
+ ဖိုင် %d ခုကိုစကန်မဖတ်နိုင်ပါ
+
+ ဖန်တီးမည်
+
+ ဖန်တီးထားသော Playlist %1$s ခု
+
+ အဖွဲ့ဝင်များနှင့် ကူညီသူများ
+
+ %2$s သီဆိုထားသော %1$s ကိုယခုနားထောင်နေသည်
+
+ အနက်ရောင်ဆန်ဆန်
+
+ Playlist ဖျက်ခြင်း
+ %1$s Playlist ကိုဖျက်မှာလား]]>
+ Playlist များဖျက်ခြင်း
+ သီချင်းဖျက်ခြင်း
+ %1$s? သီချင်းကိုဖျက်မှာလား]]>
+ သီချင်းများဖျက်ခြင်း
+ %1$d ခုကိုဖျက်မှာလား]]>
+ %1$d ပုဒ်ကိုဖျက်မှာလား]]>
+
+ သီချင်း %1$d ပုဒ်ကိုဖျက်ပစ်ခဲ့သည်
+
+ Depth
+
+ အကြောင်းအရာအသေးစိတ်
+
+ Device အချက်အလက်
+
+ အသံ Settings ပြုပြင်ရန် Retro Music ကိုခွင့်ပြုချက်ပေးပါ
+ Ringtone ထားခြင်း
+
+ Blacklist ကိုရှင်းလင်းလိုပါသလား
+ %1$s ကိုဖယ်ရှားလိုပါသလား]]>
+
+ လှူဒါန်းမည်
+ ကျွန်တော့်ရဲ့လက်ရာအတွက် မုန့်ဖိုးရဖို့ထိုက်တန်တယ်လို့ထင်ရင် ဒီမှာပေးသွားလိုက်ပါ။
+
+ ဝယ်ပေးမယ်:
+
+ ပြီးပြီ
+
+ Drive mode
+
+ ဘာမှမရှိပါ
+
+ Equalizer
+
+ မေးလေ့ရှိသောမေးခွန်းများ
+
+ အကြိုက်ဆုံး
+
+ Finish last song
+
+ အနေတော်
+
+ အပြားပုံစံ
+
+ Folders
+
+ System အတိုင်း
+
+ သင့်အတွက်
+
+ အခမဲ့
+
+ အပြည့်
+ ကတ်အပြည့်ပုံစံ
+
+ App Theme နှင့် အရောင်များကိုပြောင်းလဲရန်
+ Look and Feel
+
+ အမျိုးအစား
+
+ အမျိုးအစားများ
+
+ Project ကို GitHub မှာ Fork လုပ်ပါ
+
+ Gradient
+
+ ၁
+ ၂
+ ၃
+ ၄
+ ၅
+ ၆
+ ၇
+ ၈
+ အကွက်စတိုင်
+
+ အကူအညီထပ်လိုပါသေးလား
+
+ Hinge
+
+ မှတ်တမ်း
+
+ မူလ
+
+ ရေပြင်ညီအတိုင်းဟိုဘက်ဒီဘက်လှန်ခြင်း
+
+ ဓာတ်ပုံ
+ Gradient ပုံ
+ အဆိုတော်ပုံအား ဒေါင်းလုဒ်ဆွဲခြင်း Settings များ
+
+ Import
+ Import playlist
+ Android မီဒီယာစတိုးမှ Playlist များကိုသီချင်းများနှင့်အတူ import လုပ်သွားမည်ဖြစ်ပြီး ရှိပြီးသား Playlist ဖြစ်ပါကသီချင်းများကိုထည့်ပေါင်းသွားပါမည်။
+
+ Playlist %2$s သို့သီချင်း %1$d ပုဒ်ထည့်ပြီးပါပြီ
+
+ Instagram
+ သင့်ရဲ့ Retro Music setup ကို Instagram တွင်ပြသလိုက်ပါ
+
+ ကီးဘုတ်
+
+ Bitrate
+ အမျိုးအစား
+ ဖိုင်နာမည်
+ ဖိုင်နေရာ
+ အရွယ်အစား
+ %s ၏နောက်ထပ် Album များ
+ Sampling rate
+ ကြာချိန်
+
+ Label ထိုးထားမည်
+
+ နောက်ဆုံးသွင်းထားသော
+ နောက်ဆုံးအပုဒ်
+
+ Tab အမျိုးအစားများ
+
+ လိုင်စင်များ
+
+ အဖြူရောင်သက်သက်
+
+ နားဆင်သူများ
+
+ ဖိုင်ပြန်စီနေသည်...
+
+ ခဏစောင့်ပါ...
+
+ Login
+
+ သီချင်းစာသား
+
+ အိန္ဒိယနိုင်ငံတွင် ❤️ များဖြင့် ဖန်တီးသည်
+
+ Material
+
+ Error
+ Storage ခွင့်ပြုချက် error
+
+ နာမည်
+ အများဆုံးနားထောင်ခဲ့သော
+
+ ဘယ်တော့မှ
+
+ Playlist အသစ်
+ %s ဟာ Directory အစဖြစ်သွားပါပြီ
+
+ နောက်တစ်ပုဒ်
+
+ Album တစ်ခုမှမရှိပါ
+ အဆိုတော်တစ်ယောက်မှမရှိပါ
+ "သီချင်းတစ်ပုဒ်အရင် play ကြည့်ပြီးမှ ပြန်ကြိုးစားပါ"
+ Equalizer တစ်ခုမှရှာမတွေ့ပါ
+ အမျိုးအစားခွဲစရာတစ်ခုမှမရှိပါ
+ သီချင်းစာသားရှာမတွေ့ပါ
+ သီချင်းတစ်ပုဒ်မှ play မထားပါ
+ Playlist တစ်ခုမှမရှိပါ
+ ဝယ်ယူထားမှုမရှိပါ
+ ရှာမတွေ့ပါ
+ သီချင်းတစ်ပုဒ်မှမရှိပါ
+
+ ပုံမှန်
+ ပုံမှန်သီချင်းစာသား
+
+ %s သည် Android မီဒီယာစတိုးတွင် မရှိပါ]]>
+ မကြာသေးခင်က play မထားပါ
+
+ စကန်ဖတ်စရာမရှိပါ
+ ကြည့်စရာတစ်ခုမှမရှိပါ
+
+ Notification
+ Notification ပုံစံကို စိတ်ကြိုက်ပြင်ဆင်မည်
+
+ Now playing
+ Now playing queue
+ Now playing screen ကိုစိတ်ကြိုက်ပြင်ခြင်း
+ Now playing theme (၉) ခုအထက် ရရှိခြင်း
+
+ Wi-Fi ဖြင့်သာ
+
+ အဆင့်မြင့် Settings များ
+
+ အခြား
+
+ Password
+
+ လွန်ခဲ့သော (၃)လ
+
+ Peak ပုံစံ
+
+ External Storage ကြည့်ရှုခွင့်အားငြင်းပယ်ခဲ့သည်။
+ သီချင်းဖွင့်ရန်အတွက် ယခု App အား Storage ကြည့်ရှုခွင့်ပေးရန်လိုသည်။
+ Storage ကြည့်ရှုခွင့်
+
+ ခွင့်ပြုချက်ငြင်းပယ်ခံရသည်
+
+ မိမိစိတ်ကြိုက်
+ Now Playing နှင့် UI controls များကိုစိတ်ကြိုက်ပြင်ဆင်မည်
+
+ Local Storage မှ ရွေးမည်
+
+ Pinterest
+ Retro Music ဒီဇိုင်းအကြံဉာဏ်ကောင်းများအတွက် Pinterest page ကို follow ပါ
+
+ ရှင်းရှင်းလင်းလင်းပုံစံ
+
+ Playing notification သည် play/pause ခလုတ် စသည့်တို့ကိုဖော်ပြပေးသည်
+ Playing notification
+
+ Playlist တွင်ဘာမှမရှိပါ
+ Playlist နာမည်
+
+ Playlists
+
+ Blur Themes များအတွက်သက်ရောက်သော အဝါးပမာဏဖြစ်ပြီး ပမာဏနည်းလေ ပိုမြန်လေဖြစ်သည်
+ အဝါးပမာဏ
+ ကြာချိန်ဖြင့်သီချင်းစစ်ထုတ်မည်
+ သီချင်းကြာချိန်စစ်ထုတ်ခြင်း
+ ပိုမိုဆန်းသစ်သော
+ Album စတိုင်
+ အသံပိုင်းဆိုင်ရာ
+ Blacklist
+ ထိန်းချုပ်မှုဆိုင်ရာ
+ Theme
+ Images
+ Library
+ Lockscreen
+ Playlists
+ Volume သုညရောက်သွားပါက သီချင်းရပ်ပြီး Volume ပြန်ကျယ်လာသည့်အခါ ပြန် play မည်ဖြစ်သည်။ App ထဲဝင်မထားသော်လည်းအလုပ်လုပ်သည်။
+ သုည၌ရပ်ခြင်း
+ ဤ feature ဖွင့်ထားပါက ဘက်ထရီသက်တမ်းထိခိုက်နိုင်ပါသည်
+ Screen တစ်ချိန်လုံးဖွင့်ထားမည်
+ ဘာသာစကားရွေးချယ်မည်
+ ယခု play နေသောသီချင်း Album cover ပုံအား Lockscreen wallpaper အဖြစ်ထားမည်
+ Album သီဆိုသူများကိုလည်း အဆိုတော် Category တွင်ထားမည်
+ System Sound (သို့) Notification တစ်ခုရောက်လာသည့်အခါ သီချင်းအသံကိုတိုးမည်
+ Blacklist folder သိို့သွင်းထားသည်များကို Library တွင်မြင်ရမည်မဟုတ်ပါ
+ Bluetooth device နှင့်ချိတ်ဆက်လိုက်သည်နှင့် သီချင်းစဖွင့်မည်
+ Lockscreen တွင် Album cover ပုံကိုဝါးထားမည်။ Third-party app နှင့် Widget များတွင် ပြဿနာတက်နိုင်သည်။
+ Now Playing screen မှ Album cover အတွက် Carousel effect ဖြစ်သည်။ ဤ effect ကြောင့် ကတ်နှင့် ကတ်အဝါး Theme များအလုပ်လုပ်မည်မဟုတ်ပါ။
+ Android ၏ Notification ဒီဇိုင်းအဟောင်းကိုသုံးမည်
+ နောက်ခံအရောင်နှင့်ထိန်းချုပ်ခလုတ်အရောင်များသည် Now Playing screen မှ Album cover အရောင်အတိုင်း ပြောင်းလဲပါမည်
+ Accent color မှ App shortcuts များကိုအရောင်ပြောင်းလဲသည်။ Accent color ပြောင်းသည့်အခါတိုင်း App ကိုသက်ရောက်မှုရှိစေရန် ဤခလုတ်ကိုအဖွင့်၊အပိတ်လုပ်ပေးပါ။
+ "Notification အရောင်ကို Album cover မှထင်ရှားသည့်အရောင်အတိုင်း ပြောင်းမည်"
+ Material ဒီဇိုင်းညွှန်ကြားချက်များအရ Dark Mode ဖွင့်ထားချိန်တွင်အရောင်များမှိန်နေသင့်သည်
+ Notification ကိုနှိပ်သည့်အခါ Home screen သို့ရောက်မည့်အစား Now Playing screen သို့တိုက်ရိုက်ရောက်သွားမည်
+ Mini player တွင် ထိန်းချုပ်ခလုတ်အပိုများထပ်ပေါင်းမည်
+ သီချင်းဖိုင်၏အသေးစိတ်အချက်အလက်များ ပြသမည်၊ ဥပမာ - ဖိုင်အမျိုးအစား၊ bitrate နှင့် ကြိမ်နှုန်း
+ "အချို့ device များတွင် playback ပြဿနာများဖြစ်ပေါ်နိုင်သည်"
+ Home banner အား ပြသခြင်း၊ ဖျောက်ထားခြင်း
+ Album cover အရည်အသွေးပိုမိုကောင်းမွန်လာနိုင်သော်လည်း Loading time ပိုကြာနိုင်သည်။ အရည်အသွေးနိမ့်သောပုံများနှင့်အဆင်မပြေမှသာလျှင် ဤခလုတ်ကိုဖွင့်ပါ။
+ Library category များ ဖော်ခြင်း၊ ဖျောက်ခြင်းနှင့် အထားအသိုများ ချိန်ညှိမည်
+ Retro Music ၏ ပြင်ဆင်ထားသော Lockscreen controls များကိုသုံးမည်
+ Open Source software အတွက် လိုင်စင်အချက်အလက်များ
+ Immersive mode
+ နားကြပ်နှင့်ချိတ်ဆက်ပြီးသည့်နှင့် စတင် play မည်
+ သီချင်းဖွင့်မည့်စာရင်း\'အသစ်\'ကို play သည့်အခါ Shuffle Mode ပိတ်သွားပါမည်
+ နေရာလုံလုံလောက်လောက်ရှိပါက Now Playing screen တွင် အသံအတိုးအကျယ်ခလုတ်များပြသမည်
+ Album cover ပြသခြင်း
+ Album သီဆိုသူဖြင့် ရှာဖွေခြင်း
+ Album cover theme
+ Album cover skip
+ Colored App shortcuts
+ Reduce volume on focus loss
+ အဆိုတော်ဓာတ်ပုံများကို အလိုအလျောက်ဒေါင်းလုဒ်ဆွဲခြင်း
+ Blacklist
+ Bluetooth playback
+ Album cover အဝါး
+ Notification ဒီဇိုင်းအဟောင်း
+ Adaptive color
+ အရောင်ပါသော notification
+ Desaturated color
+ Now Playing screen ပြသခြင်း
+ အပိုထိန်းချုပ်မှုများ
+ သီချင်းဖိုင်အချက်အလက်
+ လစ်ဟာမှုမရှိ play ခြင်း
+ App theme
+ Album အကွက်ပုံစံ
+ အဆိုတော်အကွက်ပုံစံ
+ Banner
+ Media Store covers များကိုလျစ်လျူရှုခြင်း
+ နောက်ဆုံးသွင်းထားသော playlist ရှိသီချင်းများ
+ Lockscreen အပြည့် controls
+ Now playing theme
+ Open source licences
+ Tab ခေါင်းစဉ်ပြသခြင်း
+ Carousel effect
+ App ကို screen အပြည့်ထားမည်
+ အလိုအလျောက် play ခြင်း
+ Shuffle mode
+ အသံထိန်းချုပ်မှု
+
+ Pro
+ Black theme ၊ Now playing themes နှင့် Carousel effect စသည်များ...
+
+ Profile
+
+ ဝယ်ယူမည်
+
+ နားထောင်နေသည့်စာရင်း
+
+ ဤ app ကို star ပေးမည်
+ App ကိုကြိုက်ပါသလား။ ယခုထက်ပိုကောင်းမွန်အောင်ဘယ်လိုလုပ်ရမလဲဆိုတာ ကျွန်တော်တို့ကို Google Play Store မှာပြောပြပေးပါ။
+
+ မကြာသေးခင်ကနားထောင်ထားသော Album များ
+ မကြာသေးခင်ကနားထောင်ထားသော အဆိုတော်များ
+
+ ပယ်ဖျက်မည်
+ Cover ကိုဖျက်မည်
+ Blacklist မှဖျက်မည်
+ Playlist မှဖျက်မည်
+ %1$s ကို Playlist ကဖျက်မှာလား]]>
+ Playlist မှသီချင်းများဖျက်ခြင်း
+ %1$d ပုဒ်ကို playlist ကဖျက်မှာလား]]>
+
+ Playlist နာမည်ပြင်မည်
+
+ ပြဿနာတစ်ခုသတင်းပို့မည်
+ Bug report တင်မည်
+
+ Reset
+ Reset artist image
+
+ ပြန်လည်ရယူမည်
+
+ ယခင်ဝယ်ယူမှုကို ပြန်လည်ရယူပြီးပါပြီ။ Feature အားလုံးအလုပ်လုပ်ရန် app မှထွက်ပြီးပြန်ဝင်ပါ။
+ ယခင်ဝယ်ယူမှုအား ပြန်လည်ရယူပြီးပါပြီ
+
+ ယခင်ဝယ်ယူမှုအား ပြန်လည်ရယူနေသည်...
+
+ Retro Music Player
+ Retro Music Pro
+
+ သီချင်းများကို Ringtone ထားရန် app အား System Settings များကိုပြင်ဆင်ခွင့်ပေးရန်လိုသည်။
+ Ringtone
+
+ ဖိုင်ဖျက်ခြင်းမအောင်မြင်ပါ: %s
+
+ SAF URI ကိုမရယူနိုင်ပါ
+ Navigation drawer ကိုဖွင့်ပါ
+ Overflow Menu မှ \'Show SD card\' ကိုနှိပ်ပါ
+
+ %s သည် SD card ကြည့်ရှုခွင့်လိုအပ်သည်
+ SD card ၏ ထိပ်ဆုံး Directory ကိုရွေးပေးရန်လိုအပ်သည်
+ Navigation drawer တွင် SD card ကိုရွေးချယ်ပါ
+ Folder အခွဲများကို မဖွင့်ပါနှင့်
+ Screen ၏အောက်ဆုံးတွင်ရှိသော \'select\' ခလုတ်ကိုနှိပ်ပါ
+ ဖိုင်ပြုပြင်ခြင်းမအောင်မြင်ပါ: %s
+
+ မှတ်ထားမည်
+
+
+ ဖိုင်အဖြစ်သိမ်းမည်
+ ဖိုင်များအဖြစ်သိမ်းမည်
+
+ %s တွင် playlist ကိုသိမ်းခဲ့သည်
+
+ ပြောင်းလဲမှုများကိုမှတ်သားနေသည်
+
+ မီဒီယာစကန်ဖတ်မည်
+
+ ဖိုင် %2$d ခုအနက် %1$d ခုကို စကန်ဖတ်ပြီးပါပြီ
+
+ Scrobbles
+
+ အားလုံးရွေးမည်
+
+ ရွေးချယ်ထားသော
+
+ ထားမည်
+ အဆိုတော်ပုံအဖြစ်ထားမည်
+
+ App ကိုမျှဝေမည်
+ သင့်မိသားစုနှင့် သူငယ်ချင်းများကိုပြန်လည်မျှဝေလိုက်ပါ
+ Stories သို့မျှဝေမည်
+
+ Shuffle
+
+ ရိုးရိုးရှင်းရှင်း
+
+ Sleep timer ကိုဖျက်ပြီးပါပြီ
+ ယခုမှစတင်၍ Sleep timer ကို %d မိနစ်အချိန်မှတ်ပြီးပါပြီ
+
+ Social
+ Story မျှဝေမည်
+
+ သီချင်း
+ သီချင်းကြာချိန်
+
+ သီချင်းများ
+
+ အထားအသိုပြင်မည်
+ ငယ်ရာမှကြီးရာ
+ Album
+ အဆိုတော်
+ တေးရေးဆရာ
+ ထည့်သွင်းသည့်ရက်
+ ပြင်ဆင်သည့်ရက်
+ အပုဒ်အရေအတွက်
+ အပုဒ်အရေအတွက်ပြောင်းပြန်
+ ထွက်ရှိသည့်နှစ်
+ ကြီးရာမှငယ်ရာ
+
+ ဆောရီး! သင့် device သည် အသံဖြင့်ပြောဆိုခြင်းအား အထောက်အပံ့မပေးထားပါ
+ သင့် Library တွင်ရှာဖွေခြင်း
+
+ Stack
+
+ သီချင်းစတင် play ပါပြီ
+
+ အကြံပြုထားသောသီချင်းများ
+
+ Support development
+
+ Swipe to unlock
+
+ ချိန်ကိုက်ထားသောသီချင်းစာသား
+
+
+ Telegram
+ Bugs များကို ဆွေးနွေးရန်၊ အကြံပြုချက်များပေးရန်၊ ကြွားရန်နှင့် စသည်များ...
+
+ ကျေးဇူးတင်ပါတယ်
+
+ အသံဖိုင်
+
+ ယခုလ
+ ယခုအပတ်
+ ယခုနှစ်
+
+ Tiny
+ Tiny card
+
+ နာမည်
+
+ ယနေ့
+
+ ထိပ်ဆုံး Album များ
+ ထိပ်ဆုံးအဆိုတော်များ
+
+ "Track (2 for track 2 or 3004 for CD3 track 4)"
+ အပုဒ်နံပါတ်
+
+ ဘာသာပြန်ခြင်း
+ App ကိုသင့်ဘာသာစကားသို့ ကူပြန်ပေးပါ
+
+ Retro Music Premium ကိုစမ်းကြည့်ပါ
+
+ Twitter
+ သင့် Retro Music ဒီဇိုင်းများကိုမျှဝေပါ
+
+ Label မထိုးပါ
+
+ ဤသီချင်းကို မ play နိုင်ပါ
+
+ လာမည့်အပုဒ်
+
+ Update image
+
+ အပ်ဒိတ်လုပ်နေသည်…
+
+ သုံးစွဲသူ
+
+ သုံးစွဲသူအမည်
+
+ Version
+
+ ဒေါင်လိုက်ဟိုဘက်ဒီဘက်လှန်ခြင်း
+
+ အသံအတိုးအကျယ်
+
+ Web search
+
+ မင်္ဂလာပါ
+
+ ဘာများမျှဝေချင်ပါသလဲ
+
+ ဘာအသစ်တွေရှိလဲ
+
+ Window
+ အနားအကွေးပုံစံ
+
+ %1$s ကို Ringtone အဖြစ်ထားပြီးပါပြီ
+ %1$d ခုကိုရွေးထားသည်
+
+ ထွက်ရှိသည့်နှစ်
+
+ အနည်းဆုံး category တစ်ခုရွေးချယ်ရန်လိုအပ်သည်
+ Issue tracker website သို့ခေါ်ဆောင်သွားပါမည်
+
+ သင့်အကောင့်အချက်အလက်ကို အတည်ပြုရန်အတွက်သာအသုံးပြုပါသည်။
+
\ No newline at end of file
From 27b9ccc81e0c6ab956d5cb39837e6b23cb5a9d41 Mon Sep 17 00:00:00 2001
From: "Daksh P. Jain"
Date: Thu, 5 Nov 2020 12:51:53 +0530
Subject: [PATCH 23/26] Fix an error in Russian translation
---
app/src/main/res/values-ru-rRU/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index ab893bf60..d868302d9 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -315,7 +315,7 @@
Следующая песня
Альбомы отсутствуют
- Исполнители отсутствую
+ Исполнители отсутствуют
"Сначала проиграйте песню, затем попробуйте заново."
Эквалайзер не найден
Жанры отсутствуют
From 15ede0b71cce6193220b5c2b6f8b26355a09cccf Mon Sep 17 00:00:00 2001
From: rsaliyevzhomart
Date: Thu, 12 Nov 2020 00:47:12 +0500
Subject: [PATCH 24/26] Fixed compilation issue: Problem with missed > symbol
in el-rGR/strings.xml
---
app/src/main/res/values-el-rGR/strings.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index b573bdbc8..c2671b300 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -629,5 +629,5 @@
Πρέπει να επιλέξετε τουλάχιστον μία κατηγορία.
Θα προωθηθείτε στον ιστότοπο παρακολούθησης ζητημάτων.
-
+ Τα δεδομένα του λογαριασμού σας χρησιμοποιούνται μόνο για έλεγχο ταυτότητας.
From bf2f4ac757f03a25f3ef7979648fc002907827fd Mon Sep 17 00:00:00 2001
From: Hemanth S
Date: Mon, 16 Nov 2020 23:07:16 +0530
Subject: [PATCH 25/26] Add play all and shuffle all buttons for lists
---
.../base/AbsSlidingMusicPanelActivity.kt | 7 ++-
.../tageditor/WriteTagsAsyncTask.java | 3 +-
.../adapter/song/ShuffleButtonSongAdapter.kt | 10 +++-
.../monkey/retromusic/db/RetroDatabase.kt | 2 +-
.../fragments/CoroutineViewModel.kt | 37 ------------
.../fragments/DetailListFragment.kt | 24 +++-----
.../playlists/PlaylistDetailsFragment.kt | 8 +--
.../fragments/search/SearchFragment.kt | 15 +++++
.../preferences/LibraryPreference.kt | 2 +-
.../name/monkey/retromusic/util/MusicUtil.kt | 13 ++--
.../res/layout/item_list_quick_actions.xml | 59 ++++++++-----------
...nce_dialog_library_categories_listitem.xml | 7 +--
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 4 +-
14 files changed, 77 insertions(+), 116 deletions(-)
delete mode 100644 app/src/main/java/code/name/monkey/retromusic/fragments/CoroutineViewModel.kt
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
index 2d28cd368..ca21f78b0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -86,6 +86,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
setMiniPlayerAlphaProgress(slideOffset)
dimBackground.show()
dimBackground.alpha = slideOffset
+ println(slideOffset)
}
override fun onStateChanged(bottomSheet: View, newState: Int) {
@@ -97,6 +98,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
onPanelCollapsed()
dimBackground.hide()
}
+
else -> {
println("Do something")
}
@@ -114,11 +116,11 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
setupBottomSheet()
updateColor()
- val themeColor = ATHUtil.resolveColor(this, android.R.attr.windowBackground, Color.GRAY)
+ val themeColor = resolveColor(android.R.attr.windowBackground, Color.GRAY)
dimBackground.setBackgroundColor(ColorUtil.withAlpha(themeColor, 0.5f))
dimBackground.setOnClickListener {
println("dimBackground")
-
+ collapsePanel()
}
}
@@ -154,6 +156,7 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity() {
fun collapsePanel() {
bottomSheetBehavior.state = STATE_COLLAPSED
+ setMiniPlayerAlphaProgress(0f)
}
fun expandPanel() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java
index 45cb21a69..6e71e4d6c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java
@@ -98,7 +98,8 @@ public class WriteTagsAsyncTask extends DialogAsyncTask,
itemLayoutRes: Int,
ICabHolder: ICabHolder?
@@ -35,16 +38,19 @@ class ShuffleButtonSongAdapter(
override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
if (holder.itemViewType == OFFSET_ITEM) {
+ val color = ThemeStore.accentColor(activity)
val viewHolder = holder as ViewHolder
viewHolder.playAction?.let {
it.setOnClickListener {
MusicPlayerRemote.openQueue(dataSet, 0, true)
}
+ it.applyOutlineColor(color)
}
viewHolder.shuffleAction?.let {
it.setOnClickListener {
MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
}
+ it.applyColor(color)
}
} else {
super.onBindViewHolder(holder, position - 1)
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt b/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt
index 42eefa7b4..804342126 100644
--- a/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt
@@ -19,7 +19,7 @@ import androidx.room.RoomDatabase
@Database(
entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class, BlackListStoreEntity::class, LyricsEntity::class],
- version = 22,
+ version = 23,
exportSchema = false
)
abstract class RetroDatabase : RoomDatabase() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/CoroutineViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/CoroutineViewModel.kt
deleted file mode 100644
index a1227d9c9..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/CoroutineViewModel.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments
-
-import androidx.lifecycle.ViewModel
-import kotlin.coroutines.CoroutineContext
-import kotlinx.coroutines.*
-
-open class CoroutineViewModel(
- private val mainDispatcher: CoroutineDispatcher
-) : ViewModel() {
- private val job = Job()
- protected val scope = CoroutineScope(job + mainDispatcher)
-
- protected fun launch(
- context: CoroutineContext = mainDispatcher,
- start: CoroutineStart = CoroutineStart.DEFAULT,
- block: suspend CoroutineScope.() -> Unit
- ) = scope.launch(context, start, block)
-
- override fun onCleared() {
- super.onCleared()
- job.cancel()
- }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/DetailListFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/DetailListFragment.kt
index 59267957a..5566e1023 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/DetailListFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/DetailListFragment.kt
@@ -26,6 +26,7 @@ import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver
import code.name.monkey.retromusic.*
import code.name.monkey.retromusic.adapter.album.AlbumAdapter
import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
+import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
import code.name.monkey.retromusic.adapter.song.SongAdapter
import code.name.monkey.retromusic.db.toSong
import code.name.monkey.retromusic.extensions.dipToPix
@@ -34,7 +35,6 @@ import code.name.monkey.retromusic.interfaces.IAlbumClickListener
import code.name.monkey.retromusic.interfaces.IArtistClickListener
import code.name.monkey.retromusic.model.Album
import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.state.NowPlayingPanelState
import code.name.monkey.retromusic.util.RetroUtil
import kotlinx.android.synthetic.main.fragment_playlist_detail.*
@@ -48,18 +48,10 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
mainActivity.setSupportActionBar(toolbar)
progressIndicator.hide()
when (args.type) {
- TOP_ARTISTS -> {
- loadArtists(R.string.top_artists, TOP_ARTISTS)
- }
- RECENT_ARTISTS -> {
- loadArtists(R.string.recent_artists, RECENT_ARTISTS)
- }
- TOP_ALBUMS -> {
- loadAlbums(R.string.top_albums, TOP_ALBUMS)
- }
- RECENT_ALBUMS -> {
- loadAlbums(R.string.recent_albums, RECENT_ALBUMS)
- }
+ TOP_ARTISTS -> loadArtists(R.string.top_artists, TOP_ARTISTS)
+ RECENT_ARTISTS -> loadArtists(R.string.recent_artists, RECENT_ARTISTS)
+ TOP_ALBUMS -> loadAlbums(R.string.top_albums, TOP_ALBUMS)
+ RECENT_ALBUMS -> loadAlbums(R.string.recent_albums, RECENT_ALBUMS)
FAVOURITES -> loadFavorite()
HISTORY_PLAYLIST -> loadHistory()
LAST_ADDED_PLAYLIST -> lastAddedSongs()
@@ -77,7 +69,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
private fun lastAddedSongs() {
toolbar.setTitle(R.string.last_added)
- val songAdapter = SongAdapter(
+ val songAdapter = ShuffleButtonSongAdapter(
requireActivity(),
mutableListOf(),
R.layout.item_list, null
@@ -93,7 +85,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
private fun topPlayed() {
toolbar.setTitle(R.string.my_top_tracks)
- val songAdapter = SongAdapter(
+ val songAdapter = ShuffleButtonSongAdapter(
requireActivity(),
mutableListOf(),
R.layout.item_list, null
@@ -110,7 +102,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
private fun loadHistory() {
toolbar.setTitle(R.string.history)
- val songAdapter = SongAdapter(
+ val songAdapter = ShuffleButtonSongAdapter(
requireActivity(),
mutableListOf(),
R.layout.item_list, null
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
index d74a1aaf8..9e0b4ffe2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
@@ -12,14 +12,13 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import code.name.monkey.appthemehelper.util.ATHUtil
import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.PlaylistSongAdapter
+import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
import code.name.monkey.retromusic.db.PlaylistWithSongs
import code.name.monkey.retromusic.db.toSongs
import code.name.monkey.retromusic.extensions.dipToPix
import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.state.NowPlayingPanelState
import com.google.android.material.transition.MaterialContainerTransform
import kotlinx.android.synthetic.main.fragment_playlist_detail.*
import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -32,7 +31,7 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
}
private lateinit var playlist: PlaylistWithSongs
- private lateinit var playlistSongAdapter: PlaylistSongAdapter
+ private lateinit var playlistSongAdapter: ShuffleButtonSongAdapter
private fun setUpTransitions() {
val transform = MaterialContainerTransform()
@@ -61,8 +60,7 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
}
private fun setUpRecyclerView() {
- playlistSongAdapter = PlaylistSongAdapter(
- playlist.playlistEntity,
+ playlistSongAdapter = ShuffleButtonSongAdapter(
requireActivity(),
ArrayList(),
R.layout.item_list,
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
index 6ab5113ab..4c552385b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
@@ -15,12 +15,14 @@
package code.name.monkey.retromusic.fragments.search
import android.content.ActivityNotFoundException
+import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.speech.RecognizerIntent
import android.text.Editable
import android.text.TextWatcher
import android.view.View
+import android.view.inputmethod.InputMethodManager
import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.recyclerview.widget.LinearLayoutManager
@@ -143,6 +145,19 @@ class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search), TextWa
showToast(getString(R.string.speech_not_supported))
}
}
+
+ override fun onDestroyView() {
+ hideKeyboard(view)
+ super.onDestroyView()
+ }
+
+ private fun hideKeyboard(view: View?) {
+ if (view != null) {
+ val imm: InputMethodManager =
+ requireContext().getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+ imm.hideSoftInputFromWindow(view.windowToken, 0)
+ }
+ }
}
fun TextInputEditText.clearText() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt
index 7ff912e3c..ccf12b4b4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt
@@ -72,7 +72,7 @@ class LibraryPreferenceDialog : DialogFragment() {
categoryAdapter.categoryInfos = PreferenceUtil.defaultCategories
}
.setNegativeButton(android.R.string.cancel, null)
- .setPositiveButton(android.R.string.ok) { _, _ -> updateCategories(categoryAdapter.categoryInfos) }
+ .setPositiveButton( R.string.done) { _, _ -> updateCategories(categoryAdapter.categoryInfos) }
.setView(view)
.create()
.colorButtons()
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
index 3c4614008..4d4746af0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
@@ -94,7 +94,7 @@ object MusicUtil : KoinComponent {
fun deleteAlbumArt(context: Context, albumId: Long) {
val contentResolver = context.contentResolver
val localUri = Uri.parse("content://media/external/audio/albumart")
- contentResolver.delete(ContentUris.withAppendedId(localUri, albumId.toLong()), null, null)
+ contentResolver.delete(ContentUris.withAppendedId(localUri, albumId), null, null)
contentResolver.notifyChange(localUri, null)
}
@@ -165,7 +165,7 @@ object MusicUtil : KoinComponent {
try {
val newLyrics =
FileUtil.read(f)
- if (newLyrics != null && !newLyrics.trim { it <= ' ' }.isEmpty()) {
+ if (newLyrics != null && newLyrics.trim { it <= ' ' }.isNotEmpty()) {
if (AbsSynchronizedLyrics.isSynchronized(newLyrics)) {
return newLyrics
}
@@ -283,9 +283,8 @@ object MusicUtil : KoinComponent {
path: String?
) {
val contentResolver = context.contentResolver
- val artworkUri =
- Uri.parse("content://media/external/audio/albumart")
- contentResolver.delete(ContentUris.withAppendedId(artworkUri, albumId.toLong()), null, null)
+ val artworkUri = Uri.parse("content://media/external/audio/albumart")
+ contentResolver.delete(ContentUris.withAppendedId(artworkUri, albumId), null, null)
val values = ContentValues()
values.put("album_id", albumId)
values.put("_data", path)
@@ -444,9 +443,7 @@ object MusicUtil : KoinComponent {
}
fun deleteTracks(context: Context, songs: List) {
- val projection = arrayOf(
- BaseColumns._ID, MediaStore.MediaColumns.DATA
- )
+ val projection = arrayOf(BaseColumns._ID, MediaStore.MediaColumns.DATA)
val selection = StringBuilder()
selection.append(BaseColumns._ID + " IN (")
for (i in songs.indices) {
diff --git a/app/src/main/res/layout/item_list_quick_actions.xml b/app/src/main/res/layout/item_list_quick_actions.xml
index 1899825b5..1194bb555 100644
--- a/app/src/main/res/layout/item_list_quick_actions.xml
+++ b/app/src/main/res/layout/item_list_quick_actions.xml
@@ -12,59 +12,48 @@
~ See the GNU General Public License for more details.
-->
-
+ app:cornerRadius="8dp"
+ app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ app:cornerRadius="8dp"
+ app:layout_constraintBottom_toBottomOf="@+id/playAction"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintStart_toEndOf="@+id/playAction"
+ app:layout_constraintTop_toTopOf="@+id/playAction" />
-
-
-
-
-
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
index 22b376fc4..8ab634aa3 100644
--- a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
+++ b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
@@ -20,6 +20,7 @@
android:background="?attr/rectSelector"
android:descendantFocusability="blocksDescendants"
android:focusable="true"
+ android:minHeight="@dimen/md_listitem_height"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="0dp"
@@ -41,11 +42,7 @@
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center_vertical"
- android:minHeight="@dimen/md_listitem_height"
- android:paddingStart="@dimen/md_listitem_control_margin"
- android:paddingLeft="@dimen/md_listitem_control_margin"
- android:paddingTop="@dimen/md_listitem_vertical_margin_choice"
- android:paddingBottom="@dimen/md_listitem_vertical_margin_choice"
+ android:paddingHorizontal="16dp"
android:singleLine="true"
android:textAppearance="@style/TextViewNormal"
android:textColor="?android:attr/textColorPrimary"
diff --git a/build.gradle b/build.gradle
index c6c313625..4971f4b5d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:4.0.2'
+ classpath 'com.android.tools.build:gradle:4.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
def nav_version = "2.3.0"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index faacd9634..4237faf6b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Jun 06 02:12:18 IST 2020
+#Fri Nov 13 20:52:31 IST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
From bfe03a2b0667824591c7ef864c15061c83537afa Mon Sep 17 00:00:00 2001
From: Hemanth S
Date: Sat, 28 Nov 2020 14:33:54 +0530
Subject: [PATCH 26/26] Adding shuffle button
---
.../fragments/albums/AlbumDetailsFragment.kt | 13 -------------
.../retromusic/fragments/songs/SongsFragment.kt | 8 ++++----
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
index 3f351fe8b..cb06d353b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
@@ -31,7 +31,6 @@ import androidx.recyclerview.widget.DefaultItemAnimator
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import code.name.monkey.appthemehelper.common.ATHToolbarActivity.getToolbarBackgroundColor
-import code.name.monkey.appthemehelper.util.ATHUtil
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
import code.name.monkey.retromusic.EXTRA_ALBUM_ID
import code.name.monkey.retromusic.EXTRA_ARTIST_ID
@@ -64,7 +63,6 @@ import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.util.RetroUtil
import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
import com.bumptech.glide.Glide
-import com.google.android.material.transition.MaterialContainerTransform
import kotlinx.android.synthetic.main.fragment_album_content.*
import kotlinx.android.synthetic.main.fragment_album_details.*
import kotlinx.coroutines.Dispatchers
@@ -89,17 +87,6 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
private val savedSortOrder: String
get() = PreferenceUtil.albumDetailSongSortOrder
- private fun setUpTransitions() {
- val transform = MaterialContainerTransform()
- transform.setAllContainerColors(ATHUtil.resolveColor(requireContext(), R.attr.colorSurface))
- sharedElementEnterTransition = transform
- }
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setUpTransitions()
- }
-
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
setHasOptionsMenu(true)
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt
index 8ba0b0e84..c9f791412 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt
@@ -20,6 +20,7 @@ import androidx.annotation.LayoutRes
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.GridLayoutManager
import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
import code.name.monkey.retromusic.adapter.song.SongAdapter
import code.name.monkey.retromusic.extensions.surfaceColor
import code.name.monkey.retromusic.fragments.ReloadType
@@ -35,7 +36,7 @@ class SongsFragment : AbsRecyclerViewCustomGridSizeFragment gridSizeMenu.findItem(R.id.action_grid_size_1).isChecked =
- true
+ 1 -> gridSizeMenu.findItem(R.id.action_grid_size_1).isChecked = true
2 -> gridSizeMenu.findItem(R.id.action_grid_size_2).isChecked = true
3 -> gridSizeMenu.findItem(R.id.action_grid_size_3).isChecked = true
4 -> gridSizeMenu.findItem(R.id.action_grid_size_4).isChecked = true