diff --git a/app/build.gradle b/app/build.gradle index c86696d92..e795a8050 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 393 - versionName '3.4.800' + versionCode 394 + versionName '3.4.850' multiDexEnabled true diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 6b8f9172f..b4dd90b3a 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

v3.4.800

v3.4.700

v3.4.600

v3.4.500

v3.3.200

v.3.3.100

v3.3.000

v3.2.240

v3.2.220

v3.2.203

v3.2.135

v3.2.125

v3.2.120

v3.2.105

v3.2.100

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

v3.4.850

v3.4.800

v3.4.700

v3.4.600

v3.4.500

v3.3.200

v.3.3.100

v3.3.000

v3.2.240

v3.2.220

v3.2.203

v3.2.135

v3.2.125

v3.2.120

v3.2.105

v3.2.100

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt index 73ca7e85a..106e56a63 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt @@ -1,14 +1,12 @@ package code.name.monkey.retromusic.fragments.player.color import android.animation.ValueAnimator -import android.graphics.Color import android.graphics.drawable.Drawable import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.appcompat.widget.Toolbar -import androidx.palette.graphics.Palette import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.ColorUtil import code.name.monkey.appthemehelper.util.MaterialValueHelper @@ -16,7 +14,7 @@ import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment import code.name.monkey.retromusic.glide.RetroMusicColoredTarget -import code.name.monkey.retromusic.glide.SongGlideRequest +import code.name.monkey.retromusic.glide.SongGlideRequest.Builder import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.model.Song @@ -80,10 +78,7 @@ class ColorFragment : AbsPlayerFragment() { } } - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle? - ): View? { - + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { return inflater.inflate(R.layout.fragment_color_player, container, false) } @@ -120,8 +115,10 @@ class ColorFragment : AbsPlayerFragment() { } private fun updateSong() { - SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong) - .checkIgnoreMediaStore(requireContext()).generatePalette(requireContext()).build() + Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong) + .checkIgnoreMediaStore(requireContext()) + .generatePalette(requireContext()) + .build() .into(object : RetroMusicColoredTarget(playerImage) { override fun onColorReady(color: Int) { @@ -147,25 +144,21 @@ class ColorFragment : AbsPlayerFragment() { override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) { super.onLoadFailed(e, errorDrawable) val backgroundColor = defaultFooterColor - val textColor = if (ColorUtil.isColorLight(defaultFooterColor)) MaterialValueHelper.getPrimaryTextColor( - context, - true - ) - else MaterialValueHelper.getPrimaryTextColor(context, false) - + val textColor = if (ColorUtil.isColorLight(defaultFooterColor)) MaterialValueHelper.getPrimaryTextColor(requireContext(), true) + else MaterialValueHelper.getPrimaryTextColor(requireContext(), false) setColors(backgroundColor, textColor) } }) } - private fun setColors(backgroundColor: Int, textColor: Int) { - playbackControlsFragment.setDark(textColor, backgroundColor) - colorGradientBackground?.setBackgroundColor(backgroundColor) - ToolbarContentTintHelper.colorizeToolbar(playerToolbar, textColor, activity) - lastColor = textColor + private fun setColors(backgroundColor: Int, componentsColor: Int) { + this.lastColor = componentsColor this.backgroundColor = backgroundColor + playbackControlsFragment.setDark(componentsColor, backgroundColor) + colorGradientBackground?.setBackgroundColor(backgroundColor) playerActivity?.setLightNavigationBar(ColorUtil.isColorLight(backgroundColor)) callbacks?.onPaletteColorChanged() + ToolbarContentTintHelper.colorizeToolbar(playerToolbar, componentsColor, requireActivity()) } companion object { @@ -177,12 +170,3 @@ class ColorFragment : AbsPlayerFragment() { } } } - -fun Palette.getColor(): Int { - return when { - darkMutedSwatch != null -> darkMutedSwatch!!.rgb - mutedSwatch != null -> mutedSwatch!!.rgb - lightMutedSwatch != null -> lightMutedSwatch!!.rgb - else -> Palette.Swatch(Color.BLACK, 1).rgb - } -} diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml index 7bb5a74da..00ba56eff 100755 --- a/app/src/main/res/layout/item_song.xml +++ b/app/src/main/res/layout/item_song.xml @@ -54,7 +54,7 @@ android:layout_height="wrap_content" android:layout_weight="0" android:fontFeatureSettings="onum" - android:padding="4dp" + android:padding="8dp" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/menu" diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt index 827a18972..c683bf5d4 100644 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt @@ -29,16 +29,7 @@ class ATEPreferenceCategory @JvmOverloads constructor( ) : PreferenceCategory(context, attrs, defStyleAttr, defStyleRes) { override fun onBindViewHolder(holder: PreferenceViewHolder) { super.onBindViewHolder(holder) - val mTitle = holder.itemView.findViewById(android.R.id.title) - mTitle.setTextColor(ThemeStore.accentColor(holder.itemView.context)) - /*mTitle.textSize = dip2px(context, 4f) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - mTitle.setTextAppearance(R.style.TextAppearance_MaterialComponents_Overline) - }*/ - } - - fun dip2px(context: Context, dpVale: Float): Float { - val scale = context.resources.displayMetrics.density - return (dpVale * scale + 0.5f) + val title = holder.itemView.findViewById(android.R.id.title) + title.setTextColor(ThemeStore.accentColor(context)) } }