diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt index e76aeaa04..bb7b8491c 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt @@ -4,16 +4,13 @@ import android.graphics.Color import android.view.ActionMode import android.view.Menu import android.view.MenuItem -import android.view.View import androidx.activity.OnBackPressedCallback import androidx.annotation.MenuRes -import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentActivity import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.util.VersionUtils import code.name.monkey.retromusic.R import code.name.monkey.retromusic.databinding.NumberRollViewBinding -import code.name.monkey.retromusic.extensions.rootView import code.name.monkey.retromusic.views.NumberRollView abstract class AbsMultiSelectAdapter( 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 02764b1a0..a83f27e10 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 @@ -14,7 +14,6 @@ */ package code.name.monkey.retromusic.extensions -import android.R import android.animation.Animator import android.animation.ObjectAnimator import android.animation.ValueAnimator @@ -72,7 +71,7 @@ fun EditText.appHandleColor(): EditText { fun NavigationBarView.setItemColors(@ColorInt normalColor: Int, @ColorInt selectedColor: Int) { val csl = ColorStateList( - arrayOf(intArrayOf(-R.attr.state_checked), intArrayOf(R.attr.state_checked)), + arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)), intArrayOf(normalColor, selectedColor) ) itemIconTintList = csl diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt index 93d10ee54..4af6750dc 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt @@ -21,7 +21,6 @@ import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager -import androidx.transition.Fade import code.name.monkey.retromusic.EXTRA_ALBUM_ID import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt index 363ee6458..a2980e382 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt @@ -340,12 +340,12 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics), lyricsType = if (!loadLRCLyrics()) { binding.lyricsView.isVisible = false loadNormalLyrics() - LyricsType.SYNCED_LYRICS + LyricsType.NORMAL_LYRICS } else { binding.normalLyrics.isVisible = false binding.noLyricsFound.isVisible = false binding.lyricsView.isVisible = true - LyricsType.NORMAL_LYRICS + LyricsType.SYNCED_LYRICS } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt index d3ea66bfd..39a19ab5d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt @@ -20,7 +20,6 @@ import android.view.Menu import android.view.MenuInflater import android.view.MenuItem import android.view.View -import androidx.activity.addCallback import androidx.core.os.bundleOf import androidx.core.view.doOnPreDraw import androidx.core.view.isVisible