From c7143a6f89464b7d784e4e9d57e22bbb2dcca683 Mon Sep 17 00:00:00 2001 From: juntao Date: Thu, 19 May 2022 18:25:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=AE=80=E9=99=8B=E7=9A=84?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=9C=80=E8=BF=91=E7=95=85=E7=8E=A9=20item?= =?UTF-8?q?=20UI=20&=20=E8=B0=83=E6=95=B4=E5=8E=9F=E6=9C=89=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=A2=9C=E8=89=B2=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/common/databind/BindingAdapters.java | 2 +- .../search/ForumContentSearchListAdapter.kt | 2 +- .../qa/answer/detail/AnswerDetailFragment.kt | 2 +- .../qa/answer/edit/AnswerEditActivity.kt | 2 +- .../qa/editor/VideoAlbumsSpanner.kt | 2 +- .../qa/questions/detail/AnswerViewHolder.java | 2 +- .../res/drawable-xxhdpi/bg_video_control.xml | 2 +- .../main/res/drawable/bg_forum_game_zone.xml | 2 +- app/src/main/res/drawable/bg_forum_rule.xml | 2 +- .../bg_game_collection_user_container.xml | 2 +- .../bg_game_collectionchange_poster.xml | 2 +- .../bg_home_vgame_progress_active.xml | 24 +++++++ .../bg_home_vgame_progress_inactive.xml | 24 +++++++ .../main/res/drawable/bg_pic_count_label.xml | 2 +- .../bg_shape_black_alpha_40_radius_2.xml | 2 +- .../main/res/drawable/bg_vgame_icon_mask.xml | 10 +++ .../drawable/button_round_black_alpha_60.xml | 2 +- .../drawable/game_collection_poster_mask.xml | 2 +- .../drawable/game_detail_video_bottom_bg.xml | 2 +- .../drawable/oval_hint_accent_stroke_bg.xml | 11 ++++ .../visit_history_video_bottom_bg.xml | 2 +- .../res/layout/activity_background_clip.xml | 2 +- app/src/main/res/layout/activity_comment.xml | 2 +- .../main/res/layout/dialog_choose_forum.xml | 2 +- app/src/main/res/layout/fragment_comment.xml | 2 +- .../main/res/layout/fragment_forum_home.xml | 2 +- .../fragment_game_collection_poster.xml | 2 +- .../res/layout/fragment_preview_video.xml | 6 +- .../main/res/layout/item_community_image.xml | 2 +- app/src/main/res/layout/item_home_vgame.xml | 66 ++++++++++++++++++- .../res/layout/layout_article_item_video.xml | 4 +- ..._forum_video_detail_videoview_portrait.xml | 2 +- .../src/main/res/values-night/colors.xml | 6 +- module_common/src/main/res/values/colors.xml | 28 +++++++- 34 files changed, 191 insertions(+), 38 deletions(-) create mode 100644 app/src/main/res/drawable/bg_home_vgame_progress_active.xml create mode 100644 app/src/main/res/drawable/bg_home_vgame_progress_inactive.xml create mode 100644 app/src/main/res/drawable/bg_vgame_icon_mask.xml create mode 100644 app/src/main/res/drawable/oval_hint_accent_stroke_bg.xml diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index 5e451a812e..61fca9c2f7 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -777,7 +777,7 @@ public class BindingAdapters { public static void setCommunityVideoDuration(TextView mVideoDuration, List videos) { if (videos != null && videos.size() > 0) { CommunityVideoEntity videoEntity = videos.get(0); - mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_80, 999F)); + mVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_50, 999F)); mVideoDuration.setText(videoEntity.getDuration()); mVideoDuration.setVisibility(View.VISIBLE); } else { diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt index bcca9352cf..dcc4dd7e91 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt @@ -212,7 +212,7 @@ class ForumContentSearchListAdapter(context: Context, val mListViewModel: ForumC durationTv.goneIf(answer.getPassVideos().isEmpty()) durationTv.text = if (answer.getPassVideos().isNotEmpty()) answer.getPassVideos()[0].duration else "00:00" durationTv.background = GradientDrawable().apply { - setColor(R.color.black_alpha_40.toColor(mContext)) + setColor(R.color.black_alpha_60.toColor(mContext)) cornerRadius = 2F.dip2px().toFloat() } countTv.text = "${answer.count.comment}评论 · ${answer.count.vote}点赞" diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index 9b7fb9d457..8eedb1e820 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -1029,7 +1029,7 @@ open class AnswerDetailFragment : ToolbarFragment() { mQuestionBinding.videoStatus.visibleIf(video != null && video.status != "pass") mQuestionBinding.videoDuration.visibleIf(video?.status == "pass") if (video?.status == "pass") { - mQuestionBinding.videoDuration.background = DrawableView.getOvalDrawable(R.color.black_alpha_80, 999f) + mQuestionBinding.videoDuration.background = DrawableView.getOvalDrawable(R.color.black_alpha_50, 999f) mQuestionBinding.videoDuration.text = video.duration } else { val status = if (!question.me.isContentOwner && !question.me.isModerator && video?.status == "fail") { diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt index e75f5de0ec..c067aabcf0 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/edit/AnswerEditActivity.kt @@ -293,7 +293,7 @@ class AnswerEditActivity : BaseRichEditorActivity(), Keyboa mBinding.videoStatus.visibleIf(video != null && video.status != "pass") mBinding.videoDuration.visibleIf(video?.status == "pass") if (video?.status == "pass") { - mBinding.videoDuration.background = DrawableView.getOvalDrawable(R.color.black_alpha_80, 999f) + mBinding.videoDuration.background = DrawableView.getOvalDrawable(R.color.black_alpha_50, 999f) mBinding.videoDuration.text = video.duration } else { val status = if (!question.me.isContentOwner && !question.me.isModerator && video?.status == "fail") { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt index f033d07d5a..83d6df9f11 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt @@ -60,7 +60,7 @@ class VideoAlbumsSpanner(val context: Context) { //添加半透明maskView val maskView = View(context) val maskViewParams = FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, popupHeight) - maskView.background = ColorDrawable(ContextCompat.getColor(context, R.color.black_alpha_60)) + maskView.background = ColorDrawable(ContextCompat.getColor(context, R.color.black_alpha_40)) maskView.layoutParams = maskViewParams parentContainer.addView(maskView, 0) maskView.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java index 1fd5026fc4..f2dd0dd312 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/detail/AnswerViewHolder.java @@ -154,7 +154,7 @@ public class AnswerViewHolder extends BaseRecyclerViewHolder { if (videos.size() > 0) { CommunityVideoEntity videoEntity = videos.get(0); ImageUtils.display(binding.askAnswerItemImg, videoEntity.getPoster()); - binding.askAnswerItemVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_80, 999F)); + binding.askAnswerItemVideoDuration.setBackground(DrawableView.getOvalDrawable(R.color.black_alpha_50, 999F)); binding.askAnswerItemVideoDuration.setText(videoEntity.getDuration()); binding.askAnswerItemVideoDuration.setVisibility(View.VISIBLE); binding.askAnswerItemVideoPlay.setVisibility(View.VISIBLE); diff --git a/app/src/main/res/drawable-xxhdpi/bg_video_control.xml b/app/src/main/res/drawable-xxhdpi/bg_video_control.xml index 5e78703298..e23cb35da6 100644 --- a/app/src/main/res/drawable-xxhdpi/bg_video_control.xml +++ b/app/src/main/res/drawable-xxhdpi/bg_video_control.xml @@ -2,6 +2,6 @@ diff --git a/app/src/main/res/drawable/bg_forum_game_zone.xml b/app/src/main/res/drawable/bg_forum_game_zone.xml index 3582e13a59..4bfa5a5ea3 100644 --- a/app/src/main/res/drawable/bg_forum_game_zone.xml +++ b/app/src/main/res/drawable/bg_forum_game_zone.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_forum_rule.xml b/app/src/main/res/drawable/bg_forum_rule.xml index a67f7c8bba..3c8cdeadd6 100644 --- a/app/src/main/res/drawable/bg_forum_rule.xml +++ b/app/src/main/res/drawable/bg_forum_rule.xml @@ -8,6 +8,6 @@ android:width="1dp" android:color="@color/white_alpha_20" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_game_collection_user_container.xml b/app/src/main/res/drawable/bg_game_collection_user_container.xml index fa06805b62..6256437e4a 100644 --- a/app/src/main/res/drawable/bg_game_collection_user_container.xml +++ b/app/src/main/res/drawable/bg_game_collection_user_container.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_game_collectionchange_poster.xml b/app/src/main/res/drawable/bg_game_collectionchange_poster.xml index fa06805b62..6256437e4a 100644 --- a/app/src/main/res/drawable/bg_game_collectionchange_poster.xml +++ b/app/src/main/res/drawable/bg_game_collectionchange_poster.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_home_vgame_progress_active.xml b/app/src/main/res/drawable/bg_home_vgame_progress_active.xml new file mode 100644 index 0000000000..7b7b58ed9e --- /dev/null +++ b/app/src/main/res/drawable/bg_home_vgame_progress_active.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_home_vgame_progress_inactive.xml b/app/src/main/res/drawable/bg_home_vgame_progress_inactive.xml new file mode 100644 index 0000000000..2b643c6188 --- /dev/null +++ b/app/src/main/res/drawable/bg_home_vgame_progress_inactive.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_pic_count_label.xml b/app/src/main/res/drawable/bg_pic_count_label.xml index e918ee8da8..04c5f13230 100644 --- a/app/src/main/res/drawable/bg_pic_count_label.xml +++ b/app/src/main/res/drawable/bg_pic_count_label.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_black_alpha_40_radius_2.xml b/app/src/main/res/drawable/bg_shape_black_alpha_40_radius_2.xml index da35f81358..8c1adb483d 100644 --- a/app/src/main/res/drawable/bg_shape_black_alpha_40_radius_2.xml +++ b/app/src/main/res/drawable/bg_shape_black_alpha_40_radius_2.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_vgame_icon_mask.xml b/app/src/main/res/drawable/bg_vgame_icon_mask.xml new file mode 100644 index 0000000000..1a21fffb10 --- /dev/null +++ b/app/src/main/res/drawable/bg_vgame_icon_mask.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_round_black_alpha_60.xml b/app/src/main/res/drawable/button_round_black_alpha_60.xml index 2131b51661..e3597ca745 100644 --- a/app/src/main/res/drawable/button_round_black_alpha_60.xml +++ b/app/src/main/res/drawable/button_round_black_alpha_60.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/game_collection_poster_mask.xml b/app/src/main/res/drawable/game_collection_poster_mask.xml index 7227ba3990..6f3766673f 100644 --- a/app/src/main/res/drawable/game_collection_poster_mask.xml +++ b/app/src/main/res/drawable/game_collection_poster_mask.xml @@ -5,6 +5,6 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/game_detail_video_bottom_bg.xml b/app/src/main/res/drawable/game_detail_video_bottom_bg.xml index 83ed383b91..569bad62d9 100644 --- a/app/src/main/res/drawable/game_detail_video_bottom_bg.xml +++ b/app/src/main/res/drawable/game_detail_video_bottom_bg.xml @@ -7,7 +7,7 @@ android:topRightRadius="0dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_hint_accent_stroke_bg.xml b/app/src/main/res/drawable/oval_hint_accent_stroke_bg.xml new file mode 100644 index 0000000000..941f8e3052 --- /dev/null +++ b/app/src/main/res/drawable/oval_hint_accent_stroke_bg.xml @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/visit_history_video_bottom_bg.xml b/app/src/main/res/drawable/visit_history_video_bottom_bg.xml index 1cc116bec2..8e20ea5d51 100644 --- a/app/src/main/res/drawable/visit_history_video_bottom_bg.xml +++ b/app/src/main/res/drawable/visit_history_video_bottom_bg.xml @@ -3,7 +3,7 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/activity_background_clip.xml b/app/src/main/res/layout/activity_background_clip.xml index 49c8ca158b..9a80012f5e 100644 --- a/app/src/main/res/layout/activity_background_clip.xml +++ b/app/src/main/res/layout/activity_background_clip.xml @@ -23,7 +23,7 @@ diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml index c2abaa65f0..46b2fb1679 100644 --- a/app/src/main/res/layout/activity_comment.xml +++ b/app/src/main/res/layout/activity_comment.xml @@ -8,7 +8,7 @@ android:id="@+id/maskView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/black_alpha_60"/> + android:background="@color/black_alpha_40"/> + android:background="@color/black_alpha_40" /> diff --git a/app/src/main/res/layout/fragment_forum_home.xml b/app/src/main/res/layout/fragment_forum_home.xml index 9c53e3889d..fc8e4b0a7c 100644 --- a/app/src/main/res/layout/fragment_forum_home.xml +++ b/app/src/main/res/layout/fragment_forum_home.xml @@ -226,7 +226,7 @@ android:id="@+id/guideMaskView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/black_alpha_80" + android:background="@color/black_alpha_50" android:visibility="gone"> + android:background="@color/black_alpha_60" /> @@ -28,7 +28,7 @@ @@ -44,7 +44,7 @@ diff --git a/app/src/main/res/layout/item_community_image.xml b/app/src/main/res/layout/item_community_image.xml index 790df8a964..22ebc7bc46 100644 --- a/app/src/main/res/layout/item_community_image.xml +++ b/app/src/main/res/layout/item_community_image.xml @@ -44,7 +44,7 @@ android:id="@+id/pendingView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/black_alpha_40" + android:background="@color/black_alpha_60" android:gravity="center" android:lineSpacingExtra="4dp" android:paddingLeft="16dp" diff --git a/app/src/main/res/layout/item_home_vgame.xml b/app/src/main/res/layout/item_home_vgame.xml index 77d9ef65f8..8e868d823f 100644 --- a/app/src/main/res/layout/item_home_vgame.xml +++ b/app/src/main/res/layout/item_home_vgame.xml @@ -1,6 +1,68 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/layout_article_item_video.xml b/app/src/main/res/layout/layout_article_item_video.xml index c9e6bbf129..37452bf0f1 100644 --- a/app/src/main/res/layout/layout_article_item_video.xml +++ b/app/src/main/res/layout/layout_article_item_video.xml @@ -59,7 +59,7 @@ android:id="@+id/pendingView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/black_alpha_40" + android:background="@color/black_alpha_60" android:gravity="center" android:textColor="@color/white_alpha_80" android:textSize="12sp" @@ -107,7 +107,7 @@ android:id="@+id/completeContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/black_alpha_40" + android:background="@color/black_alpha_60" android:gravity="center" android:orientation="horizontal" android:visibility="gone" diff --git a/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml b/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml index 78cd422789..4786795e6b 100644 --- a/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml +++ b/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml @@ -54,7 +54,7 @@ android:id="@+id/pendingView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/black_alpha_40" + android:background="@color/black_alpha_60" android:gravity="center" android:text="@string/pending_status" android:textColor="@color/white_alpha_80" diff --git a/module_common/src/main/res/values-night/colors.xml b/module_common/src/main/res/values-night/colors.xml index f259427c39..20f3897d06 100644 --- a/module_common/src/main/res/values-night/colors.xml +++ b/module_common/src/main/res/values-night/colors.xml @@ -159,9 +159,9 @@ #1A000000 #33000000 #4D000000 - #99000000 - #66000000 - #80000000 + #99000000 + #66000000 + #80000000 #1AFFFFFF #33FFFFFF diff --git a/module_common/src/main/res/values/colors.xml b/module_common/src/main/res/values/colors.xml index 669ac8a7e3..cbe8913539 100644 --- a/module_common/src/main/res/values/colors.xml +++ b/module_common/src/main/res/values/colors.xml @@ -167,9 +167,31 @@ #1A000000 #33000000 #4D000000 - #99000000 - #66000000 - #80000000 + #66000000 + #80000000 + #99000000 + + #CC000000 #1AFFFFFF #33FFFFFF