Merge branch 'develop' into release

boostcampwm-2022 · Dec 9, 2022 · c102ae8 · c102ae8
2 parents 115a9f4 + b0fe80b
commit c102ae8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/buildSrc/src/main/java/com/gta/buildsrc/Configuration.kt b/buildSrc/src/main/java/com/gta/buildsrc/Configuration.kt
@@ -5,5 +5,5 @@ object Configuration {
     const val minSdk = 23
     const val targetSdk = 33
     const val versionCode = 1
-    const val versionName = "0.2.0"
+    const val versionName = "0.2.1"
 }
diff --git a/...ation/src/main/java/com/gta/presentation/ui/reservation/check/ReservationCheckFragment.kt b/...ation/src/main/java/com/gta/presentation/ui/reservation/check/ReservationCheckFragment.kt
@@ -12,6 +12,7 @@ import com.gta.domain.model.UCMCResult
 import com.gta.presentation.R
 import com.gta.presentation.databinding.FragmentReservationCheckBinding
 import com.gta.presentation.ui.base.BaseFragment
+import com.gta.presentation.util.FirebaseUtil
 import com.gta.presentation.util.repeatOnStarted
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.collectLatest
@@ -85,7 +86,7 @@ class ReservationCheckFragment :
                             else -> null
                         }?.isChecked = true
 
-                        if (result.data.state == ReservationState.PENDING.state) {
+                        if (result.data.state == ReservationState.PENDING.state && result.data.ownerId == FirebaseUtil.uid) {
                             anchorView = binding.btnReservationAccept
                             View.VISIBLE
                         } else {

diff --git a/presentation/src/main/res/layout/fragment_reservation.xml b/presentation/src/main/res/layout/fragment_reservation.xml
@@ -33,7 +33,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    app:layout_constraintGuide_end="395dp" />
+                    app:layout_constraintGuide_begin="@dimen/padding_medium" />
 
                 <androidx.constraintlayout.widget.Guideline
                     android:id="@+id/gl_reservation_end"