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/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/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/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/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/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/ic_menu.xml b/android/app/src/main/res/drawable/ic_menu.xml deleted file mode 100644 index c626f75d3..000000000 --- a/android/app/src/main/res/drawable/ic_menu.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/android/app/src/main/res/drawable/ic_watch.xml b/android/app/src/main/res/drawable/ic_watch.xml deleted file mode 100644 index c40772dff..000000000 --- a/android/app/src/main/res/drawable/ic_watch.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - 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/rectangle_radius_20_without_bottom_left.xml b/android/app/src/main/res/drawable/rectangle_radius_20_without_bottom_left.xml new file mode 100644 index 000000000..c48b5d4f7 --- /dev/null +++ b/android/app/src/main/res/drawable/rectangle_radius_20_without_bottom_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_radius_20_without_bottom_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_radius_20_without_bottom_right.xml index 419825172..cbc882aee 100644 --- a/android/app/src/main/res/drawable/rectangle_tooltip.xml +++ b/android/app/src/main/res/drawable/rectangle_radius_20_without_bottom_right.xml @@ -2,8 +2,8 @@ + android:topLeftRadius="20dp" + android:topRightRadius="20dp" /> 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 new file mode 100644 index 000000000..18f0c8f2f --- /dev/null +++ b/android/app/src/main/res/layout/fragment_detail_meeting.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +