diff --git a/app/build.gradle b/app/build.gradle
index f992d3199..5ccf5d413 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,8 +31,8 @@ android {
vectorDrawables.useSupportLibrary = true
applicationId "code.name.monkey.retromusic"
- versionCode 334
- versionName '3.1.900'
+ versionCode 336
+ versionName '3.2.100'
multiDexEnabled true
diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index 07c6c59f3..f608e39ba 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -1 +1 @@
-
We're really sorry for Announcing this Retro Music is driving towards pure Android Material
Design guidelines we don't want any unnecessary UI elements that don't need for Music
player.
v3.2.000
- Implemented Artist image loading all thanks to VinylMusicPlayer
- Fixed buttons in Genre details
v3.1.900
- Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist
Details etc.
- Home toolbar is semi transparent in Banner mode
- Added new Buy Retro Music pro in settings
- Improved dark color in Dark theme
v3.1.850
- Toolbar will be clickable for Search
v3.1.800
- Search bar CardView background
- Improve volume zero
- Now playing and Album theme picker rollback to dialog
- Fix sharing app link
- Fix scanning dialog
- Added settings icons for options
v3.1.700
- Cleaned internal code
- Removed full screen option
- Added Toolbar elevation
- To access menu either tap on Toolbar or Hamburger icon
- Fix back button not working on playing queue
- Fix crashing on What's New screen
- Fix lyrics dialog
- Changed toggles to line icons
- Custom UserImageView for loading user profile image
- Fix crashing on artist list for number format error
- Fix blacklist dialog crashing
- Rearranged icons and main menu access
- Fix some crashes when device is locked or background
- Folder screen have main options access
- Dialogs are now using Material Dialogs v3(BottomSheet)
- Fix Shuffle icon for Artist, Album, Genre and Playlist details
v3.1.400
- Removed sync lyrics for Android 5
- Fix Seek-bar color in settings
- Added keyboard to popup on search
- Added keyboard to popup on search
- Improved lock-screen behavior and UI
- Improved text appearance
- Fix bio text not showing in settings
- Fix not showing slider(blur, filter song) amount in settings
- Fix setting ringtone
- Fix file sharing crash
- Fix some crashes
- Fix playlist icon on small devices
- Fix empty lyrics text color
- Fix album cover background purple color in color theme
v3.1.300
- Fix rename playlist text color
- Fix same album showing in details page
- Fix lyrics text alignment on sync and lyrics reading improved
- Improved home sections loading
- Removed library options which are duplicated (it's available from profile menu)
- Replaced collapsing Fab with Android Floating Extended Fab
- Replaced home with for you
- Fixed profile image not loading in about
- Improved selecting user profile image
- Added bio to enter custom message
- Improved some UI screens
v3.1.240
- Fix Search not showing from home screen
- Fix Volume controls color issue
- Fix Seek bar alignment
- Added tiny theme
- Improved full theme appearances
- Now playing theme preview updated
- Fix composer error
- Bottom Options improved(internal)
v3.1.200
- Added composer sort and editing
- Fix Crash in Album tag editor while selecting options
- Added Filter song length
- Added Favourites playlist icon will be accent color
- Added Colorful settings icons
- Added Corners for dialog
v3.0.570
- Fix Album/Artist square image
- Fix Delete dialog text format
- Fix Profile picture not showing after coming back from folders
- Fix Play button color i Simple and Plain themes
- Fix Sleep timer dialog crashing
- Fix Share song dialog title and text
If you see entire app white or dark or black select same theme in settings to fix
FAQ's
*If you face any UI related issues you clear app data and cache, if its
not working try to
uninstall and install again.
\ No newline at end of file
+
We're really sorry for Announcing this Retro Music is driving towards pure Android Material
Design guidelines we don't want any unnecessary UI elements that don't need for Music
player.
v3.2.100
- Fix crashing on Sleep timer
v3.2.000
- Implemented Artist image loading all thanks to VinylMusicPlayer
- Fixed buttons in Genre details
- Fixed color buttons in Album and Artist details screen
v3.1.900
- Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist
Details etc.
- Home toolbar is semi transparent in Banner mode
- Added new Buy Retro Music pro in settings
- Improved dark color in Dark theme
v3.1.850
- Toolbar will be clickable for Search
v3.1.800
- Search bar CardView background
- Improve volume zero
- Now playing and Album theme picker rollback to dialog
- Fix sharing app link
- Fix scanning dialog
- Added settings icons for options
v3.1.700
- Cleaned internal code
- Removed full screen option
- Added Toolbar elevation
- To access menu either tap on Toolbar or Hamburger icon
- Fix back button not working on playing queue
- Fix crashing on What's New screen
- Fix lyrics dialog
- Changed toggles to line icons
- Custom UserImageView for loading user profile image
- Fix crashing on artist list for number format error
- Fix blacklist dialog crashing
- Rearranged icons and main menu access
- Fix some crashes when device is locked or background
- Folder screen have main options access
- Dialogs are now using Material Dialogs v3(BottomSheet)
- Fix Shuffle icon for Artist, Album, Genre and Playlist details
v3.1.400
- Removed sync lyrics for Android 5
- Fix Seek-bar color in settings
- Added keyboard to popup on search
- Added keyboard to popup on search
- Improved lock-screen behavior and UI
- Improved text appearance
- Fix bio text not showing in settings
- Fix not showing slider(blur, filter song) amount in settings
- Fix setting ringtone
- Fix file sharing crash
- Fix some crashes
- Fix playlist icon on small devices
- Fix empty lyrics text color
- Fix album cover background purple color in color theme
v3.1.300
- Fix rename playlist text color
- Fix same album showing in details page
- Fix lyrics text alignment on sync and lyrics reading improved
- Improved home sections loading
- Removed library options which are duplicated (it's available from profile menu)
- Replaced collapsing Fab with Android Floating Extended Fab
- Replaced home with for you
- Fixed profile image not loading in about
- Improved selecting user profile image
- Added bio to enter custom message
- Improved some UI screens
v3.1.240
- Fix Search not showing from home screen
- Fix Volume controls color issue
- Fix Seek bar alignment
- Added tiny theme
- Improved full theme appearances
- Now playing theme preview updated
- Fix composer error
- Bottom Options improved(internal)
v3.1.200
- Added composer sort and editing
- Fix Crash in Album tag editor while selecting options
- Added Filter song length
- Added Favourites playlist icon will be accent color
- Added Colorful settings icons
- Added Corners for dialog
v3.0.570
- Fix Album/Artist square image
- Fix Delete dialog text format
- Fix Profile picture not showing after coming back from folders
- Fix Play button color i Simple and Plain themes
- Fix Sleep timer dialog crashing
- Fix Share song dialog title and text
If you see entire app white or dark or black select same theme in settings to fix
FAQ's
*If you face any UI related issues you clear app data and cache, if its
not working try to
uninstall and install again.
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/Constants.kt b/app/src/main/java/code/name/monkey/retromusic/Constants.kt
index e4781b1cf..2ff0d03fe 100644
--- a/app/src/main/java/code/name/monkey/retromusic/Constants.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/Constants.kt
@@ -19,9 +19,6 @@ import android.provider.MediaStore
object Constants {
- @JvmField
- val DISCORD_LINK = "https://discord.gg/qTecXXn"
-
@JvmField
val RETRO_MUSIC_PACKAGE_NAME = "code.name.monkey.retromusic"
@JvmField
@@ -66,10 +63,8 @@ object Constants {
@JvmField
val MEDIA_STORE_CHANGED = "$RETRO_MUSIC_PACKAGE_NAME.mediastorechanged"
const val RATE_ON_GOOGLE_PLAY = "https://play.google.com/store/apps/details?id=code.name.monkey.retromusic"
- const val PAYPAL_ME_URL = "https://www.paypal.me/h4h14"
const val TRANSLATE = "http://monkeycodeapp.oneskyapp.com/collaboration/project?id=238534"
const val GITHUB_PROJECT = "https://github.com/h4h13/RetroMusicPlayer"
- const val BASE_API_URL_KUGOU = "http://lyrics.kugou.com/"
const val TELEGRAM_CHANGE_LOG = "https://t.me/retromusiclog"
const val USER_PROFILE = "profile.jpg"
const val USER_BANNER = "banner.jpg"
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
index bdd88e92c..b6fbb822e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
@@ -14,7 +14,6 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
import code.name.monkey.retromusic.Constants.APP_INSTAGRAM_LINK
import code.name.monkey.retromusic.Constants.APP_TELEGRAM_LINK
import code.name.monkey.retromusic.Constants.APP_TWITTER_LINK
-import code.name.monkey.retromusic.Constants.DISCORD_LINK
import code.name.monkey.retromusic.Constants.FAQ_LINK
import code.name.monkey.retromusic.Constants.GITHUB_PROJECT
import code.name.monkey.retromusic.Constants.PINTEREST
@@ -118,7 +117,6 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener {
R.id.pinterestLink -> openUrl(PINTEREST)
R.id.faqLink -> openUrl(FAQ_LINK)
R.id.telegramLink -> openUrl(APP_TELEGRAM_LINK)
- R.id.discordLink -> openUrl(DISCORD_LINK)
R.id.appGithub -> openUrl(GITHUB_PROJECT)
R.id.appTranslation -> openUrl(TRANSLATE)
R.id.appRate -> openUrl(RATE_ON_GOOGLE_PLAY)
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
index 91fe80f03..9152abf5b 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
@@ -2,7 +2,6 @@ package code.name.monkey.retromusic.activities
import android.app.Activity
import android.content.Intent
-import android.content.res.ColorStateList
import android.graphics.Color
import android.graphics.drawable.Drawable
import android.os.Build
@@ -37,12 +36,7 @@ import code.name.monkey.retromusic.rest.LastFMRestClient
import code.name.monkey.retromusic.rest.model.LastFmArtist
import code.name.monkey.retromusic.util.*
import com.google.android.material.appbar.AppBarLayout
-import kotlinx.android.synthetic.main.activity_album_content.*
import kotlinx.android.synthetic.main.activity_artist_content.*
-import kotlinx.android.synthetic.main.activity_artist_content.playAction
-import kotlinx.android.synthetic.main.activity_artist_content.recyclerView
-import kotlinx.android.synthetic.main.activity_artist_content.shuffleAction
-import kotlinx.android.synthetic.main.activity_artist_content.songTitle
import kotlinx.android.synthetic.main.activity_artist_details.*
import retrofit2.Call
import retrofit2.Callback
@@ -242,12 +236,12 @@ class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailContrac
//TransitionManager.beginDelayedTransition(titleContainer);
biographyText.visibility = View.VISIBLE
biographyTitle.visibility = View.VISIBLE
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
- biography = Html.fromHtml(bioContent, Html.FROM_HTML_MODE_LEGACY)
+ biography = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ Html.fromHtml(bioContent, Html.FROM_HTML_MODE_LEGACY)
} else {
- biography = Html.fromHtml(bioContent)
+ Html.fromHtml(bioContent)
}
- biographyText!!.text = biography
+ biographyText.text = biography
}
}
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt
index 408f1b754..49adc9b8f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.kt
@@ -64,14 +64,10 @@ open class MediaEntryViewHolder(view: View) : RecyclerView.ViewHolder(view), Vie
playSongs = view.findViewById(R.id.playSongs)
view.setOnClickListener(this@MediaEntryViewHolder)
- view.setOnLongClickListener(this)
+ view.setOnLongClickListener(this@MediaEntryViewHolder)
+
+ imageContainerCard?.setCardBackgroundColor(ThemeStore.primaryColor(itemView.context))
- if (imageTextContainer != null) {
- imageTextContainer!!.setCardBackgroundColor(ThemeStore.primaryColor(itemView.context))
- }
- if (imageContainerCard != null) {
- imageContainerCard!!.setCardBackgroundColor(ThemeStore.primaryColor(itemView.context))
- }
}
fun setImageTransitionName(transitionName: String) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
index 9819269ac..effce02f3 100755
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
@@ -203,7 +203,10 @@ class PlaylistAdapter(protected val activity: AppCompatActivity, dataSet: ArrayL
popupMenu.show()
}
- imageTextContainer?.cardElevation = 0f
+ imageTextContainer?.apply {
+ cardElevation = 0f
+ setCardBackgroundColor(ThemeStore.primaryColor(itemView.context))
+ }
}
override fun onClick(v: View?) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
index 4ae77091a..b0eb5f5ea 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
@@ -42,9 +42,6 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
R.id.actionFolders -> mainActivity.selectedFragment(R.id.action_folder)
R.id.actionLibrary -> mainActivity.selectedFragment(PreferenceUtil.getInstance().lastPage)
R.id.actionSettings -> NavigationUtil.goToSettings(mainActivity)
- R.id.actionSleepTimer -> if (fragmentManager != null) {
- SleepTimerDialog().show(fragmentManager!!, TAG)
- }
R.id.actionRate -> NavigationUtil.goToPlayStore(mainActivity)
R.id.actionShare -> shareApp()
R.id.actionBugReport -> prepareBugReport()
@@ -67,7 +64,6 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
}
private lateinit var actionSettings: View
- private lateinit var actionSleepTimer: View
private lateinit var actionLibrary: View
private lateinit var actionEqualizer: View
private lateinit var actionFolders: View
@@ -79,7 +75,6 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
val layout = LayoutInflater.from(context).inflate(R.layout.fragment_main_options, null)
actionSettings = layout.findViewById(R.id.actionSettings)
- actionSleepTimer = layout.findViewById(R.id.actionSleepTimer)
actionLibrary = layout.findViewById(R.id.actionLibrary)
actionEqualizer = layout.findViewById(R.id.actionEqualizer)
actionFolders = layout.findViewById(R.id.actionFolders)
@@ -88,7 +83,6 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
actionBugReport = layout.findViewById(R.id.actionBugReport)
actionSettings.setOnClickListener(this)
- actionSleepTimer.setOnClickListener(this)
actionLibrary.setOnClickListener(this)
actionEqualizer.setOnClickListener(this)
actionFolders.setOnClickListener(this)
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt
index d46e16bba..9691d60ab 100755
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt
@@ -146,7 +146,7 @@ class SleepTimerDialog : DialogFragment() {
}
- private fun makeTimerPendingIntent(flag: Int): PendingIntent {
+ private fun makeTimerPendingIntent(flag: Int): PendingIntent? {
return PendingIntent.getService(activity, 0, makeTimerIntent(), flag)
}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
index 884caf4d7..1d5856279 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
@@ -731,6 +731,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
ProgressDialog dialog = new ProgressDialog(context);
dialog.setIndeterminate(true);
dialog.setTitle(R.string.listing_files);
+ dialog.setCancelable(false);
dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
dialog.setOnCancelListener(dialog1 -> cancel(false));
dialog.setOnDismissListener(dialog1 -> cancel(false));
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt
index c0ee28b3e..34281a592 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt
@@ -35,7 +35,7 @@ import io.reactivex.disposables.CompositeDisposable
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.abs_playlists.*
import kotlinx.android.synthetic.main.fragment_banner_home.*
-import kotlinx.android.synthetic.main.fragment_home.recyclerView
+import kotlinx.android.synthetic.main.home_content.*
import java.io.File
import java.util.*
import kotlin.collections.ArrayList
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java b/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
index 48322d027..b0e052247 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
@@ -18,6 +18,7 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.media.MediaScannerConnection;
import android.net.Uri;
+import android.os.Build;
import android.widget.Toast;
import java.lang.ref.WeakReference;
@@ -57,7 +58,17 @@ public class UpdateToastMediaScannerCompletionListener implements MediaScannerCo
}
String text = " " + String.format(scannedFiles, scanned, toBeScanned.length) + (failed > 0 ? " " + String.format(couldNotScanFiles, failed) : "");
toast.setText(text);
- toast.show();
+ try {
+ if (toast.getView().isShown()) {
+ toast.cancel();
+ }
+ if (Build.VERSION.SDK_INT < 28 && toast.getView().isShown()) {
+ toast.cancel();
+ }
+ toast.show();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
});
}
}
diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
index 3bd0cf62b..40f7e9a96 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -71,8 +71,8 @@
android:id="@+id/toolbar"
style="@style/Toolbar"
app:title="@string/search_hint"
- app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Body1"
app:titleMarginStart="0dp"
+ app:titleTextAppearance="@style/TextAppearance.MaterialComponents.Body1"
tools:ignore="UnusedAttribute" />
@@ -94,24 +94,7 @@
android:layout_height="match_parent"
app:cardCornerRadius="12dp">
-
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index 3586ddc39..00a8d4f7e 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -53,24 +53,7 @@
android:layout_marginEnd="@dimen/horizontal_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
index 2955e154a..486b4c972 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
@@ -91,23 +91,7 @@
android:layout_marginEnd="128dp"
app:cardCornerRadius="12dp">
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout-xlarge-land/fragment_home.xml b/app/src/main/res/layout-xlarge-land/fragment_home.xml
index 7da43fdf9..0ddbc4f09 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml
@@ -53,24 +53,7 @@
android:layout_marginEnd="128dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout-xlarge/fragment_banner_home.xml b/app/src/main/res/layout-xlarge/fragment_banner_home.xml
index bf1489e46..ec497ccad 100644
--- a/app/src/main/res/layout-xlarge/fragment_banner_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_banner_home.xml
@@ -91,23 +91,7 @@
android:layout_marginEnd="64dp"
app:cardCornerRadius="12dp">
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout-xlarge/fragment_home.xml b/app/src/main/res/layout-xlarge/fragment_home.xml
index 79d4afd1c..38b526490 100644
--- a/app/src/main/res/layout-xlarge/fragment_home.xml
+++ b/app/src/main/res/layout-xlarge/fragment_home.xml
@@ -56,23 +56,7 @@
android:background="@color/md_white_1000"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml
index e61853de8..ffd6cccb7 100644
--- a/app/src/main/res/layout/card_social.xml
+++ b/app/src/main/res/layout/card_social.xml
@@ -149,49 +149,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -84,25 +84,7 @@
android:layout_height="wrap_content"
app:cardCornerRadius="12dp">
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml
index fb41be13f..f044916e1 100644
--- a/app/src/main/res/layout/fragment_classic_player.xml
+++ b/app/src/main/res/layout/fragment_classic_player.xml
@@ -100,6 +100,7 @@
sothree:cardCornerRadius="12dp">
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 9035d32f6..616bd6eb5 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -36,8 +36,8 @@
@@ -49,24 +49,7 @@
android:layout_weight="1"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-
-
-
-
-
+
diff --git a/app/src/main/res/layout/fragment_main_options.xml b/app/src/main/res/layout/fragment_main_options.xml
index 4a46b6cb9..1af6272cd 100644
--- a/app/src/main/res/layout/fragment_main_options.xml
+++ b/app/src/main/res/layout/fragment_main_options.xml
@@ -47,16 +47,6 @@
app:optionIcon="@drawable/ic_equalizer_white_24dp"
app:optionTitle="@string/equalizer" />
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 4d8d0a03e..d6a856929 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -117,8 +117,6 @@ https://play.google.com/store/apps/details?id=%s
%1$d؟]]>
%1$d؟]]>
تم حذف %1$d الأغاني.
- ديسكود
- لمواكبة آخر الأخبار انضمام إلى Discord
هل تريد إزالة القائمة السوداء؟
%1$s من القائمة السوداء]]>
تبرع
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index f148b332c..d56cfbed9 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -116,8 +116,6 @@
%1$d плейлисти?]]>
%1$d песни?]]>
Изтрити %1$d песни.
- Discord
- Присъедини се към Discord сървъра за актуални новини
Да се изчисти ли черният списък?
%1$s от черния списък?]]>
Дарения
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 438bae732..ee7a3fd06 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -116,8 +116,6 @@
%1$d gelöscht werden?]]>
%1$d gelöscht werden?]]>
%1$d Song(s) wurden gelöscht.
- Discord
- Trete dem Discord-Server bei und erhalte Neuigkeiten schneller
Möchtest du die schwarze Liste leeren?
%1$s von der schwarzen Liste entfernen?]]>
Spenden
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 04d87a75c..88a9aee7d 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -116,8 +116,6 @@
%1$d listas de reproducción?]]>
%1$d canciones?]]>
Se han eliminado %1$d canciones.
- Discord
- Únete al servidor de Discord para mantenerte al día con las últimas noticias
¿Quieres limpiar la lista negra?
%1$s de la lista negra?]]>
Donar
diff --git a/app/src/main/res/values-es-rUS/strings.xml b/app/src/main/res/values-es-rUS/strings.xml
index 68049cf6f..9ec404fed 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -117,8 +117,6 @@
%1$d listas?]]>
%1$d canciones?]]>
Se eliminaron %1$d canciones
- Discord
- Únete al servidor de Discord para mantenerte al día con las últimas noticias
¿Deseas limpiar la lista negra?
%1$s de la lista negra?]]>
Donar
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 73a554492..c4eef6a3a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -117,8 +117,6 @@
%1$d listas de reproducción?]]>
%1$d canciones?]]>
%1$d canciones eliminadas.
- Discord
- Únete al servidor de Discord para mantenerte al día con las últimas noticias
¿Quieres limpiar la lista negra?
%1$s de la lista negra?]]>
Donar
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 8fd9713e6..e039db8a6 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -116,8 +116,6 @@
%1$d erreprodukzio zerrenda ezabatu?]]>
%1$d abesti ezabatu?]]>
%1$d abesti ezabatu dira
- Discord
- Batu Discord-eko zerbitzaria azken berriak jasotzeko
Zerrenda beltza garbitu nahi duzu?
%1$s zerrenda beltzetik ezabatu nahi duzu?]]>
Lagundu diruz
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index b64202698..ffd1af0f9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -116,8 +116,6 @@
%1$d ?]]>
%1$d ?]]>
%1$d à été supprimé.
- Discord
- Rejoignez le serveur Discord pour rester au courant des dernières nouveautés
Voulez vous vraiment vider la liste noire ?
%1$s de la liste noire ?]]>
Faire un don
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 75097fbff..b64115947 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -116,8 +116,6 @@
%1$d popisa naslova?]]>
%1$d pjesama?]]>
Izbrisano je %1$d pjesama.
- Discord
- Pridružite se Discord serveru kako bi bili u toku sa novostima
Želite li očistiti crni popis?
%1$s sa crnog popisa?]]>
Doniraj
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1f1c91edc..fdc3b1127 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -113,8 +113,6 @@
%1$d lejátszási listát?]]>
%1$d zenét?]]>
Törölte a %1$d zenét.
- Discord
- Csatlakozz a DIscord szerverre és ne maradj le az új hírekről
Szeretné törölni a feketelistát?
%1$s a feketelistáról?]]>
Támogatás
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index f9aa7fb75..67498af62 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -114,8 +114,6 @@ https://play.google.com/store/apps/details?id=%s
%1$d daftar putar?]]>
%1$d lagu?]]>
Lagu %1$d dihapus
- Discord
- Bergabung dengan server DIscord untuk mengetahui berita terbaru
Bersihkan daftar hitam?
%1$s dari
Daftar hitam?]]>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ef01e33fa..3d5b50608 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -116,8 +116,6 @@
%1$d playlist?]]>
%1$d brani?]]>
Eliminati %1$d brani
- Discord
- Unisciti al server Discord per tenerti aggiornato con le ultime notizie
Vuoi cancellare la blacklist?
%1$s dalla blacklist?]]>
Dona
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c6becda40..60ac38738 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -116,8 +116,6 @@
%1$d ?]]>
%1$d ?]]>
Usunięto %1$d utworów.
- Discord
- Dołącz do serwera Discord, aby być na bieżąco z najnowszymi newsami
Czy chcesz wyczyścić czarną listę?
%1$s z czarnej listy?]]>
Wesprzyj nas
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a4d2c1b8a..b390cd703 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -117,8 +117,6 @@ https://play.google.com/store/apps/details?id=%s
%1$d playlists?]]>
%1$d músicas?]]>
%1$d músicas foram excluídas
- Discord
- Entre no servidor no Discord para acompanhar as últimas notícias
Deseja limpar a lista negra?
%1$s da lista negra?]]>
Doar
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 6b53b1ffd..fef1f5b32 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -116,8 +116,6 @@
%1$d плейлистов?]]>
%1$d треков?]]>
Удалено %1$d треков.
- Discord
- Присоединяйтесь к серверу Discord, чтобы следить за последними новостями
Хотите очистить черный список?
%1$s из черного списка?]]>
Пожертвовать
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c73106aea..7bb95b165 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -116,8 +116,6 @@
%1$d çalma listeleri silinsin mi?]]>
%1$d parçaları silinsin mi?]]>
%1$d parça silindi.
- Discord
- En son gelişmelerden haberdar olmak için Discord\'a katılın
Kara listeyi temizlemek istiyor musunuz?
%1$s parçasını kaldırmak istiyor musunuz?]]>
Bağış
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 23940a8dc..a3687e226 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -113,8 +113,6 @@
%1$d danh sách phát?]]>
%1$d bài hát?]]>
Đã xoá %1$d bài hát.
- Discord
- Tham gia vào máy chủ Discord để cập nhật tin tức mới nhất
Bạn có muốn xóa danh sách đen?
%1$s khỏi danh sách đen?]]>
Ủng hộ
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 037ccf786..3f94c0a01 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -113,8 +113,6 @@
%1$s 吗?]]>
%1$s 吗?]]>
已删除 %1$d 首歌曲
- 不谐和
- 加入Discord服务器以了解最新消息
你想清除黑名单吗?
%1$s 吗?]]>
捐赠
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index a5f35d718..c6a06be8b 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -116,8 +116,6 @@
%1$d個播放清單嗎?]]>
%1$d個歌曲嗎?]]>
已刪除%1$d首歌曲。
- Discord
- 加入Discord伺服器來了解最新消息
要清除黑名單嗎?
%1$s由黑名單移除嗎?]]>
捐款
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 995f1e837..85d453c17 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -155,9 +155,6 @@
Delete songs
Deleted %1$d songs.
- Discord
- Join the Discord server to keep up with the latest news
-
Do you want to clear the blacklist?
%1$s from the blacklist?]]>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 3160afbd6..5c0f49802 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -106,12 +106,11 @@
- false
-