diff --git a/Android/app/src/main/java/com/team16/airbnb/ui/search/roomdetail/ReservationInfoDialogFragment.kt b/Android/app/src/main/java/com/team16/airbnb/ui/search/roomdetail/ReservationInfoDialogFragment.kt
index 068ccfd57..81794e7fe 100644
--- a/Android/app/src/main/java/com/team16/airbnb/ui/search/roomdetail/ReservationInfoDialogFragment.kt
+++ b/Android/app/src/main/java/com/team16/airbnb/ui/search/roomdetail/ReservationInfoDialogFragment.kt
@@ -1,9 +1,13 @@
package com.team16.airbnb.ui.search.roomdetail
+import android.content.Context
+import android.graphics.Point
+import android.os.Build
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
+import android.view.WindowManager
import androidx.databinding.DataBindingUtil
import androidx.fragment.app.DialogFragment
import com.team16.airbnb.R
@@ -25,6 +29,43 @@ class ReservationInfoDialogFragment: DialogFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
-
+
+ context?.dialogFragmentResize(this, 0.95f, 0.95f)
+ }
+
+ override fun onResume() {
+ super.onResume()
+ //context?.dialogFragmentResize(this, 0.95f, 0.95f)
+ }
+
+ fun Context.dialogFragmentResize(dialogFragment: DialogFragment, width: Float, height: Float) {
+
+ val windowManager = getSystemService(Context.WINDOW_SERVICE) as WindowManager
+
+ if (Build.VERSION.SDK_INT < 30) {
+
+ val display = windowManager.defaultDisplay
+ val size = Point()
+
+ display.getSize(size)
+
+ val window = dialogFragment.dialog?.window
+
+ val x = (size.x * width).toInt()
+ val y = (size.y * height).toInt()
+
+ window?.setLayout(x, WindowManager.LayoutParams.WRAP_CONTENT)
+
+ } else {
+
+ val rect = windowManager.currentWindowMetrics.bounds
+
+ val window = dialogFragment.dialog?.window
+
+ val x = (rect.width() * width).toInt()
+ val y = (rect.height() * height).toInt()
+
+ window?.setLayout(x, WindowManager.LayoutParams.WRAP_CONTENT)
+ }
}
}
\ No newline at end of file
diff --git a/Android/app/src/main/java/com/team16/airbnb/ui/search/roomdetail/RoomDetailActivity.kt b/Android/app/src/main/java/com/team16/airbnb/ui/search/roomdetail/RoomDetailActivity.kt
index f106108c0..7be4d8e29 100644
--- a/Android/app/src/main/java/com/team16/airbnb/ui/search/roomdetail/RoomDetailActivity.kt
+++ b/Android/app/src/main/java/com/team16/airbnb/ui/search/roomdetail/RoomDetailActivity.kt
@@ -33,7 +33,8 @@ class RoomDetailActivity: AppCompatActivity() {
private fun setReservationButton(){
// 예약 상세 정보 dialog fragment
binding.btnReserve.setOnClickListener {
-
+ val reservationDialog = ReservationInfoDialogFragment()
+ reservationDialog.show(supportFragmentManager, "reservationDialog")
}
}
diff --git a/Android/app/src/main/res/drawable/layout_corner_radius_1.xml b/Android/app/src/main/res/drawable/layout_corner_radius_1.xml
new file mode 100644
index 000000000..ddca2b0e6
--- /dev/null
+++ b/Android/app/src/main/res/drawable/layout_corner_radius_1.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Android/app/src/main/res/layout/dialog_fragment_reservation_info.xml b/Android/app/src/main/res/layout/dialog_fragment_reservation_info.xml
index 67ed5d4c8..d1ca046c9 100644
--- a/Android/app/src/main/res/layout/dialog_fragment_reservation_info.xml
+++ b/Android/app/src/main/res/layout/dialog_fragment_reservation_info.xml
@@ -1,13 +1,421 @@
-
+
-
+
+ android:layout_width="400dp"
+ android:layout_height="wrap_content">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Android/app/src/main/res/values/colors.xml b/Android/app/src/main/res/values/colors.xml
index fa0f1955f..82ba004f6 100644
--- a/Android/app/src/main/res/values/colors.xml
+++ b/Android/app/src/main/res/values/colors.xml
@@ -11,6 +11,7 @@
#010101
#E84C60
#333333
+ #4F4F4F
#828282
#E0E0E0
#F5F5F7