From 3fe882c79c7d02b7e17f90d2d13842bd4babbff6 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Fri, 12 Nov 2021 11:07:02 +0530
Subject: [PATCH] More rounded corners for Home banner

---
 app/src/debug/res/values/styles.xml                           | 2 +-
 .../name/monkey/retromusic/fragments/home/HomeFragment.kt     | 3 +--
 .../monkey/retromusic/fragments/other/UserInfoFragment.kt     | 3 +--
 app/src/main/res/layout-land/fragment_banner_home.xml         | 1 +
 app/src/main/res/layout/fragment_banner_home.xml              | 4 ++--
 app/src/main/res/layout/fragment_user_info.xml                | 3 ++-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/debug/res/values/styles.xml b/app/src/debug/res/values/styles.xml
index e984e856c..b9ca988eb 100644
--- a/app/src/debug/res/values/styles.xml
+++ b/app/src/debug/res/values/styles.xml
@@ -96,7 +96,7 @@
 
     <style name="circleImageView" parent="">
         <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">16dp</item>
+        <item name="cornerSize">40dp</item>
     </style>
 
     <style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
index 160b91f3f..6a1c47c88 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
@@ -83,10 +83,9 @@ class HomeFragment :
 
     private fun setupListeners() {
         binding.bannerImage?.setOnClickListener {
-            binding.userImage.transitionName = "userImage"
             findNavController().navigate(
                 R.id.user_info_fragment, null, null, FragmentNavigatorExtras(
-                    binding.userImage to "userImage"
+                    binding.userImage to "user_image"
                 )
             )
             reenterTransition = null
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
index c2d86716b..2615b1f78 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
@@ -39,7 +39,6 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.databinding.FragmentUserInfoBinding
 import code.name.monkey.retromusic.extensions.accentColor
 import code.name.monkey.retromusic.extensions.applyToolbar
-import code.name.monkey.retromusic.extensions.resolveColor
 import code.name.monkey.retromusic.fragments.LibraryViewModel
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
@@ -54,6 +53,7 @@ import com.bumptech.glide.request.target.Target
 import com.github.dhaval2404.imagepicker.ImagePicker
 import com.github.dhaval2404.imagepicker.constant.ImageProvider
 import com.google.android.material.transition.MaterialContainerTransform
+import com.google.android.material.transition.MaterialSharedAxis
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -79,7 +79,6 @@ class UserInfoFragment : Fragment() {
             drawingViewId = R.id.fragment_container
             duration = 300L
             scrimColor = Color.TRANSPARENT
-            setAllContainerColors(requireContext().resolveColor(R.attr.colorSurface))
         }
         _binding = FragmentUserInfoBinding.inflate(layoutInflater)
         return binding.root
diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
index 44a244536..89211b4dd 100644
--- a/app/src/main/res/layout-land/fragment_banner_home.xml
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -79,6 +79,7 @@
                 android:layout_height="0dp"
                 app:cardCornerRadius="24dp"
                 app:cardUseCompatPadding="true"
+                android:transitionName="banner_image"
                 app:layout_constraintDimensionRatio="21:7"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml
index bec99b000..c4d3e3ba4 100644
--- a/app/src/main/res/layout/fragment_banner_home.xml
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@@ -74,8 +74,8 @@
                 android:id="@+id/imageContainer"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                app:cardCornerRadius="16dp"
-                app:cardUseCompatPadding="true"
+                app:cardCornerRadius="40dp"
+                android:layout_margin="16dp"
                 app:layout_constraintDimensionRatio="21:10"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_user_info.xml b/app/src/main/res/layout/fragment_user_info.xml
index 1f222aac6..225099bb5 100644
--- a/app/src/main/res/layout/fragment_user_info.xml
+++ b/app/src/main/res/layout/fragment_user_info.xml
@@ -35,12 +35,13 @@
             android:id="@+id/bannerImage"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_margin="8dp"
+            android:layout_margin="16dp"
             android:scaleType="centerCrop"
             app:layout_constraintDimensionRatio="21:10"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            android:transitionName="banner_image"
             app:shapeAppearanceOverlay="@style/circleImageView"
             app:srcCompat="@drawable/material_design_default" />