경매 상세 페이지 수정(마감기한 시간 정보 뷰 수정 및 최고 입찰자 표시)

android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailActivity.kt

@@ -3,6 +3,7 @@ package com.ddangddangddang.android.feature.detail
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.util.TypedValue
 import android.view.View
 import androidx.activity.viewModels
 import androidx.viewpager2.widget.ViewPager2
@@ -18,6 +19,7 @@ import com.ddangddangddang.android.notification.NotificationType
 import com.ddangddangddang.android.notification.cancelActiveNotification
 import com.ddangddangddang.android.util.binding.BindingActivity
 import com.ddangddangddang.android.util.view.Toaster
+import com.ddangddangddang.android.util.view.convertDpToPx
 import com.ddangddangddang.android.util.view.observeLoadingWithDialog
 import com.ddangddangddang.android.util.view.showDialog
 import com.google.android.material.tabs.TabLayoutMediator
@@ -40,18 +42,18 @@ class AuctionDetailActivity :
 
     // 액션바 높이를 반환하는 함수
     private fun getActionBarHeight(context: Context): Int {
-        val styledAttributes =
-            context.theme.obtainStyledAttributes(intArrayOf(android.R.attr.actionBarSize))
-        val actionBarHeight = styledAttributes.getDimension(0, 0f).toInt()
-        styledAttributes.recycle()
-        return actionBarHeight
+        val typedValue = TypedValue()
+        context.theme.resolveAttribute(androidx.appcompat.R.attr.actionBarSize, typedValue, true)
+        return TypedValue.complexToDimensionPixelSize(typedValue.data, resources.displayMetrics)
     }
 
-    // 스크린 높이에서 액션바 높이를 뺀 높이를 계산하는 함수
     private fun getRemainingHeight(context: Context): Int {
         val screenHeight = context.resources.displayMetrics.heightPixels
+        val statusBarHeight = convertDpToPx(STATUS_BAR_HEIGHT) // 탭 레이아웃의 톱 마진과도 같은 값임.
         val actionBarHeight = getActionBarHeight(context)
-        return screenHeight - actionBarHeight * 2
+        val tabLayoutHeight = resources.getDimensionPixelOffset(R.dimen.height_submit_button)
+        val bottomButtonHeight = resources.getDimensionPixelOffset(R.dimen.height_submit_button)
+        return screenHeight - statusBarHeight - actionBarHeight - tabLayoutHeight - bottomButtonHeight
     }
 
     // 뷰의 높이를 동적으로 설정하는 함수
@@ -184,6 +186,7 @@ class AuctionDetailActivity :
 
     companion object {
         private const val AUCTION_ID_KEY = "auction_id_key"
+        private const val STATUS_BAR_HEIGHT = 24f
 
         fun getIntent(context: Context, auctionId: Long): Intent {
             return Intent(context, AuctionDetailActivity::class.java).apply {

android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailBottomButtonStatus.kt

@@ -17,6 +17,8 @@ enum class AuctionDetailBottomButtonStatus(
     EnterAuctionChatRoom(R.string.detail_auction_chat_room_entrance, true),
 
     MyAuction(R.string.detail_auction_my_auction, false),
+
+    AlreadyLastBidder(R.string.detail_auction_already_last_bidder, false),
     ;
 
     companion object {
@@ -26,10 +28,18 @@ enum class AuctionDetailBottomButtonStatus(
             val isOwner = auctionDetailModel.isOwner
             val auctionStatus = auctionDetailModel.auctionDetailStatusModel
             val chatStatus = auctionDetailModel.chatAuctionDetailModel
+            val isLastBidder = auctionDetailModel.isLastBidder
 
             return when {
                 canEnterMessageRoom(chatStatus) -> EnterAuctionChatRoom
-                canBidAuction(auctionStatus, isOwner) -> BidAuction
+                canBidAuction(auctionStatus, isOwner) -> {
+                    if (isLastBidder) {
+                        AlreadyLastBidder
+                    } else {
+                        BidAuction
+                    }
+                }
+
                 isOwner -> MyAuction
                 else -> FinishAuction
             }

android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailFormatter.kt

@@ -70,9 +70,8 @@ object AuctionDetailFormatter {
         val minutes = (differenceInMills / (60 * 1000L)) % 60
 
         return buildString {
-            if (days > 0L) append("${days}일")
-            if (hours > 0L) append(" ${hours}시간")
-            if (minutes > 0L) append(" ${minutes}분")
+            if (days > 0L) append("${days}일 ")
+            append(" ${String.format("%02d:%02d", hours, minutes)}")
         }.trim()
     }
 

android/app/src/main/java/com/ddangddangddang/android/feature/detail/AuctionDetailViewModel.kt

@@ -80,8 +80,9 @@ class AuctionDetailViewModel @Inject constructor(
             when (it) {
                 AuctionDetailBottomButtonStatus.BidAuction -> popupAuctionBidEvent()
                 AuctionDetailBottomButtonStatus.EnterAuctionChatRoom -> enterChatRoomEvent()
-                AuctionDetailBottomButtonStatus.FinishAuction -> {}
+                AuctionDetailBottomButtonStatus.AlreadyLastBidder -> {}
                 AuctionDetailBottomButtonStatus.MyAuction -> {}
+                AuctionDetailBottomButtonStatus.FinishAuction -> {}
             }
         }
     }

android/app/src/main/java/com/ddangddangddang/android/model/AuctionDetailModel.kt

@@ -20,4 +20,5 @@ data class AuctionDetailModel(
     val sellerModel: SellerModel,
     val chatAuctionDetailModel: ChatAuctionDetailModel,
     val isOwner: Boolean,
+    val isLastBidder: Boolean,
 )

android/app/src/main/java/com/ddangddangddang/android/model/mapper/AuctionDetailModelMapper.kt

@@ -34,6 +34,7 @@ object AuctionDetailModelMapper : Mapper<AuctionDetailModel, AuctionDetailRespon
             SellerModel(seller.id, seller.image ?: "", seller.nickname, seller.reliability),
             ChatAuctionDetailModel(chat.id, chat.isChatParticipant),
             isOwner,
+            isLastBidder,
         )
     }
 }

android/app/src/main/res/layout/activity_auction_detail.xml

@@ -21,7 +21,8 @@
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:layout_marginBottom="@dimen/height_submit_button">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/tb_detail_auction"
@@ -260,13 +261,16 @@
                     <com.google.android.material.tabs.TabLayout
                         android:id="@+id/tb_detail_info"
                         android:layout_width="0dp"
-                        android:layout_height="wrap_content"
+                        android:layout_height="48dp"
                         android:layout_marginTop="24dp"
                         android:backgroundTint="@color/grey_50"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tv_auctioneer_count"
-                        app:tabIndicatorFullWidth="true" />
+                        app:tabGravity="fill"
+                        app:tabIndicatorFullWidth="true"
+                        app:tabMaxWidth="0dp"
+                        app:tabMode="fixed" />
 
                     <androidx.viewpager2.widget.ViewPager2
                         android:id="@+id/vp_detail_info"
@@ -282,7 +286,7 @@
             android:id="@+id/btn_auction_detail_bottom_button"
             style="@style/BigButton"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/height_submit_button"
             android:layout_gravity="bottom"
             android:layout_marginHorizontal="@dimen/margin_side_layout"
             android:enabled="@{viewModel.auctionDetailBottomButtonStatus.enabled}"
@@ -292,6 +296,7 @@
             android:padding="0dp"
             android:text="@{AuctionDetailFormatter.INSTANCE.getAuctionBottomButtonText(context,viewModel.auctionDetailBottomButtonStatus)}"
             android:textColor="@color/text_active_fixed"
+            android:textSize="18dp"
             tools:text="입찰하기" />
     </FrameLayout>
 </layout>

android/app/src/main/res/layout/fragment_auction_info.xml

@@ -116,11 +116,12 @@
             <TextView
                 android:id="@+id/tv_seller_nickname"
                 style="@style/Body"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:text="@{activityViewModel.auctionDetailModel.sellerModel.nickname}"
                 app:layout_constraintBottom_toTopOf="@id/iv_reliability_icon"
+                app:layout_constraintEnd_toStartOf="@id/gl_end"
                 app:layout_constraintStart_toEndOf="@id/cv_profile"
                 app:layout_constraintTop_toTopOf="@id/cv_profile"
                 app:layout_constraintVertical_chainStyle="packed"

android/app/src/main/res/values/strings.xml

@@ -59,6 +59,7 @@
     <string name="detail_auction_chat_room_create">쪽지방 생성</string>
     <string name="detail_auction_chat_room_entrance">쪽지방 입장</string>
     <string name="detail_auction_my_auction">내꺼 입찰금지</string>
+    <string name="detail_auction_already_last_bidder">현재까지 최고입찰자</string>
     <string name="detail_auction_category">%s > %s</string>
     <string name="detail_auction_price_status">%s %,d원</string>
     <string name="detail_auction_start_price">시작가 %,d원</string>

android/data/src/main/java/com/ddangddangddang/data/model/response/AuctionDetailResponse.kt

@@ -8,4 +8,5 @@ data class AuctionDetailResponse(
     val seller: SellerResponse,
     val chat: ChatAuctionDetailResponse,
     val isOwner: Boolean,
+    val isLastBidder: Boolean,
 )