From e1b50c86f34f0796253dfa1498ebfa85a965fcb3 Mon Sep 17 00:00:00 2001
From: Sadwhy <99601717+Sadwhy@users.noreply.github.com>
Date: Thu, 21 Mar 2024 12:11:16 +0600
Subject: [PATCH 1/5] feet(watch): Fixed one inconsistent switch (#273)

* feet(watch): Fixed one inconsistent switch
---
 app/src/main/res/layout/item_anime_watch.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/item_anime_watch.xml b/app/src/main/res/layout/item_anime_watch.xml
index ae95f1d7..9fc4224a 100644
--- a/app/src/main/res/layout/item_anime_watch.xml
+++ b/app/src/main/res/layout/item_anime_watch.xml
@@ -154,7 +154,7 @@
                 android:orientation="horizontal"
                 android:visibility="gone">
 
-                <com.google.android.material.switchmaterial.SwitchMaterial
+                <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/animeSourceDubbed"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -162,7 +162,9 @@
                     android:padding="12dp"
                     app:cornerRadius="0dp"
                     app:showText="false"
-                    app:useMaterialThemeColors="true" />
+                    android:scaleX="0.80"
+		    android:scaleY="0.80"
+                    app:useMaterialThemeColors="true"/>
 
                 <TextView
                     android:id="@+id/animeSourceDubbedText"
@@ -174,7 +176,7 @@
                     android:ellipsize="marquee"
                     android:fontFamily="@font/poppins_bold"
                     android:marqueeRepeatLimit="marquee_forever"
-                    android:paddingLeft="7dp"
+                    android:paddingLeft="5dp"
                     android:singleLine="true"
                     android:textSize="14sp"
                     tools:text="Dubbed" />
@@ -373,3 +375,4 @@
     </LinearLayout>
 
 </LinearLayout>
+                

From 3016792f95525872517b6b7352610bc48cb2b866 Mon Sep 17 00:00:00 2001
From: aayush262 <aayushthakur262006@gmail.com>
Date: Fri, 22 Mar 2024 11:24:36 +0530
Subject: [PATCH 2/5] fix(activity): blur banner

---
 app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt | 2 --
 app/src/main/res/layout/item_activity.xml                 | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt b/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt
index 980c70c5..e361199d 100644
--- a/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt
+++ b/app/src/main/java/ani/dantotsu/profile/ProfileFragment.kt
@@ -143,8 +143,6 @@ class ProfileFragment : Fragment() {
         super.onResume()
         if (this::binding.isInitialized) {
             binding.root.requestLayout()
-            setFavPeople()
-            model.refresh()
         }
     }
 
diff --git a/app/src/main/res/layout/item_activity.xml b/app/src/main/res/layout/item_activity.xml
index 03b96d30..816c1732 100644
--- a/app/src/main/res/layout/item_activity.xml
+++ b/app/src/main/res/layout/item_activity.xml
@@ -113,7 +113,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="start|center_vertical"
-            android:backgroundTint="?attr/colorSurface"
+            app:cardBackgroundColor="@color/nav_bg"
             app:cardCornerRadius="24dp"
             app:strokeColor="@color/transparent">
 
@@ -150,7 +150,7 @@
                     android:layout_height="160dp"
                     android:layout_gravity="center"
                     android:scaleType="centerCrop"
-                    app:srcCompat="@drawable/ic_round_add_circle_24"
+                    tools:srcCompat="@tools:sample/backgrounds/scenic"
                     tools:ignore="ContentDescription,ImageContrastCheck"
                     tools:tint="@color/transparent" />
 

From 02efc01a10b2218d11fbd83be68fff4701331d37 Mon Sep 17 00:00:00 2001
From: aayush262 <aayushthakur262006@gmail.com>
Date: Fri, 22 Mar 2024 12:50:04 +0530
Subject: [PATCH 3/5] feat(profile): round chips

---
 app/src/main/res/layout/activity_profile.xml | 94 +++++++++-----------
 1 file changed, 43 insertions(+), 51 deletions(-)

diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 13870e1e..068e1e41 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -128,145 +128,137 @@
                         app:tint="@color/bg_opp" />
                 </LinearLayout>
             </FrameLayout>
+
             <LinearLayout
                 android:id="@+id/profileButtonContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
                 android:layout_marginTop="210dp"
                 android:layout_marginBottom="6dp"
+                android:layout_marginEnd="8dp"
                 android:background="?attr/colorSurface"
                 android:baselineAligned="false"
-                android:layout_gravity="bottom"
                 android:orientation="horizontal"
                 tools:ignore="HardcodedText">
 
-                <View
-                    android:layout_width="3dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginStart="2dp"
-                    android:background="?android:attr/listDivider" />
-
-                <LinearLayout
+                <com.google.android.material.card.MaterialCardView
                     android:id="@+id/profileFollowerCountContainer"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
+                    android:layout_marginStart="8dp"
+                    android:backgroundTint="?attr/colorSurfaceVariant"
+                    app:cardCornerRadius="16dp">
 
                     <TextView
                         android:id="@+id/profileFollowerCount"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
                         android:fontFamily="@font/poppins_semi_bold"
-                        tools:text="1"
-                        android:textColor="?attr/colorPrimary" />
+                        android:textColor="?attr/colorPrimary"
+                        tools:text="1" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="24dp"
                         android:fontFamily="@font/poppins_semi_bold"
                         android:text="Follower" />
+                </com.google.android.material.card.MaterialCardView>
 
-                </LinearLayout>
 
-                <View
-                    android:layout_width="3dp"
-                    android:layout_height="match_parent"
-                    android:background="?android:attr/listDivider" />
-
-                <LinearLayout
+                <com.google.android.material.card.MaterialCardView
                     android:id="@+id/profileFollowingCountContainer"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
+                    android:layout_marginStart="8dp"
+                    android:backgroundTint="?attr/colorSurfaceVariant"
+                    app:cardCornerRadius="16dp">
 
                     <TextView
                         android:id="@+id/profileFollowingCount"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
                         android:fontFamily="@font/poppins_semi_bold"
-                        tools:text="2"
-                        android:textColor="?attr/colorPrimary" />
+                        android:textColor="?attr/colorPrimary"
+                        tools:text="2" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="24dp"
                         android:fontFamily="@font/poppins_semi_bold"
                         android:text="Following" />
 
-                </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
 
-                <View
-                    android:layout_width="3dp"
-                    android:layout_height="match_parent"
-                    android:background="?android:attr/listDivider" />
 
-                <LinearLayout
+                <com.google.android.material.card.MaterialCardView
                     android:id="@+id/profileAnimeCountContainer"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
+                    android:layout_marginStart="8dp"
+                    android:backgroundTint="?attr/colorSurfaceVariant"
+                    app:cardCornerRadius="16dp">
 
                     <TextView
                         android:id="@+id/profileAnimeCount"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
                         android:fontFamily="@font/poppins_semi_bold"
-                        tools:text="3"
-                        android:textColor="?attr/colorPrimary" />
+                        android:textColor="?attr/colorPrimary"
+                        tools:text="3" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="24dp"
                         android:fontFamily="@font/poppins_semi_bold"
                         android:text="Anime" />
 
-                </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
 
-                <View
-                    android:layout_width="3dp"
-                    android:layout_height="match_parent"
-                    android:background="?android:attr/listDivider" />
-
-                <LinearLayout
+                <com.google.android.material.card.MaterialCardView
                     android:id="@+id/profileMangaCountContainer"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:gravity="center"
-                    android:orientation="vertical">
+                    android:layout_marginStart="8dp"
+                    android:backgroundTint="?attr/colorSurfaceVariant"
+                    app:cardCornerRadius="16dp">
 
                     <TextView
                         android:id="@+id/profileMangaCount"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
                         android:fontFamily="@font/poppins_semi_bold"
-                        tools:text="4"
-                        android:textColor="?attr/colorPrimary" />
+                        android:textColor="?attr/colorPrimary"
+                        tools:text="4" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="24dp"
                         android:fontFamily="@font/poppins_semi_bold"
                         android:text="Manga" />
 
-                </LinearLayout>
+                </com.google.android.material.card.MaterialCardView>
 
-                <View
-                    android:layout_width="3dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginEnd="2dp"
-                    android:background="?android:attr/listDivider" />
             </LinearLayout>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
 
-
     </com.google.android.material.appbar.AppBarLayout>
 
     <LinearLayout

From 917ffe644f66d5a857dded6ab4fb4dd18272e980 Mon Sep 17 00:00:00 2001
From: aayush262 <aayushthakur262006@gmail.com>
Date: Fri, 22 Mar 2024 20:38:34 +0530
Subject: [PATCH 4/5] feat: something

---
 .../download/anime/OfflineAnimeAdapter.kt     |  2 +-
 .../download/manga/OfflineMangaAdapter.kt     |  2 +-
 app/src/main/res/layout/item_activity.xml     |  4 ++--
 app/src/main/res/layout/item_follower.xml     | 21 +++++++++----------
 app/src/main/res/layout/item_notification.xml |  4 ++--
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeAdapter.kt b/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeAdapter.kt
index ef0c4148..63cc384a 100644
--- a/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeAdapter.kt
@@ -62,7 +62,7 @@ class OfflineAnimeAdapter(
             val bannerView = view.findViewById<ImageView>(R.id.itemCompactBanner) // for large view
             val episodes = view.findViewById<TextView>(R.id.itemTotal)
             episodes.text = " Episodes"
-            bannerView.setImageURI(item.banner)
+            bannerView.setImageURI(item.banner ?: item.image)
             totalepisodes.text = item.totalEpisodeList
         } else if (style == 1) {
             val watchedEpisodes =
diff --git a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt
index 4ef12c03..0bc9ef08 100644
--- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaAdapter.kt
@@ -61,7 +61,7 @@ class OfflineMangaAdapter(
             val bannerView = view.findViewById<ImageView>(R.id.itemCompactBanner) // for large view
             val chapters = view.findViewById<TextView>(R.id.itemTotal)
             chapters.text = " Chapters"
-            bannerView.setImageURI(item.banner)
+            bannerView.setImageURI(item.banner ?: item.image)
             totalChapter.text = item.totalChapter
         } else if (style == 1) {
             val readChapter =
diff --git a/app/src/main/res/layout/item_activity.xml b/app/src/main/res/layout/item_activity.xml
index 816c1732..e45d45ca 100644
--- a/app/src/main/res/layout/item_activity.xml
+++ b/app/src/main/res/layout/item_activity.xml
@@ -109,7 +109,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp">
 
-        <com.google.android.material.card.MaterialCardView
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="start|center_vertical"
@@ -193,7 +193,7 @@
                     android:textStyle="bold"
                     tools:ignore="HardcodedText" />
             </LinearLayout>
-        </com.google.android.material.card.MaterialCardView>
+        </androidx.cardview.widget.CardView>
     </FrameLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/layout/item_follower.xml b/app/src/main/res/layout/item_follower.xml
index 2908ff31..2339b8ce 100644
--- a/app/src/main/res/layout/item_follower.xml
+++ b/app/src/main/res/layout/item_follower.xml
@@ -7,21 +7,21 @@
     android:layout_marginTop="16dp"
     android:orientation="horizontal">
 
-    <com.google.android.material.card.MaterialCardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="90dp"
         android:layout_gravity="start|center_vertical"
         android:backgroundTint="@color/bg_white"
-        app:strokeColor="@color/transparent"
-        app:cardCornerRadius="24dp">
+        app:cardCornerRadius="24dp"
+        app:strokeColor="@color/transparent">
 
         <ImageView
             android:id="@+id/profileBannerImage"
             android:layout_width="match_parent"
             android:layout_height="89dp"
             android:scaleType="centerCrop"
-            tools:srcCompat="@tools:sample/backgrounds/scenic"
-            tools:ignore="ContentDescription" />
+            tools:ignore="ContentDescription"
+            tools:srcCompat="@tools:sample/backgrounds/scenic" />
 
         <ImageView
             android:id="@+id/imageView"
@@ -38,8 +38,8 @@
             android:layout_gravity="start|center_vertical"
             android:layout_marginStart="16dp"
             android:backgroundTint="@color/transparent"
-            app:strokeColor="@color/transparent"
-            app:cardCornerRadius="64dp">
+            app:cardCornerRadius="64dp"
+            app:strokeColor="@color/transparent">
 
             <com.google.android.material.imageview.ShapeableImageView
                 android:id="@+id/profileUserAvatar"
@@ -58,9 +58,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="start|center_vertical"
             android:layout_marginStart="120dp"
+            android:fontFamily="@font/poppins_semi_bold"
             android:text="@string/username"
-            android:textColor="@color/bg_white"
-            android:textSize="18sp"
-            android:textStyle="bold"/>
-    </com.google.android.material.card.MaterialCardView>
+            android:textSize="18sp" />
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_notification.xml b/app/src/main/res/layout/item_notification.xml
index 77868138..b20359ef 100644
--- a/app/src/main/res/layout/item_notification.xml
+++ b/app/src/main/res/layout/item_notification.xml
@@ -8,7 +8,7 @@
     android:layout_margin="8dp"
     android:orientation="horizontal">
 
-    <com.google.android.material.card.MaterialCardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="start|center_vertical"
@@ -110,5 +110,5 @@
                 tools:ignore="HardcodedText,SmallSp" />
         </LinearLayout>
 
-    </com.google.android.material.card.MaterialCardView>
+    </androidx.cardview.widget.CardView>
 </FrameLayout>
\ No newline at end of file

From d1e03b8237a9c389fb144e209c8bb1a29ed67f82 Mon Sep 17 00:00:00 2001
From: aayush262 <aayushthakur262006@gmail.com>
Date: Fri, 22 Mar 2024 23:44:51 +0530
Subject: [PATCH 5/5] feat(media): fav and popularity count

---
 .../connections/anilist/AnilistQueries.kt     |   5 +-
 app/src/main/java/ani/dantotsu/media/Media.kt |   4 +-
 .../ani/dantotsu/media/MediaInfoFragment.kt   |   2 +
 app/src/main/res/layout/activity_profile.xml  | 224 +++++++++---------
 .../main/res/layout/fragment_media_info.xml   |  39 +++
 app/src/main/res/values/strings.xml           |   2 +
 6 files changed, 167 insertions(+), 109 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
index c9ff694d..c83fd07f 100644
--- a/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
+++ b/app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt
@@ -72,7 +72,7 @@ class AnilistQueries {
         media.cameFromContinue = false
 
         val query =
-            """{Media(id:${media.id}){id mediaListEntry{id status score(format:POINT_100)progress private notes repeat customLists updatedAt startedAt{year month day}completedAt{year month day}}isFavourite siteUrl idMal nextAiringEpisode{episode airingAt}source countryOfOrigin format duration season seasonYear startDate{year month day}endDate{year month day}genres studios(isMain:true){nodes{id name siteUrl}}description trailer{site id}synonyms tags{name rank isMediaSpoiler}characters(sort:[ROLE,FAVOURITES_DESC],perPage:25,page:1){edges{role node{id image{medium}name{userPreferred}isFavourite}}}relations{edges{relationType(version:2)node{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}popularity meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}staffPreview:staff(perPage:8,sort:[RELEVANCE,ID]){edges{role node{id image{large medium}name{userPreferred}}}}recommendations(sort:RATING_DESC){nodes{mediaRecommendation{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}externalLinks{url site}}}"""
+            """{Media(id:${media.id}){id favourites popularity mediaListEntry{id status score(format:POINT_100)progress private notes repeat customLists updatedAt startedAt{year month day}completedAt{year month day}}isFavourite siteUrl idMal nextAiringEpisode{episode airingAt}source countryOfOrigin format duration season seasonYear startDate{year month day}endDate{year month day}genres studios(isMain:true){nodes{id name siteUrl}}description trailer{site id}synonyms tags{name rank isMediaSpoiler}characters(sort:[ROLE,FAVOURITES_DESC],perPage:25,page:1){edges{role node{id image{medium}name{userPreferred}isFavourite}}}relations{edges{relationType(version:2)node{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}popularity meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}staffPreview:staff(perPage:8,sort:[RELEVANCE,ID]){edges{role node{id image{large medium}name{userPreferred}}}}recommendations(sort:RATING_DESC){nodes{mediaRecommendation{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}externalLinks{url site}}}"""
         runBlocking {
             val anilist = async {
                 var response = executeQuery<Query.Media>(query, force = true, show = true)
@@ -83,7 +83,8 @@ class AnilistQueries {
                         media.source = fetchedMedia.source?.toString()
                         media.countryOfOrigin = fetchedMedia.countryOfOrigin
                         media.format = fetchedMedia.format?.toString()
-
+                        media.favourites = fetchedMedia.favourites
+                        media.popularity = fetchedMedia.popularity
                         media.startDate = fetchedMedia.startDate
                         media.endDate = fetchedMedia.endDate
 
diff --git a/app/src/main/java/ani/dantotsu/media/Media.kt b/app/src/main/java/ani/dantotsu/media/Media.kt
index d26a5048..c0196218 100644
--- a/app/src/main/java/ani/dantotsu/media/Media.kt
+++ b/app/src/main/java/ani/dantotsu/media/Media.kt
@@ -25,7 +25,7 @@ data class Media(
     var cover: String? = null,
     var banner: String? = null,
     var relation: String? = null,
-    var popularity: Int? = null,
+    var favourites: Int? = null,
 
     var isAdult: Boolean,
     var isFav: Boolean = false,
@@ -56,6 +56,7 @@ data class Media(
     var trailer: String? = null,
     var startDate: FuzzyDate? = null,
     var endDate: FuzzyDate? = null,
+    var popularity: Int? = null,
 
     var characters: ArrayList<Character>? = null,
     var staff: ArrayList<Author>? = null,
@@ -95,6 +96,7 @@ data class Media(
         meanScore = apiMedia.meanScore,
         startDate = apiMedia.startDate,
         endDate = apiMedia.endDate,
+        favourites = apiMedia.favourites,
         anime = if (apiMedia.type == MediaType.ANIME) Anime(
             totalEpisodes = apiMedia.episodes,
             nextAiringEpisode = apiMedia.nextAiringEpisode?.episode?.minus(1)
diff --git a/app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt b/app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt
index 06fb3aa9..1cec1eb6 100644
--- a/app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt
@@ -97,6 +97,8 @@ class MediaInfoFragment : Fragment() {
                 binding.mediaInfoSource.text = media.source
                 binding.mediaInfoStart.text = media.startDate?.toString() ?: "??"
                 binding.mediaInfoEnd.text = media.endDate?.toString() ?: "??"
+                binding.mediaInfoPopularity.text = media.popularity.toString()
+                binding.mediaInfoFavorites.text = media.favourites.toString()
                 if (media.anime != null) {
                     val episodeDuration = media.anime.episodeDuration
 
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
index 068e1e41..5b61ea3d 100644
--- a/app/src/main/res/layout/activity_profile.xml
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -129,133 +129,145 @@
                 </LinearLayout>
             </FrameLayout>
 
-            <LinearLayout
+            <com.google.android.material.card.MaterialCardView
                 android:id="@+id/profileButtonContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
                 android:layout_marginTop="210dp"
-                android:layout_marginBottom="6dp"
-                android:layout_marginEnd="8dp"
-                android:background="?attr/colorSurface"
+                android:layout_marginBottom="2dp"
+                android:backgroundTint="?attr/colorSurfaceVariant"
                 android:baselineAligned="false"
-                android:orientation="horizontal"
-                tools:ignore="HardcodedText">
+                app:cardCornerRadius="16dp">
 
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/profileFollowerCountContainer"
-                    android:layout_width="0dp"
+                <LinearLayout
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginStart="8dp"
-                    android:backgroundTint="?attr/colorSurfaceVariant"
-                    app:cardCornerRadius="16dp">
+                    android:orientation="horizontal"
+                    tools:ignore="HardcodedText">
 
-                    <TextView
-                        android:id="@+id/profileFollowerCount"
-                        android:layout_width="wrap_content"
+                    <LinearLayout
+                        android:id="@+id/profileFollowerCountContainer"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:fontFamily="@font/poppins_semi_bold"
-                        android:textColor="?attr/colorPrimary"
-                        tools:text="1" />
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                        <TextView
+                            android:id="@+id/profileFollowerCount"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/poppins_semi_bold"
+                            android:textColor="?attr/colorPrimary"
+                            tools:text="1" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/poppins_semi_bold"
+                            android:text="Follower" />
+
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="3dp"
+                        android:layout_height="match_parent"
+                        android:background="?android:attr/listDivider" />
+
+                    <LinearLayout
+                        android:id="@+id/profileFollowingCountContainer"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="24dp"
-                        android:fontFamily="@font/poppins_semi_bold"
-                        android:text="Follower" />
-                </com.google.android.material.card.MaterialCardView>
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
+                        <TextView
+                            android:id="@+id/profileFollowingCount"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/poppins_semi_bold"
+                            android:textColor="?attr/colorPrimary"
+                            tools:text="2" />
 
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/profileFollowingCountContainer"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginStart="8dp"
-                    android:backgroundTint="?attr/colorSurfaceVariant"
-                    app:cardCornerRadius="16dp">
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/poppins_semi_bold"
+                            android:text="Following" />
 
-                    <TextView
-                        android:id="@+id/profileFollowingCount"
-                        android:layout_width="wrap_content"
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="3dp"
+                        android:layout_height="match_parent"
+                        android:background="?android:attr/listDivider" />
+
+                    <LinearLayout
+                        android:id="@+id/profileAnimeCountContainer"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:fontFamily="@font/poppins_semi_bold"
-                        android:textColor="?attr/colorPrimary"
-                        tools:text="2" />
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                        <TextView
+                            android:id="@+id/profileAnimeCount"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/poppins_semi_bold"
+                            android:textColor="?attr/colorPrimary"
+                            tools:text="3" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/poppins_semi_bold"
+                            android:text="Anime" />
+
+                    </LinearLayout>
+
+                    <View
+                        android:layout_width="3dp"
+                        android:layout_height="match_parent"
+                        android:background="?android:attr/listDivider" />
+
+                    <LinearLayout
+                        android:id="@+id/profileMangaCountContainer"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="24dp"
-                        android:fontFamily="@font/poppins_semi_bold"
-                        android:text="Following" />
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
 
-                </com.google.android.material.card.MaterialCardView>
+                        <TextView
+                            android:id="@+id/profileMangaCount"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/poppins_semi_bold"
+                            android:textColor="?attr/colorPrimary"
+                            tools:text="4" />
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:fontFamily="@font/poppins_semi_bold"
+                            android:text="Manga" />
 
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/profileAnimeCountContainer"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginStart="8dp"
-                    android:backgroundTint="?attr/colorSurfaceVariant"
-                    app:cardCornerRadius="16dp">
-
-                    <TextView
-                        android:id="@+id/profileAnimeCount"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:fontFamily="@font/poppins_semi_bold"
-                        android:textColor="?attr/colorPrimary"
-                        tools:text="3" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="24dp"
-                        android:fontFamily="@font/poppins_semi_bold"
-                        android:text="Anime" />
-
-                </com.google.android.material.card.MaterialCardView>
-
-                <com.google.android.material.card.MaterialCardView
-                    android:id="@+id/profileMangaCountContainer"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginStart="8dp"
-                    android:backgroundTint="?attr/colorSurfaceVariant"
-                    app:cardCornerRadius="16dp">
-
-                    <TextView
-                        android:id="@+id/profileMangaCount"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:fontFamily="@font/poppins_semi_bold"
-                        android:textColor="?attr/colorPrimary"
-                        tools:text="4" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="24dp"
-                        android:fontFamily="@font/poppins_semi_bold"
-                        android:text="Manga" />
-
-                </com.google.android.material.card.MaterialCardView>
-
-            </LinearLayout>
+                    </LinearLayout>
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml
index 0cc14a6a..29ae8ff9 100644
--- a/app/src/main/res/layout/fragment_media_info.xml
+++ b/app/src/main/res/layout/fragment_media_info.xml
@@ -303,7 +303,46 @@
                             android:fontFamily="@font/poppins_bold"
                             android:textAlignment="textEnd" />
                     </TableRow>
+                    <TableRow
+                        android:layout_width="match_parent"
+                        android:layout_height="24dp"
+                        android:orientation="horizontal">
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:alpha="0.58"
+                            android:text="@string/popularity"
+                            android:textStyle="bold" />
+
+                        <TextView
+                            android:id="@+id/mediaInfoPopularity"
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_weight="1"
+                            android:fontFamily="@font/poppins_bold"
+                            android:textAlignment="textEnd" />
+                    </TableRow>
+                    <TableRow
+                        android:layout_width="match_parent"
+                        android:layout_height="24dp"
+                        android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:alpha="0.58"
+                        android:text="@string/favourites"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/mediaInfoFavorites"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:fontFamily="@font/poppins_bold"
+                        android:textAlignment="textEnd" />
+                </TableRow>
                     <View
                         android:layout_width="match_parent"
                         android:layout_height="16dp" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a974ff47..9b0ec0f3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -124,6 +124,8 @@
     <string name="characters">Characters</string>
     <string name="relations">Relations</string>
     <string name="staff">Staff</string>
+    <string name="favourites">Favourites</string>
+    <string name="popularity">Popularity</string>
 
     <string name="roles">Roles</string>
     <string name="details">Details</string>