From 796beba1f019aaf49fd03aea267646b97003317d Mon Sep 17 00:00:00 2001 From: kimhyemin Date: Fri, 17 Jan 2025 19:05:13 +0900 Subject: [PATCH 1/9] =?UTF-8?q?design:=20meeting=20room=20=ED=88=B4?= =?UTF-8?q?=EB=B0=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../room/log/listener/MenuListener.kt | 5 --- android/app/src/main/res/drawable/ic_exit.xml | 8 ++-- .../res/layout/fragment_detail_meeting.xml | 39 +++++++++++++++++++ ...ation_log.xml => toolbar_meeting_room.xml} | 35 ++++------------- 4 files changed, 51 insertions(+), 36 deletions(-) delete mode 100644 android/app/src/main/java/com/mulberry/ody/presentation/room/log/listener/MenuListener.kt create mode 100644 android/app/src/main/res/layout/fragment_detail_meeting.xml rename android/app/src/main/res/layout/{toolbar_notification_log.xml => toolbar_meeting_room.xml} (69%) diff --git a/android/app/src/main/java/com/mulberry/ody/presentation/room/log/listener/MenuListener.kt b/android/app/src/main/java/com/mulberry/ody/presentation/room/log/listener/MenuListener.kt deleted file mode 100644 index 408eaaee0..000000000 --- a/android/app/src/main/java/com/mulberry/ody/presentation/room/log/listener/MenuListener.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.mulberry.ody.presentation.room.log.listener - -interface MenuListener { - fun onClickMenu() -} diff --git a/android/app/src/main/res/drawable/ic_exit.xml b/android/app/src/main/res/drawable/ic_exit.xml index 616280fd4..32bf9cce2 100644 --- a/android/app/src/main/res/drawable/ic_exit.xml +++ b/android/app/src/main/res/drawable/ic_exit.xml @@ -1,6 +1,6 @@ diff --git a/android/app/src/main/res/layout/fragment_detail_meeting.xml b/android/app/src/main/res/layout/fragment_detail_meeting.xml new file mode 100644 index 000000000..c05a3e95f --- /dev/null +++ b/android/app/src/main/res/layout/fragment_detail_meeting.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/layout/toolbar_notification_log.xml b/android/app/src/main/res/layout/toolbar_meeting_room.xml similarity index 69% rename from android/app/src/main/res/layout/toolbar_notification_log.xml rename to android/app/src/main/res/layout/toolbar_meeting_room.xml index 37bf9afc1..88502bf70 100644 --- a/android/app/src/main/res/layout/toolbar_notification_log.xml +++ b/android/app/src/main/res/layout/toolbar_meeting_room.xml @@ -9,17 +9,10 @@ name="title" type="java.lang.String" /> - - - @@ -60,35 +53,23 @@ style="@style/pretendard_bold_24" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:ellipsize="end" android:maxLines="1" android:text="@{title}" tools:text="아주긴모임이름아주긴모임이름아주긴모임이름아" /> - - + + app:layout_constraintStart_toEndOf="@id/hsv_title" + app:layout_constraintTop_toTopOf="parent" /> From 1caf2754dc16c00ceb658e6aa3425b1c51afa1ec Mon Sep 17 00:00:00 2001 From: kimhyemin Date: Fri, 17 Jan 2025 19:22:35 +0900 Subject: [PATCH 2/9] =?UTF-8?q?design:=20=EB=A1=9C=EA=B7=B8=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../room/listener/MeetingRoomListener.kt | 5 + .../room/log/NotificationLogFragment.kt | 19 +- .../log/listener/NotificationLogListener.kt | 7 - .../res/layout/fragment_notification_log.xml | 282 ++++-------------- 4 files changed, 67 insertions(+), 246 deletions(-) create mode 100644 android/app/src/main/java/com/mulberry/ody/presentation/room/listener/MeetingRoomListener.kt delete mode 100644 android/app/src/main/java/com/mulberry/ody/presentation/room/log/listener/NotificationLogListener.kt diff --git a/android/app/src/main/java/com/mulberry/ody/presentation/room/listener/MeetingRoomListener.kt b/android/app/src/main/java/com/mulberry/ody/presentation/room/listener/MeetingRoomListener.kt new file mode 100644 index 000000000..5510cbe08 --- /dev/null +++ b/android/app/src/main/java/com/mulberry/ody/presentation/room/listener/MeetingRoomListener.kt @@ -0,0 +1,5 @@ +package com.mulberry.ody.presentation.room.listener + +interface MeetingRoomListener { + fun onExitMeetingRoom() +} diff --git a/android/app/src/main/java/com/mulberry/ody/presentation/room/log/NotificationLogFragment.kt b/android/app/src/main/java/com/mulberry/ody/presentation/room/log/NotificationLogFragment.kt index 819da212f..dc19450a9 100644 --- a/android/app/src/main/java/com/mulberry/ody/presentation/room/log/NotificationLogFragment.kt +++ b/android/app/src/main/java/com/mulberry/ody/presentation/room/log/NotificationLogFragment.kt @@ -3,7 +3,6 @@ package com.mulberry.ody.presentation.room.log import android.content.Intent import android.os.Bundle import android.view.View -import androidx.core.view.GravityCompat import androidx.fragment.app.activityViewModels import com.mulberry.ody.R import com.mulberry.ody.databinding.FragmentNotificationLogBinding @@ -11,15 +10,13 @@ import com.mulberry.ody.presentation.collectWhenStarted import com.mulberry.ody.presentation.common.binding.BindingFragment import com.mulberry.ody.presentation.room.MeetingRoomActivity import com.mulberry.ody.presentation.room.MeetingRoomViewModel +import com.mulberry.ody.presentation.room.listener.MeetingRoomListener import com.mulberry.ody.presentation.room.log.adapter.MatesAdapter import com.mulberry.ody.presentation.room.log.adapter.NotificationLogsAdapter -import com.mulberry.ody.presentation.room.log.listener.MenuListener -import com.mulberry.ody.presentation.room.log.listener.NotificationLogListener class NotificationLogFragment : BindingFragment(R.layout.fragment_notification_log), - MenuListener, - NotificationLogListener { + MeetingRoomListener { private val viewModel: MeetingRoomViewModel by activityViewModels() private val notificationLogsAdapter: NotificationLogsAdapter by lazy { NotificationLogsAdapter() } private val matesAdapter: MatesAdapter by lazy { MatesAdapter() } @@ -36,10 +33,8 @@ class NotificationLogFragment : fun initializeBinding() { binding.vm = viewModel binding.backListener = requireActivity() as MeetingRoomActivity - binding.menuListener = this - binding.notificationLogListener = this + binding.meetingRoomListener = this binding.rvNotificationLog.adapter = notificationLogsAdapter - binding.rvMates.adapter = matesAdapter } private fun initializeObserve() { @@ -64,14 +59,6 @@ class NotificationLogFragment : } } - override fun onClickMenu() { - binding.dlNotificationLog.openDrawer(GravityCompat.END) - } - - override fun onCopyInviteCode() { - viewModel.copyInviteCode() - } - override fun onExitMeetingRoom() { ExitMeetingRoomDialog().show(parentFragmentManager, EXIT_MEETING_ROOM_DIALOG_TAG) } diff --git a/android/app/src/main/java/com/mulberry/ody/presentation/room/log/listener/NotificationLogListener.kt b/android/app/src/main/java/com/mulberry/ody/presentation/room/log/listener/NotificationLogListener.kt deleted file mode 100644 index de72e1bad..000000000 --- a/android/app/src/main/java/com/mulberry/ody/presentation/room/log/listener/NotificationLogListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.mulberry.ody.presentation.room.log.listener - -interface NotificationLogListener { - fun onCopyInviteCode() - - fun onExitMeetingRoom() -} diff --git a/android/app/src/main/res/layout/fragment_notification_log.xml b/android/app/src/main/res/layout/fragment_notification_log.xml index 7f398053b..d8ca03549 100644 --- a/android/app/src/main/res/layout/fragment_notification_log.xml +++ b/android/app/src/main/res/layout/fragment_notification_log.xml @@ -14,237 +14,73 @@ type="com.mulberry.ody.presentation.common.listener.BackListener" /> - - + name="meetingRoomListener" + type="com.mulberry.ody.presentation.room.listener.MeetingRoomListener" /> - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - + android:src="@drawable/ic_white_ody" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginStart="4dp" + android:text="@string/meeting_room_dashboard_button" + android:textColor="@color/secondaryVariant" /> - + - + From b2839cf1164d07e636b346317e254631cbf11445 Mon Sep 17 00:00:00 2001 From: kimhyemin Date: Fri, 17 Jan 2025 20:22:27 +0900 Subject: [PATCH 3/9] =?UTF-8?q?design:=20=EC=B6=9C=EB=B0=9C=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EA=B0=80=EC=9D=B4=EB=93=9C=20tooltip=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/rectangle_tooltip_left.xml | 9 ++++++++ ...ooltip.xml => rectangle_tooltip_right.xml} | 6 ++--- .../layout/layout_departure_time_tooltip.xml | 23 +++++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 android/app/src/main/res/drawable/rectangle_tooltip_left.xml rename android/app/src/main/res/drawable/{rectangle_tooltip.xml => rectangle_tooltip_right.xml} (64%) create mode 100644 android/app/src/main/res/layout/layout_departure_time_tooltip.xml diff --git a/android/app/src/main/res/drawable/rectangle_tooltip_left.xml b/android/app/src/main/res/drawable/rectangle_tooltip_left.xml new file mode 100644 index 000000000..d6874156a --- /dev/null +++ b/android/app/src/main/res/drawable/rectangle_tooltip_left.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/android/app/src/main/res/drawable/rectangle_tooltip.xml b/android/app/src/main/res/drawable/rectangle_tooltip_right.xml similarity index 64% rename from android/app/src/main/res/drawable/rectangle_tooltip.xml rename to android/app/src/main/res/drawable/rectangle_tooltip_right.xml index 419825172..a78bde427 100644 --- a/android/app/src/main/res/drawable/rectangle_tooltip.xml +++ b/android/app/src/main/res/drawable/rectangle_tooltip_right.xml @@ -2,8 +2,8 @@ + android:topLeftRadius="22dp" + android:topRightRadius="22dp" /> diff --git a/android/app/src/main/res/layout/layout_departure_time_tooltip.xml b/android/app/src/main/res/layout/layout_departure_time_tooltip.xml new file mode 100644 index 000000000..fffcde9ba --- /dev/null +++ b/android/app/src/main/res/layout/layout_departure_time_tooltip.xml @@ -0,0 +1,23 @@ + + + + + + From 8dfad63fa3df8146e93c30d2ede0d2daed68237a Mon Sep 17 00:00:00 2001 From: kimhyemin Date: Fri, 17 Jan 2025 20:23:01 +0900 Subject: [PATCH 4/9] =?UTF-8?q?design:=20=EC=83=81=EC=84=B8=20=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../room/detail/DetailMeetingFragment.kt | 25 +++ .../src/main/res/drawable/ic_information.xml | 12 ++ .../main/res/drawable/rectangle_radius_10.xml | 4 + .../rectangle_radius_15_stroke_1_gray_350.xml | 6 +- ...ectangle_radius_15_stroke_1_purple_800.xml | 7 + .../selector_detail_meeting_button.xml | 5 + .../res/layout/fragment_detail_meeting.xml | 201 +++++++++++++++++- .../res/layout/fragment_notification_log.xml | 1 - android/app/src/main/res/layout/item_mate.xml | 31 ++- .../res/layout/layout_missing_tooltip.xml | 2 +- .../main/res/layout/toolbar_meeting_room.xml | 5 + android/app/src/main/res/values/dimens.xml | 1 + android/app/src/main/res/values/strings.xml | 10 + 13 files changed, 286 insertions(+), 24 deletions(-) create mode 100644 android/app/src/main/java/com/mulberry/ody/presentation/room/detail/DetailMeetingFragment.kt create mode 100644 android/app/src/main/res/drawable/ic_information.xml create mode 100644 android/app/src/main/res/drawable/rectangle_radius_10.xml create mode 100644 android/app/src/main/res/drawable/rectangle_radius_15_stroke_1_purple_800.xml create mode 100644 android/app/src/main/res/drawable/selector_detail_meeting_button.xml diff --git a/android/app/src/main/java/com/mulberry/ody/presentation/room/detail/DetailMeetingFragment.kt b/android/app/src/main/java/com/mulberry/ody/presentation/room/detail/DetailMeetingFragment.kt new file mode 100644 index 000000000..723e2835e --- /dev/null +++ b/android/app/src/main/java/com/mulberry/ody/presentation/room/detail/DetailMeetingFragment.kt @@ -0,0 +1,25 @@ +package com.mulberry.ody.presentation.room.detail + +import android.os.Bundle +import android.view.View +import com.mulberry.ody.R +import com.mulberry.ody.databinding.FragmentNotificationLogBinding +import com.mulberry.ody.presentation.common.binding.BindingFragment + +class DetailMeetingFragment : + BindingFragment(R.layout.fragment_detail_meeting) { + override fun onViewCreated( + view: View, + savedInstanceState: Bundle?, + ) { + super.onViewCreated(view, savedInstanceState) + initializeBinding() + initializeObserve() + } + + fun initializeBinding() { + } + + private fun initializeObserve() { + } +} diff --git a/android/app/src/main/res/drawable/ic_information.xml b/android/app/src/main/res/drawable/ic_information.xml new file mode 100644 index 000000000..7ce7fd238 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_information.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/android/app/src/main/res/drawable/rectangle_radius_10.xml b/android/app/src/main/res/drawable/rectangle_radius_10.xml new file mode 100644 index 000000000..82b64f9b1 --- /dev/null +++ b/android/app/src/main/res/drawable/rectangle_radius_10.xml @@ -0,0 +1,4 @@ + + + + diff --git a/android/app/src/main/res/drawable/rectangle_radius_15_stroke_1_gray_350.xml b/android/app/src/main/res/drawable/rectangle_radius_15_stroke_1_gray_350.xml index a38bbd382..a8ed6416c 100644 --- a/android/app/src/main/res/drawable/rectangle_radius_15_stroke_1_gray_350.xml +++ b/android/app/src/main/res/drawable/rectangle_radius_15_stroke_1_gray_350.xml @@ -1,7 +1,7 @@ - + diff --git a/android/app/src/main/res/drawable/rectangle_radius_15_stroke_1_purple_800.xml b/android/app/src/main/res/drawable/rectangle_radius_15_stroke_1_purple_800.xml new file mode 100644 index 000000000..b624bd327 --- /dev/null +++ b/android/app/src/main/res/drawable/rectangle_radius_15_stroke_1_purple_800.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/android/app/src/main/res/drawable/selector_detail_meeting_button.xml b/android/app/src/main/res/drawable/selector_detail_meeting_button.xml new file mode 100644 index 000000000..0408887be --- /dev/null +++ b/android/app/src/main/res/drawable/selector_detail_meeting_button.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/app/src/main/res/layout/fragment_detail_meeting.xml b/android/app/src/main/res/layout/fragment_detail_meeting.xml index c05a3e95f..44f2fcaef 100644 --- a/android/app/src/main/res/layout/fragment_detail_meeting.xml +++ b/android/app/src/main/res/layout/fragment_detail_meeting.xml @@ -1,6 +1,7 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> @@ -19,7 +20,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:mateCount="3" app:title="이름" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +