From 6f9d1d81adfa45fb07bb51c9bec3d1834167da35 Mon Sep 17 00:00:00 2001 From: wzq Date: Thu, 19 Oct 2023 12:02:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E7=9B=B8=E5=86=8C=20UI?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/avroom/room_album/RoomAlbumActivity.kt | 1 - .../erban/avroom/room_album/RoomAlbumFragment.kt | 13 +++++++++---- .../img_mask_room_album_list_bottom.png | Bin 0 -> 8147 bytes ...cfa_cf70ff_20.xml => bg_5aecfa_cf70ff_24.xml} | 2 +- app/src/main/res/drawable/bg_gift_icon.xml | 7 +++++++ .../main/res/drawable/bg_gift_icon_stroke.xml | 12 ++++++++++++ app/src/main/res/layout/activity_room_album.xml | 9 ++++++++- .../res/layout/dialog_lock_room_album_photo.xml | 4 +++- .../main/res/layout/dialog_room_album_upload.xml | 4 ++++ app/src/main/res/layout/fragment_room_album.xml | 11 ++++++++--- app/src/main/res/layout/item_room_album.xml | 11 +++++++---- .../layout/layout_msg_view_holder_room_album.xml | 12 ++++++++---- app/src/main/res/values/colors.xml | 1 + 13 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/img_mask_room_album_list_bottom.png rename app/src/main/res/drawable/{bg_5aecfa_cf70ff_20.xml => bg_5aecfa_cf70ff_24.xml} (82%) create mode 100644 app/src/main/res/drawable/bg_gift_icon.xml create mode 100644 app/src/main/res/drawable/bg_gift_icon_stroke.xml diff --git a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumActivity.kt b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumActivity.kt index 52c768e97..0ebb99ca1 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumActivity.kt @@ -73,7 +73,6 @@ class RoomAlbumActivity : BaseViewBindingActivity() { lineHeight = resources.getDimensionPixelOffset(R.dimen.dp_4).toFloat() lineWidth = resources.getDimensionPixelOffset(R.dimen.dp_15).toFloat() roundRadius = resources.getDimensionPixelOffset(R.dimen.dp_2).toFloat() - //yOffset = resources.getDimensionPixelOffset(R.dimen.dp_4).toFloat() mode = LinePagerIndicator.MODE_EXACTLY } } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumFragment.kt index 9fcb77755..9220a21ed 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/room_album/RoomAlbumFragment.kt @@ -1,6 +1,7 @@ package com.yizhuan.erban.avroom.room_album import android.os.Bundle +import android.view.View import android.view.ViewGroup import android.widget.ImageView import androidx.fragment.app.activityViewModels @@ -35,12 +36,13 @@ class RoomAlbumFragment : BaseViewBindingFragment() { override fun init() { binding.recyclerView.layoutManager = GridLayoutManager(context, 2) - val offset = resources.getDimensionPixelOffset(R.dimen.dp_15) + val offsetH = resources.getDimensionPixelOffset(R.dimen.dp_7) + val offsetV = resources.getDimensionPixelOffset(R.dimen.dp_4) binding.recyclerView.addItemDecoration( GridSpacingItemNewDecoration( - offset, - offset, - true + offsetV, + offsetH, + false ) ) val adapter = object : @@ -96,6 +98,9 @@ class RoomAlbumFragment : BaseViewBindingFragment() { } }.apply { + addFooterView(View(context).apply { + layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, resources.getDimensionPixelOffset(R.dimen.dp_80)) + }) setEnableLoadMore(true) setOnLoadMoreListener({ viewModel.loadPhotos(type, ++page) diff --git a/app/src/main/res/drawable-xhdpi/img_mask_room_album_list_bottom.png b/app/src/main/res/drawable-xhdpi/img_mask_room_album_list_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..1879122af53f55385e2e63e62779c3dca39c0cc7 GIT binary patch literal 8147 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/bg_5aecfa_cf70ff_20.xml b/app/src/main/res/drawable/bg_5aecfa_cf70ff_24.xml similarity index 82% rename from app/src/main/res/drawable/bg_5aecfa_cf70ff_20.xml rename to app/src/main/res/drawable/bg_5aecfa_cf70ff_24.xml index a459fdda0..672c14006 100644 --- a/app/src/main/res/drawable/bg_5aecfa_cf70ff_20.xml +++ b/app/src/main/res/drawable/bg_5aecfa_cf70ff_24.xml @@ -1,7 +1,7 @@ - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_gift_icon_stroke.xml b/app/src/main/res/drawable/bg_gift_icon_stroke.xml new file mode 100644 index 000000000..795be799c --- /dev/null +++ b/app/src/main/res/drawable/bg_gift_icon_stroke.xml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_room_album.xml b/app/src/main/res/layout/activity_room_album.xml index ac5cba857..03f760b48 100644 --- a/app/src/main/res/layout/activity_room_album.xml +++ b/app/src/main/res/layout/activity_room_album.xml @@ -22,16 +22,23 @@ android:id="@+id/vp" android:layout_width="match_parent" android:layout_height="0dp" + android:layout_marginTop="@dimen/dp_12" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/indicator" /> + + @@ -31,6 +32,7 @@ android:layout_width="@dimen/dp_80" android:layout_height="@dimen/dp_80" android:layout_marginTop="@dimen/dp_24" + android:background="@drawable/bg_gift_icon" android:src="@drawable/default_cover" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -78,7 +80,7 @@ android:layout_height="@dimen/dp_44" android:layout_marginTop="@dimen/dp_22" android:layout_marginBottom="@dimen/dp_24" - android:background="@drawable/bg_5aecfa_cf70ff_20" + android:background="@drawable/bg_5aecfa_cf70ff_24" android:gravity="center" android:text="馬上解鎖" android:textColor="@color/white" 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 a13e0176e..276a4df60 100644 --- a/app/src/main/res/layout/dialog_room_album_upload.xml +++ b/app/src/main/res/layout/dialog_room_album_upload.xml @@ -42,6 +42,7 @@ android:text="@string/photo_type" android:textColor="@color/color_1F1B4F" android:textSize="@dimen/sp_14" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/v_type" app:layout_constraintStart_toStartOf="@id/v_type" app:layout_constraintTop_toTopOf="@id/v_type" /> @@ -99,6 +100,7 @@ android:text="@string/unlock_gift" android:textColor="@color/color_B3B3C3" android:textSize="@dimen/sp_14" + android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/v_gift" app:layout_constraintStart_toStartOf="@id/v_gift" app:layout_constraintTop_toTopOf="@id/v_gift" /> @@ -131,6 +133,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_12" + android:textColor="@color/color_1F1B4F" android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="@id/v_gift" app:layout_constraintEnd_toStartOf="@id/iv_diamond" @@ -153,6 +156,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_8" android:text="@string/zero" + android:textColor="@color/color_1F1B4F" 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/layout/fragment_room_album.xml b/app/src/main/res/layout/fragment_room_album.xml index 91659e8c0..235722e4d 100644 --- a/app/src/main/res/layout/fragment_room_album.xml +++ b/app/src/main/res/layout/fragment_room_album.xml @@ -1,6 +1,7 @@ + android:layout_marginStart="@dimen/dp_8" + android:layout_marginEnd="@dimen/dp_8" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="2" + tools:itemCount="20" + tools:listitem="@layout/item_room_album" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/item_room_album.xml b/app/src/main/res/layout/item_room_album.xml index c7242dff7..34ee80c60 100644 --- a/app/src/main/res/layout/item_room_album.xml +++ b/app/src/main/res/layout/item_room_album.xml @@ -3,12 +3,12 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/dp_170" + android:layout_height="wrap_content" android:padding="@dimen/dp_4" app:cornerRadius="@dimen/dp_8" app:shadowRadius="@dimen/dp_4" tools:layout_gravity="center" - tools:layout_width="@dimen/dp_170"> + tools:layout_width="@dimen/dp_168"> + app:layout_constraintBottom_toBottomOf="@id/iv_pic" /> @@ -68,6 +68,7 @@ android:layout_width="@dimen/dp_20" android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_6" + android:background="@drawable/bg_gift_icon_stroke" android:src="@drawable/default_cover" app:layout_constraintBottom_toBottomOf="@id/v_bottom_mask" app:layout_constraintStart_toStartOf="@id/v_bottom_mask" @@ -75,8 +76,8 @@ #306065 #1E686868 #9E9EA8 + #001338