diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index 04e4013af9..99e6362133 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -210,7 +210,7 @@ abstract class BaseRichEditorActivity : ToolBarAct mViewModel.setUploadVideoListener(this) mKeyboardHeightProvider = KeyboardHeightProvider(this) mRichEditor.post { mKeyboardHeightProvider?.start() } - mRichEditor.enableForceDark(NightModeUtils.isNightMode(this)) + mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this)) // 防止个别手机在Js里无法获取粘贴内容 mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener") mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener") @@ -743,10 +743,10 @@ abstract class BaseRichEditorActivity : ToolBarAct override fun isAutoResetViewBackgroundEnabled(): Boolean =true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) - mRichEditor.enableForceDark(NightModeUtils.isNightMode(this)) + mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this)) } companion object { diff --git a/app/src/main/java/com/gh/base/NightModeSwitchHelper.kt b/app/src/main/java/com/gh/base/DarkModeSwitchHelper.kt similarity index 68% rename from app/src/main/java/com/gh/base/NightModeSwitchHelper.kt rename to app/src/main/java/com/gh/base/DarkModeSwitchHelper.kt index 0980f725ec..bcf8c7a0b6 100644 --- a/app/src/main/java/com/gh/base/NightModeSwitchHelper.kt +++ b/app/src/main/java/com/gh/base/DarkModeSwitchHelper.kt @@ -5,17 +5,17 @@ import android.view.Gravity import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatDelegate import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.DarkModeUtils import com.gh.gamecenter.common.utils.DialogHelper -import com.gh.gamecenter.common.utils.NightModeUtils import com.gh.gamecenter.common.utils.PackageFlavorHelper import com.gh.gamecenter.common.utils.dip2px import com.lzf.easyfloat.EasyFloat import com.lzf.easyfloat.enums.ShowPattern import com.lzf.easyfloat.enums.SidePattern -object NightModeSwitchHelper { +object DarkModeSwitchHelper { - fun showNightModeSwitchFloatingView(activity: AppCompatActivity) { + fun showDarkModeSwitchFloatingView(activity: AppCompatActivity) { if (PackageFlavorHelper.IS_TEST_FLAVOR) { EasyFloat.with(activity) .setLayout(R.layout.layout_day_mode_night_mode_switch) @@ -27,12 +27,8 @@ object NightModeSwitchHelper { .setShowPattern(ShowPattern.CURRENT_ACTIVITY) .registerCallback { createResult { _, _, view -> -// val url = "https://ps.w.org/dark-mode-for-wp-dashboard/assets/icon-128x128.png" -// view?.findViewById(R.id.iconIv)?.let { -// Picasso.with(activity).load(url).into(it) -// } view?.setOnClickListener { - showNightModeSwitchDialog(activity) + showDarkModeSwitchDialog(activity) } } } @@ -40,23 +36,23 @@ object NightModeSwitchHelper { } } - fun dismissNightModeSwitchFloatingView() { + fun dismissDarkModeSwitchFloatingView() { if (PackageFlavorHelper.IS_TEST_FLAVOR) { EasyFloat.dismiss("night_mode_switch_floating_view") } } - private fun showNightModeSwitchDialog(activity: AppCompatActivity) { + private fun showDarkModeSwitchDialog(activity: AppCompatActivity) { if (PackageFlavorHelper.IS_TEST_FLAVOR) { //切换深色模式 var mode = "普通模式" var positive = "跟随系统模式" var negative ="深色模式" - if (NightModeUtils.getSystemMode()) { + if (DarkModeUtils.isFollowSystemDarkModeFromSp()) { mode = "跟随系统模式" positive = "普通模式" negative = "深色模式" - } else if (NightModeUtils.getNightMode()) { + } else if (DarkModeUtils.isAppDarkModeEnabledFromSp()) { mode = "深色模式" positive = "跟随系统模式" negative = "普通模式" @@ -68,37 +64,37 @@ object NightModeSwitchHelper { confirmText = positive, cancelText = negative, confirmClickCallback = { - if (NightModeUtils.getSystemMode()) { - NightModeUtils.setNightMode(false) - NightModeUtils.setSystemMode(false) + if (DarkModeUtils.isFollowSystemDarkModeFromSp()) { + DarkModeUtils.updateAppDarkModeStatusToSp(false) + DarkModeUtils.updateFollowSystemDarkModeToSp(false) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { activity.delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_NO } } else { - NightModeUtils.setSystemMode(true) + DarkModeUtils.updateFollowSystemDarkModeToSp(true) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { activity.delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM } } - NightModeUtils.initNightMode() + DarkModeUtils.initDarkMode() }, cancelClickCallback = { - if (NightModeUtils.getSystemMode()) { - NightModeUtils.setNightMode(true) + if (DarkModeUtils.isFollowSystemDarkModeFromSp()) { + DarkModeUtils.updateAppDarkModeStatusToSp(true) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { activity.delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES } } else { - val nightMode = NightModeUtils.getNightMode() - NightModeUtils.setNightMode(!NightModeUtils.getNightMode()) + val isDarkModeEnabledFromSp = DarkModeUtils.isAppDarkModeEnabledFromSp() + DarkModeUtils.updateAppDarkModeStatusToSp(!DarkModeUtils.isAppDarkModeEnabledFromSp()) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { activity.delegate.localNightMode = - if (nightMode) AppCompatDelegate.MODE_NIGHT_NO else AppCompatDelegate.MODE_NIGHT_YES + if (isDarkModeEnabledFromSp) AppCompatDelegate.MODE_NIGHT_NO else AppCompatDelegate.MODE_NIGHT_YES } } - NightModeUtils.setSystemMode(false) - NightModeUtils.initNightMode() + DarkModeUtils.updateFollowSystemDarkModeToSp(false) + DarkModeUtils.initDarkMode() }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) diff --git a/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt b/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt index a43f4662dd..38e286f827 100644 --- a/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt +++ b/app/src/main/java/com/gh/base/DownloadToolbarActivity.kt @@ -101,8 +101,8 @@ abstract class DownloadToolbarActivity : ToolBarActivity() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) { (getMenuItem(R.id.menu_download).actionView.findViewById(R.id.menu_download_iv) as ImageView).setImageResource(R.drawable.toolbar_download) } diff --git a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt index fcb1755058..5eb16a8435 100644 --- a/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt +++ b/app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt @@ -58,7 +58,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks { } if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) { - NightModeSwitchHelper.showNightModeSwitchFloatingView(activity) + DarkModeSwitchHelper.showDarkModeSwitchFloatingView(activity) } if (activity is AppCompatActivity && activity !is SplashScreenActivity) { @@ -78,7 +78,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks { override fun onActivityPaused(activity: Activity) { FloatingBackViewManager.dismissBackView() if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) { - NightModeSwitchHelper.dismissNightModeSwitchFloatingView() + DarkModeSwitchHelper.dismissDarkModeSwitchFloatingView() } } 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 1f189c4a80..ae51556d3d 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -59,7 +59,7 @@ import com.gh.gamecenter.common.baselist.LoadStatus; import com.gh.gamecenter.common.callback.OnViewClickListener; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.ImageUtils; -import com.gh.gamecenter.common.utils.NightModeUtils; +import com.gh.gamecenter.common.utils.DarkModeUtils; import com.gh.gamecenter.common.view.DrawableView; import com.gh.gamecenter.core.utils.DisplayUtils; import com.gh.gamecenter.core.utils.MtaHelper; @@ -730,16 +730,16 @@ public class BindingAdapters { tagStyle.add(typeTag); } else { TagStyleEntity typeTag = new TagStyleEntity(); - boolean isNightMode = NightModeUtils.INSTANCE.isNightMode(layout.getContext()); + boolean isDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(layout.getContext()); typeTag.setName(test.getType() != null ? test.getType() : ""); typeTag.setBackground("1AFFA142"); - typeTag.setColor(isNightMode ? "EB9238" : "FFA142"); + typeTag.setColor(isDarkModeOn ? "EB9238" : "FFA142"); tagStyle.add(typeTag); TagStyleEntity timeTag = new TagStyleEntity(); timeTag.setName(GameViewUtils.getGameTestDate(test.getStart())); timeTag.setBackground("1A06CEA8"); - timeTag.setColor(isNightMode ? "07A385" : "06CEA8"); + timeTag.setColor(isDarkModeOn ? "07A385" : "06CEA8"); tagStyle.add(timeTag); } } else { diff --git a/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt b/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt index a48820a51a..afde654fe6 100644 --- a/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt +++ b/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt @@ -11,12 +11,12 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat -import com.gh.gamecenter.core.utils.DisplayUtils +import com.gh.gamecenter.R +import com.gh.gamecenter.common.utils.DarkModeUtils import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.sp2px -import com.gh.gamecenter.R -import com.gh.gamecenter.common.utils.NightModeUtils import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.entity.TagStyleEntity import kotlin.math.ceil @@ -93,7 +93,7 @@ class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: Attrib val params = LayoutParams(mLastItemWidth, mItemHeight) layoutParams = params setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_game_detail_label_more)) - if (NightModeUtils.isNightMode(context)) setColorFilter(R.color.text_title.toColor(context)) + if (DarkModeUtils.isDarkModeOn(context)) setColorFilter(R.color.text_title.toColor(context)) background = createBackgroundDrawable() scaleType = ImageView.ScaleType.CENTER } @@ -127,9 +127,9 @@ class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: Attrib private fun createBackgroundDrawable(): GradientDrawable { val gradientDrawable = GradientDrawable() - val isNightMode = NightModeUtils.isNightMode(context) + val isDarkModeOn = DarkModeUtils.isDarkModeOn(context) gradientDrawable.setColor(Color.TRANSPARENT) - gradientDrawable.setStroke(mStrokeWidth, Color.parseColor(if (isNightMode) "#33FFFFFF" else "#CCCCCC")) + gradientDrawable.setStroke(mStrokeWidth, Color.parseColor(if (isDarkModeOn) "#33FFFFFF" else "#CCCCCC")) gradientDrawable.cornerRadius = DisplayUtils.dip2px(2f).toFloat() return gradientDrawable } diff --git a/app/src/main/java/com/gh/common/view/GameIconView.kt b/app/src/main/java/com/gh/common/view/GameIconView.kt index 84edfb0e39..ed97d49e34 100644 --- a/app/src/main/java/com/gh/common/view/GameIconView.kt +++ b/app/src/main/java/com/gh/common/view/GameIconView.kt @@ -10,10 +10,7 @@ import androidx.cardview.widget.CardView import com.facebook.drawee.generic.RoundingParams import com.facebook.drawee.view.SimpleDraweeView import com.gh.gamecenter.R -import com.gh.gamecenter.common.utils.ImageUtils -import com.gh.gamecenter.common.utils.dip2px -import com.gh.gamecenter.common.utils.display -import com.gh.gamecenter.common.utils.toColor +import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.entity.GameEntity import splitties.views.dsl.core.add @@ -70,6 +67,9 @@ class GameIconView : CardView { mGameIconDecorationIv = gameIconUi.gameIconDecorationIv mBorderView = gameIconUi.borderView + mGameIconIv?.dimOnDarkMode() + mGameIconDecorationIv?.dimOnDarkMode() + if (mFadeDuration != -1) { mGameIconIv?.hierarchy?.fadeDuration = mFadeDuration } diff --git a/app/src/main/java/com/gh/gamecenter/AboutActivity.java b/app/src/main/java/com/gh/gamecenter/AboutActivity.java index ce35159eba..23fead2e18 100644 --- a/app/src/main/java/com/gh/gamecenter/AboutActivity.java +++ b/app/src/main/java/com/gh/gamecenter/AboutActivity.java @@ -38,8 +38,8 @@ public class AboutActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } } diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java index 62d1873e94..0a17392351 100644 --- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java @@ -25,8 +25,8 @@ public class CollectionActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 61bb637da7..f94bb2775b 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -26,8 +26,8 @@ public class ConcernActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } diff --git a/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java index 85b0bcb60e..e598a8a234 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernInfoActivity.java @@ -25,8 +25,8 @@ public class ConcernInfoActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } } diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index aa82ffe434..2f444ce63a 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -72,8 +72,8 @@ public class DownloadManagerActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt b/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt index 2b47a3978e..28e14fe82e 100644 --- a/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/HelpAndFeedbackActivity.kt @@ -55,8 +55,8 @@ class HelpAndFeedbackActivity : BaseActivity_TabLayout() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/InfoActivity.java b/app/src/main/java/com/gh/gamecenter/InfoActivity.java index 5b1788ccfe..c65df96a23 100644 --- a/app/src/main/java/com/gh/gamecenter/InfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/InfoActivity.java @@ -25,8 +25,8 @@ public class InfoActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } } diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index 63c0cc4286..d7089240e9 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -562,8 +562,8 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.setRootBackgroundColor(mContentView, R.color.background); mDetailBottom.setBackgroundColor(ContextCompat.getColor(this, R.color.background)); mLibaoDetailRv.getRecycledViewPool().clear(); diff --git a/app/src/main/java/com/gh/gamecenter/MessageActivity.java b/app/src/main/java/com/gh/gamecenter/MessageActivity.java index e014a34a71..f5f0e06de4 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageActivity.java @@ -28,8 +28,8 @@ public class MessageActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } } diff --git a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java index e9f5f85fe5..4244de76ca 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java @@ -37,7 +37,7 @@ public class MessageDetailActivity extends ToolBarActivity { ViewGroup.LayoutParams layoutParams = mShadowView.getLayoutParams(); layoutParams.height = DisplayUtils.dip2px(50f) + DisplayUtils.getStatusBarHeight(getResources()); mShadowView.setLayoutParams(layoutParams); - DisplayUtils.setStatusBarColor(this, R.color.transparent, !mNightMode); + DisplayUtils.setStatusBarColor(this, R.color.transparent, !mIsDarkModeOn); } public View getShadowView() { @@ -75,9 +75,9 @@ public class MessageDetailActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); - DisplayUtils.setStatusBarColor(this, R.color.transparent, !mNightMode); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); + DisplayUtils.setStatusBarColor(this, R.color.transparent, !mIsDarkModeOn); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java index 5a85535069..ea582a896c 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageInviteActivity.java @@ -30,8 +30,8 @@ public class MessageInviteActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } } diff --git a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java index 4ee5ea6c0e..02a706cc6b 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageKeFuActivity.java @@ -33,8 +33,8 @@ public class MessageKeFuActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } } diff --git a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java index 364b433133..7a6ac55b9e 100644 --- a/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MessageVoteActivity.java @@ -30,8 +30,8 @@ public class MessageVoteActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } } diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index baa8dac443..baf6c9e214 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -713,8 +713,8 @@ public class NewsDetailActivity extends DownloadToolbarActivity implements OnCli } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); mNewsShare.setIcon(R.drawable.icon_share_black); mNewsCollection.setIcon(R.drawable.community_content_detail_collect_unselect); diff --git a/app/src/main/java/com/gh/gamecenter/QaActivity.kt b/app/src/main/java/com/gh/gamecenter/QaActivity.kt index 0aa246d757..2e155faa39 100644 --- a/app/src/main/java/com/gh/gamecenter/QaActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/QaActivity.kt @@ -36,8 +36,8 @@ class QaActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt index ae72add009..97417dc604 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt @@ -3,7 +3,6 @@ package com.gh.gamecenter import android.annotation.SuppressLint import android.content.Context import android.content.Intent -import android.os.Build import android.os.Bundle import android.text.TextUtils import android.view.View @@ -267,8 +266,8 @@ open class SearchActivity : BaseActivity() { return super.handleBackPressed() } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/SettingActivity.kt b/app/src/main/java/com/gh/gamecenter/SettingActivity.kt index a5d7f5cee6..9e82b78ab8 100644 --- a/app/src/main/java/com/gh/gamecenter/SettingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SettingActivity.kt @@ -16,8 +16,8 @@ class SettingActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index 01b5e20a64..c6c01cb985 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -12,7 +12,6 @@ import android.graphics.Paint; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.preference.PreferenceManager; import android.provider.MediaStore; import android.text.Html; @@ -43,7 +42,6 @@ import com.gh.gamecenter.common.constant.Config; import com.gh.gamecenter.common.constant.Constants; import com.gh.gamecenter.common.utils.NotificationHelper; import com.gh.common.util.PackageUtils; -import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.gamecenter.common.utils.UploadImageUtils; import com.gh.gamecenter.common.base.TrackableDialog; import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment; @@ -91,12 +89,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.io.BufferedInputStream; -import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.io.InputStreamReader; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; @@ -1470,8 +1463,8 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); ActivitySuggestBinding binding = ActivitySuggestBinding.bind(mContentView); binding.divider1.setBackgroundColor(ContextCompat.getColor(this, R.color.cutting_line)); diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt index 4cc024f881..4b1b06cb50 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt @@ -19,8 +19,8 @@ class UserInfoActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean=true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index e4b2173e18..613882dd55 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -3,7 +3,6 @@ package com.gh.gamecenter; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.view.View; import androidx.annotation.NonNull; @@ -12,8 +11,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.vote.VoteFragment; -import java.util.ArrayList; - /** * Created by khy on 2017/4/11. * 求版本投票页面 @@ -36,8 +33,8 @@ public class VoteActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.kt b/app/src/main/java/com/gh/gamecenter/WebActivity.kt index 5d4a458788..c814796d74 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.kt @@ -70,8 +70,8 @@ open class WebActivity : ToolBarActivity() { return super.onKeyDown(keyCode, event) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt index c1edcc2da6..41824e5c16 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt @@ -154,7 +154,7 @@ class AmwayFragment : LazyListFragment() { private fun initDefaultLayout() { mDefaultBinding?.run { - nightMaskView.goneIf(!mNightMode) + nightMaskView.goneIf(!mIsDarkModeOn) // toolbar 消费 fitsSystemWindows 避免在 collapsingToolbar 下面出现多出来的 padding // [https://stackoverflow.com/questions/48137666/viewgroup-inside-collapsingtoolbarlayout-show-extra-bottom-padding-when-set-fits] @@ -170,7 +170,7 @@ class AmwayFragment : LazyListFragment() { collapsingToolbar.scrimVisibleHeightTrigger = collapsingTrigger collapsingToolbar.scrimShownAction = { mIsCollapsed = it - DisplayUtils.setLightStatusBar(requireActivity(), !mNightMode && it) + DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn && it) if (it) { titleTv.alpha = 1F titleTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_black)) @@ -213,9 +213,9 @@ class AmwayFragment : LazyListFragment() { } private fun initAlternativeLayout() { - mAlternativeBinding?.firstBackground?.goneIf(mNightMode) - mAlternativeBinding?.secondBackground?.goneIf(mNightMode) - mAlternativeBinding?.topBackgroundView?.goneIf(mNightMode) + mAlternativeBinding?.firstBackground?.goneIf(mIsDarkModeOn) + mAlternativeBinding?.secondBackground?.goneIf(mIsDarkModeOn) + mAlternativeBinding?.topBackgroundView?.goneIf(mIsDarkModeOn) mAlternativeBinding?.fab?.setOnClickListener { MtaHelper.onEvent("发表评论", "进入", "上墙") ifLogin("安利墙") { @@ -326,19 +326,19 @@ class AmwayFragment : LazyListFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mItemDecoration?.let { mListRv?.removeItemDecoration(it) } mListRv?.addItemDecoration(itemDecoration) mAdapter?.itemCount?.let { mAdapter?.notifyItemRangeChanged(0, it) } if (mUseAlternativeLayout) { - mAlternativeBinding?.firstBackground?.goneIf(mNightMode) - mAlternativeBinding?.secondBackground?.goneIf(mNightMode) - mAlternativeBinding?.topBackgroundView?.goneIf(mNightMode) + mAlternativeBinding?.firstBackground?.goneIf(mIsDarkModeOn) + mAlternativeBinding?.secondBackground?.goneIf(mIsDarkModeOn) + mAlternativeBinding?.topBackgroundView?.goneIf(mIsDarkModeOn) mAlternativeBinding?.listRefresh?.setBackgroundColor(R.color.background.toColor(requireContext())) onScrollChanged() } else { - mDefaultBinding?.nightMaskView?.goneIf(!mNightMode) + mDefaultBinding?.nightMaskView?.goneIf(!mIsDarkModeOn) mDefaultBinding?.appbar?.setBackgroundColor(R.color.background_white.toColor(requireContext())) mDefaultBinding?.collapsingToolbar?.setContentScrimColor(R.color.background_white.toColor(requireContext())) mDefaultBinding?.listRefresh?.setBackgroundColor(R.color.background.toColor(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt index 12b02b5831..935315c125 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt @@ -24,8 +24,8 @@ class CatalogActivity : DownloadToolbarActivity() { return getTargetIntent(this, CatalogActivity::class.java, CatalogFragment::class.java) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt index a73474add7..2a80218f92 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt @@ -219,8 +219,8 @@ class CatalogFragment : LazyFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.rvCatalog?.adapter?.run { notifyItemRangeChanged(0, itemCount) } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt index bbbbf1179c..d38a45d34c 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt @@ -21,8 +21,8 @@ class NewCatalogListActivity : DownloadToolbarActivity() { return true } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt index d472aa975a..15429e9b05 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt @@ -198,8 +198,8 @@ class NewCatalogListFragment : ListFragment } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.filterContainer?.run { setRootBackgroundColor(R.color.background_white.toColor(requireContext())) setItemTextColor(R.color.text_subtitle.toColor(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt index de7b696ae7..f784be756d 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt @@ -94,8 +94,8 @@ class SpecialCatalogFragment : ListFragment (parentFragment as? CategoryV2Fragment)?.openDirectoryLayout() } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.filterContainer?.run { setRootBackgroundColor(R.color.background_white.toColor(requireContext())) setItemTextColor(R.color.text_subtitle.toColor(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java index 78b767c38a..0107714ca0 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java @@ -99,8 +99,8 @@ public class AnswerFragment extends ListFragment } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); mCachedView.post(this::resetBackgroundColor); } diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java index 00ac1b2293..677ef94bb7 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java @@ -123,8 +123,8 @@ public class ArticleFragment extends ListFragment } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); mCachedView.post(this::resetBackgroundColor); } diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt index 01549a877b..0f227a4503 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt @@ -85,8 +85,8 @@ class CommunityArticleFragment : ListFragment 0) { mListRv.removeItemDecorationAt(0); diff --git a/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt b/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt index 51a68bb981..a12d0c485a 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt @@ -72,8 +72,8 @@ class VideoFragment : ListFragment(), IBatchDelet override fun toString() = value } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if ((mListRv?.itemDecorationCount ?: 0) > 0) { mListRv?.removeItemDecorationAt(0) mListRv?.addItemDecoration(itemDecoration) diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java index e26e5d1934..9a16a9e9f9 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragment.java @@ -455,8 +455,8 @@ public class GameDownloadFragment extends BaseFragment implements View.OnClickLi } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); mBinding.downloadmanagerRvShow.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); mBinding.downloadingContainer.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); mBinding.downloadmanagerHeadContainer.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); diff --git a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt index 43fce50c7e..beb71dac21 100644 --- a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt @@ -3,7 +3,6 @@ package com.gh.gamecenter.download import android.annotation.SuppressLint import android.os.Bundle import android.view.View -import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DefaultItemAnimator import com.ethanhua.skeleton.Skeleton @@ -228,8 +227,8 @@ class NewInstalledGameFragment : ToolbarFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.root.setBackgroundColor(R.color.background.toColor(requireContext())) mBinding.reuseNoneData.reuseNoneData.setBackgroundColor(R.color.background_white.toColor(requireContext())) mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(R.color.text_title.toColor(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt index 0c8ee4e964..11d985aaab 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt @@ -1,7 +1,6 @@ package com.gh.gamecenter.download import android.view.View -import androidx.core.content.ContextCompat import com.gh.common.exposure.ExposureListener import com.gh.gamecenter.MainActivity import com.gh.gamecenter.R @@ -119,8 +118,8 @@ class UpdatableGameFragment : LazyFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.recyclerView?.setBackgroundColor(R.color.background_white.toColor(requireContext())) mBinding?.noDataContainer?.reuseNoneDataTv?.setTextColor(R.color.text_title.toColor(requireContext())) mBinding?.noDataContainer?.reuseNoneDataDescTv?.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt index 2916ee4401..cdcf854be6 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt @@ -3,14 +3,11 @@ package com.gh.gamecenter.forum.detail import android.graphics.Color import android.os.Bundle import android.view.View -import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.ethanhua.skeleton.Skeleton import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.common.constant.Constants -import com.gh.common.util.* import com.gh.common.util.NewLogUtils -import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.R import com.gh.gamecenter.common.baselist.LazyListFragment import com.gh.gamecenter.common.constant.EntranceConsts @@ -308,8 +305,8 @@ class ForumArticleAskListFragment : LazyListFragment 0) R.color.background_white.toColor(requireContext()) else if (mNightMode && y == 0) R.color.background.toColor( + if (mIsDarkModeOn && y > 0) R.color.background_white.toColor(requireContext()) else if (mIsDarkModeOn && y == 0) R.color.background.toColor( requireContext() ) else R.color.transparent.toColor(requireContext()) ) navigationBg.setImageDrawable(null) - } else if (mNightMode) { + } else if (mIsDarkModeOn) { navigationBg.setBackgroundColor(R.color.background_white.toColor(requireContext())) navigationBg.setImageDrawable(null) } } } - override fun onNightModeChange() { - super.onNightModeChange() - if (isSupportVisible) DisplayUtils.setLightStatusBar(requireActivity(), !mNightMode) + override fun onDarkModeChanged() { + super.onDarkModeChanged() + if (isSupportVisible) DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn) mBinding?.tabLayout?.run { for (i in 0 until tabCount) { val tab: TabLayout.Tab? = getTabAt(i) @@ -577,7 +577,7 @@ class CommunityHomeFragment : LazyFragment() { ) ) topBg.run { - visibleIf(!mNightMode) + visibleIf(!mIsDarkModeOn) post { val bitmap = getBitmapFromView() bitmap?.let { diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt index 718c9b3762..e3096585e8 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityAdapter.kt @@ -4,16 +4,17 @@ import android.content.Context import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import com.gh.gamecenter.common.base.BaseRecyclerViewHolder -import com.gh.gamecenter.common.constant.ItemViewType import com.gh.common.exposure.time.TimeUtil -import com.gh.common.util.* +import com.gh.common.util.DirectUtils import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.FooterViewHolder +import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.baselist.ListAdapter +import com.gh.gamecenter.common.constant.ItemViewType import com.gh.gamecenter.common.utils.* -import com.gh.gamecenter.core.utils.* +import com.gh.gamecenter.core.utils.TimeUtils +import com.gh.gamecenter.core.utils.ToastUtils import com.gh.gamecenter.databinding.ForumActivityItemBinding import com.gh.gamecenter.entity.ForumActivityEntity @@ -51,9 +52,9 @@ class ForumActivityAdapter( when (holder) { is ForumActivityViewHolder -> { holder.binding.run { - val isNightMode = NightModeUtils.isNightMode(mContext) + val isDarkModeOn = DarkModeUtils.isDarkModeOn(mContext) root.background = R.drawable.bg_forum_activity_card.toDrawable(mContext) - root.setPadding(0, 0, 0, if (isNightMode) 16F.dip2px() else 26F.dip2px()) + root.setPadding(0, 0, 0, if (isDarkModeOn) 16F.dip2px() else 26F.dip2px()) root.layoutParams = (root.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins(16F.dip2px(), if (position == 0 && !hasCategory) 8F.dip2px() else 0, 16F.dip2px(), 0) } diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt index ba407a134f..d2389f92aa 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumActivityFragment.kt @@ -88,7 +88,7 @@ class ForumActivityFragment: LazyListFragment) { if (list.isEmpty()) return @@ -152,22 +152,22 @@ class ForumActivityFragment: LazyListFragment 0) { mListRv?.removeItemDecorationAt(0) mListRv?.addItemDecoration(itemDecoration) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt index 02525e4470..ab21b3d19c 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt @@ -350,8 +350,8 @@ class ForumArticleListFragment : LazyListFragment 0) { mListRv?.removeItemDecorationAt(0) mListRv?.addItemDecoration(itemDecoration) diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalItemViewHolder.kt index f0c6c7d60d..d90bc4fa73 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalItemViewHolder.kt @@ -60,7 +60,7 @@ class GameHorizontalItemViewHolder(val binding: GameHorizontalItemBinding) : val endTime = gameEntity.assignRemark.endTime * 1000 val currentTime = System.currentTimeMillis() - val isNightMode = NightModeUtils.isNightMode(binding.root.context) + val isDarkModeOn = DarkModeUtils.isDarkModeOn(binding.root.context) if (startTime < currentTime && (endTime > currentTime || startTime > endTime) ) { @@ -68,7 +68,7 @@ class GameHorizontalItemViewHolder(val binding: GameHorizontalItemBinding) : } else if (startTime == 0L && endTime > currentTime) { binding.remarkDot.setRoundedColorBackground(R.color.theme, 5F) } else { - if (isNightMode) { + if (isDarkModeOn) { binding.remarkDot.background = GradientDrawable().apply { cornerRadius = 5F.dip2px().toFloat() setColor(Color.parseColor("#555555")) diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt index 7e62730945..1083a1048a 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt @@ -53,7 +53,7 @@ class GameResourcePolicyDialogFragment : BaseDialogFragment() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { settings?.layoutAlgorithm = WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING } - mVebView?.enableForceDark(NightModeUtils.isNightMode(requireContext())) + mVebView?.enableForceDark(DarkModeUtils.isDarkModeOn(requireContext())) mVebView?.setTransparentBackground() mVebView?.webViewClient = object : WebViewClient() { override fun onPageFinished(view: WebView?, url: String?) { diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt index b7f3b9b31d..e6375e88b6 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameSubmissionActivity.kt @@ -33,8 +33,8 @@ class GameSubmissionActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt index cc8642a103..c62c17d1e5 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddGamesActivity.kt @@ -18,8 +18,8 @@ class AddGamesActivity : ToolBarActivity() { return getTargetIntent(this, AddGamesActivity::class.java, AddGamesFragment::class.java) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchGameFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchGameFragment.kt index be2b4f3ea2..e7b15d06db 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchGameFragment.kt @@ -98,8 +98,8 @@ class AddSearchGameFragment : GameFragment() { override fun isAutoSearch(): Boolean = false - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mAdapter?.let { it.notifyItemRangeChanged(0, it.itemCount) } if (::mBinding.isInitialized) { mBinding.searchContainer.setBackgroundColor(R.color.background_white.toColor(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddUserPlayedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddUserPlayedGameFragment.kt index e0bf28c260..b7c5ca4774 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddUserPlayedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddUserPlayedGameFragment.kt @@ -57,8 +57,8 @@ class AddUserPlayedGameFragment : ListFragment( return mViewModel } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mCachedView?.setRootBackgroundColor(R.color.background_white) mCachedView?.findViewById(R.id.divider)?.setBackgroundColor(R.color.divider.toColor(requireContext())) mAdapter?.let { it.notifyItemRangeChanged(0, it.itemCount) } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt index da8abe0a20..a48805d5f5 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesActivity.kt @@ -18,8 +18,8 @@ class ChooseGamesActivity : ToolBarActivity() { return getTargetIntent(this, ChooseGamesActivity::class.java, ChooseGamesFragment::class.java) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt index d4e01ff6d0..ec99880096 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesFragment.kt @@ -142,8 +142,8 @@ class ChooseGamesFragment : ToolbarFragment(), ChooseGamesAdapter.ItemDragListen } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if (::mBinding.isInitialized) { mBinding.run { root.setBackgroundColor(R.color.background_white.toColor(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt index 27d9ab4ed6..65abcdee96 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailFragment.kt @@ -263,7 +263,7 @@ class GameCollectionDetailFragment : } } - DisplayUtils.setStatusBarColor(requireActivity(), R.color.background_white, !mNightMode) + DisplayUtils.setStatusBarColor(requireActivity(), R.color.background_white, !mIsDarkModeOn) mBinding?.toolbarContainer?.setBackgroundColor(R.color.background_white.toColor(requireContext())) mBinding?.backIv?.setImageResource(R.drawable.ic_bar_back) @@ -344,10 +344,10 @@ class GameCollectionDetailFragment : squareIv.setImageResource(R.drawable.ic_game_collection_square_light) toolbarUserContainer.visibility = View.GONE } else { - DisplayUtils.setStatusBarColor(requireActivity(), R.color.background_white, !mNightMode) + DisplayUtils.setStatusBarColor(requireActivity(), R.color.background_white, !mIsDarkModeOn) toolbarContainer.setBackgroundColor(R.color.background_white.toColor(requireContext())) backIv.setImageResource(R.drawable.ic_bar_back) - squareIv.setImageResource(if (mNightMode) R.drawable.ic_game_collection_square_light else R.drawable.ic_game_collection_square) + squareIv.setImageResource(if (mIsDarkModeOn) R.drawable.ic_game_collection_square_light else R.drawable.ic_game_collection_square) toolbarUserContainer.visibility = View.VISIBLE } } @@ -1048,8 +1048,8 @@ class GameCollectionDetailFragment : ) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateToolbar() mAdapter?.let { it.notifyItemRangeChanged(0, it.itemCount) } updateStarView() diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt index a2c22d15fd..1daa7c7425 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionShareDialog.kt @@ -115,8 +115,8 @@ class GameCollectionShareDialog : BaseDraggableDialogFragment() { override fun getRootView(): View = mBinding.root override fun getDragCloseView(): View = mBinding.dragClose - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.run { container.background = R.drawable.game_detail_more_dialog_background.toDrawable(requireContext()) cancelTv.background = R.drawable.button_round_gray_light.toDrawable(requireContext()) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt index d9ce0a5169..ecaf9e0427 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationFragment.kt @@ -247,8 +247,8 @@ class GameCollectionCommentConversationFragment : startActivityForResult(intent, CommentActivity.REQUEST_CODE) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if (::mBinding.isInitialized) { mBinding.container.background = R.drawable.game_detail_more_dialog_background.toDrawable(requireContext()) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt index fe3425279e..3f18a9bf23 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionActivity.kt @@ -18,8 +18,8 @@ class MyGameCollectionActivity : ToolBarActivity() { return getTargetIntent(this, MyGameCollectionActivity::class.java, MyGameCollectionFragment::class.java) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt index ba4645c438..46db99e96a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/mine/MyGameCollectionFragment.kt @@ -106,8 +106,8 @@ class MyGameCollectionFragment : ListFragment(R.id.postTv)?.background = R.drawable.textview_concern_red_up_round.toDrawable(this) if (::mBinding.isInitialized) { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt index ec3b6fffe1..97f05d74ef 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareFragment.kt @@ -189,8 +189,8 @@ class GameCollectionSquareFragment : LazyListFragment(), IScrollable { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.recyclerview.setBackgroundColor(R.color.background.toColor(requireContext())) mBinding.recyclerview.recycledViewPool.clear() mAdapter.notifyItemRangeChanged(0, mAdapter.itemCount) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt index b0ff06d7b1..5fffc1c35b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt @@ -176,8 +176,8 @@ class GameDetailMoreDialog : BaseDraggableDialogFragment() { override fun getRootView(): View = binding.root override fun getDragCloseView(): View = binding.dragClose - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() binding.container.background = R.drawable.game_detail_more_dialog_background.toDrawable(requireContext()) binding.gameNameTv.setTextColor(R.color.text_title.toColor(requireContext())) binding.handleView.background = R.drawable.download_dialog_close_hint.toDrawable(requireContext()) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt index 80858f2db0..11fd7bc584 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiFragment.kt @@ -183,8 +183,8 @@ class FuLiFragment : LazyFragment(), IScrollable { } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.containerRl?.setBackgroundColor(R.color.background.toColor(requireContext())) mBinding?.fmFuliRv?.recycledViewPool?.clear() mAdapter?.notifyItemRangeChanged(0, mAdapter?.itemCount ?: 0) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt index 84ca1f990c..3de9b4e8bf 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarActivity.kt @@ -384,8 +384,8 @@ class ServersCalendarActivity : ToolBarActivity() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.root.setRootBackgroundColor(R.color.background) mBinding.hint.setBackgroundColor(R.color.background.toColor(this)) mBinding.hint.setTextColor(R.color.text_subtitleDesc.toColor(this)) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt index 5691e0ee76..10c40b079a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListFragment.kt @@ -116,8 +116,8 @@ class HistoryApkListFragment : ListFragment mAdapter?.notifyDataSetChanged() } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.root.setRootBackgroundColor(R.color.background_white) mListRv.recycledViewPool.clear() mAdapter?.notifyItemRangeChanged(0, mAdapter?.itemCount ?: 0) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt index 51bf40f56f..6731cfd82c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingFragment.kt @@ -4,7 +4,6 @@ import android.app.Activity import android.content.Intent import android.os.Bundle import android.view.View -import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProviders import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.MainActivity @@ -83,8 +82,8 @@ class MyRatingFragment : ListFragment() { return itemDecoration } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(R.color.text_title.toColor(requireContext())) mBinding.reuseNoneData.reuseNoneDataDescTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) mBinding.reuseNoneData.reuseNoneDataIv.setImageResource(R.drawable.ic_empty_data) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt index 9b6fe89fe2..3dc23a7836 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingFragment.kt @@ -29,7 +29,6 @@ import com.gh.gamecenter.entity.RatingComment import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.eventbus.EBTypeChange import com.gh.gamecenter.gamedetail.GameDetailFragment -import com.gh.gamecenter.personal.PersonalFragment import com.halo.assistant.HaloApp import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe @@ -231,8 +230,8 @@ class RatingFragment : LazyListFragment(), IScro mListRv?.scrollToPosition(0) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mListRv?.background = R.color.background.toDrawable(requireContext()) mListRv?.recycledViewPool?.clear() mAdapter?.notifyItemRangeChanged(0, mAdapter?.itemCount ?: 0) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt index 459b44cd12..ccfaddb17f 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyActivity.kt @@ -142,7 +142,7 @@ class RatingReplyActivity : ListActivity= Build.VERSION_CODES.LOLLIPOP) { settings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW } @@ -509,10 +508,10 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) - mBinding.mWebView.enableForceDark(NightModeUtils.isNightMode(this)) + mBinding.mWebView.enableForceDark(DarkModeUtils.isDarkModeOn(this)) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsActivity.kt index 1add3c5ef3..c5b40899ea 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/logs/CommentLogsActivity.kt @@ -58,8 +58,8 @@ class CommentLogsActivity : ListActivity } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.root.setRootBackgroundColor(R.color.background) if (mListRv != null) { mListRv.recycledViewPool.clear() diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt index 2d961cc3dd..6798312b2c 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpContainerFragment.kt @@ -201,8 +201,8 @@ class HelpContainerFragment : ToolbarFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.searchInput.run { post { setHintTextColor(R.color.text_body.toColor(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt index 1d6b12876c..b5a79ac2e4 100644 --- a/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/HelpQaCategoryFragment.kt @@ -94,8 +94,8 @@ class HelpQaCategoryFragment : ToolbarFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.listRv.run { if (itemDecorationCount > 0) { removeItemDecorationAt(0) diff --git a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt index dbf829e46a..ac414f2394 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt @@ -10,22 +10,18 @@ import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentTransaction import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.GridLayoutManager -import com.gh.common.util.* -import com.gh.gamecenter.common.view.GridSpacingItemDecoration +import com.gh.common.util.DialogUtils import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity import com.gh.gamecenter.common.BuildConfig import com.gh.gamecenter.common.constant.Constants -import com.gh.gamecenter.common.utils.NightModeUtils.getSystemMode -import com.gh.gamecenter.common.utils.NightModeUtils.isNightMode -import com.gh.gamecenter.common.utils.dip2px -import com.gh.gamecenter.common.utils.toColor -import com.gh.gamecenter.common.utils.toDrawable -import com.gh.gamecenter.common.utils.TextHelper -import com.gh.gamecenter.common.utils.viewModelProvider -import com.gh.gamecenter.core.utils.* -import com.gh.gamecenter.databinding.DialogQaFeedbackBinding import com.gh.gamecenter.common.eventbus.EBReuse +import com.gh.gamecenter.common.utils.* +import com.gh.gamecenter.common.utils.DarkModeUtils.isDarkModeOn +import com.gh.gamecenter.common.utils.DarkModeUtils.isFollowSystemDarkModeFromSp +import com.gh.gamecenter.common.view.GridSpacingItemDecoration +import com.gh.gamecenter.core.utils.ToastUtils +import com.gh.gamecenter.databinding.DialogQaFeedbackBinding import com.gh.gamecenter.suggest.SuggestType import com.halo.assistant.HaloApp import com.lightgame.dialog.BaseDialogFragment @@ -39,7 +35,7 @@ class QaFeedbackDialogFragment : BaseDialogFragment() { private val mReasonList = arrayListOf("内容看不懂", "没有解决办法", "方法不可行", "其他原因") private lateinit var mAdapter: QaFeedbackReasonAdapter - private var mNightMode = false + private var mIsDarkModeOn = false override fun onCreateView( inflater: LayoutInflater, @@ -61,8 +57,8 @@ class QaFeedbackDialogFragment : BaseDialogFragment() { mLoadingDialog?.dismiss() } - mNightMode = if (BuildConfig.IS_NIGHT_MODE_ON) { - isNightMode(requireContext()) + mIsDarkModeOn = if (BuildConfig.IS_DARK_MODE_ON) { + isDarkModeOn(requireContext()) } else { false } @@ -131,18 +127,18 @@ class QaFeedbackDialogFragment : BaseDialogFragment() { override fun onResume() { super.onResume() - if (!getSystemMode() && mNightMode != isNightMode(requireContext())) { - onNightModeChange() + if (!isFollowSystemDarkModeFromSp() && mIsDarkModeOn != isDarkModeOn(requireContext())) { + onDarkModeChanged() } } override fun onConfigurationChanged(newConfig: Configuration) { super.onConfigurationChanged(newConfig) - onNightModeChange() + onDarkModeChanged() } - private fun onNightModeChange() { - mNightMode = isNightMode(requireContext()) + private fun onDarkModeChanged() { + mIsDarkModeOn = isDarkModeOn(requireContext()) mBinding.run { root.background = R.drawable.background_shape_white_radius_8.toDrawable(requireContext()) diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt index 2b651447ac..513ebde2a7 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt @@ -17,8 +17,8 @@ class HistoryActivity: ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt index 8e29ddf5ef..0e566cafb3 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt @@ -325,8 +325,8 @@ class HomeFragment : LazyFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if (::mBinding.isInitialized) { mBinding.gameList.recycledViewPool.clear() if (::mListAdapter.isInitialized) mListAdapter.notifyItemRangeChanged(0, mListAdapter.itemCount) diff --git a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt index aa66dd24bf..23eec99d03 100644 --- a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipActivity.kt @@ -18,12 +18,12 @@ class PackageSkipActivity : BaseActivity() { ?: PackageSkipFragment().with(intent.extras) // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移 supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment, PackageSkipFragment::class.java.name).commitAllowingStateLoss() - DisplayUtils.setStatusBarColor(this, R.color.transparent, !mNightMode) + DisplayUtils.setStatusBarColor(this, R.color.transparent, !mIsDarkModeOn) } - override fun onNightModeChange() { - super.onNightModeChange() - DisplayUtils.setStatusBarColor(this, R.color.transparent, !mNightMode) + override fun onDarkModeChanged() { + super.onDarkModeChanged() + DisplayUtils.setStatusBarColor(this, R.color.transparent, !mIsDarkModeOn) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipFragment.kt b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipFragment.kt index 022095d59f..6bf3a44353 100644 --- a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipFragment.kt @@ -118,8 +118,8 @@ class PackageSkipFragment : BaseFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.root.setBackgroundColor(R.color.background.toColor(requireContext())) mBinding.normalTitle.setTextColor(R.color.text_title.toColor(requireContext())) mBinding.tipTv1.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java index 1bc426387d..8d258f0c59 100644 --- a/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/ConcernFragment.java @@ -432,8 +432,8 @@ public class ConcernFragment extends ToolbarFragment implements SwipeRefreshLayo } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); mAdapter.notifyItemRangeChanged(0, mAdapter.getItemCount()); if (mConcernRecommendAdapter != null) mConcernRecommendAdapter.notifyItemRangeChanged(0, mConcernRecommendAdapter.getItemCount()); mBinding.news1RvList.removeItemDecoration(mItemDecoration); diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java index a7633b2330..2c27403c2b 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyFragment.java @@ -289,8 +289,8 @@ public class StrategyFragment extends BaseFragment implements SwipeRefreshLayout } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); mBinding.container.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); mStrategyAdapter.notifyItemRangeChanged(0, mStrategyAdapter.getItemCount()); if (dialog != null && dialogContentView != null && mStrategyDialogAdapter != null) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java index 5637d842b4..ed73f634e0 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java @@ -182,8 +182,8 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(),R.color.background_white); ExtensionsKt.setRootBackgroundColor(mBinding.searchBar.getRoot(),R.color.background_white); mBinding.searchBar.searchBackground.setBackground(ContextCompat.getDrawable(requireContext(),R.drawable.actionbar_search_bg)); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java index e25a197da8..45159f7d18 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -222,8 +222,8 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.background_white); mBinding.libao2RvList.getRecycledViewPool().clear(); adapter.notifyItemRangeChanged(0, adapter.getItemCount()); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java index 77924108f7..bb8cd52d29 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -177,8 +177,8 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.background_white); mBinding.radiogroup.setBackgroundColor(ContextCompat.getColor(requireContext(),R.color.background_white)); mBinding.receivedRb.setBackground(ContextCompat.getDrawable(requireContext(),R.drawable.bg_button_round_selector)); diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java index 592a966916..e0938868b9 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java @@ -148,8 +148,8 @@ public class LibaoFragment extends BaseFragment_TabLayout { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); mBinding.fragmentTabRl.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); mBinding.divider.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.divider)); ExtensionsKt.updateStatusBarColor(requireActivity(), R.color.black, R.color.white); diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java index 19c2b030e6..fa6002012c 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewFragment.java @@ -272,8 +272,8 @@ public class LibaoNewFragment extends BaseFragment implements SwipeRefreshLayout } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); mBinding.libao1RvList.getRecycledViewPool().clear(); mAdapter.notifyItemRangeChanged(0, mAdapter.getItemCount()); if (mBinding.libao1RvList.getItemDecorationCount() > 0) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java index 0ee0b883ec..51a9a1831b 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java @@ -168,8 +168,8 @@ public class LibaoSearchFragment extends BaseFragment implements SwipeRefreshLay } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.background); mBinding.libaoSearchRvList.getRecycledViewPool().clear(); mAdapter.notifyItemRangeChanged(0, mAdapter.getItemCount()); diff --git a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java index aad78b4476..ce692f4a9e 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -527,8 +527,8 @@ public class MessageDetailFragment extends ToolbarFragment implements OnCommentC } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); if (adapter != null) { adapter.notifyItemRangeChanged(0, adapter.getItemCount()); } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt index edc4eb46c6..ebfe001c6c 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt @@ -230,8 +230,8 @@ class MyFollowedGameFragment : ListFragment } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.run { if (mRecommendAdapter?.recommendGameList?.isNotEmpty() == true) { concernRvRecommend.recycledViewPool.clear() diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt index 76d88ff75e..1abfbe3601 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt @@ -63,8 +63,8 @@ class MyGameActivity : BaseActivity_TabLayout() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt index 8cc81509cd..5168feddde 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt @@ -139,8 +139,8 @@ class MyReservationFragment : ListFragment() } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mListRv.setBackgroundColor(R.color.background_white.toColor(requireContext())) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index cab81aa7dd..dc0ac1205f 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -50,7 +50,7 @@ import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.common.utils.DialogHelper; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.ImageUtils; -import com.gh.gamecenter.common.utils.NightModeUtils; +import com.gh.gamecenter.common.utils.DarkModeUtils; import com.gh.gamecenter.common.utils.TextHelper; import com.gh.gamecenter.common.view.DrawableView; import com.gh.gamecenter.core.utils.DisplayUtils; @@ -260,7 +260,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { mWebSettings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN); SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext); mWebSettings.setTextZoom(defaultTextZoom + sp.getInt(SettingsFragment.FONT_SIZE_SP_KEY, 1) * 15); - ExtensionsKt.enableForceDark(viewHolder.binding.newsdetailItemWvContent, NightModeUtils.INSTANCE.isNightMode(mContext)); + ExtensionsKt.enableForceDark(viewHolder.binding.newsdetailItemWvContent, DarkModeUtils.INSTANCE.isDarkModeOn(mContext)); ExtensionsKt.setTransparentBackground(viewHolder.binding.newsdetailItemWvContent); viewHolder.binding.newsdetailItemWvContent.setHtml(mNewsDetailEntity.getContent(), true); // viewHolder.binding.newsdetailItemWvContent.initArticleVideo(); diff --git a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt index 3ec7b92529..864b6707e6 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt @@ -15,8 +15,8 @@ class DeliveryInfoActivity : ToolBarActivity() { updateStatusBarColor(R.color.background_white, R.color.background_white) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt index d9e6bddad2..5e73e60329 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt @@ -39,8 +39,8 @@ class DeliveryInfoFragment: ToolbarFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.divider.setBackgroundColor(R.color.background.toColor(requireContext())) mBinding.divider2.setBackgroundColor(R.color.background.toColor(requireContext())) mBinding.divider3.setBackgroundColor(R.color.background.toColor(requireContext())) diff --git a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt index 90542c204f..9dc138facb 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/NewPersonalFragment.kt @@ -663,8 +663,8 @@ class NewPersonalFragment : BaseLazyFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if (::mStubBinding.isInitialized) { mStubBinding.listRefresh.setBackgroundColor(R.color.background_white.toColor(requireContext())) mPersonalFuncGroupAdapter.notifyItemRangeChanged(0, mPersonalFuncGroupAdapter.itemCount) diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt index 8dcb30bae2..88bd0b2f34 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt @@ -714,8 +714,8 @@ class PersonalFragment : BaseLazyFragment() { private fun getItemDecoration() = VerticalItemDecoration(requireContext(), 8F, false) .apply { mItemDecoration = this } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if (::mStubBinding.isInitialized && ::mPersonalFuncGroupAdapter.isInitialized) { mStubBinding.listRefresh.setBackgroundColor(R.color.background.toColor(requireContext())) mPersonalFuncGroupAdapter.notifyItemRangeChanged(0, mPersonalFuncGroupAdapter.itemCount) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundActivity.kt index 011e53649c..c0cb3b7b9f 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundActivity.kt @@ -17,8 +17,8 @@ class PersonalityBackgroundActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundFragment.kt index 6e84b19c38..c67541dfa7 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundFragment.kt @@ -115,8 +115,8 @@ class PersonalityBackgroundFragment : ToolbarFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.recommendRv.run { if (itemDecorationCount > 0) { removeItemDecorationAt(0) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt index d89bcde145..41ef496d2b 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderActivity.kt @@ -28,9 +28,9 @@ class AvatarBorderActivity : BaseActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() - DisplayUtils.setLightStatusBar(this, !mNightMode) + override fun onDarkModeChanged() { + super.onDarkModeChanged() + DisplayUtils.setLightStatusBar(this, !mIsDarkModeOn) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt index 186756810b..5690a37ec0 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/fans/FansActivity.kt @@ -19,8 +19,8 @@ class FansActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt b/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt index b850058484..b5c7933f39 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/followers/FollowersActivity.kt @@ -19,8 +19,8 @@ class FollowersActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt index f0e66b1840..37a16aaea2 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryFragment.kt @@ -435,8 +435,8 @@ class UserHistoryFragment : ListFragment>() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } 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 f5103f8e95..148075c399 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 @@ -45,7 +45,6 @@ import com.gh.gamecenter.databinding.PieceQuestionContentBinding import com.gh.gamecenter.entity.* import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.login.user.UserManager -import com.gh.gamecenter.personal.PersonalFragment import com.gh.gamecenter.qa.answer.edit.AnswerEditActivity import com.gh.gamecenter.qa.comment.CommentActivity import com.gh.gamecenter.qa.dialog.MoreFunctionPanelDialog @@ -107,7 +106,7 @@ open class AnswerDetailFragment : ToolbarFragment() { mSpecialColumn = it.getParcelable(EntranceConsts.KEY_DATA) mViewModel.getAnswerDetail(mAnswerId) } - mBinding.richEditor.enableForceDark(NightModeUtils.isNightMode(requireContext())) + mBinding.richEditor.enableForceDark(DarkModeUtils.isDarkModeOn(requireContext())) mBinding.richEditor.setInputEnabled(false) mBinding.richEditor.setPadding(20, 15, 20, 15) mBinding.bottomController.replyTv.text = "说点什么吧" diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt index 98e944c544..c3ac15ecb7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/SimpleAnswerDetailActivity.kt @@ -26,8 +26,8 @@ class SimpleAnswerDetailActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean =true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt index 51467f992f..7619b814db 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/MyArticleFragment.kt @@ -113,8 +113,8 @@ class MyArticleFragment : ListFragment 0) { mListRv.removeItemDecorationAt(0) mListRv.addItemDecoration(itemDecoration) diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt index d86c5b2c26..2c90d2b60b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt @@ -37,8 +37,8 @@ class ArticleDetailActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt index a3aaa519e0..8bbdca8cf5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailContentViewHolder.kt @@ -37,7 +37,7 @@ class ArticleDetailContentViewHolder( @SuppressLint("AddJavascriptInterface") fun bindView(article: ArticleDetailEntity) { binding.run { - richEditor.enableForceDark(NightModeUtils.isNightMode(binding.root.context)) + richEditor.enableForceDark(DarkModeUtils.isDarkModeOn(binding.root.context)) richEditor.setInputEnabled(false) richEditor.setPadding(16, 4, 16, 4) richEditor.addJavascriptInterface(JsInterface(article.status ?: ""), "imagelistener") diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt index c4471872da..ffb3ee2849 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailFragment.kt @@ -41,7 +41,6 @@ import com.gh.gamecenter.eventbus.EBDeleteCommentDetail import com.gh.gamecenter.eventbus.EBDeleteDetail import com.gh.gamecenter.common.eventbus.EBReuse import com.gh.gamecenter.login.user.UserManager -import com.gh.gamecenter.personal.PersonalFragment import com.gh.gamecenter.qa.article.edit.ArticleEditActivity import com.gh.gamecenter.qa.comment.CommentActivity import com.gh.gamecenter.qa.comment.base.BaseCommentAdapter @@ -950,8 +949,8 @@ class ArticleDetailFragment : BaseCommentFragment 0) { mListRv?.removeItemDecorationAt(0) mListRv?.addItemDecoration(itemDecoration) diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt index dab7a6259c..ee5f53ea41 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentFragment.kt @@ -125,8 +125,8 @@ abstract class BaseCommentFragment : ListFragment< return (provideListAdapter() as BaseCommentAdapter).filterVH } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if (mListRv != null) { mListRv.removeItemDecoration(mItemDecoration) mListRv.addItemDecoration(itemDecoration) diff --git a/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt index 2d2b9c8027..59e4e90cd8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/draft/CommunityDraftWrapperActivity.kt @@ -33,8 +33,8 @@ class CommunityDraftWrapperActivity : BaseActivity_TabLayout() { override fun isAutoResetViewBackgroundEnabled(): Boolean =true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerFragment.kt index e6dbed9816..f0d439a72c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/AnswerFragment.kt @@ -36,8 +36,8 @@ class AnswerFragment : ListFragment() { } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if ((mListRv?.itemDecorationCount ?: 0) > 0) { mListRv?.removeItemDecorationAt(0) itemDecoration?.let { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt index eb1e3d6278..fade58828b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/ArticleFragment.kt @@ -35,8 +35,8 @@ class ArticleFragment : ListFragment() { return itemDecoration } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if ((mListRv?.itemDecorationCount ?: 0) > 0) { mListRv?.removeItemDecorationAt(0) mListRv?.addItemDecoration(itemDecoration) diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt index dbba7c0a1f..9d0538f8b7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameActivity.kt @@ -21,8 +21,8 @@ class GameActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/GameFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/GameFragment.kt index 9dd133735a..6bd81d41c9 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/GameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/GameFragment.kt @@ -212,8 +212,8 @@ open class GameFragment : ListFragment 0) { mListRv?.removeItemDecorationAt(0) itemDecoration?.let { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt index 781d4ff69a..5f867ff537 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertAnswerWrapperActivity.kt @@ -30,8 +30,8 @@ class InsertAnswerWrapperActivity : BaseActivity_TabLayout() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt index 2355f9e700..dfe4c29b73 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertArticleWrapperActivity.kt @@ -29,8 +29,8 @@ class InsertArticleWrapperActivity : BaseActivity_TabLayout() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt index 31acf4a99b..68dbe661ba 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertGameCollectionWrapperActivity.kt @@ -50,8 +50,8 @@ class InsertGameCollectionWrapperActivity : BaseActivity_TabLayout() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt index 8f56d9f32e..77850ae37d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/InsertVideoWrapperActivity.kt @@ -46,8 +46,8 @@ class InsertVideoWrapperActivity : BaseActivity_TabLayout() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt index eb16d71e39..c3ba8981c4 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaActivity.kt @@ -117,8 +117,8 @@ class LocalMediaActivity : ToolBarActivity(), AlbumCollection.AlbumCallbacks { override fun isAutoResetViewBackgroundEnabled(): Boolean =true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java index 11facf9fca..1e3bd2febe 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerFragment.java @@ -87,8 +87,8 @@ public class MyAnswerFragment extends ListFragment 0) { mListRv.removeItemDecorationAt(0); mListRv.addItemDecoration(getItemDecoration()); diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java index 3d6edab778..9f43666f09 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAskActivity.java @@ -26,8 +26,8 @@ public class MyAskActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt index ab409c59e9..e05715aff0 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftActivity.kt @@ -16,8 +16,8 @@ class QuestionDraftActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftFragment.kt index 2846da77f0..21bf967058 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/draft/QuestionDraftFragment.kt @@ -89,8 +89,8 @@ class QuestionDraftFragment : ListFragment 0) { mListRv?.removeItemDecorationAt(0) mListRv?.addItemDecoration(itemDecoration) diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java index 50dedf9d3c..51fb9d62a1 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteActivity.java @@ -22,8 +22,8 @@ public class QuestionsInviteActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt index d8ce5add15..65dd925081 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt @@ -37,8 +37,8 @@ class NewQuestionDetailActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean =true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt index 1b3293daa8..5d2fdb312d 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/QuestionDetailContentViewHolder.kt @@ -38,7 +38,7 @@ class QuestionDetailContentViewHolder( fun bindView(question: QuestionsDetailEntity) { binding.run { richEditor.setInputEnabled(false) - richEditor.enableForceDark(NightModeUtils.isNightMode(binding.root.context)) + richEditor.enableForceDark(DarkModeUtils.isDarkModeOn(binding.root.context)) richEditor.setPadding(16, 4, 16, 4) richEditor.addJavascriptInterface(JsInterface(question.status), "imagelistener") richEditor.addJavascriptInterface( diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt index e96c686c80..803eee277c 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishActivity.kt @@ -23,8 +23,8 @@ class VideoPublishActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean =true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt index f0d3c2a722..6d2137db6c 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultFragment.kt @@ -304,7 +304,7 @@ open class SearchDefaultFragment : BaseFragment() { flexCell.setTextColor(R.color.text_subtitle.toColor(requireContext())) } flexCell.setPadding(8F.dip2px(), 0, 8F.dip2px(), 0) - flexCell.background = if (mNightMode) GradientDrawable().apply { + flexCell.background = if (mIsDarkModeOn) GradientDrawable().apply { setStroke(0.5F.dip2px(), Color.parseColor("#21FFFFFF")) cornerRadius = 999F } else DrawableView.getStrokeDrawable(R.color.text_dddddd, 0.5F) @@ -347,8 +347,8 @@ open class SearchDefaultFragment : BaseFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.rootContainer.setBackgroundColor(R.color.background_white.toColor(requireContext())) mBinding.hotList.adapter?.run { notifyItemRangeChanged(0, itemCount) diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt index 34a4a89d42..65ee565212 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneActivity.kt @@ -22,8 +22,8 @@ class BindPhoneActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt index 3e2c091532..3a7e3f9581 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt @@ -7,7 +7,6 @@ import android.os.Message import android.view.View import androidx.lifecycle.Observer import com.gh.gamecenter.common.constant.Constants -import com.gh.common.util.* import com.gh.common.util.DialogUtils import com.gh.gamecenter.energy.utils.EnergyTaskHelper.postInviteCodeTask import com.gh.gamecenter.R @@ -292,8 +291,8 @@ class BindPhoneFragment : ToolbarFragment() { mDialog = null } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.run { bindPhoneEt.post { listOf( diff --git a/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt b/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt index 0be29fe608..f15c8b3821 100644 --- a/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/security/SecurityActivity.kt @@ -18,8 +18,8 @@ class SecurityActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt index c901674760..7ecf246f7d 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServerTestActivity.kt @@ -22,8 +22,8 @@ class GameServerTestActivity : DownloadToolbarActivity() { return getTargetIntent(this, GameServerTestActivity::class.java, GameServersTestFragment::class.java) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt index 558bbc75be..c8a178525d 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersActivity.kt @@ -152,8 +152,8 @@ class GameServersActivity : DownloadToolbarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) mServersTest?.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_black, R.color.theme_font, this)) mServersPublish?.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_black, R.color.theme_font, this)) diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt index 6a2490ca49..2cfd4cf4a8 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt @@ -415,8 +415,8 @@ class GameServersContentFragment : BaseFragment() { }, 10) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.recyclerView?.run { recycledViewPool.clear() adapter?.run { diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt index 6b6588efd4..15f828c141 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt @@ -484,8 +484,8 @@ class GameServersTestFragment : LazyFragment() { LogUtils.logServerTestSelectTypeEvent(type, mViewModel!!.testTitle, mViewModel!!.testRemark) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.run { root.setBackgroundColor(R.color.background.toColor(requireContext())) filterView.run { diff --git a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt index 43511f53db..0bae436902 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/add/AddKaiFuActivity.kt @@ -200,8 +200,8 @@ class AddKaiFuActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) mBinding?.run { root.setBackgroundColor(R.color.background.toColor(this@AddKaiFuActivity)) diff --git a/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt b/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt index a82998e02c..b51b974043 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/patch/PatchKaifuActivity.kt @@ -104,8 +104,8 @@ class PatchKaifuActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) mBinding?.run { root.setBackgroundColor(R.color.background.toColor(this@PatchKaifuActivity)) diff --git a/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt b/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt index 2e5ae3066b..de56cc713e 100644 --- a/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingActivity.kt @@ -28,8 +28,8 @@ class GameDownloadSettingActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingFragment.kt b/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingFragment.kt index 221a749169..66f3874358 100644 --- a/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/setting/GameDownloadSettingFragment.kt @@ -125,8 +125,8 @@ class GameDownloadSettingFragment: ToolbarFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.run { root.setBackgroundColor(R.color.background.toColor(requireContext())) autoInstallItem.switchLottie.setSwitchAnimation(SPUtils.getBoolean(AUTO_INSTALL_SP_KEY, true)) diff --git a/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt b/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt index 0c6a84200c..0e2912468b 100644 --- a/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/setting/VideoSettingActivity.kt @@ -29,8 +29,8 @@ class VideoSettingActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt b/app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt index 442e60c54d..f9eab98eb4 100644 --- a/app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/setting/VideoSettingFragment.kt @@ -169,8 +169,8 @@ class VideoSettingFragment: ToolbarFragment() { return status == SPUtils.getString(SP_HOME_OR_DETAIL_VIDEO_OPTION, VIDEO_OPTION_WIFI) ?: VIDEO_OPTION_WIFI } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.root?.setBackgroundColor(R.color.background.toColor(requireContext())) mBinding?.muteItem?.switchLottie?.setSwitchAnimation(SPUtils.getBoolean(SP_VIDEO_PLAY_MUTE, true)) setContentVideoOption(mContentVideoOptionSelected) diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt index 951c3da60f..ff2fb98f88 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt @@ -17,8 +17,8 @@ class SimulatorGameActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt index 3610c18b23..06bd0a4d6d 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt @@ -17,8 +17,8 @@ class SimulatorManagementActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementFragment.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementFragment.kt index f47a5ab4b7..64672ff34d 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementFragment.kt @@ -77,8 +77,8 @@ class SimulatorManagementFragment : ListFragment() - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mAdapter?.updatePopupWindow() } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt index 6dc193ea99..95110507fd 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt @@ -36,8 +36,8 @@ class SubjectActivity : DownloadToolbarActivity() { override fun isAutoResetViewBackgroundEnabled() = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt index 50dc6ae29c..c83f6ee8a9 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt @@ -182,8 +182,8 @@ class SubjectTabFragment : BaseFragment() { return view } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() for (i in 0 until mBinding.subjectTab.tabCount) { val tab = mBinding.subjectTab.getTabAt(i) ?: continue tab.customView?.background = diff --git a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java index 5b35aa488c..accc79a0b2 100644 --- a/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java +++ b/app/src/main/java/com/gh/gamecenter/suggest/SuggestSelectFragment.java @@ -107,8 +107,8 @@ public class SuggestSelectFragment extends BaseFragment { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); if (mBinding != null) { mBinding.getRoot().setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); mBinding.divider1.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background)); diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt index 2ce45b0d71..8ae519e2e9 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt @@ -53,8 +53,8 @@ class TagsActivity : DownloadToolbarActivity() { return "游戏标签详情" } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt index 82ce2b2b14..6fbd189bb5 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt @@ -212,8 +212,8 @@ class TagsListFragment : ListFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mSkeletonScreen = Skeleton.bind(mBinding.listSkeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt index 524f188e29..f1958f8ca4 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt @@ -196,8 +196,8 @@ class PasswordSettingFragment : ToolbarFragment() { requireActivity().finish() } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.run { root.setBackgroundColor(R.color.background_white.toColor(requireContext())) include.backBtn.setImageResource(R.drawable.ic_bar_back) diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt index 1085aa7d89..a980df50c4 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt @@ -26,8 +26,8 @@ class TeenagerModeActivity : BaseActivity() { override fun preventRecreateFragmentByFragmentManager(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) } diff --git a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt index 547881c09d..26921227e5 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt @@ -81,8 +81,8 @@ class TeenagerModeFragment : ToolbarFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.run { root.setBackgroundColor(R.color.background_white.toColor(requireContext())) include.backBtn.setImageResource(R.drawable.ic_bar_back) diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt index 2de7568f9d..2f1f25b77e 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt @@ -2,7 +2,6 @@ package com.gh.gamecenter.toolbox import android.content.Context import android.content.Intent -import android.os.Build import android.os.Bundle import android.view.KeyEvent import android.view.MotionEvent @@ -263,8 +262,8 @@ class ToolBoxBlockActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) if (::mBinding.isInitialized) { mBinding.run { diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt index 66b31f9f43..f491a79c18 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt @@ -8,28 +8,28 @@ import com.gh.common.constant.Config import com.gh.gamecenter.NewsDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity.Companion.getWebByCollectionTools -import com.gh.gamecenter.common.baselist.ListExecutor import com.gh.gamecenter.common.base.BaseRecyclerViewHolder +import com.gh.gamecenter.common.baselist.ListExecutor +import com.gh.gamecenter.common.entity.ToolBoxEntity +import com.gh.gamecenter.common.utils.DarkModeUtils import com.gh.gamecenter.common.utils.ImageUtils.display -import com.gh.gamecenter.common.utils.NightModeUtils import com.gh.gamecenter.common.utils.goneIf import com.gh.gamecenter.common.utils.safelyGetInRelease import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.databinding.ItemToolboxBinding -import com.gh.gamecenter.common.entity.ToolBoxEntity import com.lightgame.adapter.BaseRecyclerAdapter class ToolBoxItemAdapter(context: Context, private val isBlockInside: Boolean = false, private val mViewModel: ToolBoxViewModel) : BaseRecyclerAdapter(context) { private var mEntityList: List = arrayListOf() - private var mNightMode = NightModeUtils.isNightMode(context) + private var mIsDarkModeOn = DarkModeUtils.isDarkModeOn(context) fun setDataList(dataList: List, isSearch: Boolean = false) { - if (mNightMode != NightModeUtils.isNightMode(mContext)) { + if (mIsDarkModeOn != DarkModeUtils.isDarkModeOn(mContext)) { mEntityList = dataList notifyItemRangeChanged(0, itemCount) - mNightMode = NightModeUtils.isNightMode(mContext) + mIsDarkModeOn = DarkModeUtils.isDarkModeOn(mContext) return } if (mEntityList == dataList) { diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt index e0c2691731..b59694d5d2 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataFragment.kt @@ -79,8 +79,8 @@ class VideoDataFragment : BaseFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if (mBinding.listRv.itemDecorationCount > 0) { mBinding.listRv.removeItemDecorationAt(0) mBinding.listRv.addItemDecoration(getItemDecoration()) diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt index 1f554767fa..100ee56f6f 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoActivity.kt @@ -98,7 +98,7 @@ class GameVideoActivity : ToolBarActivity() { override fun isAutoResetViewBackgroundEnabled(): Boolean = true - override fun onNightModeChange() { + override fun onDarkModeChanged() { mToolbar.setBackgroundColor(R.color.transparent.toColor(this)) mToolbar.setNavigationIcon(R.drawable.ic_toolbar_back_white) mBinding.tabContainer.setBackgroundColor(R.color.background_white.toColor(this)) diff --git a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt index 30d7ec3ac4..6be5d41052 100644 --- a/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/game/GameVideoFragment.kt @@ -62,8 +62,8 @@ class GameVideoFragment : ListFragment() mListRv.layoutManager = FixLinearLayoutManager(requireContext()) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() if ((mListRv?.itemDecorationCount ?: 0) > 0) { mListRv?.removeItemDecorationAt(0) mListRv?.addItemDecoration(itemDecoration) diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index c04f86dfde..da4945fd18 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -47,7 +47,7 @@ import com.gh.gamecenter.common.utils.DeviceUtils; import com.gh.gamecenter.common.utils.EmulatorUtil; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.ImageUtils; -import com.gh.gamecenter.common.utils.NightModeUtils; +import com.gh.gamecenter.common.utils.DarkModeUtils; import com.gh.gamecenter.common.utils.PackageFlavorHelper; import com.gh.gamecenter.common.utils.TimestampUtils; import com.gh.gamecenter.core.AppExecutor; @@ -238,7 +238,7 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid } registerActivityLifecycleCallbacks(new GlobalActivityLifecycleObserver()); - NightModeUtils.INSTANCE.initNightMode(); + DarkModeUtils.INSTANCE.initDarkMode(); } /** diff --git a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt index 139c2bc836..b755bc8c1f 100644 --- a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.kt @@ -4,18 +4,13 @@ import android.annotation.SuppressLint import android.app.Activity import android.app.ActivityManager import android.content.Context -import android.content.DialogInterface import android.os.Build import android.os.Bundle import android.os.Message import android.preference.PreferenceManager import android.text.TextUtils import android.view.View -import android.widget.EditText -import android.widget.Toast -import androidx.appcompat.app.AlertDialog import androidx.core.content.ContextCompat -import androidx.transition.Visibility import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.WebActivity @@ -179,8 +174,8 @@ class AboutFragment : ToolbarFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.root.setBackgroundColor(R.color.background.toColor(requireContext())) } } \ No newline at end of file diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt index 7bf11ccc73..ed61534080 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt @@ -620,8 +620,8 @@ class SettingsFragment : ToolbarFragment() { } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding.root.setBackgroundColor(R.color.background.toColor(requireContext())) mBinding.personalRecommendItem.switchLottie.setSwitchAnimation(SPUtils.getBoolean(PERSONAL_RECOMMEND_SP_KEY, true)) mBinding.usageStatsItem.switchLottie.setSwitchAnimation(mUsageStatus) diff --git a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt index e316a63da8..e16a8be576 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt @@ -120,8 +120,8 @@ class SwitchInstallMethodFragment : ToolbarFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() requireActivity().updateStatusBarColor(R.color.background_white, R.color.background_white) mBinding?.toolbar?.run { normalToolbar.setBackgroundColor(R.color.background_white.toColor(requireContext())) diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt index 64d52370ec..415c4fe662 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt @@ -15,7 +15,6 @@ import android.view.MenuItem import android.view.View import android.webkit.* import androidx.annotation.RequiresApi -import androidx.webkit.WebViewCompat import com.gh.gamecenter.common.base.activity.BaseActivity import com.gh.gamecenter.common.base.fragment.LazyFragment import com.gh.gamecenter.core.AppExecutor.uiExecutor @@ -43,7 +42,6 @@ import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.core.utils.EmptyCallback import com.gh.gamecenter.databinding.FragmentWebBinding import com.gh.gamecenter.entity.CommentnumEntity -import com.gh.gamecenter.entity.MeEntity import com.gh.gamecenter.common.entity.ToolBoxEntity import com.gh.gamecenter.entity.WebShareEntity import com.gh.gamecenter.common.eventbus.EBReuse @@ -53,7 +51,6 @@ import com.gh.gamecenter.message.MessageDetailFragment import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.databinding.FragmentWebWarningBinding import com.gh.gamecenter.retrofit.RetrofitManager -import com.halo.assistant.HaloApp import com.lightgame.utils.Utils import com.zhihu.matisse.Matisse import com.zhihu.matisse.MimeType @@ -320,7 +317,7 @@ class WebFragment : LazyFragment(), IScrollable { mBinding?.run { val settings = newsWebview.settings settings.javaScriptEnabled = true - newsWebview.enableForceDark(NightModeUtils.isNightMode(requireContext())) + newsWebview.enableForceDark(DarkModeUtils.isDarkModeOn(requireContext())) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { settings.mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW } @@ -774,11 +771,11 @@ class WebFragment : LazyFragment(), IScrollable { }, 200) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mMenuShare?.setIcon(R.drawable.icon_share_black) mMenuCollect?.setIcon(R.drawable.community_content_detail_collect_unselect) - mBinding?.newsWebview?.enableForceDark(NightModeUtils.isNightMode(requireContext())) + mBinding?.newsWebview?.enableForceDark(DarkModeUtils.isDarkModeOn(requireContext())) } private fun onShareSuccess() { diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java index 6ddf745e37..5eb746e32a 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernFragment.java @@ -145,8 +145,8 @@ public class MyConcernFragment extends ToolbarFragment implements OnRequestCallB } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); if (concernAdapter != null) { mConcernRv.getRecycledViewPool().clear(); concernAdapter.notifyItemRangeChanged(0, concernAdapter.getItemCount()); diff --git a/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt index c21beede6a..b60d37ffb4 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/RealNameInfoFragment.kt @@ -357,8 +357,8 @@ class RealNameInfoFragment : ToolbarFragment() { }.applyTo(mBinding.infoContainer) } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() requireActivity().updateStatusBarColor(R.color.background_white, R.color.background_white) mBinding.toolbar.run { normalToolbar.setBackgroundColor(R.color.background_white.toColor(requireContext())) diff --git a/module_common/build.gradle b/module_common/build.gradle index 7f0431305a..90ad14cef9 100644 --- a/module_common/build.gradle +++ b/module_common/build.gradle @@ -27,10 +27,10 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" /** * Build Time 供区分 jenkins 打包时间用 - * IS_NIGHT_MODE_ON 供区分夜间模式功能是否启用 + * IS_NIGHT_MODE_ON 供区分深色模式功能是否启用 */ buildConfigField "long", "BUILD_TIME", "0" - buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true" + buildConfigField "boolean", "IS_DARK_MODE_ON", "true" buildConfigField "boolean", "IS_VGAME_ON", "true" } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/CustomLayoutInflaterFactory.kt b/module_common/src/main/java/com/gh/gamecenter/common/base/CustomLayoutInflaterFactory.kt index 05751f14c5..945e7fc986 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/CustomLayoutInflaterFactory.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/CustomLayoutInflaterFactory.kt @@ -5,7 +5,9 @@ import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import androidx.appcompat.app.AppCompatActivity +import com.facebook.drawee.view.SimpleDraweeView import com.gh.gamecenter.common.R +import com.gh.gamecenter.common.utils.dimOnDarkMode class CustomLayoutInflaterFactory( private val mAppCompatActivity: AppCompatActivity @@ -43,6 +45,10 @@ class CustomLayoutInflaterFactory( } } + if (view is SimpleDraweeView) { + view.dimOnDarkMode() + } + return view } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java index e530874ea9..72d7a09fe1 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java @@ -39,6 +39,7 @@ import com.alibaba.android.arouter.core.LogisticsCenter; import com.alibaba.android.arouter.exception.NoRouteFoundException; import com.alibaba.android.arouter.facade.Postcard; import com.alibaba.android.arouter.launcher.ARouter; +import com.facebook.drawee.view.SimpleDraweeView; import com.gh.gamecenter.common.BuildConfig; import com.gh.gamecenter.common.R; import com.gh.gamecenter.common.base.CustomLayoutInflaterFactory; @@ -53,7 +54,7 @@ import com.gh.gamecenter.common.utils.DialogUtils; import com.gh.gamecenter.common.utils.EnvHelper; import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.NetworkUtils; -import com.gh.gamecenter.common.utils.NightModeUtils; +import com.gh.gamecenter.common.utils.DarkModeUtils; import com.gh.gamecenter.common.utils.PackageFlavorHelper; import com.gh.gamecenter.common.utils.ShareUtils; import com.gh.gamecenter.core.provider.IDownloadManagerProvider; @@ -69,7 +70,6 @@ import com.lightgame.BaseAppCompatActivity; import com.lightgame.download.DownloadEntity; import com.lightgame.download.FileUtils; import com.lightgame.utils.Utils; -import com.lightgame.view.CheckableImageView; import com.tencent.tauth.Tencent; import org.greenrobot.eventbus.EventBus; @@ -105,7 +105,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy protected String mEntrance; private boolean mIsExistLogoutDialog; - protected boolean mNightMode; + protected boolean mIsDarkModeOn; public long startPageTime = 0; protected final Handler mBaseHandler = new BaseHandler(this); @@ -187,7 +187,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy } } - mNightMode = NightModeUtils.INSTANCE.isNightMode(this); + mIsDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(this); } @Override @@ -195,10 +195,10 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy super.onResume(); startPageTime = System.currentTimeMillis(); - if (BuildConfig.IS_NIGHT_MODE_ON - && !NightModeUtils.INSTANCE.getSystemMode() - && mNightMode != NightModeUtils.INSTANCE.isNightMode(this)) { - onNightModeChange(); + if (BuildConfig.IS_DARK_MODE_ON + && !DarkModeUtils.INSTANCE.isFollowSystemDarkModeFromSp() + && mIsDarkModeOn != DarkModeUtils.INSTANCE.isDarkModeOn(this)) { + onDarkModeChanged(); } } @@ -316,7 +316,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy screenRootView.addView(view); screenRootView.addView(ll); - screenRootView.addView(getNightModeIndicatorView()); + screenRootView.addView(getDarkModeIndicatorView()); RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) ll.getLayoutParams(); lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); @@ -328,18 +328,18 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy } @Nullable - private View getNightModeIndicatorView() { + private View getDarkModeIndicatorView() { if (PackageFlavorHelper.IS_TEST_FLAVOR) { LinearLayout ll = new LinearLayout(this); TextView tv = new TextView(this); - String envText = NightModeUtils.INSTANCE.isNightMode(this) ? "夜间模式" : "日间模式"; + String envText = DarkModeUtils.INSTANCE.isDarkModeOn(this) ? "深色模式" : "浅色模式"; tv.setBackground(ContextCompat.getDrawable(this, R.color.theme)); tv.setText(envText); tv.setGravity(Gravity.CENTER); tv.setTextColor(Color.WHITE); tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13); tv.measure(0, 0); - tv.setAlpha(NightModeUtils.INSTANCE.isNightMode(this) ? 0.8F : 0.15F); + tv.setAlpha(DarkModeUtils.INSTANCE.isDarkModeOn(this) ? 0.8F : 0.15F); tv.setId(ID_NIGHT_INDICATOR); int height = tv.getMeasuredHeight(); int width = tv.getMeasuredWidth(); @@ -544,18 +544,18 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy @Override public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); - if (BuildConfig.IS_NIGHT_MODE_ON && mNightMode != NightModeUtils.INSTANCE.isNightMode(this)) { - onNightModeChange(); + if (BuildConfig.IS_DARK_MODE_ON && mIsDarkModeOn != DarkModeUtils.INSTANCE.isDarkModeOn(this)) { + mIsDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(this); + onDarkModeChanged(); } } - protected void onNightModeChange() { - if (BuildConfig.IS_NIGHT_MODE_ON) { - mNightMode = NightModeUtils.INSTANCE.isNightMode(this); + protected void onDarkModeChanged() { + if (BuildConfig.IS_DARK_MODE_ON) { TextView tv = findViewById(ID_NIGHT_INDICATOR); if (tv != null) { - tv.setText(NightModeUtils.INSTANCE.isNightMode(this) ? "夜间模式" : "日间模式"); - tv.setAlpha(NightModeUtils.INSTANCE.isNightMode(this) ? 0.8F : 0.15F); + tv.setText(DarkModeUtils.INSTANCE.isDarkModeOn(this) ? "深色模式" : "浅色模式"); + tv.setAlpha(DarkModeUtils.INSTANCE.isDarkModeOn(this) ? 0.8F : 0.15F); } if (isAutoResetViewBackgroundEnabled()) { updateStaticViewBackground(getWindow().getDecorView()); @@ -598,6 +598,10 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy String drawableRightString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_DRAWABLE_RIGHT_ID()); String drawableBottomString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_DRAWABLE_BOTTOM_ID()); + if (view instanceof SimpleDraweeView) { + ExtensionsKt.dimOnDarkMode((ImageView) view); + } + if (backgroundString != null) { if (backgroundString.startsWith("#")) return; int backgroundId = Integer.parseInt( diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity_TabLayout.java b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity_TabLayout.java index abb7883a18..e1266f68c9 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity_TabLayout.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity_TabLayout.java @@ -136,8 +136,8 @@ public abstract class BaseActivity_TabLayout extends ToolBarActivity implements } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); View container = findViewById(R.id.activity_tab_container); if (container != null) { container.setBackgroundColor(ContextCompat.getColor(this, R.color.background_white)); diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/ToolBarActivity.java b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/ToolBarActivity.java index 9c07d24dd2..b47692648a 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/ToolBarActivity.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/ToolBarActivity.java @@ -334,8 +334,8 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); if (mToolbar != null) { mToolbar.setBackgroundColor(ContextCompat.getColor(this, R.color.background_white)); } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseDialogFragment.java b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseDialogFragment.java index d32a8b996c..62f999b874 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseDialogFragment.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseDialogFragment.java @@ -15,7 +15,7 @@ import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.Lifecycle; import com.gh.gamecenter.common.R; -import com.gh.gamecenter.common.utils.NightModeUtils; +import com.gh.gamecenter.common.utils.DarkModeUtils; import com.gh.gamecenter.core.utils.ClickUtils; import com.lightgame.utils.RuntimeUtils; import com.lightgame.utils.Utils; @@ -30,12 +30,12 @@ import java.lang.reflect.Field; public class BaseDialogFragment extends DialogFragment { - protected boolean mNightMode; + protected boolean mIsDarkModeOn; @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext()); + mIsDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(requireContext()); } @NonNull @@ -109,11 +109,13 @@ public class BaseDialogFragment extends DialogFragment { @Override public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); - onNightModeChange(); + + mIsDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(requireContext()); + onDarkModeChanged(); } - protected void onNightModeChange() { - mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext()); + protected void onDarkModeChanged() { + } } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment.java b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment.java index 434c8af916..c49dde99c8 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment.java @@ -29,7 +29,7 @@ import com.gh.gamecenter.common.eventbus.EBMiPush; import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler; import com.gh.gamecenter.common.syncpage.SyncDataEntity; import com.gh.gamecenter.common.syncpage.SyncPageRepository; -import com.gh.gamecenter.common.utils.NightModeUtils; +import com.gh.gamecenter.common.utils.DarkModeUtils; import com.lightgame.OnTitleClickListener; import com.lightgame.utils.RuntimeUtils; import com.lightgame.utils.Utils; @@ -60,7 +60,7 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB protected boolean isEverPause; - protected boolean mNightMode; + protected boolean mIsDarkModeOn; @NonNull protected String mEntrance = ""; @@ -162,10 +162,10 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB if (addSyncPageObserver()) { initSyncPageObserver(); } - if (BuildConfig.IS_NIGHT_MODE_ON) { - mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext()); + if (BuildConfig.IS_DARK_MODE_ON) { + mIsDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(requireContext()); } else { - mNightMode = false; + mIsDarkModeOn = false; } } @@ -240,10 +240,10 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB isEverPause = false; startPageTime = System.currentTimeMillis(); - if (BuildConfig.IS_NIGHT_MODE_ON - && !NightModeUtils.INSTANCE.getSystemMode() - && mNightMode != NightModeUtils.INSTANCE.isNightMode(requireContext())) { - onNightModeChange(); + if (BuildConfig.IS_DARK_MODE_ON + && !DarkModeUtils.INSTANCE.isFollowSystemDarkModeFromSp() + && mIsDarkModeOn != DarkModeUtils.INSTANCE.isDarkModeOn(requireContext())) { + onDarkModeChanged(); } } @@ -353,12 +353,13 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); - if (BuildConfig.IS_NIGHT_MODE_ON && mNightMode != NightModeUtils.INSTANCE.isNightMode(requireContext())) { - onNightModeChange(); + if (BuildConfig.IS_DARK_MODE_ON && mIsDarkModeOn != DarkModeUtils.INSTANCE.isDarkModeOn(requireContext())) { + mIsDarkModeOn = DarkModeUtils.INSTANCE.isDarkModeOn(requireContext()); + onDarkModeChanged(); } } - protected void onNightModeChange() { - mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext()); + protected void onDarkModeChanged() { + } } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java index 9b9ad3fd63..65868294fe 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment_TabLayout.java @@ -201,8 +201,8 @@ public abstract class BaseFragment_TabLayout extends ToolbarFragment implements } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); View container = requireView().findViewById(R.id.fragment_tab_container); if (container != null) { container.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyTabFragment.kt b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyTabFragment.kt index 729ebb9d0a..039133e94a 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyTabFragment.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseLazyTabFragment.kt @@ -122,8 +122,8 @@ abstract class BaseLazyTabFragment : BaseLazyFragment(), ViewPager.OnPageChangeL override fun onPageScrollStateChanged(state: Int) {} - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() val container = requireView().findViewById(R.id.fragment_tab_container) if (container != null) { container.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)) diff --git a/module_common/src/main/java/com/gh/gamecenter/common/baselist/ListFragment.java b/module_common/src/main/java/com/gh/gamecenter/common/baselist/ListFragment.java index 5cb89032f6..97a4b98f38 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/baselist/ListFragment.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/baselist/ListFragment.java @@ -294,8 +294,8 @@ public abstract class ListFragment setAnimation("lottie/switch_turnoff_dark.json") - !turnOff && NightModeUtils.isNightMode(context) -> setAnimation("lottie/switch_turnon_dark.json") - turnOff && !NightModeUtils.isNightMode(context) -> setAnimation("lottie/switch_turnoff_light.json") - !turnOff && !NightModeUtils.isNightMode(context) -> setAnimation("lottie/switch_turnon_light.json") + turnOff && DarkModeUtils.isDarkModeOn(context) -> setAnimation("lottie/switch_turnoff_dark.json") + !turnOff && DarkModeUtils.isDarkModeOn(context) -> setAnimation("lottie/switch_turnon_dark.json") + turnOff && !DarkModeUtils.isDarkModeOn(context) -> setAnimation("lottie/switch_turnoff_light.json") + !turnOff && !DarkModeUtils.isDarkModeOn(context) -> setAnimation("lottie/switch_turnon_light.json") } progress = 0F +} + +/** + * ImageView related + */ +fun ImageView.dimOnDarkMode() { +// val isDarkModeON = DarkModeUtils.isSystemDarkModeOn(context) +// +// if (isDarkModeON) { +// setColorFilter(0x33000000, PorterDuff.Mode.SRC_OVER) +// } else { +// clearColorFilter() +// } } \ No newline at end of file diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/NightModeUtils.kt b/module_common/src/main/java/com/gh/gamecenter/common/utils/NightModeUtils.kt deleted file mode 100644 index ba5153e294..0000000000 --- a/module_common/src/main/java/com/gh/gamecenter/common/utils/NightModeUtils.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.gh.gamecenter.common.utils - -import android.content.Context -import android.content.res.Configuration -import androidx.appcompat.app.AppCompatDelegate -import com.gh.gamecenter.common.BuildConfig -import com.gh.gamecenter.common.constant.Constants -import com.gh.gamecenter.core.utils.SPUtils - -object NightModeUtils { - /** - * 当前系统是否是深色模式 - */ - fun isNightMode(context: Context): Boolean { - // 仅配置开启的包才提供夜间模式功能 - return if (BuildConfig.IS_NIGHT_MODE_ON) { - val uiMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK - uiMode == Configuration.UI_MODE_NIGHT_YES - } else { - false - } - } - - /** - * 获取是否跟随系统，默认true - */ - fun getSystemMode() = SPUtils.getBoolean(Constants.SP_SYSTEM_MODE, true) - - fun setSystemMode(nightMode: Boolean) = SPUtils.setBoolean(Constants.SP_SYSTEM_MODE, nightMode) - - /** - * 获取是否设置深色模式，默认false - */ - fun getNightMode() = SPUtils.getBoolean(Constants.SP_NIGHT_MODE, false) - - fun setNightMode(nightMode: Boolean) = SPUtils.setBoolean(Constants.SP_NIGHT_MODE, nightMode) - - fun initNightMode() { - initNightMode(getSystemMode(), getNightMode()) - } - - /** - * 初始化App深色模式 - * - * @param systemMode 是否是跟随系统 - * @param nightMode 是否是深色模式 - */ - fun initNightMode(systemMode: Boolean, nightMode: Boolean) { - // 仅配置开启的包才提供夜间模式功能 - if (BuildConfig.IS_NIGHT_MODE_ON) { - if (systemMode) { - AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) - } else { - if (nightMode) { - AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES) - } else { - AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO) - } - } - } - } -} \ No newline at end of file diff --git a/module_energy/src/main/java/com/gh/gamecenter/energy/view/CommodityFragment.kt b/module_energy/src/main/java/com/gh/gamecenter/energy/view/CommodityFragment.kt index 6c36072f41..2ddfb31732 100644 --- a/module_energy/src/main/java/com/gh/gamecenter/energy/view/CommodityFragment.kt +++ b/module_energy/src/main/java/com/gh/gamecenter/energy/view/CommodityFragment.kt @@ -10,11 +10,11 @@ import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager import com.gh.gamecenter.common.baselist.ListFragment import com.gh.gamecenter.common.baselist.LoadType -import com.gh.gamecenter.core.utils.NumberUtils.findMax import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.common.utils.viewModelProvider +import com.gh.gamecenter.core.utils.NumberUtils.findMax import com.gh.gamecenter.energy.R import com.gh.gamecenter.energy.databinding.FragmentCommodityListBinding import com.gh.gamecenter.energy.databinding.ItemFilterCommodityCategoryBinding @@ -361,7 +361,7 @@ class CommodityFragment : ListFragment() { mListRv?.isNestedScrollingEnabled = enable } - override fun onNightModeChange() { - // 此页面暂不需要实现日夜间模式切换 + override fun onDarkModeChanged() { + // 此页面暂不需要实现深色模式 } } \ No newline at end of file diff --git a/module_energy/src/main/java/com/gh/gamecenter/energy/view/EnergyCenterFragment.kt b/module_energy/src/main/java/com/gh/gamecenter/energy/view/EnergyCenterFragment.kt index 002d7a2519..a939f5bd7c 100644 --- a/module_energy/src/main/java/com/gh/gamecenter/energy/view/EnergyCenterFragment.kt +++ b/module_energy/src/main/java/com/gh/gamecenter/energy/view/EnergyCenterFragment.kt @@ -383,8 +383,8 @@ class EnergyCenterFragment : BaseLazyFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.run { root.setBackgroundColor(R.color.background_white.toColor(requireContext())) contentContainer.setBackgroundColor(R.color.background_white.toColor(requireContext())) diff --git a/module_energy/src/main/java/com/gh/gamecenter/energy/view/EnergyHouseFragment.kt b/module_energy/src/main/java/com/gh/gamecenter/energy/view/EnergyHouseFragment.kt index 212687c71f..6a58b81d82 100644 --- a/module_energy/src/main/java/com/gh/gamecenter/energy/view/EnergyHouseFragment.kt +++ b/module_energy/src/main/java/com/gh/gamecenter/energy/view/EnergyHouseFragment.kt @@ -451,8 +451,8 @@ class EnergyHouseFragment: BaseLazyFragment() { } } - override fun onNightModeChange() { - super.onNightModeChange() + override fun onDarkModeChanged() { + super.onDarkModeChanged() mBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext())) } diff --git a/module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java index 7d9b17e44b..44a52be96d 100644 --- a/module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java +++ b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginActivity.java @@ -43,8 +43,8 @@ public class LoginActivity extends ToolBarActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); hideToolbar(true); - DisplayUtils.setLightStatusBar(this, !mNightMode); - DisplayUtils.setStatusBarColor(this, R.color.transparent, !mNightMode); + DisplayUtils.setLightStatusBar(this, !mIsDarkModeOn); + DisplayUtils.setStatusBarColor(this, R.color.transparent, !mIsDarkModeOn); } @Override @@ -53,8 +53,8 @@ public class LoginActivity extends ToolBarActivity { } @Override - protected void onNightModeChange() { - super.onNightModeChange(); + protected void onDarkModeChanged() { + super.onDarkModeChanged(); ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); } } diff --git a/scripts/build_with_simple_backup.sh b/scripts/build_with_simple_backup.sh index 6b72e33d26..20079f5913 100755 --- a/scripts/build_with_simple_backup.sh +++ b/scripts/build_with_simple_backup.sh @@ -30,7 +30,7 @@ rm -r module_common/src/main/res/values-night rm -r module_common/src/main/res/drawable-night-xxxhdpi rm -r module_common/src/main/res/drawable-night-nodpi rm -r module_common/src/main/res/drawable-night -sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' module_common/build.gradle +sed -i 's/buildConfigField "boolean", "IS_DARK_MODE_ON", "true"/buildConfigField "boolean", "IS_DARK_MODE_ON", "false"/g' module_common/build.gradle sed -i 's/buildConfigField "boolean", "IS_VGAME_ON", "true"/buildConfigField "boolean", "IS_VGAME_ON", "true"/g' module_common/build.gradle ./gradlew --stop diff --git a/scripts/jenkins_build.sh b/scripts/jenkins_build.sh index df3b78219b..df4b5c5d28 100755 --- a/scripts/jenkins_build.sh +++ b/scripts/jenkins_build.sh @@ -22,7 +22,7 @@ cd .. sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' module_common/build.gradle -# 添加 -n 代表全局禁用夜间模式 +# 添加 -n 代表全局禁用深色模式 while getopts "n" arg do case ${arg} in @@ -38,7 +38,7 @@ do rm -r module_common/src/main/res/drawable-night-xxxhdpi rm -r module_common/src/main/res/drawable-night-nodpi rm -r module_common/src/main/res/drawable-night - sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' module_common/build.gradle + sed -i 's/buildConfigField "boolean", "IS_DARK_MODE_ON", "true"/buildConfigField "boolean", "IS_DARK_MODE_ON", "false"/g' module_common/build.gradle ;; esac done diff --git a/scripts/jenkins_flutter_build.sh b/scripts/jenkins_flutter_build.sh index ca63b517cb..64acca9b5c 100755 --- a/scripts/jenkins_flutter_build.sh +++ b/scripts/jenkins_flutter_build.sh @@ -22,7 +22,7 @@ else sed -i '11 a evaluate(new File(settingsDir, "assistant_flutter/.android/include_flutter.groovy"))' settings.gradle fi -# 添加 -n 代表全局禁用夜间模式 +# 添加 -n 代表全局禁用深色模式 while getopts "n" arg do case ${arg} in @@ -38,7 +38,7 @@ do rm -r module_common/src/main/res/drawable-night-xxxhdpi rm -r module_common/src/main/res/drawable-night-nodpi rm -r module_common/src/main/res/drawable-night - sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' module_common/build.gradle + sed -i 's/buildConfigField "boolean", "IS_DARK_MODE_ON", "true"/buildConfigField "boolean", "IS_DARK_MODE_ON", "false"/g' module_common/build.gradle ;; esac done