Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

design: 약속 상세 화면 UI 구현 #959

Merged
merged 9 commits into from
Jan 18, 2025
Original file line number Diff line number Diff line change
@@ -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<FragmentNotificationLogBinding>(R.layout.fragment_detail_meeting) {
override fun onViewCreated(
view: View,
savedInstanceState: Bundle?,
) {
super.onViewCreated(view, savedInstanceState)
initializeBinding()
initializeObserve()
}

fun initializeBinding() {
}

private fun initializeObserve() {
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.mulberry.ody.presentation.room.listener

interface MeetingRoomListener {
fun onExitMeetingRoom()
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,20 @@ 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
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<FragmentNotificationLogBinding>(R.layout.fragment_notification_log),
MenuListener,
NotificationLogListener {
MeetingRoomListener {
private val viewModel: MeetingRoomViewModel by activityViewModels<MeetingRoomViewModel>()
private val notificationLogsAdapter: NotificationLogsAdapter by lazy { NotificationLogsAdapter() }
private val matesAdapter: MatesAdapter by lazy { MatesAdapter() }
Expand All @@ -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() {
Expand All @@ -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)
}
Expand Down

This file was deleted.

This file was deleted.

8 changes: 4 additions & 4 deletions android/app/src/main/res/drawable/ic_exit.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="35dp"
android:height="35dp"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M14,7.636L14,4.5C14,4.224 13.776,4 13.5,4L4.5,4C4.224,4 4,4.224 4,4.5L4,19.5C4,19.776 4.224,20 4.5,20L13.5,20C13.776,20 14,19.776 14,19.5L14,16.364"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/quarternary"
android:strokeColor="@color/tertiary"
android:strokeLineCap="round"/>
<path
android:pathData="M10,12L21,12M21,12L18,8.5M21,12L18,15.5"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="@color/quarternary"
android:strokeColor="@color/tertiary"
android:strokeLineCap="round"/>
</vector>
12 changes: 12 additions & 0 deletions android/app/src/main/res/drawable/ic_information.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="12dp"
android:height="12dp"
android:viewportWidth="12"
android:viewportHeight="12">
<group>
<clip-path android:pathData="M0,0h12v12h-12z" />
<path
android:fillColor="@color/senary"
android:pathData="M6,0.5C4.912,0.5 3.849,0.823 2.944,1.427C2.04,2.031 1.335,2.89 0.919,3.895C0.502,4.9 0.393,6.006 0.606,7.073C0.818,8.14 1.342,9.12 2.111,9.889C2.88,10.658 3.86,11.182 4.927,11.394C5.994,11.606 7.1,11.498 8.105,11.081C9.11,10.665 9.969,9.96 10.573,9.056C11.177,8.151 11.5,7.088 11.5,6C11.503,5.277 11.363,4.56 11.088,3.891C10.813,3.222 10.408,2.615 9.896,2.103C9.385,1.592 8.777,1.187 8.109,0.912C7.44,0.637 6.723,0.497 6,0.5ZM6.5,8.5C6.5,8.633 6.447,8.76 6.353,8.853C6.26,8.947 6.132,9 6,9C5.867,9 5.74,8.947 5.646,8.853C5.553,8.76 5.5,8.633 5.5,8.5V5.5C5.5,5.367 5.553,5.24 5.646,5.146C5.74,5.053 5.867,5 6,5C6.132,5 6.26,5.053 6.353,5.146C6.447,5.24 6.5,5.367 6.5,5.5V8.5ZM6,4C5.901,4 5.804,3.971 5.722,3.916C5.64,3.861 5.576,3.783 5.538,3.691C5.5,3.6 5.49,3.499 5.509,3.402C5.529,3.305 5.576,3.216 5.646,3.146C5.716,3.076 5.805,3.029 5.902,3.01C5.999,2.99 6.1,3 6.191,3.038C6.283,3.076 6.361,3.14 6.416,3.222C6.471,3.304 6.5,3.401 6.5,3.5C6.5,3.633 6.447,3.76 6.353,3.853C6.26,3.947 6.132,4 6,4Z" />
</group>
</vector>
9 changes: 0 additions & 9 deletions android/app/src/main/res/drawable/ic_menu.xml

This file was deleted.

13 changes: 0 additions & 13 deletions android/app/src/main/res/drawable/ic_watch.xml

This file was deleted.

4 changes: 4 additions & 0 deletions android/app/src/main/res/drawable/rectangle_radius_10.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/rectangle_radius_10" />
</shape>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/rectangle_radius_15" />
<stroke android:width="1dp"
android:color="@color/gray_350"
/>
<stroke
android:width="1dp"
android:color="@color/gray_350" />
</shape>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/rectangle_radius_15" />
<stroke
android:width="1dp"
android:color="@color/secondary" />
</shape>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/gray_400_70" />
<corners
android:bottomLeftRadius="0dp"
android:bottomRightRadius="20dp"
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
</shape>
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/gray_400_70" />
<corners
android:bottomLeftRadius="30dp"
android:bottomLeftRadius="20dp"
android:bottomRightRadius="0dp"
android:topLeftRadius="30dp"
android:topRightRadius="30dp" />
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />
</shape>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_cancel" android:state_selected="true"/>
<item android:drawable="@drawable/ic_ody" android:state_selected="false" />
</selector>
Loading
Loading