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">
+
+
+ app:layout_constraintTop_toTopOf="@+id/tv_writer_name" />
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" />
@@ -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" />
+ app:layout_constraintTop_toTopOf="@+id/tv_event_notification_message" />