Fixed lyrics editing dialog
This commit is contained in:
parent
f30578d5fc
commit
7c0547b085
5 changed files with 3 additions and 9 deletions
|
@ -4,16 +4,13 @@ import android.graphics.Color
|
||||||
import android.view.ActionMode
|
import android.view.ActionMode
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
import android.view.View
|
|
||||||
import androidx.activity.OnBackPressedCallback
|
import androidx.activity.OnBackPressedCallback
|
||||||
import androidx.annotation.MenuRes
|
import androidx.annotation.MenuRes
|
||||||
import androidx.core.content.ContextCompat
|
|
||||||
import androidx.fragment.app.FragmentActivity
|
import androidx.fragment.app.FragmentActivity
|
||||||
import androidx.recyclerview.widget.RecyclerView
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
import code.name.monkey.appthemehelper.util.VersionUtils
|
import code.name.monkey.appthemehelper.util.VersionUtils
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.databinding.NumberRollViewBinding
|
import code.name.monkey.retromusic.databinding.NumberRollViewBinding
|
||||||
import code.name.monkey.retromusic.extensions.rootView
|
|
||||||
import code.name.monkey.retromusic.views.NumberRollView
|
import code.name.monkey.retromusic.views.NumberRollView
|
||||||
|
|
||||||
abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
|
abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
*/
|
*/
|
||||||
package code.name.monkey.retromusic.extensions
|
package code.name.monkey.retromusic.extensions
|
||||||
|
|
||||||
import android.R
|
|
||||||
import android.animation.Animator
|
import android.animation.Animator
|
||||||
import android.animation.ObjectAnimator
|
import android.animation.ObjectAnimator
|
||||||
import android.animation.ValueAnimator
|
import android.animation.ValueAnimator
|
||||||
|
@ -72,7 +71,7 @@ fun EditText.appHandleColor(): EditText {
|
||||||
|
|
||||||
fun NavigationBarView.setItemColors(@ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
|
fun NavigationBarView.setItemColors(@ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
|
||||||
val csl = ColorStateList(
|
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)
|
intArrayOf(normalColor, selectedColor)
|
||||||
)
|
)
|
||||||
itemIconTintList = csl
|
itemIconTintList = csl
|
||||||
|
|
|
@ -21,7 +21,6 @@ import androidx.navigation.fragment.findNavController
|
||||||
import androidx.recyclerview.widget.DefaultItemAnimator
|
import androidx.recyclerview.widget.DefaultItemAnimator
|
||||||
import androidx.recyclerview.widget.GridLayoutManager
|
import androidx.recyclerview.widget.GridLayoutManager
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import androidx.transition.Fade
|
|
||||||
import code.name.monkey.retromusic.EXTRA_ALBUM_ID
|
import code.name.monkey.retromusic.EXTRA_ALBUM_ID
|
||||||
import code.name.monkey.retromusic.R
|
import code.name.monkey.retromusic.R
|
||||||
import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
|
import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
|
||||||
|
|
|
@ -340,12 +340,12 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
|
||||||
lyricsType = if (!loadLRCLyrics()) {
|
lyricsType = if (!loadLRCLyrics()) {
|
||||||
binding.lyricsView.isVisible = false
|
binding.lyricsView.isVisible = false
|
||||||
loadNormalLyrics()
|
loadNormalLyrics()
|
||||||
LyricsType.SYNCED_LYRICS
|
LyricsType.NORMAL_LYRICS
|
||||||
} else {
|
} else {
|
||||||
binding.normalLyrics.isVisible = false
|
binding.normalLyrics.isVisible = false
|
||||||
binding.noLyricsFound.isVisible = false
|
binding.noLyricsFound.isVisible = false
|
||||||
binding.lyricsView.isVisible = true
|
binding.lyricsView.isVisible = true
|
||||||
LyricsType.NORMAL_LYRICS
|
LyricsType.SYNCED_LYRICS
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@ import android.view.Menu
|
||||||
import android.view.MenuInflater
|
import android.view.MenuInflater
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import androidx.activity.addCallback
|
|
||||||
import androidx.core.os.bundleOf
|
import androidx.core.os.bundleOf
|
||||||
import androidx.core.view.doOnPreDraw
|
import androidx.core.view.doOnPreDraw
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue