diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt index 22611b4..60ee2a5 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/room/donation/LiveRoomDonationDialog.kt @@ -5,11 +5,14 @@ import android.content.Intent import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.view.LayoutInflater +import android.view.View import android.view.WindowManager +import android.widget.FrameLayout import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import coil.load import coil.transform.CircleCropTransformation +import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import kr.co.vividnext.sodalive.R import kr.co.vividnext.sodalive.common.Constants @@ -32,6 +35,16 @@ class LiveRoomDonationDialog( bottomSheetDialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) bottomSheetDialog.setCancelable(false) + val bottomSheetInternal = bottomSheetDialog.findViewById( + com.google.android.material.R.id.design_bottom_sheet + ) + + if (bottomSheetInternal != null) { + val bottomSheetBehavior = BottomSheetBehavior.from(bottomSheetInternal) + bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED + bottomSheetBehavior.skipCollapsed = true + } + dialogView.tvCancel.setOnClickListener { bottomSheetDialog.dismiss() } dialogView.tvDonation.setOnClickListener { try { @@ -70,6 +83,10 @@ class LiveRoomDonationDialog( lp.height = WindowManager.LayoutParams.WRAP_CONTENT bottomSheetDialog.window?.attributes = lp + + dialogView.scrollView.post { + dialogView.scrollView.fullScroll(View.FOCUS_DOWN) + } } } diff --git a/app/src/main/res/layout/dialog_live_room_donation.xml b/app/src/main/res/layout/dialog_live_room_donation.xml index 6f7f6a5..b29aacc 100644 --- a/app/src/main/res/layout/dialog_live_room_donation.xml +++ b/app/src/main/res/layout/dialog_live_room_donation.xml @@ -1,203 +1,209 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="wrap_content"> + android:orientation="vertical" + android:paddingTop="33.3dp" + android:paddingBottom="13.3dp"> - - - + + + + + + + + + - - - - + android:layout_marginHorizontal="20dp" + android:layout_marginTop="26dp"> - + + + + + + + + + + + + android:paddingHorizontal="20dp"> + + + + + + + + + + + + - +