From 18778f3c5af3d1da841c577491bcbd538d532ec5 Mon Sep 17 00:00:00 2001 From: aayush262 Date: Wed, 6 Mar 2024 15:58:55 +0530 Subject: [PATCH] fix(profile): remove progress in fav media --- .../java/ani/dantotsu/media/MediaAdaptor.kt | 2 + .../ani/dantotsu/profile/ProfileFragment.kt | 9 +- app/src/main/res/layout/fragment_profile.xml | 85 +++---------------- app/src/main/res/layout/item_character.xml | 4 +- .../main/res/layout/item_media_compact.xml | 1 + 5 files changed, 21 insertions(+), 80 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt b/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt index c17a5ec1..7d96e95b 100644 --- a/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt +++ b/app/src/main/java/ani/dantotsu/media/MediaAdaptor.kt @@ -43,6 +43,7 @@ class MediaAdaptor( private val activity: FragmentActivity, private val matchParent: Boolean = false, private val viewPager: ViewPager2? = null, + private val fav: Boolean = false, ) : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { @@ -128,6 +129,7 @@ class MediaAdaptor( ) b.itemCompactTotal.text = " | ${media.manga.totalChapters ?: "~"}" } + b.itemCompactProgressContainer.visibility = if (fav) View.GONE else View.VISIBLE } } diff --git a/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt b/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt index f7f4f853..408b7833 100644 --- a/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt +++ b/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt @@ -120,7 +120,6 @@ class ProfileFragment() : Fragment() { binding.profileFavAnimeContainer, binding.profileFavAnimeRecyclerView, binding.profileFavAnimeProgressBar, - binding.profileFavAnimeEmpty, binding.profileFavAnime ) @@ -129,7 +128,6 @@ class ProfileFragment() : Fragment() { binding.profileFavMangaContainer, binding.profileFavMangaRecyclerView, binding.profileFavMangaProgressBar, - binding.profileFavMangaEmpty, binding.profileFavManga ) @@ -186,21 +184,18 @@ class ProfileFragment() : Fragment() { container: View, recyclerView: RecyclerView, progress: View, - empty: View, title: View ) { container.visibility = View.VISIBLE progress.visibility = View.VISIBLE recyclerView.visibility = View.GONE - empty.visibility = View.GONE title.visibility = View.INVISIBLE mode.observe(viewLifecycleOwner) { recyclerView.visibility = View.GONE - empty.visibility = View.GONE if (it != null) { if (it.isNotEmpty()) { - recyclerView.adapter = MediaAdaptor(0, it, requireActivity()) + recyclerView.adapter = MediaAdaptor(0, it, requireActivity(), fav=true) recyclerView.layoutManager = LinearLayoutManager( requireContext(), LinearLayoutManager.HORIZONTAL, @@ -211,7 +206,7 @@ class ProfileFragment() : Fragment() { LayoutAnimationController(setSlideIn(), 0.25f) } else { - empty.visibility = View.VISIBLE + container.visibility = View.GONE } title.visibility = View.VISIBLE title.startAnimation(setSlideUp()) diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index 0ff67438..592378b4 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -144,8 +144,8 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="32dp" - android:padding="8dp" android:fontFamily="@font/poppins_bold" + android:padding="8dp" android:text="Stats" android:textSize="18sp" tools:ignore="HardcodedText" /> @@ -335,8 +335,8 @@ android:id="@+id/userInfoContainer" android:layout_width="match_parent" android:layout_height="match_parent" - tools:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" + tools:layout_height="wrap_content"> @@ -355,12 +355,12 @@ android:id="@+id/profileUserBio" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="16dp" android:layout_marginStart="16dp" + android:layout_marginTop="16dp" android:layout_marginEnd="16dp" - android:textAlignment="textStart" android:ellipsize="end" android:padding="16dp" + android:textAlignment="textStart" tools:text="@string/slogan" /> @@ -369,8 +369,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:visibility="gone" - tools:visibility="visible"> + android:visibility="gone"> - - - - - - - - + android:layout_height="wrap_content"> - - - - - - - - - + android:layout_height="wrap_content"> + + @@ -550,14 +492,15 @@ android:layout_height="wrap_content" android:orientation="vertical" tools:visibility="gone"> + diff --git a/app/src/main/res/layout/item_character.xml b/app/src/main/res/layout/item_character.xml index 1aa042f2..caf96e66 100644 --- a/app/src/main/res/layout/item_character.xml +++ b/app/src/main/res/layout/item_character.xml @@ -64,7 +64,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:alpha="0.58" - android:ellipsize="marquee" + android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" android:textAlignment="textEnd" @@ -73,7 +73,7 @@ android:textStyle="italic" android:transitionName="mediaTitle" tools:ignore="TextContrastCheck" - tools:text="SOURCE " /> + tools:text="SOURCE" /> diff --git a/app/src/main/res/layout/item_media_compact.xml b/app/src/main/res/layout/item_media_compact.xml index 389b0ae9..a3bae4b1 100644 --- a/app/src/main/res/layout/item_media_compact.xml +++ b/app/src/main/res/layout/item_media_compact.xml @@ -149,6 +149,7 @@ tools:text="@string/get_recommendations" />