From c9dbb23729c18297e364b8901d5fd5a9d6f7c220 Mon Sep 17 00:00:00 2001
From: ki960213 <ki960213@gmail.com>
Date: Fri, 9 Feb 2024 12:07:31 +0900
Subject: [PATCH] =?UTF-8?q?chore(build.gradle.kts):=20=EB=B2=84=EC=A0=84?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=EC=99=80=20=EB=B2=84=EC=A0=84=20=EB=AA=85?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EC=95=8C=EB=A6=BC=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=95=8C=EB=A6=BC=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=9E=91=EC=84=B1=EC=9E=90=EB=AA=85?=
 =?UTF-8?q?=EC=9D=84=20=EB=B3=B4=EC=97=AC=EC=A3=BC=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 60 -> 62(61버전을 임시 저장 했는데 이미 사용한 버전이라서 안된다고 해서 62로 올림)
- 2.2.5 -> 2.3.0
---
 android/2023-emmsale/app/build.gradle.kts     |  4 +--
 .../emmsale/data/mapper/NotificationMapper.kt |  5 +++-
 .../src/main/res/layout/item_all_comment.xml  |  2 +-
 .../layout/item_comment_notification_body.xml | 27 ++++++++++++++-----
 .../item_interest_event_notification.xml      | 18 ++++++-------
 5 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/android/2023-emmsale/app/build.gradle.kts b/android/2023-emmsale/app/build.gradle.kts
index 70b11740c..fffce3571 100644
--- a/android/2023-emmsale/app/build.gradle.kts
+++ b/android/2023-emmsale/app/build.gradle.kts
@@ -20,8 +20,8 @@ android {
         applicationId = "com.emmsale"
         minSdk = 28
         targetSdk = 33
-        versionCode = 60
-        versionName = "2.2.5"
+        versionCode = 62
+        versionName = "2.3.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
diff --git a/android/2023-emmsale/app/src/main/java/com/emmsale/data/mapper/NotificationMapper.kt b/android/2023-emmsale/app/src/main/java/com/emmsale/data/mapper/NotificationMapper.kt
index d39f986d1..f37f18216 100644
--- a/android/2023-emmsale/app/src/main/java/com/emmsale/data/mapper/NotificationMapper.kt
+++ b/android/2023-emmsale/app/src/main/java/com/emmsale/data/mapper/NotificationMapper.kt
@@ -49,7 +49,10 @@ fun NotificationResponse.toData(): Notification = when (notificationType) {
                 content = commentNotificationInformation.content,
                 parentCommentId = commentNotificationInformation.parentId,
                 feed = Feed(id = commentNotificationInformation.feedId),
-                writer = Member(profileImageUrl = commentNotificationInformation.writerProfileImageUrl),
+                writer = Member(
+                    name = commentNotificationInformation.writerName,
+                    profileImageUrl = commentNotificationInformation.writerProfileImageUrl,
+                ),
             ),
         )
     }
diff --git a/android/2023-emmsale/app/src/main/res/layout/item_all_comment.xml b/android/2023-emmsale/app/src/main/res/layout/item_all_comment.xml
index 04f0e0a7a..0e2937f23 100644
--- a/android/2023-emmsale/app/src/main/res/layout/item_all_comment.xml
+++ b/android/2023-emmsale/app/src/main/res/layout/item_all_comment.xml
@@ -126,7 +126,7 @@
             android:id="@+id/iv_comment_menu_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="-2dp"
+            android:layout_marginEnd="-4dp"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/comment_menu_button"
             android:onClick="@{() -> onCommentMenuClick.invoke(uiState.isWrittenByLoginUser, uiState.comment)}"
diff --git a/android/2023-emmsale/app/src/main/res/layout/item_comment_notification_body.xml b/android/2023-emmsale/app/src/main/res/layout/item_comment_notification_body.xml
index bf8f30b6f..00e8626dd 100644
--- a/android/2023-emmsale/app/src/main/res/layout/item_comment_notification_body.xml
+++ b/android/2023-emmsale/app/src/main/res/layout/item_comment_notification_body.xml
@@ -39,7 +39,7 @@
         android:focusable="true"
         android:onClick="@{() -> onNotificationClick.invoke(commentNotification)}"
         android:paddingHorizontal="17dp"
