diff --git a/app/build.gradle b/app/build.gradle index b4667e4ae..9f90ef6e9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 10597 - versionName '6.0.2-beta' + versionCode 10598 + versionName '6.0.3-beta' buildConfigField("String", "GOOGLE_PLAY_LICENSING_KEY", "\"${getProperty(getProperties('../public.properties'), 'GOOGLE_PLAY_LICENSE_KEY')}\"") } diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index da8a208f2..14297bffa 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -62,6 +62,14 @@ +
+
July 10, 2022
+

v6.0.3Beta

+

Fixed

+ +
June 21, 2022

v6.0.2Beta

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt index b83a3ba7c..31d5a4095 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt @@ -30,7 +30,6 @@ import androidx.navigation.fragment.navArgs import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager -import androidx.transition.Fade import code.name.monkey.appthemehelper.common.ATHToolbarActivity.getToolbarBackgroundColor import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.EXTRA_ALBUM_ID @@ -103,8 +102,6 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) _binding = FragmentAlbumDetailsBinding.bind(view) - enterTransition = Fade() - exitTransition = Fade() mainActivity.addMusicServiceEventListener(detailsViewModel) mainActivity.setSupportActionBar(binding.toolbar) diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt index 5e97d3705..93d10ee54 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt @@ -79,8 +79,6 @@ abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragm override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) _binding = FragmentArtistDetailsBinding.bind(view) - enterTransition = Fade() - exitTransition = Fade() mainActivity.addMusicServiceEventListener(detailsViewModel) mainActivity.setSupportActionBar(binding.toolbar) binding.toolbar.title = null diff --git a/app/src/main/res/anim/retro_fragment_open_enter.xml b/app/src/main/res/anim/retro_fragment_open_enter.xml index 648ca0840..c4521e843 100644 --- a/app/src/main/res/anim/retro_fragment_open_enter.xml +++ b/app/src/main/res/anim/retro_fragment_open_enter.xml @@ -14,7 +14,6 @@ limitations under the License. --> + android:toYScale="1" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml index 5cdbeb077..66a1e9b6a 100644 --- a/app/src/main/res/drawable/ic_refresh.xml +++ b/app/src/main/res/drawable/ic_refresh.xml @@ -6,5 +6,5 @@ android:tint="?attr/colorControlNormal"> + android:pathData="M12,20Q8.65,20 6.325,17.675Q4,15.35 4,12Q4,8.65 6.325,6.325Q8.65,4 12,4Q13.725,4 15.3,4.713Q16.875,5.425 18,6.75V5Q18,4.575 18.288,4.287Q18.575,4 19,4Q19.425,4 19.712,4.287Q20,4.575 20,5V10Q20,10.425 19.712,10.712Q19.425,11 19,11H14Q13.575,11 13.288,10.712Q13,10.425 13,10Q13,9.575 13.288,9.287Q13.575,9 14,9H17.2Q16.4,7.6 15.013,6.8Q13.625,6 12,6Q9.5,6 7.75,7.75Q6,9.5 6,12Q6,14.5 7.75,16.25Q9.5,18 12,18Q13.725,18 15.188,17.087Q16.65,16.175 17.375,14.65Q17.5,14.375 17.788,14.188Q18.075,14 18.375,14Q18.95,14 19.238,14.4Q19.525,14.8 19.3,15.3Q18.35,17.425 16.375,18.712Q14.4,20 12,20Z"/> diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml index ee84385d3..a7b19e601 100644 --- a/app/src/main/res/layout/activity_donation.xml +++ b/app/src/main/res/layout/activity_donation.xml @@ -46,9 +46,10 @@ app:cardUseCompatPadding="true"> @@ -56,8 +57,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center|bottom" - android:layout_marginTop="50dp" - android:paddingBottom="8dp" + android:layout_marginTop="96dp" + android:paddingBottom="16dp" android:text="Paypal" android:textAppearance="?textAppearanceLabelMedium" /> @@ -75,9 +76,10 @@ app:cardUseCompatPadding="true"> @@ -85,9 +87,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginTop="50dp" - android:paddingBottom="8dp" + android:layout_marginTop="96dp" android:text="Ko-fi" + android:paddingBottom="16dp" android:textAppearance="?textAppearanceLabelMedium" />