diff --git a/app/build.gradle b/app/build.gradle index fd37f5eb1..b4d7fbf0e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,7 +22,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 401 + versionCode 403 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 caa5bb97e..021687215 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

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 +

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/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt index dc38bf15f..d0218318b 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt @@ -8,6 +8,7 @@ import androidx.annotation.IntDef import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.AppCompatTextView import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.album.AlbumFullWidthAdapter @@ -22,7 +23,7 @@ import code.name.monkey.retromusic.model.Playlist import code.name.monkey.retromusic.util.PreferenceUtil class HomeAdapter( - private val activity: AppCompatActivity, private val displayMetrics: DisplayMetrics + private val activity: AppCompatActivity, private val displayMetrics: DisplayMetrics ) : RecyclerView.Adapter() { private var list = ArrayList() @@ -33,12 +34,18 @@ class HomeAdapter( override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { val layout = LayoutInflater.from(activity) - .inflate(R.layout.section_recycler_view, parent, false) + .inflate(R.layout.section_recycler_view, parent, false) return when (viewType) { RECENT_ARTISTS, TOP_ARTISTS -> ArtistViewHolder(layout) PLAYLISTS -> PlaylistViewHolder(layout) else -> { - AlbumViewHolder(LayoutInflater.from(activity).inflate(R.layout.metal_section_recycler_view, parent, false)) + AlbumViewHolder( + LayoutInflater.from(activity).inflate( + R.layout.metal_section_recycler_view, + parent, + false + ) + ) } } } @@ -89,7 +96,6 @@ class HomeAdapter( const val RECENT_ARTISTS = 2 const val TOP_ARTISTS = 0 const val PLAYLISTS = 4 - } private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view) { @@ -109,15 +115,13 @@ class HomeAdapter( if (list.isNotEmpty()) { recyclerView.apply { show() - layoutManager = GridLayoutManager( - activity, 1, GridLayoutManager.HORIZONTAL, false - ) + layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false) val artistAdapter = ArtistAdapter( - activity, - list, - PreferenceUtil.getInstance(activity).getHomeGridStyle(activity), - false, - null + activity, + list, + PreferenceUtil.getInstance(activity).getHomeGridStyle(activity), + false, + null ) adapter = artistAdapter } @@ -134,10 +138,10 @@ class HomeAdapter( recyclerView.apply { show() val songAdapter = SongAdapter( - activity, songs, R.layout.item_album_card, false, null + activity, songs, R.layout.item_album_card, false, null ) layoutManager = GridLayoutManager( - activity, 1, GridLayoutManager.HORIZONTAL, false + activity, 1, GridLayoutManager.HORIZONTAL, false ) adapter = songAdapter @@ -159,7 +163,7 @@ private fun ArrayList.toAlbums(): ArrayList { for (x in this) { arrayList.add(x as Album) } - return arrayList; + return arrayList } private fun ArrayList.toArtists(): ArrayList { @@ -167,7 +171,7 @@ private fun ArrayList.toArtists(): ArrayList { for (x in this) { arrayList.add(x as Artist) } - return arrayList; + return arrayList } private fun ArrayList.toPlaylist(): ArrayList { @@ -175,6 +179,6 @@ private fun ArrayList.toPlaylist(): ArrayList { for (x in this) { arrayList.add(x as Playlist) } - return arrayList; + return arrayList } 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 85df744e2..88283c9de 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 @@ -101,7 +101,6 @@ class AlbumCoverPagerAdapter( val view = inflater.inflate(finalLayout, container, false) albumCover = view.findViewById(R.id.player_image) albumCover.setOnClickListener { - NavigationUtil.goToLyrics(requireActivity()) } return view diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt index dfd596348..796bb1488 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt @@ -13,6 +13,7 @@ import code.name.monkey.appthemehelper.util.MaterialValueHelper import code.name.monkey.retromusic.R import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder +import code.name.monkey.retromusic.extensions.hide import code.name.monkey.retromusic.glide.ArtistGlideRequest import code.name.monkey.retromusic.glide.RetroMusicColoredTarget import code.name.monkey.retromusic.helper.menu.SongsMenuHelper @@ -63,13 +64,13 @@ class ArtistAdapter( val isChecked = isChecked(artist) holder.itemView.isActivated = isChecked holder.title?.text = artist.name - holder.text?.visibility = View.GONE + holder.text?.hide() loadArtistImage(artist, holder) } fun setColors(color: Int, holder: ViewHolder) { if (holder.paletteColorContainer != null) { - holder.paletteColorContainer?.setBackgroundColor(color) + holder.paletteColorContainer?.backgroundTintList = ColorStateList.valueOf(color) holder.title?.setTextColor( MaterialValueHelper.getPrimaryTextColor( activity, ColorUtil.isColorLight( @@ -78,7 +79,7 @@ class ArtistAdapter( ) ) } - + holder.imageContainerCard?.setCardBackgroundColor(color) holder.mask?.backgroundTintList = ColorStateList.valueOf(color) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt index c2fcc7adf..64af7cee7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt @@ -151,8 +151,7 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba private fun setupToolbar() { toolbar.apply { - backgroundTintList = - ColorStateList.valueOf(ATHUtil.resolveColor(requireContext(), R.attr.colorSurface)) + backgroundTintList = ColorStateList.valueOf(ATHUtil.resolveColor(requireContext(), R.attr.colorSurface)) setNavigationIcon(R.drawable.ic_menu_white_24dp) setOnClickListener { val options = ActivityOptions.makeSceneTransitionAnimation( 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 8bfa8a6f7..0db14c543 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 @@ -14,7 +14,7 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote import code.name.monkey.retromusic.transform.CarousalPagerTransformer import code.name.monkey.retromusic.transform.ParallaxPagerTransformer import code.name.monkey.retromusic.util.PreferenceUtil -import kotlinx.android.synthetic.main.fragment_player_album_cover.* +import kotlinx.android.synthetic.main.fragment_player_album_cover.viewPager class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChangeListener { @@ -44,8 +44,6 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChan override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - - viewPager.addOnPageChangeListener(this) //noinspection ConstantConditions if (PreferenceUtil.getInstance(requireContext()).carouselEffect() && @@ -60,8 +58,6 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChan viewPager.offscreenPageLimit = 2 viewPager.setPageTransformer(true, PreferenceUtil.getInstance(requireContext()).albumCoverTransform) } - - } override fun onDestroyView() { 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 b90527293..4cbcc6813 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 @@ -132,6 +132,7 @@ class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() { updatePrevNextColor() text.setTextColor(lastDisabledPlaybackControlsColor) + songInfo.setTextColor(lastDisabledPlaybackControlsColor) TintHelper.setTintAuto(progressSlider, lastPlaybackControlsColor, false) volumeFragment?.setTintableColor(lastPlaybackControlsColor) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt index 4c0988fb3..6107ca15d 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt @@ -90,6 +90,7 @@ class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() { val color = MaterialValueHelper.getPrimaryTextColor(context, false) songTotalTime.setTextColor(color) songCurrentProgress.setTextColor(color) + songInfo.setTextColor(color) } override fun onResume() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt index 125476e41..b6f43afe8 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt @@ -107,7 +107,6 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment(), OnSharedPref updatePrevNextColor() } - private fun updateSong() { val song = MusicPlayerRemote.currentSong title.text = song.title diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt index cb964c393..71d4ad817 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt +++ b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt @@ -30,9 +30,9 @@ import code.name.monkey.retromusic.util.RippleUtils import com.google.android.material.bottomnavigation.BottomNavigationView class BottomNavigationBarTinted @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 ) : BottomNavigationView(context, attrs, defStyleAttr) { init { @@ -43,13 +43,21 @@ class BottomNavigationBarTinted @JvmOverloads constructor( val accentColor = ThemeStore.accentColor(context) NavigationViewUtil.setItemIconColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor) NavigationViewUtil.setItemTextColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor) - itemBackground = RippleDrawable(RippleUtils.convertToRippleDrawableColor(ColorStateList.valueOf(ThemeStore.accentColor(context).addAlpha())), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background_mask)) + itemBackground = RippleDrawable( + RippleUtils.convertToRippleDrawableColor( + ColorStateList.valueOf( + ThemeStore.accentColor(context).addAlpha() + ) + ), + ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background), + ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background_mask) + ) setOnApplyWindowInsetsListener(null) //itemRippleColor = ColorStateList.valueOf(accentColor) background = ColorDrawable(ATHUtil.resolveColor(context, R.attr.colorSurface)) } } -private fun Int.addAlpha(): Int { +fun Int.addAlpha(): Int { return ColorUtil.withAlpha(this, 0.12f) } diff --git a/app/src/main/res/drawable/artist_card_gradient_effect.xml b/app/src/main/res/drawable/artist_card_gradient_effect.xml new file mode 100644 index 000000000..a51f90e5f --- /dev/null +++ b/app/src/main/res/drawable/artist_card_gradient_effect.xml @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml index 57be9f22d..e06d44519 100644 --- a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml @@ -11,55 +11,59 @@ tools:ignore="MissingPrefix"> - + android:layout_height="wrap_content" + android:gravity="center"> - - - + + + + + + + + + app:layout_constraintTop_toBottomOf="@id/toolbarContainer"> - - - - - - + app:layout_constraintTop_toTopOf="@id/progressSlider" + tools:ignore="RtlHardcoded,RtlSymmetry" + tools:text="00:22" /> - + - + - - + app:layout_constraintTop_toBottomOf="@+id/progressSlider"> + tools:ignore="RtlHardcoded,RtlSymmetry" + tools:text="00:00" /> + tools:ignore="RtlHardcoded,RtlSymmetry" + tools:text="00:00" /> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/playback_controls" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + tools:ignore="MissingPrefix"> - + - + - + - - + - + + - - + - + - + - + - + - + - + - - - + diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml index eb1162b51..8c59e6683 100644 --- a/app/src/main/res/layout/fragment_fit_playback_controls.xml +++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml @@ -9,48 +9,53 @@ android:orientation="vertical" tools:ignore="MissingPrefix"> - - - + + - + app:layout_constraintTop_toTopOf="@id/progressSlider" + tools:ignore="RtlHardcoded,RtlSymmetry" + tools:text="00:22" /> - + - + - - - - + tools:text="00:22" /> + + diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml index 0616c2d05..dce7d1d19 100644 --- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml +++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml @@ -9,55 +9,53 @@ android:orientation="vertical" tools:ignore="MissingPrefix"> - + - + - - - - + + app:layout_constraintTop_toBottomOf="@+id/progressSlider"> - + app:layout_constraintTop_toTopOf="@id/progressSlider" + tools:ignore="RtlHardcoded,RtlSymmetry" + tools:text="00:22" /> - + - - - - + + app:layout_constraintTop_toBottomOf="@+id/progressSlider"> - + app:layout_constraintTop_toTopOf="@id/progressSlider" + tools:ignore="RtlHardcoded,RtlSymmetry" + tools:text="00:22" /> - + - - - - + diff --git a/app/src/main/res/layout/fragment_plain_controls_fragment.xml b/app/src/main/res/layout/fragment_plain_controls_fragment.xml index 06b19ed91..c3e51ee17 100644 --- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml @@ -7,57 +7,53 @@ android:gravity="center_vertical" android:orientation="vertical"> - + app:layout_constraintTop_toTopOf="@id/progressSlider" + tools:ignore="RtlHardcoded,RtlSymmetry" + tools:text="00:22" /> - + - - - - + @@ -139,7 +135,8 @@ android:layout_weight="0" android:paddingStart="8dp" android:paddingEnd="8dp" - app:layout_constraintBottom_toTopOf="@id/songInfo" + app:layout_constraintBottom_toTopOf="@+id/songInfo" + app:layout_constraintTop_toBottomOf="@+id/playPauseButton" tools:backgroundTint="@color/md_red_400" tools:layout_height="52dp" /> @@ -156,8 +153,7 @@ android:textColor="?android:attr/textColorSecondary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/volumeFragmentContainer" tools:text="@tools:sample/lorem/random" /> diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml index 52209c9a4..502f3b276 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -9,55 +9,55 @@ android:orientation="vertical" tools:ignore="MissingPrefix"> - - + - - android:gravity="center_vertical|right|end" - android:paddingRight="8dp" - android:singleLine="true" - android:textColor="?android:attr/textColorSecondary" - android:textSize="12sp" - tools:ignore="RtlHardcoded,RtlSymmetry" - tools:text="00:22" /> + - - + app:layout_constraintTop_toBottomOf="@+id/progressSlider"> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_artist_square.xml b/app/src/main/res/layout/item_artist_square.xml index 59dd8f046..3a2de13e3 100644 --- a/app/src/main/res/layout/item_artist_square.xml +++ b/app/src/main/res/layout/item_artist_square.xml @@ -2,6 +2,7 @@ diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 15178800f..be624a39e 100755 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -81,18 +81,21 @@ @string/circular @string/card_color_style @string/card_style + @string/tiny_card_style 0 1 2 + 3 @layout/item_artist @layout/item_artist_square @layout/item_album_card + @layout/item_artist_card @@ -176,4 +179,5 @@ @layout/activity_album + Tiny card \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f07ca0898..76840518a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -29,6 +29,7 @@ #000000 #00000000 + #40000000 #ffffff #d4d4d4