nyancrimew
/
PlayerAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hot fix for Album cover and Volume icons tint

main
h4h13 2019-07-31 10:49:28 +05:30
parent b7ed2488f2
commit 1cbfa3da13
7 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/build.gradle
View File

@ -31,8 +31,8 @@ android {
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
applicationId "code.name.monkey.retromusic" applicationId "code.name.monkey.retromusic"
versionCode 343 versionCode 344
versionName '3.2.200' versionName '3.2.203'
multiDexEnabled true multiDexEnabled true
@ -52,14 +52,11 @@ android {
minifyEnabled true minifyEnabled true
shrinkResources true shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
resValue "string", "cast_app_id", "BA9C3F5E"
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
debug { debug {
applicationIdSuffix '.debug' applicationIdSuffix '.debug'
versionNameSuffix ' DEBUG (' + gitBranch() + ')' versionNameSuffix ' DEBUG (' + gitBranch() + ')'
resValue "string", "cast_app_id", "BA9C3F5E"
} }
} }

9
app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
View File

@ -91,11 +91,10 @@ class AlbumCoverPagerAdapter(fm: FragmentManager, private val dataSet: ArrayList
} }
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
var finalLayout = layout val finalLayout = when {
if (PreferenceUtil.getInstance().nowPlayingScreen == NowPlayingScreen.CLASSIC) { PreferenceUtil.getInstance().nowPlayingScreen == NowPlayingScreen.CLASSIC -> R.layout.fragment_album_full_cover
finalLayout = R.layout.fragment_album_full_cover PreferenceUtil.getInstance().carouselEffect() -> R.layout.fragment_album_carousel_cover
} else if (PreferenceUtil.getInstance().carouselEffect()) { else -> layout
finalLayout= R.layout.fragment_album_carousel_cover;
} }
val view = inflater.inflate(finalLayout, container, false) val view = inflater.inflate(finalLayout, container, false)
albumCover = view.findViewById(R.id.player_image) albumCover = view.findViewById(R.id.player_image)

2
app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt
View File

@ -111,8 +111,6 @@ class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolum
fun setTintable(color: Int) { fun setTintable(color: Int) {
ViewUtil.setProgressDrawable(volumeSeekBar, color, true) ViewUtil.setProgressDrawable(volumeSeekBar, color, true)
volumeDown.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN)
volumeUp.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN)
} }
fun removeThumb() { fun removeThumb() {

2
app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
View File

@ -54,7 +54,7 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChan
|| (PreferenceUtil.getInstance().nowPlayingScreen == NowPlayingScreen.FIT))) { || (PreferenceUtil.getInstance().nowPlayingScreen == NowPlayingScreen.FIT))) {
viewPager.clipToPadding = false viewPager.clipToPadding = false
viewPager.setPadding(40, 40, 40, 0) viewPager.setPadding(40, 40, 40, 0)
viewPager.pageMargin = 16 viewPager.pageMargin = 0
viewPager.setPageTransformer(false, CarousalPagerTransformer(requireContext())) viewPager.setPageTransformer(false, CarousalPagerTransformer(requireContext()))
} else { } else {
viewPager.offscreenPageLimit = 2 viewPager.offscreenPageLimit = 2

2
app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt
View File

@ -124,7 +124,7 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
text.setTextColor(colorFinal) text.setTextColor(colorFinal)
TintHelper.setTintAuto(progressSlider, colorFinal, false) TintHelper.setTintAuto(progressSlider, colorFinal, false)
volumeFragment?.setTintable(colorFinal) volumeFragment?.setTintableColor(colorFinal)
setFabColor(colorFinal) setFabColor(colorFinal)
} }

3
app/src/main/res/layout/fragment_album_carousel_cover.xml
View File

@ -25,7 +25,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
app:cardCornerRadius="8dp"> app:cardCornerRadius="8dp"
app:cardUseCompatPadding="true">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/player_image" android:id="@+id/player_image"

6
app/src/main/res/layout/fragment_album_cover.xml
View File

@ -15,9 +15,9 @@
android:id="@+id/player_album_art_frame" android:id="@+id/player_album_art_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:cardCornerRadius="8dp" android:layout_margin="16dp"
app:cardElevation="8dp" app:cardElevation="6dp"
app:cardUseCompatPadding="true"> app:cardCornerRadius="8dp">
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/player_image" android:id="@+id/player_image"