From 7bd779b8e3313485a236873154f13bbc874f7c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Mon, 9 May 2022 17:31:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E7=9A=84=E5=88=87=E6=8D=A2(=E7=A4=BE=E5=8C=BA=E5=B8=96?= =?UTF-8?q?=E5=AD=90=E9=83=A8=E5=88=86)=20https://git.shanqu.cc/halo/andro?= =?UTF-8?q?id/assistant-android/-/issues/65?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/base/BaseRichEditorActivity.kt | 9 ++++ .../collection/GamesCollectionFragment.kt | 7 ++- .../gh/gamecenter/collection/VideoFragment.kt | 9 ++++ .../detail/ForumArticleAskListFragment.kt | 6 +-- .../forum/moderator/ModeratorListActivity.kt | 2 +- .../PersonalityBackgroundActivity.kt | 1 + .../personalhome/fans/FansActivity.kt | 5 ++ .../followers/FollowersActivity.kt | 5 ++ .../personalhome/rating/RatingActivity.kt | 1 + .../qa/answer/detail/AnswerDetailFragment.kt | 2 +- .../detail/SimpleAnswerDetailActivity.kt | 14 +++++ .../qa/article/MyArticleFragment.kt | 31 ++++++----- .../article/detail/ArticleDetailActivity.kt | 18 +++++-- .../detail/ArticleDetailContentViewHolder.kt | 3 +- .../article/detail/ArticleDetailFragment.kt | 5 ++ .../qa/article/draft/ArticleDraftActivity.kt | 16 ++++++ .../qa/article/draft/ArticleDraftFragment.kt | 53 +++++++++++-------- .../qa/article/edit/ArticleEditActivity.kt | 1 + .../qa/dialog/ChooseForumActivity.kt | 23 +++++--- .../qa/draft/CommunityDraftWrapperActivity.kt | 10 ++++ .../gh/gamecenter/qa/editor/AnswerFragment.kt | 11 ++++ .../gamecenter/qa/editor/ArticleFragment.kt | 10 +++- .../gh/gamecenter/qa/editor/GameActivity.kt | 14 +++++ .../gh/gamecenter/qa/editor/GameFragment.kt | 10 ++++ .../qa/editor/InsertAnswerWrapperActivity.kt | 13 +++++ .../qa/editor/InsertArticleWrapperActivity.kt | 11 ++++ .../InsertGameCollectionWrapperActivity.kt | 15 ++++++ .../qa/editor/InsertVideoWrapperActivity.kt | 14 +++++ .../qa/editor/LocalMediaActivity.kt | 8 +++ .../qa/editor/VideoAlbumsSpanner.kt | 8 +-- .../gamecenter/qa/myqa/MyAnswerFragment.java | 14 +++-- .../gh/gamecenter/qa/myqa/MyAskActivity.java | 19 +++++++ .../questions/draft/QuestionDraftActivity.kt | 14 +++++ .../questions/draft/QuestionDraftFragment.kt | 10 +++- .../invite/QuestionsInviteActivity.java | 13 +++++ .../newdetail/NewQuestionDetailActivity.kt | 8 +++ .../QuestionDetailContentViewHolder.kt | 1 + .../video/detail/ForumVideoDetailActivity.kt | 13 +++-- .../qa/video/publish/VideoPublishActivity.kt | 8 +++ .../video/videomanager/VideoDraftActivity.kt | 9 ++++ .../video/videomanager/VideoDraftFragment.kt | 8 +++ .../bg_shape_white_editor_label_left.xml | 2 +- .../bg_shape_white_editor_label_right.xml | 2 +- .../res/drawable/bg_shape_white_radius_1.xml | 2 +- .../drawable/divider_item_line_space_20.xml | 2 +- .../activity_community_article_edit.xml | 2 +- .../layout/activity_editor_insert_game.xml | 5 +- .../res/layout/activity_questions_edit.xml | 4 +- .../activity_tablayout_no_title_viewpager.xml | 2 +- .../main/res/layout/dialog_choose_forum.xml | 2 +- .../res/layout/editor_insert_container.xml | 2 +- .../main/res/layout/forum_top_link_item.xml | 1 - .../res/layout/fragment_answer_detail.xml | 5 +- .../fragment_answer_detail_skeleton.xml | 7 +-- .../res/layout/fragment_article_detail.xml | 4 +- .../fragment_article_detail_skeleton.xml | 3 +- .../layout/fragment_forum_video_detail.xml | 6 +-- app/src/main/res/layout/fragment_invite.xml | 3 +- .../main/res/layout/fragment_local_media.xml | 2 +- .../layout/fragment_video_comment_list.xml | 5 +- .../res/layout/fragment_video_publish.xml | 4 +- .../item_article_detail_comment_footer.xml | 3 +- .../layout/item_article_detail_content.xml | 2 +- app/src/main/res/layout/item_forum_video.xml | 2 +- .../main/res/layout/item_video_desc_top.xml | 4 +- .../layout/piece_article_input_container.xml | 2 +- .../main/res/layout/questionsinvite_item.xml | 2 +- .../main/res/layout/share_popup_layout.xml | 2 +- app/src/main/res/layout/video_albums_item.xml | 2 +- 69 files changed, 429 insertions(+), 107 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index 95d1315fa4..a4f522c2c4 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -205,6 +205,7 @@ abstract class BaseRichEditorActivity : ToolBarAct mViewModel.setUploadVideoListener(this) mKeyboardHeightProvider = KeyboardHeightProvider(this) mRichEditor.post { mKeyboardHeightProvider?.start() } + mRichEditor.enableForceDark(NightModeUtils.isNightMode(this)) // 防止个别手机在Js里无法获取粘贴内容 mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener") mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener") @@ -735,6 +736,14 @@ abstract class BaseRichEditorActivity : ToolBarAct abstract fun provideViewModel(): VM abstract fun getVideoGuideKey(): String + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + mRichEditor.enableForceDark(NightModeUtils.isNightMode(this)) + } + companion object { const val ELEMENT_NAME_BOLD = " b " const val ELEMENT_NAME_ITALIC = " i " diff --git a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt index 16c4e4022a..d10457985e 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt @@ -46,7 +46,7 @@ class GamesCollectionFragment : ListFragment 0) { + removeItemDecorationAt(0) + addItemDecoration(itemDecoration) + } } } + companion object { const val TYPE_HISTORY = "history" const val TYPE_COLLECT = "collect" 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 b4657b3779..4103ab5759 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/VideoFragment.kt @@ -71,4 +71,13 @@ class VideoFragment : ListFragment(), IBatchDelet override fun toString() = value } + + override fun onNightModeChange() { + super.onNightModeChange() + if ((mListRv?.itemDecorationCount ?: 0) > 0) { + mListRv?.removeItemDecorationAt(0) + mListRv?.addItemDecoration(itemDecoration) + } + } + } \ No newline at end of file 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 0671bdd89d..ac32afb208 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 @@ -66,10 +66,10 @@ class ForumArticleAskListFragment : LazyListFragment>() { } else { setNavigationTitle("Ta的评分") } + updateStatusBarColor(R.color.black, R.color.white) } override fun provideListAdapter(): RatingAdapter { 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 cc64d78724..4a1aee74f3 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 @@ -101,7 +101,7 @@ open class AnswerDetailFragment : NormalFragment() { mSpecialColumn = it.getParcelable(EntranceUtils.KEY_DATA) mViewModel.getAnswerDetail(mAnswerId, mEntrance) } - + mBinding.richEditor.enableForceDark(NightModeUtils.isNightMode(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 5c06d50528..060e7c4325 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 @@ -5,10 +5,17 @@ import android.content.Intent import android.os.Bundle import com.gh.base.BaseActivity import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class SimpleAnswerDetailActivity : NormalActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + override fun provideNormalIntent(): Intent? { return getTargetIntent( this, @@ -17,6 +24,13 @@ class SimpleAnswerDetailActivity : NormalActivity() { ) } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { @JvmStatic fun getIntent(context: Context, answerId: String, entrance: String, path: String): Intent { 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 2f6c3c986e..b63262bd11 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 @@ -41,15 +41,13 @@ class MyArticleFragment : ListFragment>? { return RetrofitManager.getInstance().api.getMyArticleAndQuestion(mTargetUserId, page) - .flatMap(object :Function, Observable>>{ - override fun apply(list: List): Observable> { - return Observable.create { emitter-> - val articleList = list.map { it.transformArticleEntity() }.toMutableList() - emitter.onNext(articleList) - emitter.onComplete() - } - } - }) + .flatMap { list -> + Observable.create { emitter -> + val articleList = list.map { it.transformArticleEntity() }.toMutableList() + emitter.onNext(articleList) + emitter.onComplete() + } + } } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { @@ -80,7 +78,7 @@ class MyArticleFragment : ListFragment 0) { + mListRv.removeItemDecorationAt(0) + mListRv.addItemDecoration(itemDecoration) + } + } + companion object { @JvmStatic fun getInstance(entrance: String?, userId: String): MyArticleFragment { 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 7c36df7aea..8c23ba4b48 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 @@ -3,8 +3,7 @@ package com.gh.gamecenter.qa.article.detail import android.content.Context import android.content.Intent import android.os.Bundle -import com.gh.common.util.DisplayUtils -import com.gh.common.util.EntranceUtils +import com.gh.common.util.* import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.CommunityEntity @@ -21,7 +20,7 @@ class ArticleDetailActivity : NormalActivity() { // TODO 让状态栏透明 // DisplayUtils.transparentStatusBar(this) - DisplayUtils.setLightStatusBar(this, true) + updateStatusBarColor(R.color.black, R.color.white) } override fun provideNormalIntent(): Intent { @@ -30,10 +29,19 @@ class ArticleDetailActivity : NormalActivity() { override fun getBusinessId(): Pair { return Pair( - targetFragment.arguments?.getString(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID) ?: "", - targetFragment.arguments?.getParcelable(EntranceUtils.KEY_COMMUNITY_DATA)?.id ?: "") + targetFragment.arguments?.getString(EntranceUtils.KEY_COMMUNITY_ARTICLE_ID) ?: "", + targetFragment.arguments?.getParcelable(EntranceUtils.KEY_COMMUNITY_DATA)?.id ?: "" + ) } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + + companion object { const val ARTICLE_PATCH_REQUEST = 123 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 f1bb40387d..642e940b66 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 @@ -31,6 +31,7 @@ class ArticleDetailContentViewHolder( @SuppressLint("AddJavascriptInterface") fun bindView(article: ArticleDetailEntity) { binding.run { + richEditor.enableForceDark(NightModeUtils.isNightMode(binding.root.context)) richEditor.setInputEnabled(false) richEditor.setPadding(16, 4, 16, 4) richEditor.addJavascriptInterface(JsInterface(article.status ?: ""), "imagelistener") @@ -134,7 +135,7 @@ class ArticleDetailContentViewHolder( ) } labelIv.goneIf(article.getSimplifyChoicenessStatus() != "pass") - if (article.getSimplifyChoicenessStatus() == "pass"){ + if (article.getSimplifyChoicenessStatus() == "pass") { labelIv.setImageDrawable(R.drawable.ic_essence_label.toDrawable()) } titleTv.text = article.title 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 682f91fb70..bb2b670aa9 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 @@ -953,4 +953,9 @@ class ArticleDetailFragment : BaseCommentFragment() { - override fun onResponse(response: ResponseBody?) { - val index = mAdapter?.entityList?.indexOf(entity) ?: -1 - if (index >= 0) { - mAdapter?.entityList?.remove(entity) - if (mAdapter?.entityList.isNullOrEmpty()) { - mListViewModel.load(LoadType.REFRESH) - } else { - mAdapter?.notifyItemRemoved(index) - } + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(object : Response() { + override fun onResponse(response: ResponseBody?) { + val index = mAdapter?.entityList?.indexOf(entity) ?: -1 + if (index >= 0) { + mAdapter?.entityList?.remove(entity) + if (mAdapter?.entityList.isNullOrEmpty()) { + mListViewModel.load(LoadType.REFRESH) + } else { + mAdapter?.notifyItemRemoved(index) } } + } - override fun onFailure(e: HttpException?) { - toast(R.string.post_failure_hint) - } - }) + override fun onFailure(e: HttpException?) { + toast(R.string.post_failure_hint) + } + }) } @Subscribe(threadMode = ThreadMode.MAIN) @@ -129,4 +128,12 @@ class ArticleDraftFragment : ListFragment 0) { + mListRv?.removeItemDecorationAt(0) + mListRv?.addItemDecoration(itemDecoration) + } + } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt index 749e555c07..59f5bc4028 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt @@ -19,6 +19,7 @@ import com.gh.base.fragment.WaitingDialogFragment import com.gh.common.AppExecutor import com.gh.common.constant.Constants import com.gh.common.util.* +import com.gh.common.util.NightModeUtils.isNightMode import com.gh.gamecenter.R import com.gh.gamecenter.databinding.ActivityCommunityArticleEditBinding import com.gh.gamecenter.entity.ActivityLabelEntity diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt index ceab2aae64..0845fe8a93 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumActivity.kt @@ -85,9 +85,14 @@ class ChooseForumActivity : BaseActivity() { if (mSearchResultFragment == null || mSearchResultFragment?.isAdded == false) { val beginTransaction = supportFragmentManager.beginTransaction() - mSearchResultFragment = supportFragmentManager.findFragmentByTag(ChooseForumContainerFragment::class.java.simpleName) as? ChooseForumContainerFragment + mSearchResultFragment = + supportFragmentManager.findFragmentByTag(ChooseForumContainerFragment::class.java.simpleName) as? ChooseForumContainerFragment ?: ChooseForumContainerFragment.getInstance(ChooseForumContainerFragment.ChooseForumType.SEARCH) as ChooseForumContainerFragment - beginTransaction.replace(binding.searchResultContainer.id, mSearchResultFragment!!, ChooseForumContainerFragment::class.java.simpleName) + beginTransaction.replace( + binding.searchResultContainer.id, + mSearchResultFragment!!, + ChooseForumContainerFragment::class.java.simpleName + ) beginTransaction.commitAllowingStateLoss() } } else { @@ -113,14 +118,16 @@ class ChooseForumActivity : BaseActivity() { overridePendingTransition(0, 0) binding.maskView.animate().alpha(0f).setDuration(300).start() binding.forumContainer.animate() - .translationY(DisplayUtils.getScreenHeight().toFloat()) - .setDuration(300) - .doOnEnd { - super.finish() - } - .start() + .translationY(DisplayUtils.getScreenHeight().toFloat()) + .setDuration(300) + .doOnEnd { + super.finish() + } + .start() } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + companion object { const val CHOOSE_FORUM_REQUEST = 10 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 74272d938f..2cde1a9f42 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 @@ -5,6 +5,8 @@ import android.content.Intent import android.os.Bundle import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout +import com.gh.common.util.updateStatusBarColor +import com.gh.gamecenter.R import com.gh.gamecenter.qa.article.draft.ArticleDraftFragment import com.gh.gamecenter.qa.questions.draft.QuestionDraftFragment import com.gh.gamecenter.video.videomanager.VideoDraftFragment @@ -14,6 +16,7 @@ class CommunityDraftWrapperActivity : BaseActivity_TabLayout() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("我的草稿") + updateStatusBarColor(R.color.black, R.color.white) } override fun initFragmentList(fragments: MutableList) { @@ -28,6 +31,13 @@ class CommunityDraftWrapperActivity : BaseActivity_TabLayout() { tabTitleList.add("视频草稿") } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { @JvmStatic fun getIntent(context: Context): Intent { 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 165647890b..fd956309ff 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 @@ -35,4 +35,15 @@ class AnswerFragment : ListFragment() { return itemDecoration } + + override fun onNightModeChange() { + super.onNightModeChange() + if ((mListRv?.itemDecorationCount ?: 0) > 0) { + mListRv?.removeItemDecorationAt(0) + itemDecoration?.let { + mListRv?.addItemDecoration(it) + } + } + } + } 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 5fc9acc787..275b2cdea0 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 @@ -28,10 +28,18 @@ class ArticleFragment : ListFragment() { return mAdapter!! } - override fun getItemDecoration(): RecyclerView.ItemDecoration? { + override fun getItemDecoration(): RecyclerView.ItemDecoration { val insetDivider = ContextCompat.getDrawable(requireContext(), R.drawable.divider_item_line_space_20) val itemDecoration = CustomDividerItemDecoration(requireContext(), notDecorateTheLastItem = true) itemDecoration.setDrawable(insetDivider!!) return itemDecoration } + + override fun onNightModeChange() { + super.onNightModeChange() + 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 bddaa7d784..b22c736efe 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 @@ -2,16 +2,30 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.content.Intent +import android.os.Bundle import androidx.core.os.bundleOf import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class GameActivity : NormalActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } override fun provideNormalIntent(): Intent { return getTargetIntent(this, GameActivity::class.java, GameFragment::class.java) } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context, title: String): Intent { val bundle = bundleOf( 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 a2ec7f0ef8..021e7c9794 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 @@ -211,4 +211,14 @@ open class GameFragment : ListFragment 0) { + mListRv?.removeItemDecorationAt(0) + itemDecoration?.let { + mListRv?.addItemDecoration(it) + } + } + } } \ No newline at end of file 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 05ebef7ec4..b6e52cf344 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 @@ -6,10 +6,16 @@ import android.os.Bundle import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R class InsertAnswerWrapperActivity : BaseActivity_TabLayout() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager override fun initFragmentList(fragments: MutableList?) { @@ -22,6 +28,13 @@ class InsertAnswerWrapperActivity : BaseActivity_TabLayout() { tabTitleList?.add("收藏回答") } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { const val KEY_ANSWER_TYPE = "AnswerType" 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 44cfdce631..4e32cc88b5 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 @@ -6,10 +6,15 @@ import android.os.Bundle import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R class InsertArticleWrapperActivity : BaseActivity_TabLayout() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager override fun initFragmentList(fragments: MutableList?) { @@ -22,6 +27,12 @@ class InsertArticleWrapperActivity : BaseActivity_TabLayout() { tabTitleList?.add("收藏帖子") } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } companion object { const val KEY_ARTICLE_TYPE = "ArticleType" 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 0baf3555ef..f7867468b3 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 @@ -2,16 +2,23 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.content.Intent +import android.os.Bundle import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R import com.gh.gamecenter.collection.GamesCollectionFragment import com.gh.gamecenter.manager.UserManager class InsertGameCollectionWrapperActivity : BaseActivity_TabLayout() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager override fun initFragmentList(fragments: MutableList?) { @@ -40,6 +47,14 @@ class InsertGameCollectionWrapperActivity : BaseActivity_TabLayout() { tabTitleList?.add("收藏游戏单") } + + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context): Intent { return Intent(context, InsertGameCollectionWrapperActivity::class.java) 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 aab641d485..94845db7ff 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 @@ -2,15 +2,22 @@ package com.gh.gamecenter.qa.editor import android.content.Context import android.content.Intent +import android.os.Bundle import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import com.gh.base.BaseActivity_TabLayout import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R import com.gh.gamecenter.collection.VideoFragment class InsertVideoWrapperActivity : BaseActivity_TabLayout() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager override fun initFragmentList(fragments: MutableList?) { @@ -37,6 +44,13 @@ class InsertVideoWrapperActivity : BaseActivity_TabLayout() { tabTitleList?.add("收藏视频帖") } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context): Intent { return Intent(context, InsertVideoWrapperActivity::class.java) 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 6f98c70ff3..88048cca63 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 @@ -11,6 +11,7 @@ import android.widget.PopupWindow import androidx.core.content.ContextCompat import com.gh.base.ToolBarActivity import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R import com.halo.assistant.HaloApp import com.zhihu.matisse.Matisse @@ -114,6 +115,13 @@ class LocalMediaActivity : ToolBarActivity(), AlbumCollection.AlbumCallbacks { arrowIv?.setImageDrawable(drawable) } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context, chooseType: ChooseType, maxChooseCount: Int = 1, entrance: String): Intent { return Intent(context, LocalMediaActivity::class.java).apply { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt index 132356a44b..2692c9a945 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/VideoAlbumsSpanner.kt @@ -1,11 +1,13 @@ package com.gh.gamecenter.qa.editor -import android.animation.ValueAnimator import android.content.Context import android.graphics.drawable.ColorDrawable import android.view.View import android.view.ViewGroup -import android.widget.* +import android.widget.AdapterView +import android.widget.CursorAdapter +import android.widget.FrameLayout +import android.widget.PopupWindow import androidx.appcompat.widget.ListPopupWindow import androidx.core.content.ContextCompat import com.gh.common.util.dip2px @@ -51,7 +53,7 @@ class VideoAlbumsSpanner(val context: Context) { val containerView = mListPopupWindow.listView as? ViewGroup val params = containerView?.layoutParams as ViewGroup.LayoutParams params.height = 280f.dip2px() - containerView.background = ColorDrawable(ContextCompat.getColor(context, R.color.white)) + containerView.background = ColorDrawable(ContextCompat.getColor(context, R.color.background_white)) containerView.layoutParams = params val parentContainer = containerView.parent as FrameLayout 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 2044714896..bda62969f9 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 @@ -4,7 +4,6 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.View; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.RecyclerView; @@ -22,8 +21,6 @@ import com.gh.gamecenter.retrofit.RetrofitManager; import com.halo.assistant.HaloApp; import com.lightgame.utils.Utils; -import org.jetbrains.annotations.NotNull; - import java.util.List; import io.reactivex.Observable; @@ -58,7 +55,7 @@ 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 8e4c651ccf..5fa1f06d4f 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 @@ -5,7 +5,9 @@ import android.content.Intent; import android.os.Bundle; import com.gh.common.util.EntranceUtils; +import com.gh.common.util.ExtensionsKt; import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.R; /** * Created by khy on 10/04/18. @@ -13,6 +15,23 @@ import com.gh.gamecenter.NormalActivity; public class MyAskActivity extends NormalActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); + } + + @Override + protected boolean isAutoResetViewBackgroundEnabled() { + return true; + } + + @Override + protected void onNightModeChange() { + super.onNightModeChange(); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); + } + public static Intent getIntent(Context context) { Bundle bundle = new Bundle(); bundle.putString(EntranceUtils.KEY_ENTRANCE, "(我的光环)+(我的问答)"); 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 349eee17ab..d2c1ae211e 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 @@ -4,10 +4,24 @@ import android.content.Context import android.content.Intent import android.os.Bundle import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class QuestionDraftActivity : NormalActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.black, R.color.white) + } + + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { fun getIntent(context: Context): Intent { val bundle = Bundle() 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 1921561f7a..59b8960ecd 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 @@ -78,7 +78,7 @@ class QuestionDraftFragment : ListFragment 0) { + mListRv?.removeItemDecorationAt(0) + mListRv?.addItemDecoration(itemDecoration) + } + } } \ No newline at end of file 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 80fdbe2bef..ae356402a8 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 @@ -5,7 +5,9 @@ import android.content.Intent; import android.os.Bundle; import com.gh.common.util.EntranceUtils; +import com.gh.common.util.ExtensionsKt; import com.gh.gamecenter.NormalActivity; +import com.gh.gamecenter.R; import com.gh.gamecenter.qa.entity.QuestionsDetailEntity; /** @@ -14,6 +16,17 @@ import com.gh.gamecenter.qa.entity.QuestionsDetailEntity; public class QuestionsInviteActivity extends NormalActivity { + @Override + protected boolean isAutoResetViewBackgroundEnabled() { + return true; + } + + @Override + protected void onNightModeChange() { + super.onNightModeChange(); + ExtensionsKt.updateStatusBarColor(this, R.color.black, R.color.white); + } + public static Intent getIntent(Context context, QuestionsDetailEntity entity, String entrance) { Bundle bundle = new Bundle(); bundle.putParcelable(QuestionsDetailEntity.class.getSimpleName(), entity); 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 bcff3faa07..887896aa58 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 @@ -5,6 +5,7 @@ import android.content.Intent import android.os.Bundle import com.gh.common.util.DisplayUtils import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.CommunityEntity @@ -35,6 +36,13 @@ class NewQuestionDetailActivity : NormalActivity() { ?: "") } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { @JvmStatic fun getIntent( 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 cd46a19148..47fc9798ff 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 @@ -32,6 +32,7 @@ class QuestionDetailContentViewHolder( fun bindView(question: QuestionsDetailEntity) { binding.run { richEditor.setInputEnabled(false) + richEditor.enableForceDark(NightModeUtils.isNightMode(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/detail/ForumVideoDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt index dee4cfa70f..8bc2adbc18 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailActivity.kt @@ -8,6 +8,7 @@ import com.gh.base.BaseActivity import com.gh.base.fragment.BaseFragment_TabLayout.PAGE_INDEX import com.gh.common.util.DisplayUtils import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.R import com.gh.gamecenter.normal.NormalFragment @@ -23,19 +24,23 @@ class ForumVideoDetailActivity : BaseActivity() { DisplayUtils.transparentStatusBar(this) containerFragment = supportFragmentManager.findFragmentByTag(ForumVideoDetailFragment::class.java.simpleName) - ?: ForumVideoDetailFragment().with(intent.extras) + ?: ForumVideoDetailFragment().with(intent.extras) // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移 - supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment!!, ForumVideoDetailFragment::class.java.simpleName).commitAllowingStateLoss() + supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment!!, ForumVideoDetailFragment::class.java.simpleName) + .commitAllowingStateLoss() } override fun onBackPressed() { if (containerFragment is NormalFragment - && (containerFragment as NormalFragment).isAdded - && !(containerFragment as NormalFragment).onBackPressed()) { + && (containerFragment as NormalFragment).isAdded + && !(containerFragment as NormalFragment).onBackPressed() + ) { super.onBackPressed() } } + override fun isAutoResetViewBackgroundEnabled(): Boolean = true + companion object { const val VIDEO_PATCH_REQUEST = 100 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 274def7c51..32ba678a26 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 @@ -6,6 +6,7 @@ import android.os.Bundle import android.view.View import com.gh.base.ToolBarActivity import com.gh.common.util.EntranceUtils +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity import com.gh.gamecenter.R import com.gh.gamecenter.entity.* @@ -20,6 +21,13 @@ class VideoPublishActivity : NormalActivity() { findViewById(R.id.backBtn).setOnClickListener { onBackPressed() } } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } + companion object { @JvmStatic diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt index 91d2406bf3..23fd25161c 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftActivity.kt @@ -3,15 +3,24 @@ package com.gh.gamecenter.video.videomanager import android.content.Context import android.content.Intent import android.os.Bundle +import com.gh.common.util.updateStatusBarColor import com.gh.gamecenter.NormalActivity +import com.gh.gamecenter.R class VideoDraftActivity : NormalActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("视频草稿") + updateStatusBarColor(R.color.black, R.color.white) } + override fun isAutoResetViewBackgroundEnabled(): Boolean =true + + override fun onNightModeChange() { + super.onNightModeChange() + updateStatusBarColor(R.color.black, R.color.white) + } companion object { fun getIntent(context: Context): Intent { return getTargetIntent(context, VideoDraftActivity::class.java, VideoDraftFragment::class.java) diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt index 4b47adce31..838663975d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoDraftFragment.kt @@ -58,4 +58,12 @@ class VideoDraftFragment : ListFragment() super.onViewCreated(view, savedInstanceState) mListRv.layoutManager = FixLinearLayoutManager(requireContext()) } + + override fun onNightModeChange() { + super.onNightModeChange() + if ((mListRv?.itemDecorationCount ?: 0) > 0) { + mListRv?.removeItemDecorationAt(0) + mListRv?.addItemDecoration(itemDecoration) + } + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_white_editor_label_left.xml b/app/src/main/res/drawable/bg_shape_white_editor_label_left.xml index b439e68e0c..f3020b4bab 100644 --- a/app/src/main/res/drawable/bg_shape_white_editor_label_left.xml +++ b/app/src/main/res/drawable/bg_shape_white_editor_label_left.xml @@ -9,5 +9,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_white_editor_label_right.xml b/app/src/main/res/drawable/bg_shape_white_editor_label_right.xml index 7387725fd5..013c1d07a2 100644 --- a/app/src/main/res/drawable/bg_shape_white_editor_label_right.xml +++ b/app/src/main/res/drawable/bg_shape_white_editor_label_right.xml @@ -6,7 +6,7 @@ android:bottomRightRadius="4dp" android:topLeftRadius="1dp" android:topRightRadius="4dp" /> - + diff --git a/app/src/main/res/drawable/bg_shape_white_radius_1.xml b/app/src/main/res/drawable/bg_shape_white_radius_1.xml index dc14a42ce6..f5011d2552 100644 --- a/app/src/main/res/drawable/bg_shape_white_radius_1.xml +++ b/app/src/main/res/drawable/bg_shape_white_radius_1.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/divider_item_line_space_20.xml b/app/src/main/res/drawable/divider_item_line_space_20.xml index 50d9e9e25b..e657b1334b 100644 --- a/app/src/main/res/drawable/divider_item_line_space_20.xml +++ b/app/src/main/res/drawable/divider_item_line_space_20.xml @@ -3,7 +3,7 @@ - + diff --git a/app/src/main/res/layout/activity_community_article_edit.xml b/app/src/main/res/layout/activity_community_article_edit.xml index d046b441d0..84c6e67d18 100644 --- a/app/src/main/res/layout/activity_community_article_edit.xml +++ b/app/src/main/res/layout/activity_community_article_edit.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/background_white" android:focusable="true" android:focusableInTouchMode="true" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_editor_insert_game.xml b/app/src/main/res/layout/activity_editor_insert_game.xml index d853d68753..a9f27e976f 100644 --- a/app/src/main/res/layout/activity_editor_insert_game.xml +++ b/app/src/main/res/layout/activity_editor_insert_game.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/background" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_questions_edit.xml b/app/src/main/res/layout/activity_questions_edit.xml index e71f854aea..c32d56b1fd 100644 --- a/app/src/main/res/layout/activity_questions_edit.xml +++ b/app/src/main/res/layout/activity_questions_edit.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/background_white" android:focusable="true" android:focusableInTouchMode="true" android:orientation="vertical"> @@ -164,7 +164,7 @@ android:layout_width="match_parent" android:layout_height="44dp" android:layout_above="@+id/editor_insert_container" - android:background="@color/white"> + android:background="@color/background_white"> + android:background="@color/background_white"> diff --git a/app/src/main/res/layout/editor_insert_container.xml b/app/src/main/res/layout/editor_insert_container.xml index 6f0da6899e..d24e8d6f28 100644 --- a/app/src/main/res/layout/editor_insert_container.xml +++ b/app/src/main/res/layout/editor_insert_container.xml @@ -11,7 +11,7 @@ android:id="@+id/editor_insert_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_white" android:gravity="center_vertical" android:orientation="horizontal"> diff --git a/app/src/main/res/layout/forum_top_link_item.xml b/app/src/main/res/layout/forum_top_link_item.xml index d97b9c0e03..595fda27c4 100644 --- a/app/src/main/res/layout/forum_top_link_item.xml +++ b/app/src/main/res/layout/forum_top_link_item.xml @@ -13,7 +13,6 @@ android:gravity="center" android:textSize="10sp" android:textColor="@color/text_white" - android:background="@color/theme" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toStartOf="@+id/linkNameTv" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml index 82bebd227f..cf28cad55c 100644 --- a/app/src/main/res/layout/fragment_answer_detail.xml +++ b/app/src/main/res/layout/fragment_answer_detail.xml @@ -3,7 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="@color/background"> + android:layout_height="match_parent" + android:background="@color/background"> + android:background="@color/background_white"> + android:background="@color/background_white"> + android:layout_height="match_parent" + android:background="@color/background"> + android:background="@color/background_white" /> diff --git a/app/src/main/res/layout/fragment_local_media.xml b/app/src/main/res/layout/fragment_local_media.xml index 171cd4f220..8edafdd1e3 100644 --- a/app/src/main/res/layout/fragment_local_media.xml +++ b/app/src/main/res/layout/fragment_local_media.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/background_white" android:orientation="vertical"> + android:background="@color/background_white" /> @@ -71,6 +71,7 @@ android:id="@+id/list_rv" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/background" android:paddingBottom="56dp" /> diff --git a/app/src/main/res/layout/fragment_video_publish.xml b/app/src/main/res/layout/fragment_video_publish.xml index 7ee88a0e0f..9d069d1b88 100644 --- a/app/src/main/res/layout/fragment_video_publish.xml +++ b/app/src/main/res/layout/fragment_video_publish.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@color/white"> + android:background="@color/background_white"> + android:layout_height="wrap_content" + android:background="@color/background"> @@ -238,7 +238,7 @@ android:layout_height="1dp" android:layout_marginTop="20dp" android:layout_marginBottom="4dp" - android:background="@color/F4F5F6" + android:background="@color/divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/piece_article_input_container.xml b/app/src/main/res/layout/piece_article_input_container.xml index b97a59d6b2..f515f2a7f8 100644 --- a/app/src/main/res/layout/piece_article_input_container.xml +++ b/app/src/main/res/layout/piece_article_input_container.xml @@ -17,7 +17,7 @@ android:layout_height="32dp" android:layout_marginLeft="16dp" android:layout_marginRight="28dp" - android:background="@color/background" + android:background="@drawable/bg_shape_f5_radius_999" android:gravity="center_vertical" android:includeFontPadding="false" android:maxLines="1" diff --git a/app/src/main/res/layout/questionsinvite_item.xml b/app/src/main/res/layout/questionsinvite_item.xml index d6a5b0280a..e0a2c7d2c2 100644 --- a/app/src/main/res/layout/questionsinvite_item.xml +++ b/app/src/main/res/layout/questionsinvite_item.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_white" android:paddingLeft="20dp" android:paddingTop="15dp" android:paddingRight="20dp" diff --git a/app/src/main/res/layout/share_popup_layout.xml b/app/src/main/res/layout/share_popup_layout.xml index 4b60ed7e99..289c9e42ed 100644 --- a/app/src/main/res/layout/share_popup_layout.xml +++ b/app/src/main/res/layout/share_popup_layout.xml @@ -12,6 +12,6 @@ android:layout_alignParentBottom = "true" android:layout_alignParentLeft = "true" android:layout_alignParentStart = "true" - android:background = "@color/white" /> + android:background = "@color/background_white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/video_albums_item.xml b/app/src/main/res/layout/video_albums_item.xml index 4c7a20ccbe..edc4d56102 100644 --- a/app/src/main/res/layout/video_albums_item.xml +++ b/app/src/main/res/layout/video_albums_item.xml @@ -1,7 +1,7 @@ + android:background="@color/background_white">