From 2742f58af510ee4b3d4d15790a7f5f17928125b5 Mon Sep 17 00:00:00 2001
From: ibo <41344259+sneazy-ibo@users.noreply.github.com>
Date: Fri, 8 Mar 2024 09:34:32 +0100
Subject: [PATCH] =?UTF-8?q?feat():=20fixed=20the=20UI=20changes=20?=
 =?UTF-8?q?=F0=9F=A6=8D=20+=20notificationIcon=20logic=20and=20long=20pres?=
 =?UTF-8?q?s=20userAvatar=20=F0=9F=90=92=20(#226)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/ani/dantotsu/home/HomeFragment.kt    |  8 +++
 .../settings/SettingsDialogFragment.kt        |  7 +++
 app/src/main/res/layout/item_notification.xml | 52 ++++++++++---------
 3 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/home/HomeFragment.kt b/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
index e0a2dc14..9652c43b 100644
--- a/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
+++ b/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
@@ -32,6 +32,7 @@ import ani.dantotsu.media.Media
 import ani.dantotsu.media.MediaAdaptor
 import ani.dantotsu.media.user.ListActivity
 import ani.dantotsu.navBarHeight
+import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.setSafeOnClickListener
 import ani.dantotsu.setSlideIn
 import ani.dantotsu.setSlideUp
@@ -120,6 +121,13 @@ class HomeFragment : Fragment() {
                 "dialog"
             )
         }
+        binding.homeUserAvatarContainer.setOnLongClickListener {
+            ContextCompat.startActivity(
+                requireContext(), Intent(requireContext(), ProfileActivity::class.java)
+                    .putExtra("userId", Anilist.userid), null
+            )
+            false
+        }
 
         binding.homeContainer.updateLayoutParams<ViewGroup.MarginLayoutParams> {
             bottomMargin = navBarHeight
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt b/app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt
index 8a1c9be4..31feb45d 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt
@@ -59,6 +59,13 @@ class SettingsDialogFragment : BottomSheetDialogFragment() {
         val theme = requireContext().theme
         theme.resolveAttribute(com.google.android.material.R.attr.colorSurface, typedValue, true)
         window?.navigationBarColor = typedValue.data
+        val notificationIcon = if (Anilist.unreadNotificationCount > 0) {
+            R.drawable.ic_round_notifications_active_24
+        } else {
+            R.drawable.ic_round_notifications_none_24
+        }
+        binding.settingsNotification.setImageResource(notificationIcon)
+        binding.settingsNotification.visibility = View.VISIBLE
 
         if (Anilist.token != null) {
             binding.settingsLogin.setText(R.string.logout)
diff --git a/app/src/main/res/layout/item_notification.xml b/app/src/main/res/layout/item_notification.xml
index eedb9b5b..9befe130 100644
--- a/app/src/main/res/layout/item_notification.xml
+++ b/app/src/main/res/layout/item_notification.xml
@@ -73,32 +73,36 @@
 
         </com.google.android.material.card.MaterialCardView>
 
-        <TextView
-            android:id="@+id/notificationText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|center"
-            android:layout_marginStart="128dp"
-            android:padding="8dp"
-            android:ellipsize="end"
-            android:fontFamily="@font/poppins_semi_bold"
-            android:maxLines="3"
-            android:textSize="14dp"
-            android:transitionName="mediaTitle"
-            tools:ignore="SpUsage"
-            tools:text="@string/slogan" />
-
-        <TextView
-            android:id="@+id/notificationDate"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:layout_marginTop="2dp"
-            android:layout_marginEnd="20dp"
-            android:fontFamily="@font/poppins_semi_bold"
-            android:text="Wed,06 March 2024, 7:00PM"
-            android:textSize="10sp"
-            tools:ignore="HardcodedText" />
+            android:layout_gravity="start|center"
+            android:orientation="vertical"
+            android:layout_marginStart="125dp">
+
+            <TextView
+                android:id="@+id/notificationText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:fontFamily="@font/poppins_semi_bold"
+                android:maxLines="3"
+                android:textSize="14dp"
+                android:transitionName="mediaTitle"
+                tools:ignore="SpUsage"
+                tools:text="@string/slogan" />
+
+            <TextView
+                android:id="@+id/notificationDate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:layout_marginTop="4dp"
+                android:fontFamily="@font/poppins_semi_bold"
+                android:text="Wed,06 March 2024, 7:00PM"
+                android:textSize="10sp"
+                tools:ignore="HardcodedText" />
+        </LinearLayout>
 
     </com.google.android.material.card.MaterialCardView>
 </FrameLayout>
\ No newline at end of file