From dd2bfbc53f3b281ef6b96b3c0a8a0ca001b36d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Sat, 7 May 2022 16:48:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E5=88=87=E6=8D=A2(=E6=B8=B8=E6=88=8F=E6=9D=BF?= =?UTF-8?q?=E5=9D=97=E9=83=A8=E5=88=86)=20https://git.shanqu.cc/halo/andro?= =?UTF-8?q?id/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/ColumnCollectionDetailActivity.kt | 10 ++++ .../detail/ColumnCollectionDetailFragment.kt | 1 - .../detail/CommonCollectionDetailActivity.kt | 9 ++++ .../detail/CommonCollectionDetailFragment.kt | 6 ++- .../game/upload/GameSubmissionActivity.kt | 9 ++++ .../gamecenter/subject/SubjectListFragment.kt | 1 - .../common_collection_detail_skeleton.xml | 3 +- .../common_collection_image_text_item.xml | 5 +- .../main/res/layout/community_answer_item.xml | 34 +++++++------- .../main/res/layout/fragment_game_upload.xml | 47 ++++++++++++------- .../layout/fragment_list_base_skeleton.xml | 42 ++++++++--------- .../item_skeleton_common_collection.xml | 7 ++- 12 files changed, 111 insertions(+), 63 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt index 3a87e422b3..b9665b00c8 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt @@ -3,8 +3,10 @@ package com.gh.gamecenter.game.columncollection.detail import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.common.util.DisplayUtils import com.gh.common.util.EntranceUtils import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R import com.gh.gamecenter.catalog.CatalogActivity class ColumnCollectionDetailActivity : NormalActivity() { @@ -13,6 +15,14 @@ class ColumnCollectionDetailActivity : NormalActivity() { return NormalActivity.getTargetIntent(this, ColumnCollectionDetailActivity::class.java, ColumnCollectionDetailFragment::class.java) } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + DisplayUtils.setStatusBarColor(this, if (mNightMode) R.color.black else R.color.white) + } + + companion object { /** * [position] 当专题合集是排行榜(多专题)类型时的起始位置 diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt index 3ade59542e..d929d83df8 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt @@ -1,6 +1,5 @@ package com.gh.gamecenter.game.columncollection.detail -import android.graphics.Color import android.view.View import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.StaggeredGridLayoutManager diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt index 8c0d645605..2f0e93536d 100644 --- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailActivity.kt @@ -3,8 +3,10 @@ package com.gh.gamecenter.game.commoncollection.detail import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.common.util.DisplayUtils import com.gh.common.util.EntranceUtils import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class CommonCollectionDetailActivity : NormalActivity() { @@ -12,6 +14,13 @@ class CommonCollectionDetailActivity : NormalActivity() { return getTargetIntent(this, CommonCollectionDetailActivity::class.java, CommonCollectionDetailFragment::class.java) } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + DisplayUtils.setStatusBarColor(this, if (mNightMode) R.color.black else R.color.white) + } + companion object { fun getIntent( diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt index 718f78cfbb..dd1c82cadb 100644 --- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt @@ -57,7 +57,6 @@ class CommonCollectionDetailFragment : LazyListFragment(R.id.reuse_tv_none_data)?.text = "内容不见了" mSkeletonScreen = Skeleton.bind(mBinding.listSkeleton) .shimmer(true) @@ -125,4 +124,9 @@ class CommonCollectionDetailFragment : LazyListFragment + android:layout_height="match_parent" + android:background="@color/background"> + android:layout_height="wrap_content" + android:background="@color/background_white"> @@ -137,8 +137,8 @@ android:layout_height="wrap_content" android:layout_marginLeft="3dp" android:layout_marginTop="4dp" - android:orientation="horizontal" android:gravity="center_vertical" + android:orientation="horizontal" app:layout_constraintBottom_toBottomOf="@id/user_icon" app:layout_constraintLeft_toRightOf="@id/user_icon" app:layout_constraintTop_toBottomOf="@id/user_name"> @@ -176,38 +176,39 @@ android:lineSpacingExtra="4dp" android:maxLines="2" android:textColor="@color/text_title" - android:textStyle="bold" android:textSize="16sp" + android:textStyle="bold" app:layout_constraintTop_toBottomOf="@id/user_icon" tools:text="本名李嘉恆，加拿大籍華人，出生於廣東省廣州，2012年在韓國出道，曾為韓國男子組合EXO成員及中國分隊EXO-M隊長。" /> + tools:text="本名李嘉恆，加拿大籍華人，出生於廣東省廣州，2012年在韓國出道，曾為韓國男子組合EXO成員及中國分隊EXO-M隊長。" + tools:visibility="visible" /> + app:layout_constraintRight_toLeftOf="@+id/forumNameTv" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="地下城与勇士地下城与勇士地下城与勇士" /> diff --git a/app/src/main/res/layout/fragment_game_upload.xml b/app/src/main/res/layout/fragment_game_upload.xml index 44f687b26b..8209b3a4ed 100644 --- a/app/src/main/res/layout/fragment_game_upload.xml +++ b/app/src/main/res/layout/fragment_game_upload.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/background_white" android:orientation="vertical"> + android:layout_marginRight="20dp" + android:background="@color/background"/> + android:layout_marginRight="20dp" + android:background="@color/background"/> + android:layout_marginRight="20dp" + android:background="@color/background"/> + android:layout_height="8dp" + android:background="@color/background"/> + android:layout_marginRight="20dp" + android:background="@color/background"/> + android:layout_marginRight="20dp" + android:background="@color/background"/> + android:layout_height="8dp" + android:background="@color/background"/> + android:layout_height="8dp" + android:background="@color/background"/> + android:layout_height="8dp" + android:background="@color/background"/> + android:layout_height="8dp" + android:background="@color/background"/> + android:layout_height="8dp" + android:background="@color/background"/> diff --git a/app/src/main/res/layout/fragment_list_base_skeleton.xml b/app/src/main/res/layout/fragment_list_base_skeleton.xml index 84a48ee286..71bf22776a 100644 --- a/app/src/main/res/layout/fragment_list_base_skeleton.xml +++ b/app/src/main/res/layout/fragment_list_base_skeleton.xml @@ -1,33 +1,33 @@ - + + android:id="@+id/list_skeleton" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + android:id="@+id/list_refresh" + android:layout_width="match_parent" + android:layout_height="match_parent"> - + android:id="@+id/list_rv" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + layout="@layout/reuse_loading" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" /> - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_skeleton_common_collection.xml b/app/src/main/res/layout/item_skeleton_common_collection.xml index 4b9782c5d0..04970d5af1 100644 --- a/app/src/main/res/layout/item_skeleton_common_collection.xml +++ b/app/src/main/res/layout/item_skeleton_common_collection.xml @@ -14,7 +14,12 @@ android:layout_width="96dp" android:layout_height="16dp" android:layout_alignParentBottom="true" - android:layout_margin="12dp" + android:layout_marginStart="12dp" + android:layout_marginLeft="12dp" + android:layout_marginTop="12dp" + android:layout_marginEnd="12dp" + android:layout_marginRight="12dp" + android:layout_marginBottom="12dp" android:background="@drawable/bg_skeleton_view_radius_4" />