From 623a721e580e07cff05604a38cac2baf0f660452 Mon Sep 17 00:00:00 2001 From: wzq Date: Tue, 17 Oct 2023 10:10:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E7=9B=B8=E5=86=8C=20?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A7=A3=E9=94=81=E7=A4=BC=E7=89=A9UI=20?= =?UTF-8?q?=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChooseGiftRoomAlbumDialogFragment.kt | 1 + .../UploadRoomAlbumDialogFragment.kt | 22 +++++++++++++++++-- .../res/layout/dialog_room_album_upload.xml | 5 +++-- app/src/main/res/values/strings.xml | 2 ++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt index 4d9e5384e..9f72d0aab 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt @@ -63,6 +63,7 @@ class ChooseGiftRoomAlbumDialogFragment : BottomSheetDialogFragment() { setOnItemClickListener { _, _, position -> onPickedListener?.onPicked(data[position]) + dismiss() } } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/room_album/UploadRoomAlbumDialogFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/room_album/UploadRoomAlbumDialogFragment.kt index 7ee2a2697..ba709db23 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/UploadRoomAlbumDialogFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/UploadRoomAlbumDialogFragment.kt @@ -10,6 +10,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.WindowManager +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.GridLayoutManager import com.chad.library.adapter.base.BaseMultiItemQuickAdapter import com.chad.library.adapter.base.BaseViewHolder @@ -18,6 +19,7 @@ import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogRoomAlbumUploadBinding import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2 import com.yizhuan.erban.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration +import com.yizhuan.xchat_android_core.gift.bean.GiftInfo import com.yizhuan.xchat_android_library.common.photo.PhotoProvider import com.yizhuan.xchat_android_library.common.photo.PhotoProvider.photoProvider import com.yizhuan.xchat_android_library.easypermisssion.EasyPermissions @@ -29,6 +31,8 @@ class UploadRoomAlbumDialogFragment : BottomSheetDialogFragment() { private lateinit var photoAdapter: BaseMultiItemQuickAdapter + private var unlockedGift: GiftInfo? = null + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setStyle(STYLE_NO_TITLE, R.style.ErbanBottomSheetDialog) @@ -106,13 +110,25 @@ class UploadRoomAlbumDialogFragment : BottomSheetDialogFragment() { binding.rvPhoto.adapter = photoAdapter + binding.vGift.isEnabled = false binding.rgType.setOnCheckedChangeListener { group, checkedId -> if (checkedId == binding.rbCommon.id) { binding.tvNoGift.visibility = View.VISIBLE + binding.tvNoGift.text = + getString(R.string.room_album_type_no_need_unlocked_gift_tips) binding.groupGift.visibility = View.INVISIBLE + unlockedGift = null + + binding.vGift.isEnabled = false + binding.tvGiftLabel.setTextColor(ContextCompat.getColor(requireContext(), R.color.color_B3B3C3)) } else { - binding.tvNoGift.visibility = View.INVISIBLE - binding.groupGift.visibility = View.VISIBLE + binding.tvNoGift.visibility = View.VISIBLE + binding.tvNoGift.text = + getString(R.string.room_album_type_choose_unlocked_gift_tips) + + binding.groupGift.visibility = View.INVISIBLE + binding.vGift.isEnabled = true + binding.tvGiftLabel.setTextColor(ContextCompat.getColor(requireContext(), R.color.color_1F1B4F)) } } @@ -120,6 +136,8 @@ class UploadRoomAlbumDialogFragment : BottomSheetDialogFragment() { val chooseGiftRoomAlbumDialogFragment = ChooseGiftRoomAlbumDialogFragment() chooseGiftRoomAlbumDialogFragment.onPickedListener = ChooseGiftRoomAlbumDialogFragment.OnPickedListener { + unlockedGift = it + binding.tvNoGift.visibility = View.INVISIBLE binding.groupGift.visibility = View.VISIBLE diff --git a/app/src/main/res/layout/dialog_room_album_upload.xml b/app/src/main/res/layout/dialog_room_album_upload.xml index af126e3e4..a13e0176e 100644 --- a/app/src/main/res/layout/dialog_room_album_upload.xml +++ b/app/src/main/res/layout/dialog_room_album_upload.xml @@ -97,7 +97,7 @@ android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" android:text="@string/unlock_gift" - android:textColor="@color/color_1F1B4F" + android:textColor="@color/color_B3B3C3" android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="@id/v_gift" app:layout_constraintStart_toStartOf="@id/v_gift" @@ -108,7 +108,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_6" - android:text="當前無需選擇解鎖禮物" + android:text="@string/room_album_type_no_need_unlocked_gift_tips" + android:textColor="@color/color_B3B3C3" android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="@id/v_gift" app:layout_constraintEnd_toStartOf="@id/iv_gift_more" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a942f9b32..f2081ca9c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5140,5 +5140,7 @@ 普通照片 解鎖照片 解鎖禮物 + 當前無需選擇解鎖禮物 + 選擇解鎖禮物 \ No newline at end of file