From 1cbfa3da1378b389cd17db8c78bb34b64c6852d2 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Wed, 31 Jul 2019 10:49:28 +0530 Subject: [PATCH] Hot fix for Album cover and Volume icons tint --- app/build.gradle | 7 ++----- .../retromusic/adapter/album/AlbumCoverPagerAdapter.kt | 9 ++++----- .../name/monkey/retromusic/fragments/VolumeFragment.kt | 2 -- .../fragments/player/PlayerAlbumCoverFragment.kt | 2 +- .../player/blur/BlurPlaybackControlsFragment.kt | 2 +- .../main/res/layout/fragment_album_carousel_cover.xml | 3 ++- app/src/main/res/layout/fragment_album_cover.xml | 6 +++--- 7 files changed, 13 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d530e270..510fe8dc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,8 +31,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 343 - versionName '3.2.200' + versionCode 344 + versionName '3.2.203' multiDexEnabled true @@ -52,14 +52,11 @@ android { minifyEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - resValue "string", "cast_app_id", "BA9C3F5E" signingConfig signingConfigs.release } debug { applicationIdSuffix '.debug' versionNameSuffix ' DEBUG (' + gitBranch() + ')' - resValue "string", "cast_app_id", "BA9C3F5E" - } } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt index 6d020852..a7e99635 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt @@ -91,11 +91,10 @@ class AlbumCoverPagerAdapter(fm: FragmentManager, private val dataSet: ArrayList } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - var finalLayout = layout - if (PreferenceUtil.getInstance().nowPlayingScreen == NowPlayingScreen.CLASSIC) { - finalLayout = R.layout.fragment_album_full_cover - } else if (PreferenceUtil.getInstance().carouselEffect()) { - finalLayout= R.layout.fragment_album_carousel_cover; + val finalLayout = when { + PreferenceUtil.getInstance().nowPlayingScreen == NowPlayingScreen.CLASSIC -> R.layout.fragment_album_full_cover + PreferenceUtil.getInstance().carouselEffect() -> R.layout.fragment_album_carousel_cover + else -> layout } val view = inflater.inflate(finalLayout, container, false) albumCover = view.findViewById(R.id.player_image) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt index b78c6645..69674fae 100755 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt @@ -111,8 +111,6 @@ class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolum fun setTintable(color: Int) { ViewUtil.setProgressDrawable(volumeSeekBar, color, true) - volumeDown.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN) - volumeUp.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN) } fun removeThumb() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt index d0733f83..4908593d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt @@ -54,7 +54,7 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChan || (PreferenceUtil.getInstance().nowPlayingScreen == NowPlayingScreen.FIT))) { viewPager.clipToPadding = false viewPager.setPadding(40, 40, 40, 0) - viewPager.pageMargin = 16 + viewPager.pageMargin = 0 viewPager.setPageTransformer(false, CarousalPagerTransformer(requireContext())) } else { viewPager.offscreenPageLimit = 2 diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt index 63772209..2fbc0ab5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt @@ -124,7 +124,7 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() { text.setTextColor(colorFinal) TintHelper.setTintAuto(progressSlider, colorFinal, false) - volumeFragment?.setTintable(colorFinal) + volumeFragment?.setTintableColor(colorFinal) setFabColor(colorFinal) } diff --git a/app/src/main/res/layout/fragment_album_carousel_cover.xml b/app/src/main/res/layout/fragment_album_carousel_cover.xml index 61fd0bea..5986a5ca 100644 --- a/app/src/main/res/layout/fragment_album_carousel_cover.xml +++ b/app/src/main/res/layout/fragment_album_carousel_cover.xml @@ -25,7 +25,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - app:cardCornerRadius="8dp"> + app:cardCornerRadius="8dp" + app:cardUseCompatPadding="true"> + android:layout_margin="16dp" + app:cardElevation="6dp" + app:cardCornerRadius="8dp">