From a0bc96fa2b07351e67f77ca91899a08068a352d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=BE=E7=A5=A5=E4=BF=8A?= Date: Tue, 19 Mar 2024 13:39:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E3=80=91=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E6=96=87?= =?UTF-8?q?=E5=AD=97=E6=98=BE=E7=A4=BA=E9=A2=9C=E8=89=B2=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E9=80=82=E9=85=8D=E6=B7=B1=E8=89=B2=E6=A8=A1=E5=BC=8F=20https:?= =?UTF-8?q?//jira.shanqu.cc/browse/GHZS-4982?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gamecenter/adapter/CleanApkAdapter.java | 5 ++ .../personalhome/UserHomeFragment.kt | 63 ++++++++++-------- .../fragment/ApkCleanerFragment.java | 22 ++++-- .../bg_user_home_more.webp | Bin 0 -> 904 bytes .../main/res/drawable/border_dialog_bg.xml | 2 +- .../main/res/layout/fragment_apk_cleaner.xml | 4 +- .../main/res/layout/fragment_real_name.xml | 2 +- .../main/res/layout/dialog_suggest_game.xml | 9 +-- .../res/layout/activity_network_diagnosis.xml | 6 +- 9 files changed, 71 insertions(+), 42 deletions(-) create mode 100644 app/src/main/res/drawable-night-xxxhdpi/bg_user_home_more.webp diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java index da549c5c85..e2517f0586 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -7,6 +7,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Environment; import android.view.View; import android.view.ViewGroup; @@ -213,6 +214,10 @@ public class CleanApkAdapter extends BaseRecyclerAdapter DecimalFormat df = new DecimalFormat("#.00"); String sizeName = df.format(size) + "MB"; + View itemView = holder.itemView; + Drawable background = ContextCompat.getDrawable(itemView.getContext(), R.drawable.reuse_listview_item_style); + itemView.setBackground(background); + holder.binding.selectGameCbRl.setVisibility(View.VISIBLE); holder.binding.selectGameBtn.setVisibility(View.VISIBLE); if (mSelectPosition.get(position)) { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt index 44038f559d..8047ea479b 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt @@ -725,39 +725,12 @@ class UserHomeFragment : ToolbarFragment() { private fun showMorePopup() { if (!::mPopupWindow.isInitialized) { - val contentView = View.inflate(activity, R.layout.popup_user_home_more, null) mPopupWindow = PopupWindow( - contentView, + inflateMorePopupView(), LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT ) - contentView.run { - findViewById(R.id.shareBtn) - .setOnClickListener { - IntegralLogHelper.log("click_share", "更多面板") - mPopupWindow.dismiss() - shareUserHome() - } - - findViewById(R.id.reportBtn).setOnClickListener { - IntegralLogHelper.log("click_report", "更多面板") - mPopupWindow.dismiss() - val items = arrayListOf( - context.getString(R.string.report_reason_one), - context.getString(R.string.report_reason_two), - context.getString(R.string.report_reason_three), - context.getString(R.string.report_reason_four), - context.getString(R.string.report_reason_other) - ) - DialogUtils.showReportReasonDialog(requireContext(), items) { reason, desc -> - ifLogin("个人主页-举报") { - mUserHomeViewModel.postReport(reason, desc) - } - } - } - } - mPopupWindow.run { isTouchable = true isFocusable = true @@ -768,6 +741,36 @@ class UserHomeFragment : ToolbarFragment() { mPopupWindow.showAsDropDown(mHomeBinding?.ivMore, (-49F).dip2px(), 0) } + private fun inflateMorePopupView(): View { + val contentView = View.inflate(activity, R.layout.popup_user_home_more, null) + contentView.run { + findViewById(R.id.shareBtn) + .setOnClickListener { + IntegralLogHelper.log("click_share", "更多面板") + mPopupWindow.dismiss() + shareUserHome() + } + + findViewById(R.id.reportBtn).setOnClickListener { + IntegralLogHelper.log("click_report", "更多面板") + mPopupWindow.dismiss() + val items = arrayListOf( + context.getString(R.string.report_reason_one), + context.getString(R.string.report_reason_two), + context.getString(R.string.report_reason_three), + context.getString(R.string.report_reason_four), + context.getString(R.string.report_reason_other) + ) + DialogUtils.showReportReasonDialog(requireContext(), items) { reason, desc -> + ifLogin("个人主页-举报") { + mUserHomeViewModel.postReport(reason, desc) + } + } + } + } + return contentView + } + private fun shareUserHome() { val content = (if (mPlayGameCount == 0) "" else "好燃~ 玩过 $mPlayGameCount 款游戏\n") + (if (mBadgeCount == 0) "" else "给力~ 已领取 $mBadgeCount 枚徽章\n") + @@ -828,6 +831,10 @@ class UserHomeFragment : ToolbarFragment() { } } } + + if (::mPopupWindow.isInitialized) { + mPopupWindow.contentView = inflateMorePopupView() + } } companion object { diff --git a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java index 385b0245cf..b322fcbdbd 100644 --- a/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/ApkCleanerFragment.java @@ -56,6 +56,10 @@ public class ApkCleanerFragment extends ToolbarFragment implements CleanApkAdapt private boolean isChooseApk = false; private String platformRequestsId; + private RecyclerView mRv; + + private VerticalItemDecoration mItemDecoration; + @Override protected int getLayoutId() { return R.layout.fragment_apk_cleaner; @@ -65,7 +69,7 @@ public class ApkCleanerFragment extends ToolbarFragment implements CleanApkAdapt public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); - RecyclerView recyclerView = view.findViewById(R.id.apk_rv); + mRv = view.findViewById(R.id.apk_rv); mApkCount = view.findViewById(R.id.apk_count); mApkDeleteBtn = view.findViewById(R.id.delete_btn); mApkSelectAll = view.findViewById(R.id.select_game_all); @@ -86,9 +90,10 @@ public class ApkCleanerFragment extends ToolbarFragment implements CleanApkAdapt mNodataSkipLl.setVisibility(View.GONE); mAdapter = new CleanApkAdapter(getContext(), this, mApkDeleteBtn, mApkSelectAll, isChooseApk); - recyclerView.setLayoutManager(new LinearLayoutManager(getContext())); - recyclerView.addItemDecoration(new VerticalItemDecoration(getContext(), 8, true)); - recyclerView.setAdapter(mAdapter); + mItemDecoration = new VerticalItemDecoration(getContext(), 8, true); + mRv.setLayoutManager(new LinearLayoutManager(getContext())); + mRv.addItemDecoration(mItemDecoration); + mRv.setAdapter(mAdapter); mApkSelectAll.setOnCheckedChangeListener((buttonView, isChecked) -> { ArrayMap selectPosition = new ArrayMap<>(); @@ -269,4 +274,13 @@ public class ApkCleanerFragment extends ToolbarFragment implements CleanApkAdapt mInstallAllData.setVisibility(View.GONE); mDeleteBottom.setVisibility(View.GONE); } + + @Override + protected void onDarkModeChanged() { + if (mItemDecoration != null) { + mRv.removeItemDecoration(mItemDecoration); + mItemDecoration = new VerticalItemDecoration(getContext(), 8, true); + mRv.addItemDecoration(mItemDecoration); + } + } } diff --git a/app/src/main/res/drawable-night-xxxhdpi/bg_user_home_more.webp b/app/src/main/res/drawable-night-xxxhdpi/bg_user_home_more.webp new file mode 100644 index 0000000000000000000000000000000000000000..57eb3d4e5a2af6805e1043fbda29d37b72bd6e08 GIT binary patch literal 904 zcmWIYbaQK9W?%?+bqWXzu!!JdU|V zv?j3eHlODaV$*E?$HR3{fW=Y3#9RFM+^4fc1q~TLmA|XJ`@Qtp&78vPTqgzmo02+~ zI~pA6ULgJ`bprQA!7ENBtQ!U9I%>O=Pv9z4&}g*~X>pR_u~Ot?pDDoHPw+2^@w78Z8o1EKWRpzZBZoD+Tg7UMbuYI^wuTb02Tiwd~Cc)@;qTeVOn%%Q61; z^F+0Z2{*d>3=TG**!L?pw%oR3Z+WKU+iQvZMep?$ zU+mpiz}KYjztZ^3S4r-!`|~s$KRs=fI$g7CJKNdUvZeEWehKAVbbWnKrk+x9K&{x# zo!dGkuKSprSf{>i>ZxsSPi^Zzwk<7Zv&aAC|1bZ4`TtA(FZ;jq|M?Ta{l7UkXY;Xb zWvRE1AKMmnqbz9KN}$Opk8kN273YcxrqAl^2w66Dz1s7cufu~Xx1GFuGBT~oUu>Fa zWzFLmCnvw+DXw)BYt#Mo=h%9!^>H^!CtjD{KI_XKgV##6+Uw0;?zLE6Gx1+m&#sj+ zQ9Zu;wkMXs2(Sa}dfHAL71&rqpY7BE3 zwF($}80`!tx?PkM7YaOKP+(@+vb|upKSMo(RKWlL( - + diff --git a/app/src/main/res/layout/fragment_apk_cleaner.xml b/app/src/main/res/layout/fragment_apk_cleaner.xml index 4d477db3a8..a8873b6afa 100644 --- a/app/src/main/res/layout/fragment_apk_cleaner.xml +++ b/app/src/main/res/layout/fragment_apk_cleaner.xml @@ -7,7 +7,7 @@ android:id="@+id/select_game_installed_ll" android:layout_width="match_parent" android:layout_height="40dp" - android:background="@color/white" + android:background="@color/ui_surface" android:paddingLeft="20dp"> diff --git a/app/src/main/res/layout/fragment_real_name.xml b/app/src/main/res/layout/fragment_real_name.xml index 654794b60e..efe76997f6 100644 --- a/app/src/main/res/layout/fragment_real_name.xml +++ b/app/src/main/res/layout/fragment_real_name.xml @@ -55,7 +55,7 @@ android:layout_width="match_parent" android:layout_height="166dp" android:layout_marginTop="72dp" - android:background="@color/white" + android:background="@color/ui_surface" android:gravity="center_horizontal" android:orientation="vertical" android:visibility="gone" diff --git a/module_common/src/main/res/layout/dialog_suggest_game.xml b/module_common/src/main/res/layout/dialog_suggest_game.xml index 1327e393e4..f03caa8ba3 100644 --- a/module_common/src/main/res/layout/dialog_suggest_game.xml +++ b/module_common/src/main/res/layout/dialog_suggest_game.xml @@ -2,7 +2,7 @@ @@ -18,7 +18,8 @@ android:gravity="center_vertical" android:paddingLeft="25dp" android:paddingRight="25dp" - android:text="@string/title_suggest_game" /> + android:text="@string/title_suggest_game" + android:textColor="@color/text_secondary" /> @@ -102,7 +103,7 @@ android:background="@drawable/news_search_btn" android:gravity="center" android:text="确定" - android:textColor="@color/white" + android:textColor="@color/ui_surface" android:textSize="14sp" /> diff --git a/module_setting/src/main/res/layout/activity_network_diagnosis.xml b/module_setting/src/main/res/layout/activity_network_diagnosis.xml index e48c1b504b..10fdc85f95 100644 --- a/module_setting/src/main/res/layout/activity_network_diagnosis.xml +++ b/module_setting/src/main/res/layout/activity_network_diagnosis.xml @@ -14,7 +14,8 @@ android:paddingLeft="20dp" android:paddingTop="10dp" android:paddingBottom="10dp" - android:text="正在进行网络诊断 x% " /> + android:text="正在进行网络诊断 x% " + android:textColor="@color/text_secondary" /> + android:layout_height="match_parent" + android:textColor="@color/text_secondary" />