-        android:paddingVertical="21dp">
+        android:paddingVertical="18dp">
 
         <ImageView
             android:id="@+id/iv_member_profile"
@@ -49,11 +49,24 @@
             android:scaleType="centerCrop"
             app:imageUrl="@{commentNotification.comment.writer.profileImageUrl}"
             app:isCircle="@{true}"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:src="@tools:sample/avatars" />
 
+        <TextView
+            android:id="@+id/tv_writer_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="12dp"
+            android:textSize="14sp"
+            android:text="@{commentNotification.comment.writer.name}"
+            app:layout_constraintTop_toTopOf="@id/iv_member_profile"
+            app:layout_constraintStart_toEndOf="@id/iv_member_profile"
+            app:layout_constraintEnd_toStartOf="@id/btn_delete"
+            android:fontFamily="@font/nanum_square_extra_bold"
+            tools:text="토마스" />
+
         <TextView
             android:id="@+id/tv_comment"
             android:layout_width="0dp"
@@ -66,9 +79,10 @@
             android:textColor="@color/black"
             android:textSize="14sp"
             android:textStyle="bold"
-            app:layout_constraintEnd_toStartOf="@id/btn_delete"
+            android:layout_marginTop="10dp"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/iv_member_profile"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_writer_name"
             tools:text="이번 행사 너무 재밌었어요! 저는 그래도 더 재밌었던 것 같아요. 다음에 또 만나요!" />
 
         <TextView
@@ -77,6 +91,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/dark_gray"
             android:textSize="12sp"
+            android:layout_marginTop="10dp"
             app:dateText="@{commentNotification.createdAt}"
             app:dateTimeFormatter="@{DateTimePattern.RELATIVE_TIME}"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -94,9 +109,9 @@
             android:onClick="@{() -> onDeleteClick.invoke(commentNotification.id)}"
             android:padding="6dp"
             android:src="@drawable/ic_notification_delete"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_comment"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_writer_name"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_comment" />
+            app:layout_constraintTop_toTopOf="@+id/tv_writer_name" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/android/2023-emmsale/app/src/main/res/layout/item_interest_event_notification.xml b/android/2023-emmsale/app/src/main/res/layout/item_interest_event_notification.xml
index 87f1021b6..83f408f86 100644
--- a/android/2023-emmsale/app/src/main/res/layout/item_interest_event_notification.xml
+++ b/android/2023-emmsale/app/src/main/res/layout/item_interest_event_notification.xml
@@ -51,7 +51,7 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/tv_comment"
+            android:id="@+id/tv_event_notification_message"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="15dp"
@@ -67,17 +67,17 @@
             app:layout_constraintTop_toTopOf="@+id/iv_member_profile" />
 
         <TextView
-            android:id="@+id/tv_comment_event_title"
+            android:id="@+id/tv_event_title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:fontFamily="@font/nanum_square_bold"
             android:text="@{interestEventNotification.event.name}"
             android:textColor="@color/black"
             android:textSize="14sp"
+            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/tv_comment"
-            app:layout_constraintTop_toBottomOf="@+id/tv_comment"
+            app:layout_constraintStart_toStartOf="@+id/tv_event_notification_message"
+            app:layout_constraintTop_toBottomOf="@+id/tv_event_notification_message"
             tools:text="안드로이드 최대 행사 드로이드 나이츠" />
 
 
@@ -91,8 +91,8 @@
             android:textSize="12sp"
             app:dateText="@{interestEventNotification.createdAt}"
             app:dateTimeFormatter="@{DateTimePattern.RELATIVE_TIME}"
-            app:layout_constraintStart_toStartOf="@+id/tv_comment"
-            app:layout_constraintTop_toBottomOf="@+id/tv_comment_event_title"
+            app:layout_constraintStart_toStartOf="@+id/tv_event_notification_message"
+            app:layout_constraintTop_toBottomOf="@+id/tv_event_title"
             tools:text="07.28" />
 
         <ImageView
@@ -105,9 +105,9 @@
             android:onClick="@{() -> onDeleteClick.invoke(interestEventNotification.id)}"
             android:padding="6dp"
             android:src="@drawable/ic_notification_delete"
-            app:layout_constraintBottom_toBottomOf="@+id/tv_comment"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_event_notification_message"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/tv_comment" />
+            app:layout_constraintTop_toTopOf="@+id/tv_event_notification_message" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>