Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix refactor code

Browse source
This commit is contained in:
Hemanth S 2020-05-07 12:27:24 +05:30
parent c3c5f7e829
commit 43bfc24ec5
21 changed files with 82 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
View file

@ -53,29 +53,13 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChan
viewPager.setPadding(40, 40, 40, 0)
viewPager.pageMargin = 0
viewPager.setPageTransformer(false, CarousalPagerTransformer(requireContext()))
}else{
} else {
viewPager.offscreenPageLimit = 2
viewPager.setPageTransformer(
true,
PreferenceUtil.getInstance(requireContext()).albumCoverTransform
)
}
/* if (PreferenceUtil.getInstance(requireContext()).carouselEffect() &&
!((nps == FULL) || (nps == ADAPTIVE) || (nps == FIT))
) {
viewPager.clipToPadding = false
viewPager.setPadding(40, 40, 40, 0)
viewPager.pageMargin = 0
viewPager.setPageTransformer(false, CarousalPagerTransformer(requireContext()))
} else if () {
} else {
viewPager.offscreenPageLimit = 2
viewPager.setPageTransformer(
true,
PreferenceUtil.getInstance(requireContext()).albumCoverTransform
)
}*/
}
override fun onDestroyView() {

6
app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
View file

@ -12,7 +12,7 @@ import androidx.core.view.ViewCompat
import androidx.recyclerview.widget.LinearLayoutManager
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.appthemehelper.util.*
import code.name.monkey.retromusic.CustomBottomSheetBehavior
import code.name.monkey.retromusic.RetroBottomSheetBehavior
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
@ -145,9 +145,9 @@ class ClassicPlayerFragment : AbsPlayerFragment(), View.OnLayoutChangeListener,
progressViewUpdateHelper.stop()
}
private fun getQueuePanel(): CustomBottomSheetBehavior<MaterialCardView> {
private fun getQueuePanel(): RetroBottomSheetBehavior<MaterialCardView> {
playerQueueSheet as MaterialCardView
return CustomBottomSheetBehavior.from(playerQueueSheet) as CustomBottomSheetBehavior<MaterialCardView>
return RetroBottomSheetBehavior.from(playerQueueSheet) as RetroBottomSheetBehavior<MaterialCardView>
}
private fun setupPanel() {

6
app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
View file

@ -20,6 +20,7 @@ import kotlinx.android.synthetic.main.fragment_color_player.*
class ColorFragment : AbsPlayerFragment() {
private var lastColor: Int = 0
private var navigationColor: Int = 0
private lateinit var playbackControlsFragment: ColorPlaybackControlsFragment
private var valueAnimator: ValueAnimator? = null
@ -28,11 +29,12 @@ class ColorFragment : AbsPlayerFragment() {
}
override val paletteColor: Int
get() = lastColor
get() = navigationColor
override fun onColorChanged(color: MediaNotificationProcessor) {
playbackControlsFragment.setDark(color)
lastColor = color.backgroundColor
navigationColor = color.backgroundColor
lastColor = color.secondaryTextColor
callbacks?.onPaletteColorChanged()
ToolbarContentTintHelper.colorizeToolbar(