diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt index 5d9ecede..0d33eb6f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt @@ -54,9 +54,7 @@ class UserInfoActivity : AbsBaseActivity() { setupToolbar() MaterialUtil.setTint(nameContainer, false) - MaterialUtil.setTint(bioContainer, false) name.setText(PreferenceUtil.getInstance(this).userName) - bio.setText(PreferenceUtil.getInstance(this).userBio) if (PreferenceUtil.getInstance(this).profileImage.isNotEmpty()) { loadImageFromStorage(PreferenceUtil.getInstance(this).profileImage) 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 0a4302df..41c96c81 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 @@ -110,7 +110,8 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba toolbar = view.findViewById(R.id.toolbar) bannerImage?.setOnClickListener { - NavigationUtil.goToUserInfo(requireActivity()) + val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, userImage, getString(R.string.transition_user_image)) + NavigationUtil.goToUserInfo(requireActivity(), options) } if (!PreferenceUtil.getInstance(requireContext()).isHomeBanner) setStatusbarColorAuto(view) @@ -137,7 +138,8 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba checkPadding() userImage.setOnClickListener { - NavigationUtil.goToUserInfo(requireActivity()) + val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, userImage, getString(R.string.transition_user_image)) + NavigationUtil.goToUserInfo(requireActivity(), options) } titleWelcome.setTextColor(ThemeStore.textColorPrimary(requireContext())) titleWelcome.text = String.format("%s", PreferenceUtil.getInstance(requireContext()).userName) diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java index 111f66cc..3de177e5 100755 --- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java +++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java @@ -139,8 +139,10 @@ public class NavigationUtil { ActivityCompat.startActivity(activity, new Intent(activity, AboutActivity.class), null); } - public static void goToUserInfo(@NonNull Activity activity) { - ActivityCompat.startActivity(activity, new Intent(activity, UserInfoActivity.class), null); + public static void goToUserInfo(@NonNull Activity activity, + @NonNull ActivityOptions activityOptions) { + ActivityCompat.startActivity(activity, new Intent(activity, UserInfoActivity.class), + activityOptions.toBundle()); } public static void goToOpenSource(@NonNull Activity activity) { diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml index 2b2e65f1..e6071edb 100644 --- a/app/src/main/res/layout/activity_user_info.xml +++ b/app/src/main/res/layout/activity_user_info.xml @@ -10,39 +10,40 @@ android:id="@+id/appBarLayout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:elevation="0dp" - app:elevation="0dp"> + app:liftOnScroll="true"> - + app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"> - + app:cardUseCompatPadding="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> @@ -59,52 +60,66 @@ android:layout_height="156dp" android:background="@color/twenty_percent_black_overlay" /> - - - - - - - + + + + + + + + app:hintAnimationEnabled="true" + app:hintEnabled="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/userImageContainer"> + android:textAppearance="@style/TextViewSubtitle1" + tools:text="@tools:sample/full_names" /> - - - - - - - + + album_art_transition + user_image_transition album_art_transition album_art_transition artist_image_transition