From 42e009b91d0bb140009a435d63d4f446329b9257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=99=A8?= Date: Wed, 25 Oct 2023 17:37:23 +0800 Subject: [PATCH] =?UTF-8?q?=20feat:=E7=BB=9F=E4=B8=80=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=B8=8E=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=86=85?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84=E5=91=BD=E5=90=8D=20https://jira.sh?= =?UTF-8?q?anqu.cc/browse/GHZS-3757?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/base/BaseRichEditorActivity.kt | 6 +- .../common/databind/AddKaiFuBindingAdapter.kt | 6 +- .../gh/common/databind/BindingAdapters.java | 4 +- .../dialog/ApplyModeratorDialogFragment.kt | 2 +- .../dialog/GameOffServiceDialogFragment.kt | 2 +- .../dialog/NewPrivacyPolicyDialogFragment.kt | 2 +- .../dialog/PackageCheckDialogFragment.kt | 6 +- .../dialog/PrivacyPolicyDialogFragment.kt | 6 +- .../simulator/NewSimulatorGameManager.kt | 2 +- .../simulator/SimulatorDownloadManager.kt | 2 +- .../com/gh/common/util/BbsReportHelper.kt | 4 +- .../java/com/gh/common/util/CommentUtils.java | 14 +- .../java/com/gh/common/util/DialogUtils.java | 16 +-- .../java/com/gh/common/util/ErrorHelper.kt | 5 +- .../java/com/gh/common/util/LibaoUtils.java | 12 +- .../com/gh/common/util/ReservationHelper.kt | 2 +- .../com/gh/common/view/CatalogFilterView.kt | 6 +- .../com/gh/common/view/CategoryFilterView.kt | 4 +- .../com/gh/common/view/ConfigFilterView.kt | 2 +- .../gh/common/view/DownloadProgressBar.java | 10 +- .../java/com/gh/common/view/FilterView.kt | 6 +- .../com/gh/common/view/FlexLinearLayout.kt | 4 +- .../gh/common/view/GameTagFlexLinearLayout.kt | 2 +- .../download/dialog/DownloadDialogAdapter.kt | 4 +- .../DownloadDialogInstalledItemViewHolder.kt | 2 +- .../gh/gamecenter/BbsCertificationActivity.kt | 2 +- .../java/com/gh/gamecenter/BlockActivity.kt | 4 +- .../com/gh/gamecenter/CollectionActivity.java | 4 +- .../com/gh/gamecenter/ConcernActivity.java | 4 +- .../com/gh/gamecenter/CropImageActivity.java | 2 +- .../gamecenter/DownloadManagerActivity.java | 5 +- .../java/com/gh/gamecenter/InfoActivity.java | 4 +- .../java/com/gh/gamecenter/LibaoActivity.java | 4 +- .../gh/gamecenter/LibaoDetailActivity.java | 8 +- .../com/gh/gamecenter/NewsDetailActivity.java | 10 +- .../java/com/gh/gamecenter/SearchActivity.kt | 4 +- .../com/gh/gamecenter/ShareGhActivity.java | 4 +- .../com/gh/gamecenter/UserAuthActivity.kt | 4 +- .../com/gh/gamecenter/UserInfoActivity.kt | 4 +- .../com/gh/gamecenter/VerifyPhoneActivity.kt | 2 +- .../java/com/gh/gamecenter/VoteActivity.java | 4 +- .../java/com/gh/gamecenter/WebActivity.kt | 4 +- .../gamecenter/adapter/CleanApkAdapter.java | 4 +- .../gamecenter/adapter/LiBaoCodeAdapter.java | 2 +- .../adapter/LibaoDetailAdapter.java | 8 +- .../adapter/MessageDetailAdapter.java | 18 +-- .../adapter/viewholder/GameHeadViewHolder.kt | 2 +- .../adapter/viewholder/GameViewHolder.java | 2 +- .../com/gh/gamecenter/amway/AmwayAdapter.kt | 10 +- .../com/gh/gamecenter/amway/AmwayFragment.kt | 8 +- .../search/AmwaySearchDefaultFragment.kt | 2 +- .../amway/search/AmwaySearchViewHolder.kt | 4 +- .../authorization/AuthorizationActivity.kt | 4 +- .../gh/gamecenter/catalog/CatalogActivity.kt | 4 +- .../gh/gamecenter/catalog/CatalogAdapter.kt | 6 +- .../gh/gamecenter/catalog/CatalogFragment.kt | 4 +- .../catalog/NewCatalogListActivity.kt | 4 +- .../catalog/NewCatalogListFragment.kt | 6 +- .../catalog/SpecialCatalogAdapter.kt | 4 +- .../catalog/SpecialCatalogFragment.kt | 4 +- .../catalog/SpecialCatalogSubjectAdapter.kt | 2 +- .../gamecenter/catalog/SubCatalogAdapter.kt | 2 +- .../category/CategoryDirectoryActivity.kt | 4 +- .../category/CategoryDirectoryAdapter.kt | 2 +- .../category/CategoryDirectoryFragment.kt | 8 +- .../category/CategoryListActivity.kt | 4 +- .../category/NewCategoryListFragment.kt | 6 +- .../category2/CategoryDirectoryAdapter.kt | 2 +- .../category2/CategoryV2Activity.kt | 4 +- .../gamecenter/category2/CategoryV2Adapter.kt | 8 +- .../category2/CategoryV2Fragment.kt | 4 +- .../category2/CategoryV2ListAdapter.kt | 6 +- .../category2/CategoryV2ListFragment.kt | 6 +- .../category2/SubCategoryAdapter.kt | 8 +- .../CloudArchiveManagerActivity.kt | 4 +- .../cloudarchive/MyArchiveFragment.kt | 16 +-- .../MyArchiveOptionDialogFragment.kt | 6 +- .../gamecenter/collection/AnswerAdapter.java | 2 +- .../gamecenter/collection/AnswerFragment.java | 2 +- .../gamecenter/collection/ArticleAdapter.java | 2 +- .../collection/ArticleFragment.java | 2 +- .../collection/CommunityArticleAdapter.kt | 3 +- .../collection/CommunityArticleFragment.kt | 4 +- .../collection/GamesCollectionAdapter.kt | 4 +- .../collection/GamesCollectionFragment.kt | 10 +- .../gamecenter/collection/ToolsFragment.java | 4 +- .../gh/gamecenter/collection/VideoAdapter.kt | 3 +- .../gamecenter/discovery/DiscoveryActivity.kt | 4 +- .../gamecenter/discovery/DiscoveryAdapter.kt | 24 ++-- .../gamecenter/discovery/DiscoveryFragment.kt | 8 +- .../interestedgame/InterestedGameActivity.kt | 4 +- .../interestedgame/InterestedGameFragment.kt | 4 +- .../download/GameDownloadFragment.java | 16 +-- .../download/GameDownloadFragmentAdapter.java | 30 ++-- .../download/NewInstalledGameFragment.kt | 10 +- .../download/UpdatableGameAdapter.kt | 18 +-- .../download/UpdatableGameFragment.kt | 6 +- .../detail/ForumArticleAskListAdapter.kt | 8 +- .../detail/ForumArticleAskListFragment.kt | 11 +- .../forum/detail/ForumDetailActivity.kt | 2 +- .../forum/detail/ForumDetailFragment.kt | 10 +- .../forum/detail/ForumSectionAdapter.kt | 2 +- .../forum/home/CommunityHomeFragment.kt | 22 +-- .../forum/home/ForumActivityAdapter.kt | 14 +- .../forum/home/ForumActivityFragment.kt | 8 +- .../home/ForumArticleAskItemViewHolder.kt | 2 +- .../forum/home/ForumArticleListAdapter.kt | 3 +- .../forum/home/ForumArticleListFragment.kt | 4 +- .../gh/gamecenter/forum/home/ForumFragment.kt | 14 +- .../forum/home/ForumRecordsAdapter.kt | 2 +- .../forum/home/HorizontalForumsAdapter.kt | 10 +- .../forum/list/ForumListActivity.kt | 4 +- .../gamecenter/forum/list/ForumListAdapter.kt | 14 +- .../forum/moderator/ApplyModeratorActivity.kt | 2 +- .../forum/moderator/ModeratorListActivity.kt | 4 +- .../forum/moderator/ModeratorListAdapter.kt | 2 +- .../forum/moderator/ModeratorListFragment.kt | 4 +- .../forum/moderator/ModeratorTaskAdapter.kt | 2 +- .../search/ForumContentSearchListAdapter.kt | 2 +- .../search/ForumContentSearchListFragment.kt | 10 +- .../forum/search/ForumOrUserSearchActivity.kt | 2 +- .../ForumOrUserSearchDefaultFragment.kt | 2 +- .../forum/search/UserSearchListAdapter.kt | 4 +- .../forum/search/UserSearchListFragment.kt | 8 +- .../fragment/HomeSearchToolWrapperFragment.kt | 18 +-- .../fragment/HomeTabWrapperFragment.kt | 12 +- .../fragment/HomeToolbarWrapperFragment.kt | 2 +- .../fragment/MainWrapperFragment.kt | 4 +- .../fragment/SearchToolWrapperFragment.java | 2 +- .../fragment/SearchToolbarFragment.java | 4 +- .../com/gh/gamecenter/game/GameFragment.kt | 8 +- .../detail/ColumnCollectionDetailActivity.kt | 4 +- .../detail/ColumnCollectionDetailFragment.kt | 4 +- .../CommonCollection12ViewHolder.kt | 4 +- .../CommonCollectionAdapter.kt | 4 +- .../detail/CommonCollectionDetailActivity.kt | 2 +- .../detail/CommonCollectionDetailFragment.kt | 4 +- .../game/gallery/GameGalleryViewHolder.kt | 4 +- .../GameHorizontalItemViewHolder.kt | 8 +- .../horizontal/GameHorizontalSlideAdapter.kt | 4 +- .../game/imageslide/ImageSlideAdapter.kt | 2 +- .../game/rank/RankCollectionAdapter.kt | 6 +- .../gh/gamecenter/game/rank/RankGameItemUi.kt | 2 +- .../game/upload/GameSubmissionActivity.kt | 4 +- .../game/upload/GameUploadFragment.kt | 2 +- .../gh/gamecenter/game/vertical/GameItemUi.kt | 8 +- .../game/vertical/GameVerticalAdapter.kt | 16 +-- .../gamecollection/choose/AddGamesActivity.kt | 4 +- .../choose/AddSearchAndPlayedGameAdapter.kt | 2 +- .../choose/AddSearchGameFragment.kt | 14 +- .../choose/AddUserPlayedGameFragment.kt | 6 +- .../choose/ChooseGamesActivity.kt | 4 +- .../choose/ChooseGamesAdapter.kt | 10 +- .../choose/ChooseGamesFragment.kt | 8 +- .../detail/GameCollectionDetailAdapter.kt | 74 +++++----- .../detail/GameCollectionDetailFragment.kt | 26 ++-- .../detail/GameCollectionShareDialog.kt | 10 +- ...ameCollectionCommentConversationAdapter.kt | 2 +- ...meCollectionCommentConversationFragment.kt | 30 ++-- .../hotlist/GameCollectionHotListAdapter.kt | 10 +- .../hotlist/GameCollectionHotListFragment.kt | 2 +- .../GameCollectionHotListWrapperFragment.kt | 8 +- .../GameCollectionPlayerCreationAdapter.kt | 20 +-- .../mine/MyGameCollectionActivity.kt | 4 +- .../mine/MyGameCollectionFragment.kt | 10 +- .../ChooseGameCollectionActivityDialog.kt | 4 +- .../ChooseGameCollectionCoverTypeDialog.kt | 21 ++- .../ChooseGameCollectionDefaultCoverDialog.kt | 10 +- .../GameCollectionActivityLabelFragment.kt | 2 +- .../publish/GameCollectionEditActivity.kt | 56 ++++---- .../square/GameCollectionSquareAdapter.kt | 4 +- .../square/GameCollectionSquareFragment.kt | 16 +-- .../tag/GameCollectionTagAdapter.kt | 4 +- .../tag/GameCollectionTagSelectActivity.kt | 4 +- .../tag/GameCollectionTagSelectFragment.kt | 4 +- .../GameDetailContentCardContentAdapter.kt | 2 +- .../gamedetail/GameDetailFragment.kt | 28 ++-- .../gamecenter/gamedetail/desc/DescAdapter.kt | 76 +++++----- .../gamedetail/desc/DescCommentsAdapter.kt | 6 +- .../gamedetail/desc/DescFragment.kt | 2 +- .../gamedetail/desc/GameCollectionAdapter.kt | 4 +- .../desc/GameDetailInfoItemAdapter.kt | 12 +- .../gamedetail/desc/GameGalleryAdapter.kt | 2 +- .../gamedetail/desc/GameLibaoAdapter.kt | 6 +- .../gamedetail/desc/GameRaidersAdapter.kt | 12 +- .../desc/GameRelatedVersionAdapter.kt | 4 +- .../gamedetail/dialog/GameBigEventAdapter.kt | 4 +- .../gamedetail/dialog/GameBigEventDialog.kt | 2 +- .../gamedetail/dialog/GameDetailMoreDialog.kt | 16 +-- .../dialog/GamePermissionAdapter.kt | 4 +- .../gamedetail/dialog/GameTagsDialog.kt | 3 +- .../gamecenter/gamedetail/fuli/FuLiAdapter.kt | 2 +- .../gamedetail/fuli/FuLiFragment.kt | 4 +- .../gamedetail/fuli/GameNewsAdapter.kt | 2 +- .../fuli/kaifu/ServersCalendarActivity.kt | 32 ++--- .../fuli/kaifu/ServersCalendarAdapter.kt | 10 +- .../kaifu/ServersDetailReportViewHolder.kt | 13 +- .../fuli/kaifu/ServersDetailViewHolder.kt | 6 +- .../history/HistoryApkListAdapter.kt | 2 +- .../history/HistoryApkListFragment.kt | 2 +- .../gamedetail/myrating/MyRatingAdapter.kt | 2 +- .../gamedetail/myrating/MyRatingFragment.kt | 4 +- .../gamedetail/rating/RatingAdapter.kt | 6 +- .../rating/RatingCommentItemViewHolder.kt | 22 +-- .../RatingDetailCommentItemViewHolder.kt | 22 +-- .../gamedetail/rating/RatingFragment.kt | 4 +- .../gamedetail/rating/RatingItemViewHolder.kt | 2 +- .../gamedetail/rating/RatingReplyActivity.kt | 10 +- .../gamedetail/rating/RatingReplyAdapter.kt | 36 ++--- .../rating/edit/RatingEditActivity.kt | 2 +- .../rating/logs/CommentLogsActivity.kt | 2 +- .../rating/logs/CommentLogsAdapter.kt | 7 +- .../gh/gamecenter/history/HistoryActivity.kt | 4 +- .../history/HistoryGameListAdapter.kt | 2 +- .../history/HistoryGameListFragment.kt | 2 +- .../gamecenter/home/HomeDividerViewHolder.kt | 2 +- .../com/gh/gamecenter/home/HomeFragment.kt | 2 +- .../gamecenter/home/HomeGameItemViewHolder.kt | 4 +- .../LegacyHomeFragmentAdapterAssistant.kt | 12 +- .../home/amway/HomeAmwayItemViewHolder.kt | 12 +- .../discovercard/DiscoverCardGameAdapter.kt | 2 +- .../HomeDiscoverCardViewHolder.kt | 2 +- .../HomeGameCollectionRefreshAdapter.kt | 2 +- .../HomeGameCollectionRefreshViewHolder.kt | 4 +- .../slide/HomeGameCollectionSlideAdapter.kt | 16 +-- .../HomeHorizontalSlideVideoItemViewHolder.kt | 2 +- .../recommend/HomeRecommendItemGridAdapter.kt | 2 +- .../home/skip/PackageSkipAdapter.kt | 2 +- .../home/skip/PackageSkipFragment.kt | 8 +- .../home/slide/HomeSlideListViewHolder.kt | 8 +- .../slide/HomeSlideWithCardsViewHolder.kt | 12 +- ...GameTestV2GameListPlaceHolderViewHolder.kt | 2 +- .../HomeGameTestV2GameListViewHolder.kt | 12 +- .../HomeGameTestV2RecommendViewHolder.kt | 2 +- .../test_v2/HomeItemGameTestV2ViewHolder.kt | 2 +- .../info/StrategyDialogAdapter.java | 2 +- .../gh/gamecenter/info/StrategyFragment.java | 14 +- .../gh/gamecenter/libao/Libao1Fragment.java | 10 +- .../gh/gamecenter/libao/Libao2Fragment.java | 6 +- .../libao/Libao2FragmentAdapter.java | 2 +- .../gh/gamecenter/libao/Libao3Fragment.java | 8 +- .../libao/Libao3FragmentAdapter.java | 2 +- .../gh/gamecenter/libao/LibaoFragment.java | 6 +- .../gamecenter/libao/LibaoHistoryAdapter.java | 2 +- .../gh/gamecenter/libao/LibaoNewAdapter.kt | 2 +- .../gh/gamecenter/libao/LibaoSearchAdapter.kt | 2 +- .../gamecenter/libao/LibaoSearchFragment.java | 2 +- .../gh/gamecenter/manager/UpdateManager.java | 2 +- .../message/MessageDetailFragment.java | 4 +- .../mygame/MyFollowedGameAdapter.kt | 20 +-- .../mygame/MyFollowedGameFragment.kt | 6 +- .../gh/gamecenter/mygame/MyGameActivity.kt | 4 +- .../gamecenter/mygame/MyPlayedGameFragment.kt | 2 +- .../gamecenter/mygame/MyReservationAdapter.kt | 12 +- .../mygame/MyReservationFragment.kt | 8 +- .../gh/gamecenter/mygame/PlayedGameAdapter.kt | 16 +-- .../gh/gamecenter/mypost/MyPostActivity.kt | 4 +- .../com/gh/gamecenter/mypost/MyPostAdapter.kt | 2 +- .../gh/gamecenter/mypost/MyPostFragment.kt | 4 +- .../newsdetail/NewsDetailAdapter.java | 27 ++-- .../personal/DeliveryInfoActivity.kt | 4 +- .../personal/DeliveryInfoFragment.kt | 18 +-- .../personal/HaloPersonalFragment.kt | 18 +-- .../personal/HaloPersonalFunctionAdapter.kt | 2 +- .../personal/HaloPersonalRecommendAdapter.kt | 8 +- .../personalhome/FollowersOrFansAdapter.kt | 6 +- .../personalhome/UserHomeFragment.kt | 6 +- .../PersonalityBackgroundActivity.kt | 4 +- .../PersonalityBackgroundFragment.kt | 2 +- .../border/AvatarBorderFragment.kt | 2 +- .../border/ChooseAvatarBorderAdapter.kt | 4 +- .../personalhome/fans/FansActivity.kt | 4 +- .../followers/FollowersActivity.kt | 4 +- .../personalhome/home/UserHistoryAdapter.kt | 4 +- .../personalhome/home/UserHistoryFragment.kt | 6 +- .../home/game/UserCommentHistoryAdapter.kt | 6 +- .../home/game/UserCommentHistoryFragment.kt | 6 +- .../home/game/UserGameFragment.kt | 22 +-- .../home/game/UserPlayedGameAdapter.kt | 4 +- .../home/game/UserPlayedGameFragment.kt | 2 +- .../personalhome/rating/RatingActivity.kt | 4 +- .../BaseAnswerOrArticleItemViewHolder.kt | 14 +- .../answer/CommunityAnswerItemViewHolder.kt | 6 +- .../qa/answer/detail/AnswerDetailFragment.kt | 29 ++-- .../detail/SimpleAnswerDetailActivity.kt | 4 +- .../qa/article/MyArticleFragment.kt | 2 +- .../article/detail/ArticleDetailActivity.kt | 4 +- .../qa/article/detail/ArticleDetailAdapter.kt | 2 +- .../detail/ArticleDetailContentViewHolder.kt | 26 ++-- .../article/detail/ArticleDetailFragment.kt | 18 +-- .../qa/article/detail/EditHistoryDialog.kt | 2 +- .../qa/article/draft/ArticleDraftActivity.kt | 4 +- .../qa/article/edit/ArticleEditActivity.kt | 16 +-- .../article/edit/ArticleTagsSelectFragment.kt | 8 +- .../qa/comment/NewCommentAdapter.kt | 6 +- .../qa/comment/NewCommentDetailActivity.kt | 4 +- .../qa/comment/NewCommentFragment.kt | 2 +- .../qa/comment/StairsCommentViewHolder.kt | 18 +-- .../qa/comment/base/BaseCommentAdapter.kt | 76 +++++----- .../CommentConversationFragment.kt | 2 +- .../qa/dialog/ChooseForumContainerAdapter.kt | 2 +- .../qa/dialog/ChooseForumContainerFragment.kt | 7 +- .../qa/dialog/ChooseSectionAdapter.kt | 2 +- .../qa/dialog/ChooseSectionDialogFragment.kt | 2 +- .../qa/dialog/MoreFunctionPanelDialog.kt | 2 +- .../qa/draft/CommunityDraftWrapperActivity.kt | 4 +- .../gh/gamecenter/qa/editor/GameActivity.kt | 4 +- .../qa/editor/InsertAnswerWrapperActivity.kt | 4 +- .../qa/editor/InsertArticleWrapperActivity.kt | 4 +- .../InsertGameCollectionWrapperActivity.kt | 4 +- .../qa/editor/InsertVideoWrapperActivity.kt | 4 +- .../qa/editor/LocalMediaActivity.kt | 4 +- .../qa/editor/LocalMediaFragment.kt | 4 +- .../qa/editor/VideoAlbumsSpanner.kt | 2 +- .../gamecenter/qa/myqa/MyAnswerFragment.java | 2 +- .../gh/gamecenter/qa/myqa/MyAskActivity.java | 4 +- .../questions/draft/QuestionDraftActivity.kt | 4 +- .../qa/questions/edit/QuestionEditActivity.kt | 14 +- .../qa/questions/edit/TagsSelectFragment.kt | 8 +- .../invite/QuestionsInviteActivity.java | 2 +- .../invite/QuestionsInviteViewHolder.java | 2 +- .../newdetail/NewQuestionDetailActivity.kt | 4 +- .../newdetail/NewQuestionDetailAdapter.kt | 2 +- .../newdetail/NewQuestionDetailFragment.kt | 18 +-- .../QuestionDetailContentViewHolder.kt | 8 +- .../video/detail/ForumVideoDetailFragment.kt | 6 +- .../detail/comment/VideoCommentFragment.kt | 4 +- .../detail/desc/VideoDescTopViewHolder.kt | 6 +- .../qa/video/publish/VideoPublishActivity.kt | 4 +- .../qa/video/publish/VideoPublishFragment.kt | 14 +- .../qgame/QGameHomeWrapperActivity.kt | 4 +- .../savegame/GameArchiveListActivity.kt | 4 +- .../GameArchiveListInstalledAdapter.kt | 4 +- .../GameArchiveListInstalledFragment.kt | 2 +- .../GameArchiveListRecommendFragment.kt | 4 +- .../search/SearchDefaultFragment.kt | 6 +- .../search/SearchDefaultRankAdapter.kt | 2 +- .../search/SearchGameIndexAdapter.kt | 4 +- .../search/SearchGameIndexFragment.kt | 4 +- .../search/SearchGameIndexItemViewHolder.kt | 4 +- .../search/SearchGameResultAdapter.kt | 4 +- .../search/SearchGameResultFragment.kt | 4 +- .../servers/GameServerTestActivity.kt | 4 +- .../gamecenter/servers/GameServersActivity.kt | 15 +- .../servers/GameServersContentAdapter.kt | 14 +- .../servers/GameServersContentFragment.kt | 6 +- .../servers/GameServersPublishFragment.kt | 32 ++--- .../servers/GameServersTestAdapter.kt | 6 +- .../servers/GameServersTestFragment.kt | 42 +++--- .../servers/add/AddKaiFuActivity.kt | 14 +- .../gametest2/GameBigImageViewHolder.kt | 10 +- .../gametest2/GameServerTestV2Activity.kt | 4 +- .../gametest2/GameServerTestV2Fragment.kt | 9 +- .../gametest2/GameServerTestV2ListAdapter.kt | 4 +- .../gametest2/GameServerTestV2ListFragment.kt | 2 +- .../servers/patch/PatchKaifuActivity.kt | 6 +- .../simulatorgame/SimulatorGameActivity.kt | 4 +- .../simulatorgame/SimulatorGameFragment.kt | 3 +- .../simulatorgame/SimulatorGameListAdapter.kt | 6 +- .../SimulatorManagementActivity.kt | 4 +- .../SimulatorManagementAdapter.kt | 18 +-- .../gh/gamecenter/subject/SubjectActivity.kt | 4 +- .../gamecenter/subject/SubjectListFragment.kt | 4 +- .../subject/tab/SubjectTabFragment.kt | 10 +- .../com/gh/gamecenter/tag/TagsActivity.kt | 4 +- .../com/gh/gamecenter/tag/TagsListFragment.kt | 16 +-- .../teenagermode/PasswordSettingFragment.kt | 20 +-- .../teenagermode/TeenagerModeActivity.kt | 4 +- .../teenagermode/TeenagerModeFragment.kt | 12 +- .../toolbox/ToolBoxBlockActivity.kt | 10 +- .../gamecenter/toolbox/ToolBoxBlockAdapter.kt | 6 +- .../gamecenter/toolbox/ToolBoxItemAdapter.kt | 6 +- .../gamecenter/video/VideoItemViewHolder.kt | 6 +- .../gamecenter/video/data/VideoDataAdapter.kt | 8 +- .../video/data/VideoDataFragment.kt | 2 +- .../video/game/GameVideoActivity.kt | 2 +- .../video/label/VideoLabelAdapter.kt | 6 +- .../video/label/VideoLabelFragment.kt | 2 +- .../video/upload/view/UploadVideoActivity.kt | 14 +- .../video/videomanager/VideoDraftActivity.kt | 4 +- .../videomanager/VideoManagerActivity.kt | 5 +- .../video/videomanager/VideoVerifyAdapter.kt | 6 +- .../com/gh/gamecenter/vote/VoteAdapter.kt | 17 ++- .../com/gh/vspace/VDownloadManagerActivity.kt | 4 +- .../com/gh/vspace/VDownloadManagerAdapter.kt | 22 +-- .../com/gh/vspace/VDownloadManagerFragment.kt | 2 +- .../com/gh/vspace/VFeedbackDialogFragment.kt | 4 +- app/src/main/java/com/gh/vspace/VHelper.kt | 4 +- .../gapps/GAppsDownloadDialogFragment.kt | 2 +- .../menu/VDownLoadManagerItemMenuDialog.kt | 4 +- .../shortcut/ShortcutPermissionTipsDialog.kt | 6 +- .../fragment/SwitchInstallMethodFragment.kt | 12 +- .../comment/CommentDetailFragment.java | 2 +- .../fragment/game/GamePluggableViewHolder.kt | 2 +- .../fragment/game/GamePluginAdapter.java | 2 +- .../fragment/myconcern/MyConcernAdapter.java | 6 +- .../fragment/myconcern/MyConcernFragment.java | 2 +- .../fragment/user/RealNameInfoFragment.kt | 12 +- .../fragment/user/VerifyPhoneFragment.kt | 6 +- .../fragment/user/auth/UserAuthAdapter.kt | 14 +- .../fragment/user/auth/UserAuthFragment.kt | 4 +- .../color/comment_send_btn_dark_selector.xml | 2 +- .../res/color/comment_send_btn_selector.xml | 2 +- .../community_home_text_tabbar_style.xml | 8 +- .../res/color/forum_category_selector.xml | 4 +- .../interested_game_tag_text_selector.xml | 4 +- .../res/color/libao_rg_button_selector.xml | 4 +- .../res/color/poster_text_tabbar_style.xml | 8 +- .../subject_tiled_tab_color_selector.xml | 6 +- app/src/main/res/color/tab_selector.xml | 4 +- .../text_search_default_rank_tabbar_style.xml | 6 +- .../res/color/text_tabbar_video_style.xml | 10 +- app/src/main/res/color/theme_and_333.xml | 6 +- .../top_community_category_text_selector.xml | 4 +- .../res/color/video_upload_post_style.xml | 2 +- .../res/color/video_upload_source_check.xml | 4 +- app/src/main/res/color/vote_selector.xml | 4 +- .../drawable-night/bg_forum_activity_card.xml | 2 +- .../res/drawable-night/bg_personal_card.xml | 2 +- .../download_dialog_version_note.xml | 2 +- .../bg_game_detail_seekbar.xml | 2 +- .../drawable/amway_gradient_background.xml | 2 +- .../res/drawable/app_update_background.xml | 2 +- .../drawable/app_updating_progress_anchor.xml | 2 +- .../app_updating_progress_filling.xml | 2 +- .../drawable/app_updating_progress_style.xml | 8 +- app/src/main/res/drawable/bg_ad_label.xml | 2 +- app/src/main/res/drawable/bg_add_kaifu.xml | 4 +- .../res/drawable/bg_add_kaifu_bottom_left.xml | 4 +- .../drawable/bg_add_kaifu_bottom_right.xml | 4 +- .../main/res/drawable/bg_add_kaifu_top.xml | 4 +- .../res/drawable/bg_add_kaifu_top_left.xml | 4 +- .../res/drawable/bg_add_kaifu_top_right.xml | 4 +- .../main/res/drawable/bg_apply_moderator.xml | 2 +- .../main/res/drawable/bg_blue_radius_20.xml | 2 +- .../res/drawable/bg_border_blue_radius_4.xml | 2 +- .../bg_border_blue_radius_4_width_1.xml | 2 +- .../res/drawable/bg_circle_background.xml | 2 +- .../main/res/drawable/bg_eeeeee_corner_7.xml | 2 +- .../main/res/drawable/bg_f5f5f5_radius_20.xml | 2 +- .../res/drawable/bg_forum_activity_card.xml | 2 +- .../res/drawable/bg_forum_banner_selected.xml | 2 +- .../res/drawable/bg_forum_banner_unselect.xml | 2 +- .../res/drawable/bg_forum_home_search.xml | 2 +- .../res/drawable/bg_forum_list_skeleton.xml | 2 +- .../res/drawable/bg_forum_welfare_item.xml | 2 +- app/src/main/res/drawable/bg_game_ad.xml | 2 +- .../main/res/drawable/bg_game_big_event.xml | 2 +- .../bg_game_collection_sfv_indicator.xml | 2 +- .../bg_game_collection_tag_select.xml | 2 +- .../bg_game_collection_tag_unselect.xml | 2 +- .../bg_game_collection_video_item.xml | 2 +- .../res/drawable/bg_hint_red_radius_999.xml | 2 +- .../res/drawable/bg_home_recent_vgame.xml | 2 +- .../bg_home_vgame_progress_active.xml | 2 +- .../main/res/drawable/bg_original_label.xml | 2 +- .../main/res/drawable/bg_personal_card.xml | 2 +- .../res/drawable/bg_personal_top_gradient.xml | 4 +- .../res/drawable/bg_red_stroke_radius_999.xml | 2 +- .../res/drawable/bg_report_kaifu_submit.xml | 2 +- .../res/drawable/bg_report_reason_top.xml | 2 +- .../res/drawable/bg_search_default_rank.xml | 2 +- .../res/drawable/bg_selected_category.xml | 2 +- .../bg_shape_2496ff_alpha_10_radius_8.xml | 2 +- .../res/drawable/bg_shape_f5_radius_3.xml | 2 +- .../res/drawable/bg_shape_f5_radius_6.xml | 2 +- .../res/drawable/bg_shape_f8_radius_12.xml | 2 +- .../res/drawable/bg_shape_f8_radius_6.xml | 2 +- .../res/drawable/bg_shape_space2_radius_4.xml | 2 +- .../drawable/bg_shape_space2_radius_999.xml | 2 +- .../res/drawable/bg_shape_space_radius_4.xml | 2 +- .../res/drawable/bg_shape_space_radius_5.xml | 2 +- .../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 +- .../bg_shape_white_radius_10_top_only.xml | 2 +- .../res/drawable/bg_shape_white_radius_4.xml | 2 +- .../drawable/bg_skeleton_child_radius_14.xml | 2 +- .../drawable/bg_skeleton_child_radius_4.xml | 2 +- .../drawable/bg_skeleton_child_radius_8.xml | 2 +- .../drawable/bg_skeleton_child_radius_999.xml | 2 +- .../res/drawable/bg_skeleton_radius_10.xml | 2 +- .../res/drawable/bg_skeleton_radius_12.xml | 2 +- .../res/drawable/bg_skeleton_radius_14.xml | 2 +- .../res/drawable/bg_skeleton_radius_16.xml | 2 +- .../res/drawable/bg_skeleton_radius_20.xml | 2 +- .../res/drawable/bg_skeleton_radius_4.xml | 2 +- .../res/drawable/bg_skeleton_radius_6.xml | 2 +- .../res/drawable/bg_skeleton_radius_8.xml | 2 +- .../res/drawable/bg_skeleton_radius_999.xml | 2 +- .../res/drawable/bg_stroke_f5_radius_999.xml | 2 +- .../main/res/drawable/bg_sub_catalog_item.xml | 2 +- app/src/main/res/drawable/bg_tag_text.xml | 2 +- app/src/main/res/drawable/bg_top_border.xml | 4 +- .../drawable/bg_top_community_category.xml | 2 +- .../bg_top_community_category_selected.xml | 2 +- .../main/res/drawable/bg_verify_password.xml | 2 +- .../drawable/bg_verify_password_select.xml | 4 +- .../main/res/drawable/bg_vfeedback_label.xml | 4 +- .../drawable/bg_vfeedback_label_selected.xml | 2 +- .../main/res/drawable/bg_white_radius_8.xml | 2 +- .../res/drawable/border_dialog_white_bg_5.xml | 2 +- .../main/res/drawable/border_round_ccc.xml | 2 +- .../res/drawable/border_round_ccc_999.xml | 2 +- .../main/res/drawable/border_round_eee_14.xml | 2 +- .../res/drawable/border_round_eee_999.xml | 2 +- .../border_round_stroke_0dot5_eee_999.xml | 4 +- .../border_round_stroke_black_alpha_7.xml | 2 +- .../drawable/border_round_stroke_eee_999.xml | 4 +- .../border_round_stroke_themefont_999.xml | 4 +- .../res/drawable/border_round_theme_14.xml | 2 +- .../res/drawable/border_round_theme_15.xml | 2 +- ...nd_transparent_stroke_divider_radius_8.xml | 2 +- .../res/drawable/button_border_blue_oval.xml | 2 +- .../res/drawable/button_normal_border.xml | 2 +- .../drawable/button_round_2496ff_alpha_10.xml | 2 +- .../drawable/button_round_2496ff_hollow.xml | 2 +- .../main/res/drawable/comment_border_bg.xml | 2 +- .../comment_send_button_available_dark.xml | 2 +- .../drawable/community_comment_background.xml | 2 +- .../community_comment_reply_background.xml | 2 +- .../res/drawable/community_edit_window_bg.xml | 2 +- ...munity_editor_insert_search_background.xml | 2 +- .../res/drawable/dialog_app_updating_bg.xml | 2 +- .../drawable/dialog_community_content_bg.xml | 2 +- .../dialog_edit_history_scrollbar.xml | 2 +- .../drawable/dialog_game_tags_background.xml | 2 +- .../divider_article_detail_comment.xml | 4 +- .../res/drawable/divider_history_apks.xml | 2 +- .../drawable/divider_item_line_space_20.xml | 4 +- .../main/res/drawable/divider_my_follow.xml | 2 +- app/src/main/res/drawable/divider_my_game.xml | 4 +- .../drawable/download_dialog_background.xml | 2 +- .../download_dialog_item_background.xml | 2 +- .../drawable/download_dialog_version_note.xml | 2 +- .../res/drawable/game_detail_amway_bg.xml | 2 +- .../res/drawable/game_detail_btn_receive.xml | 2 +- .../game_detail_info_dividing_line.xml | 2 +- .../game_detail_more_dialog_background.xml | 2 +- .../drawable/home_amway_rating_unselect.xml | 2 +- .../main/res/drawable/home_amway_unselect.xml | 2 +- .../home_slide_card_gradient_mask.xml | 2 +- app/src/main/res/drawable/ic_archive.xml | 2 +- .../drawable/ic_article_detail_forum_jump.xml | 2 +- .../drawable/ic_choose_section_selected.xml | 4 +- .../drawable/ic_create_game_collection.xml | 6 +- .../main/res/drawable/ic_edit_arrow_right.xml | 4 +- .../res/drawable/ic_gamedetail_concern.xml | 2 +- .../res/drawable/ic_gamedetail_concerned.xml | 2 +- .../res/drawable/ic_gamedetail_reserve.xml | 2 +- .../res/drawable/ic_gamedetail_reserved.xml | 2 +- .../ic_gamedetail_simulator_manage.xml | 8 +- .../drawable/ic_gamedetail_switch_install.xml | 2 +- .../ic_home_game_collection_slide_jump.xml | 2 +- app/src/main/res/drawable/ic_jump.xml | 2 +- .../res/drawable/ic_my_follow_comment.xml | 2 +- .../main/res/drawable/ic_my_follow_forum.xml | 2 +- .../main/res/drawable/ic_my_follow_zone.xml | 2 +- .../drawable/ic_personal_children_policy.xml | 2 +- .../res/drawable/ic_personal_dark_mode.xml | 2 +- .../res/drawable/ic_personal_feedback.xml | 2 +- .../main/res/drawable/ic_personal_history.xml | 2 +- .../res/drawable/ic_personal_info_list.xml | 2 +- .../res/drawable/ic_personal_light_mode.xml | 10 +- .../main/res/drawable/ic_personal_message.xml | 4 +- .../drawable/ic_personal_my_collection.xml | 2 +- .../main/res/drawable/ic_personal_my_game.xml | 2 +- .../ic_personal_my_game_collection.xml | 2 +- .../main/res/drawable/ic_personal_my_post.xml | 2 +- .../res/drawable/ic_personal_permission.xml | 2 +- .../drawable/ic_personal_privacy_policy.xml | 2 +- app/src/main/res/drawable/ic_personal_sdk.xml | 2 +- .../main/res/drawable/ic_personal_setting.xml | 2 +- .../main/res/drawable/ic_personal_share.xml | 2 +- .../main/res/drawable/ic_personal_sign.xml | 2 +- .../drawable/ic_personal_user_protocol.xml | 2 +- .../main/res/drawable/ic_server_popup_up.xml | 2 +- .../drawable/ic_smooth_load_in_background.xml | 4 +- .../main/res/drawable/ic_startup_ad_arrow.xml | 2 +- .../ic_update_version_update_highlight.xml | 2 +- .../res/drawable/ic_user_game_collection.xml | 2 +- .../res/drawable/ic_vgame_recent_hint.xml | 6 +- .../res/drawable/ic_vgame_update_hint.xml | 4 +- app/src/main/res/drawable/icon_arrow.xml | 2 +- app/src/main/res/drawable/icon_clear.xml | 2 +- app/src/main/res/drawable/icon_heat.xml | 2 +- .../main/res/drawable/icon_moderator_more.xml | 4 +- app/src/main/res/drawable/icon_revise.xml | 4 +- .../main/res/drawable/icon_sheet_close.xml | 8 +- app/src/main/res/drawable/label_original.xml | 6 +- .../main/res/drawable/launcher_background.xml | 4 +- .../main/res/drawable/login_btn_bg_enable.xml | 2 +- .../drawable/oval_hint_accent_stroke_bg.xml | 2 +- .../main/res/drawable/oval_hint_red_bg.xml | 2 +- .../res/drawable/oval_hint_red_stroke_bg.xml | 2 +- .../package_check_dialog_item_progress.xml | 2 +- .../res/drawable/progressbar_bg_style.xml | 4 +- .../progressbar_played_game_blue_style.xml | 4 +- .../res/drawable/progressbar_video_detail.xml | 2 +- .../progressbar_xapk_detail_style.xml | 4 +- .../drawable/question_edit_popup_border.xml | 2 +- app/src/main/res/drawable/round_grey_bg.xml | 2 +- .../main/res/drawable/scrollbar_vertical.xml | 2 +- .../res/drawable/search_history_delete.xml | 2 +- .../selector_device_remind_indicator.xml | 2 +- app/src/main/res/drawable/selector_f8f8f8.xml | 2 +- .../shape_default_avatar_selected.xml | 2 +- .../drawable/subject_tiled_tab_background.xml | 2 +- .../res/drawable/subject_tiled_tab_select.xml | 2 +- .../res/drawable/switchbuttom_back_color.xml | 2 +- .../main/res/drawable/textview_blue_dn.xml | 2 +- .../main/res/drawable/textview_blue_up.xml | 2 +- .../res/drawable/textview_concern_red_dn.xml | 2 +- .../res/drawable/textview_concern_red_up.xml | 2 +- .../textview_concern_red_up_round.xml | 2 +- .../main/res/drawable/triangle_right_blue.xml | 2 +- .../drawable/video_detail_seek_progress.xml | 2 +- .../res/layout/activity_authorization.xml | 8 +- .../layout/activity_cloud_archive_manager.xml | 14 +- .../activity_community_article_edit.xml | 24 ++-- .../layout/activity_editor_insert_game.xml | 16 +-- .../layout/activity_game_collection_edit.xml | 42 +++--- .../res/layout/activity_game_comment_logs.xml | 4 +- .../main/res/layout/activity_game_servers.xml | 4 +- .../res/layout/activity_install_skeleton.xml | 84 +++++------ .../main/res/layout/activity_kaifu_add.xml | 8 +- .../main/res/layout/activity_kaifu_patch.xml | 26 ++-- .../main/res/layout/activity_libaodetail.xml | 2 +- .../layout/activity_libaodetail_skeleton.xml | 34 ++--- app/src/main/res/layout/activity_main.xml | 6 +- .../main/res/layout/activity_news_detail.xml | 4 +- .../main/res/layout/activity_poster_edit.xml | 4 +- .../res/layout/activity_questions_edit.xml | 26 ++-- .../main/res/layout/activity_rating_edit.xml | 12 +- .../main/res/layout/activity_rating_reply.xml | 4 +- .../res/layout/activity_servers_calendar.xml | 22 +-- app/src/main/res/layout/activity_share_gh.xml | 8 +- .../res/layout/activity_sharecard_pic.xml | 2 +- .../res/layout/activity_toolbox_block.xml | 10 +- .../main/res/layout/activity_video_game.xml | 4 +- .../res/layout/activity_video_publish.xml | 2 +- .../main/res/layout/activity_video_uplaod.xml | 42 +++--- .../main/res/layout/amway_comment_item.xml | 8 +- app/src/main/res/layout/amway_search_item.xml | 2 +- app/src/main/res/layout/answer_draft_item.xml | 6 +- .../res/layout/app_update_hint_dialog.xml | 8 +- .../main/res/layout/app_updating_dialog.xml | 6 +- app/src/main/res/layout/area_title_item.xml | 2 +- app/src/main/res/layout/ask_answer_item.xml | 16 +-- .../main/res/layout/ask_subject_top_item.xml | 6 +- .../res/layout/avatar_background_item.xml | 2 +- app/src/main/res/layout/avatar_item.xml | 4 +- .../res/layout/big_image_recommend_item.xml | 4 +- .../main/res/layout/catalog_header_item.xml | 4 +- app/src/main/res/layout/catalog_item.xml | 2 +- .../res/layout/catalog_subject_game_item.xml | 2 +- .../res/layout/category_directory_item.xml | 2 +- .../main/res/layout/category_game_item.xml | 8 +- app/src/main/res/layout/category_v2_item.xml | 2 +- .../main/res/layout/cloud_archive_item.xml | 16 +-- .../collection_comunity_article_item.xml | 12 +- app/src/main/res/layout/comment_head_item.xml | 2 +- app/src/main/res/layout/comment_item.xml | 18 +-- .../common_collection_image_text_item.xml | 6 +- .../res/layout/common_collection_item.xml | 6 +- .../main/res/layout/community_answer_item.xml | 30 ++-- .../layout/community_article_draft_item.xml | 6 +- .../main/res/layout/community_edit_window.xml | 6 +- .../layout/community_question_draft_item.xml | 6 +- .../res/layout/community_video_draft_item.xml | 6 +- .../main/res/layout/detail_download_item.xml | 10 +- .../main/res/layout/dialog_add_new_label.xml | 14 +- app/src/main/res/layout/dialog_add_vote.xml | 14 +- .../layout/dialog_address_confirmation.xml | 6 +- .../dialog_alert_with_rounded_corner.xml | 12 +- .../res/layout/dialog_apply_moderator.xml | 4 +- .../res/layout/dialog_archive_loading.xml | 4 +- app/src/main/res/layout/dialog_bind_phone.xml | 12 +- .../res/layout/dialog_cancel_reservation.xml | 6 +- .../main/res/layout/dialog_change_avatar.xml | 14 +- .../res/layout/dialog_choose_activity.xml | 4 +- .../layout/dialog_choose_default_avatar.xml | 4 +- .../main/res/layout/dialog_choose_forum.xml | 12 +- ...alog_choose_game_collection_cover_type.xml | 20 +-- ...g_choose_game_collection_default_cover.xml | 6 +- .../main/res/layout/dialog_choose_section.xml | 4 +- app/src/main/res/layout/dialog_community.xml | 10 +- .../main/res/layout/dialog_device_remind.xml | 8 +- .../layout/dialog_disallow_privacy_policy.xml | 4 +- .../main/res/layout/dialog_downlaod_mutex.xml | 6 +- app/src/main/res/layout/dialog_download.xml | 8 +- .../main/res/layout/dialog_download_link.xml | 2 +- .../res/layout/dialog_download_traffic.xml | 10 +- .../main/res/layout/dialog_edit_archive.xml | 16 +-- .../main/res/layout/dialog_edit_history.xml | 6 +- .../dialog_game_add_shortcut_permission.xml | 6 +- .../main/res/layout/dialog_game_big_event.xml | 8 +- .../layout/dialog_game_collection_share.xml | 4 +- .../res/layout/dialog_game_detail_more.xml | 6 +- .../dialog_game_download_manager_menu.xml | 18 +-- .../res/layout/dialog_game_off_service.xml | 8 +- .../layout/dialog_game_resource_policy.xml | 4 +- .../main/res/layout/dialog_gapps_download.xml | 10 +- app/src/main/res/layout/dialog_input_url.xml | 2 +- .../res/layout/dialog_install_permission.xml | 6 +- .../main/res/layout/dialog_installed_game.xml | 4 +- .../layout/dialog_interested_game_type.xml | 8 +- .../main/res/layout/dialog_kaifu_remind.xml | 8 +- .../res/layout/dialog_modify_nickname.xml | 2 +- .../res/layout/dialog_my_archive_option.xml | 12 +- .../res/layout/dialog_package_parse_error.xml | 14 +- .../res/layout/dialog_pass_regulation.xml | 2 +- .../main/res/layout/dialog_privacy_policy.xml | 12 +- .../res/layout/dialog_privacy_protocol.xml | 18 +-- .../layout/dialog_privacy_protocol_new.xml | 14 +- .../main/res/layout/dialog_receive_badge.xml | 2 +- .../res/layout/dialog_regulation_test.xml | 14 +- .../main/res/layout/dialog_relieve_phone.xml | 12 +- .../main/res/layout/dialog_report_reason.xml | 14 +- app/src/main/res/layout/dialog_reserve.xml | 4 +- .../main/res/layout/dialog_reserve_item.xml | 2 +- .../main/res/layout/dialog_sertification.xml | 16 +-- .../dialog_servers_calendear_detail.xml | 4 +- .../dialog_servers_calendear_detail_item.xml | 8 +- ...dialog_servers_calendear_detail_report.xml | 2 +- ...servers_calendear_detail_report_header.xml | 6 +- ...g_servers_calendear_detail_report_item.xml | 6 +- .../main/res/layout/dialog_share_archive.xml | 18 +-- .../res/layout/dialog_shortcut_permission.xml | 6 +- .../dialog_shortcut_permission_tips.xml | 6 +- app/src/main/res/layout/dialog_sign.xml | 14 +- .../res/layout/dialog_simulaor_game_guide.xml | 2 +- .../dialog_stop_service_explanation.xml | 8 +- .../main/res/layout/dialog_strategy_item.xml | 2 +- .../layout/dialog_strategy_select_game.xml | 6 +- .../layout/dialog_top_community_category.xml | 2 +- .../main/res/layout/dialog_upload_archive.xml | 16 +-- .../res/layout/dialog_upload_schedule.xml | 10 +- .../main/res/layout/dialog_usage_stats.xml | 10 +- .../res/layout/dialog_verified_confirm.xml | 12 +- .../main/res/layout/dialog_vgame_feedback.xml | 12 +- .../res/layout/dialog_video_upload_draft.xml | 8 +- app/src/main/res/layout/dialog_view_badge.xml | 2 +- app/src/main/res/layout/dialog_vspace.xml | 4 +- app/src/main/res/layout/dialog_vspace_32.xml | 10 +- .../res/layout/dialog_vspace_update_32.xml | 10 +- .../layout/dialog_wechat_reserve_success.xml | 2 +- .../main/res/layout/discovery_game_item.xml | 8 +- .../layout/download_dialog_installed_item.xml | 10 +- .../main/res/layout/download_dialog_item.xml | 6 +- .../res/layout/download_dialog_link_item.xml | 4 +- .../download_dialog_platform_request_item.xml | 2 +- .../layout/download_dialog_section_item.xml | 4 +- .../res/layout/download_simulator_dialog.xml | 4 +- app/src/main/res/layout/downloadmanager.xml | 12 +- .../res/layout/downloadmanager_item_head.xml | 6 +- .../res/layout/editor_insert_container.xml | 14 +- .../res/layout/editor_insert_default_item.xml | 6 +- .../res/layout/fm_downloadmanager_item.xml | 4 +- .../res/layout/fm_search_history_item.xml | 6 +- .../res/layout/followers_or_fans_item.xml | 12 +- .../main/res/layout/forum_activity_item.xml | 6 +- .../forum_article_ask_list_skeleton.xml | 2 +- app/src/main/res/layout/forum_item.xml | 4 +- app/src/main/res/layout/forum_my_follow.xml | 6 +- app/src/main/res/layout/forum_record_item.xml | 2 +- .../res/layout/forum_search_content_list.xml | 10 +- .../main/res/layout/forum_top_link_item.xml | 2 +- .../main/res/layout/forum_welfare_item.xml | 2 +- .../layout/fragment_add_user_played_game.xml | 2 +- app/src/main/res/layout/fragment_amway.xml | 6 +- app/src/main/res/layout/fragment_amway_al.xml | 2 +- .../layout/fragment_amway_search_default.xml | 2 +- .../res/layout/fragment_amway_success.xml | 10 +- .../fragment_answer_comment_conversation.xml | 6 +- .../res/layout/fragment_answer_detail.xml | 18 +-- .../fragment_answer_detail_skeleton.xml | 42 +++--- .../main/res/layout/fragment_answer_edit.xml | 8 +- .../main/res/layout/fragment_apk_cleaner.xml | 2 +- .../res/layout/fragment_apply_moderator.xml | 6 +- .../res/layout/fragment_article_detail.xml | 10 +- ...agment_article_detail_comment_skeleton.xml | 6 +- .../fragment_article_detail_skeleton.xml | 2 +- .../res/layout/fragment_avatar_border.xml | 8 +- .../main/res/layout/fragment_avatar_list.xml | 2 +- .../layout/fragment_background_preview.xml | 10 +- .../res/layout/fragment_bbs_certification.xml | 14 +- app/src/main/res/layout/fragment_catalog.xml | 6 +- .../main/res/layout/fragment_catalog_list.xml | 2 +- app/src/main/res/layout/fragment_category.xml | 10 +- .../res/layout/fragment_category_list.xml | 2 +- .../main/res/layout/fragment_choose_games.xml | 8 +- .../res/layout/fragment_cloud_archive.xml | 14 +- .../res/layout/fragment_comment_detail.xml | 2 +- .../res/layout/fragment_community_home.xml | 8 +- app/src/main/res/layout/fragment_concern.xml | 6 +- .../res/layout/fragment_delivery_info.xml | 18 +-- app/src/main/res/layout/fragment_desc.xml | 2 +- .../res/layout/fragment_followed_game.xml | 2 +- app/src/main/res/layout/fragment_forum.xml | 16 +-- .../fragment_forum_content_search_list.xml | 2 +- .../main/res/layout/fragment_forum_detail.xml | 10 +- .../layout/fragment_forum_detail_skeleton.xml | 4 +- .../main/res/layout/fragment_forum_list.xml | 2 +- .../layout/fragment_forum_video_detail.xml | 14 +- app/src/main/res/layout/fragment_fuli.xml | 2 +- app/src/main/res/layout/fragment_game.xml | 2 +- .../fragment_game_collection_detail.xml | 14 +- ...agment_game_collection_detail_skeleton.xml | 2 +- ...gment_game_collection_hot_list_wrapper.xml | 4 +- .../fragment_game_collection_square.xml | 14 +- .../fragment_game_collection_square_al.xml | 2 +- ...agment_game_collection_square_skeleton.xml | 4 +- .../fragment_game_collection_tag_select.xml | 4 +- .../res/layout/fragment_game_news_search.xml | 2 +- .../layout/fragment_game_repo_skeleton.xml | 2 +- .../layout/fragment_game_server_test_v2.xml | 4 +- .../fragment_game_server_test_v2_list.xml | 2 +- .../fragment_game_server_test_v2_skeleton.xml | 2 +- .../main/res/layout/fragment_game_servers.xml | 12 +- .../layout/fragment_game_servers_publish.xml | 14 +- .../res/layout/fragment_game_updatable.xml | 2 +- .../main/res/layout/fragment_game_upload.xml | 90 ++++++------ .../main/res/layout/fragment_gamedetail.xml | 2 +- .../layout/fragment_gamedetail_skeleton.xml | 6 +- .../layout/fragment_gamedongtai_skeleton.xml | 68 ++++----- .../res/layout/fragment_halo_personal.xml | 20 +-- .../res/layout/fragment_history_apk_list.xml | 4 +- app/src/main/res/layout/fragment_home.xml | 6 +- .../res/layout/fragment_home_game_wrapper.xml | 2 +- .../layout/fragment_home_toolbar_wrapper.xml | 2 +- .../res/layout/fragment_info_strategy.xml | 4 +- .../res/layout/fragment_interested_game.xml | 12 +- app/src/main/res/layout/fragment_invite.xml | 8 +- app/src/main/res/layout/fragment_libao1.xml | 4 +- app/src/main/res/layout/fragment_libao2.xml | 2 +- app/src/main/res/layout/fragment_libao3.xml | 4 +- .../main/res/layout/fragment_libao_serach.xml | 2 +- .../res/layout/fragment_libao_skeleton.xml | 86 ++++++------ .../res/layout/fragment_libao_wrapper.xml | 6 +- .../fragment_list_article_detail_comment.xml | 2 +- .../layout/fragment_list_base_skeleton.xml | 2 +- .../res/layout/fragment_list_fold_rating.xml | 2 +- .../main/res/layout/fragment_local_media.xml | 6 +- app/src/main/res/layout/fragment_main.xml | 4 +- .../main/res/layout/fragment_main_home.xml | 2 +- .../res/layout/fragment_main_home_wrapper.xml | 10 +- .../layout/fragment_manually_real_name.xml | 18 +-- .../res/layout/fragment_message_detail.xml | 2 +- .../res/layout/fragment_moderator_list.xml | 4 +- .../main/res/layout/fragment_my_archive.xml | 4 +- .../fragment_my_game_collection_list.xml | 6 +- ...ragment_no_padding_tablayout_viewpager.xml | 4 +- .../res/layout/fragment_package_check.xml | 8 +- .../main/res/layout/fragment_package_skip.xml | 6 +- .../res/layout/fragment_password_setting.xml | 10 +- app/src/main/res/layout/fragment_qgame.xml | 2 +- .../main/res/layout/fragment_real_name.xml | 20 +-- app/src/main/res/layout/fragment_region.xml | 2 +- .../res/layout/fragment_search_default.xml | 6 +- .../main/res/layout/fragment_search_game.xml | 14 +- .../res/layout/fragment_search_result.xml | 6 +- .../res/layout/fragment_simulator_game.xml | 4 +- .../layout/fragment_simulator_game_list.xml | 4 +- .../main/res/layout/fragment_sub_catalog.xml | 2 +- .../fragment_subject_detail_skeleton.xml | 2 +- .../main/res/layout/fragment_subject_rows.xml | 2 +- .../main/res/layout/fragment_subject_tab.xml | 6 +- .../res/layout/fragment_subject_tiled.xml | 2 +- .../layout/fragment_switch_install_method.xml | 4 +- app/src/main/res/layout/fragment_tags.xml | 4 +- .../res/layout/fragment_teenager_mode.xml | 10 +- app/src/main/res/layout/fragment_toolbar.xml | 2 +- .../main/res/layout/fragment_user_game.xml | 6 +- .../main/res/layout/fragment_user_publish.xml | 14 +- app/src/main/res/layout/fragment_userinfo.xml | 6 +- .../res/layout/fragment_userinfo_edit.xml | 16 +-- .../res/layout/fragment_vdownload_manager.xml | 2 +- .../fragment_vdownload_manager_wrapper.xml | 6 +- .../main/res/layout/fragment_verify_phone.xml | 16 +-- .../layout/fragment_video_comment_list.xml | 14 +- .../main/res/layout/fragment_video_data.xml | 2 +- .../fragment_video_detail_container.xml | 2 +- .../layout/fragment_video_detail_skeleton.xml | 4 +- .../res/layout/fragment_video_publish.xml | 36 ++--- app/src/main/res/layout/fragment_vote.xml | 4 +- .../res/layout/fragment_vspace_loading.xml | 12 +- app/src/main/res/layout/fragment_web.xml | 2 +- .../main/res/layout/fragment_web_warning.xml | 2 +- .../res/layout/fragment_wrapper_toolbar.xml | 2 +- .../res/layout/fragment_zixun_skeleton.xml | 86 ++++++------ .../main/res/layout/gallery_video_item.xml | 2 +- app/src/main/res/layout/game_attach_item.xml | 6 +- .../game_collection_detail_divider_item.xml | 2 +- .../game_collection_detail_none_game_item.xml | 4 +- .../game_collection_detail_video_item.xml | 12 +- .../res/layout/game_collection_game_item.xml | 2 +- .../game_collection_hot_list_tab_item.xml | 2 +- .../game_collection_selected_tag_item.xml | 2 +- .../game_collection_square_amway_item.xml | 2 +- .../res/layout/game_collection_tag_item.xml | 2 +- .../main/res/layout/game_comment_log_item.xml | 6 +- app/src/main/res/layout/game_detail_info.xml | 6 +- .../main/res/layout/game_double_card_item.xml | 6 +- app/src/main/res/layout/game_gallery_item.xml | 2 +- app/src/main/res/layout/game_gallery_list.xml | 4 +- app/src/main/res/layout/game_head_item.xml | 4 +- .../main/res/layout/game_horizontal_item.xml | 6 +- .../layout/game_horizontal_simple_item.xml | 2 +- app/src/main/res/layout/game_image_item.xml | 2 +- .../res/layout/game_latest_service_list.xml | 8 +- .../res/layout/game_permission_dialog.xml | 18 +-- .../main/res/layout/game_permission_item.xml | 4 +- .../main/res/layout/game_pluggable_item.xml | 2 +- app/src/main/res/layout/game_plugin_item.xml | 4 +- app/src/main/res/layout/game_test_item.xml | 8 +- .../main/res/layout/game_update_content.xml | 8 +- app/src/main/res/layout/gamedetail_body.xml | 12 +- .../res/layout/gamedetail_item_answer.xml | 4 +- .../res/layout/gamedetail_item_comments.xml | 4 +- .../layout/gamedetail_item_custom_column.xml | 10 +- .../gamedetail_item_custom_column_item.xml | 2 +- .../gamedetail_item_game_collection.xml | 8 +- .../main/res/layout/gamedetail_item_image.xml | 4 +- .../main/res/layout/gamedetail_item_news.xml | 4 +- app/src/main/res/layout/home_amway_item.xml | 16 +-- .../res/layout/home_discover_card_item.xml | 2 +- app/src/main/res/layout/home_divider_item.xml | 2 +- .../layout/home_game_collection_card_item.xml | 2 +- .../home_game_collection_refresh_item.xml | 10 +- app/src/main/res/layout/home_game_item.xml | 10 +- .../main/res/layout/home_slide_card_item.xml | 8 +- .../res/layout/home_sub_slide_list_item.xml | 2 +- app/src/main/res/layout/home_unknown_item.xml | 2 +- .../main/res/layout/horizontal_forum_item.xml | 4 +- .../main/res/layout/imprint_content_item.xml | 6 +- .../res/layout/interested_game_type_item.xml | 2 +- .../layout/item_article_detail_comment.xml | 54 ++++---- .../item_article_detail_comment_empty.xml | 6 +- .../item_article_detail_comment_footer.xml | 2 +- .../item_article_detail_comment_pager.xml | 8 +- .../layout/item_article_detail_content.xml | 28 ++-- .../item_article_detail_related_content.xml | 6 +- .../main/res/layout/item_blank_divider.xml | 2 +- app/src/main/res/layout/item_category.xml | 2 +- app/src/main/res/layout/item_choose_games.xml | 12 +- .../res/layout/item_choose_section_dialog.xml | 2 +- .../res/layout/item_comment_edit_image.xml | 2 +- .../main/res/layout/item_detail_more_menu.xml | 2 +- .../res/layout/item_device_remind_banner.xml | 2 +- app/src/main/res/layout/item_filter_size.xml | 2 +- .../main/res/layout/item_followed_game.xml | 6 +- .../res/layout/item_forum_article_head.xml | 8 +- app/src/main/res/layout/item_forum_video.xml | 8 +- .../layout/item_game_collection_filter.xml | 6 +- .../layout/item_game_collection_hot_list.xml | 14 +- .../item_game_collection_player_creation.xml | 24 ++-- ...game_collection_player_creation_header.xml | 4 +- .../res/layout/item_game_detail_big_event.xml | 4 +- .../layout/item_game_detail_comment_more.xml | 2 +- .../res/layout/item_game_detail_game_tag.xml | 2 +- .../item_game_detail_latest_service.xml | 4 +- .../main/res/layout/item_game_detail_news.xml | 4 +- .../item_game_detail_rating_comment.xml | 16 +-- .../item_game_detail_related_version.xml | 6 +- app/src/main/res/layout/item_game_info.xml | 10 +- app/src/main/res/layout/item_game_libao.xml | 8 +- app/src/main/res/layout/item_game_raiders.xml | 8 +- .../layout/item_game_raiders_fixed_top.xml | 4 +- .../main/res/layout/item_game_save_list.xml | 2 +- .../item_game_server_test_big_image.xml | 10 +- .../res/layout/item_game_server_test_time.xml | 4 +- .../res/layout/item_game_upload_label.xml | 2 +- .../res/layout/item_halo_personal_func.xml | 2 +- app/src/main/res/layout/item_history_apk.xml | 8 +- ...em_home_game_collection_big_slide_card.xml | 4 +- ...me_game_collection_big_slide_card_game.xml | 6 +- ..._home_game_collection_small_slide_card.xml | 10 +- .../layout/item_home_game_test_v2_item.xml | 8 +- ...item_home_game_test_v2_recommend_label.xml | 2 +- .../item_home_horizontal_slide_video.xml | 6 +- .../res/layout/item_home_recent_vgame.xml | 6 +- .../layout/item_home_recommend_list_item.xml | 2 +- .../main/res/layout/item_moderator_task.xml | 4 +- app/src/main/res/layout/item_my_archive.xml | 8 +- .../main/res/layout/item_my_game_rating.xml | 14 +- .../main/res/layout/item_my_share_archive.xml | 10 +- .../res/layout/item_personal_recommend.xml | 8 +- .../res/layout/item_recommend_interest.xml | 10 +- .../layout/item_recommend_interest_footer.xml | 4 +- .../layout/item_recommend_interest_image.xml | 2 +- .../main/res/layout/item_report_reason.xml | 2 +- .../item_skeleton_article_detail_comment.xml | 4 +- .../main/res/layout/item_test_server_text.xml | 4 +- app/src/main/res/layout/item_toolbox.xml | 6 +- .../main/res/layout/item_updatable_game.xml | 6 +- .../res/layout/item_updatable_game_header.xml | 4 +- .../layout/item_updatable_other_game_hint.xml | 2 +- app/src/main/res/layout/item_user_auth.xml | 12 +- .../res/layout/item_user_comment_history.xml | 10 +- .../main/res/layout/item_vfeedback_option.xml | 2 +- .../layout/item_vgame_download_manager.xml | 4 +- .../main/res/layout/item_video_data_chart.xml | 4 +- .../res/layout/item_video_data_overview.xml | 38 ++--- .../main/res/layout/item_video_desc_top.xml | 18 +-- .../main/res/layout/kaifu_add_item_title.xml | 6 +- app/src/main/res/layout/kaifu_item_time.xml | 4 +- .../res/layout/kaifu_new_add_item_title.xml | 6 +- .../layout/layout_add_kaifu_popup_item.xml | 4 +- .../layout_article_detail_comment_list.xml | 2 +- .../main/res/layout/layout_config_filter.xml | 2 +- .../layout/layout_dialog_panel_titlebar.xml | 2 +- app/src/main/res/layout/layout_filter.xml | 2 +- .../main/res/layout/layout_filter_size.xml | 2 +- .../layout_game_collection_auth_tag.xml | 2 +- .../layout_game_collection_filter_guide.xml | 2 +- .../layout_game_detail_content_card_large.xml | 2 +- .../layout_game_detail_content_card_small.xml | 2 +- .../layout_game_detail_recommend_view.xml | 4 +- .../res/layout/layout_menu_article_detail.xml | 2 +- .../layout/layout_menu_article_publish.xml | 2 +- .../layout/layout_menu_cloud_save_manager.xml | 2 +- .../layout/layout_menu_download_manager.xml | 2 +- .../res/layout/layout_menu_game_comment.xml | 2 +- .../main/res/layout/layout_menu_manage.xml | 2 +- .../res/layout/layout_menu_my_ask_draft.xml | 2 +- .../main/res/layout/layout_menu_my_post.xml | 2 +- app/src/main/res/layout/layout_menu_post.xml | 2 +- .../layout_menu_question_and_answer.xml | 2 +- app/src/main/res/layout/layout_menu_reset.xml | 2 +- app/src/main/res/layout/layout_menu_save.xml | 2 +- .../layout_menu_simulator_uninstall.xml | 4 +- app/src/main/res/layout/layout_menu_text.xml | 2 +- .../res/layout/layout_multi_input_item.xml | 8 +- .../res/layout/layout_personal_other_item.xml | 8 +- .../layout/layout_popup_discovery_dislike.xml | 2 +- .../res/layout/layout_popup_option_item.xml | 2 +- .../res/layout/layout_qgame_search_bar.xml | 8 +- app/src/main/res/layout/layout_search_bar.xml | 8 +- .../layout/layout_search_game_content_tag.xml | 2 +- .../res/layout/layout_selected_category.xml | 2 +- .../res/layout/layout_setting_des_item.xml | 2 +- .../main/res/layout/layout_setting_item.xml | 8 +- .../res/layout/layout_single_input_item.xml | 8 +- .../main/res/layout/layout_subject_head.xml | 2 +- .../layout/layout_video_detail_surface.xml | 4 +- app/src/main/res/layout/libao_code_item.xml | 4 +- app/src/main/res/layout/libao_item.xml | 10 +- .../res/layout/libaodetail_item_content.xml | 22 +-- .../main/res/layout/libaodetail_item_top.xml | 6 +- .../main/res/layout/moderator_list_item.xml | 6 +- app/src/main/res/layout/new_comment_item.xml | 20 +-- .../main/res/layout/news_detail_comment.xml | 2 +- .../main/res/layout/news_detail_skeleton.xml | 20 +-- .../res/layout/newsdetail_item_comment.xml | 2 +- .../res/layout/newsdetail_item_content.xml | 2 +- .../main/res/layout/newsdetail_item_game.xml | 2 +- .../main/res/layout/official_forum_item.xml | 2 +- .../main/res/layout/package_check_item.xml | 4 +- .../main/res/layout/personal_home_rating.xml | 6 +- .../personality_background_fragment.xml | 6 +- .../piece_article_detail_comment_filter.xml | 12 +- .../layout/piece_article_input_container.xml | 14 +- .../layout/piece_comment_typing_container.xml | 6 +- .../piece_comment_typing_container_dark.xml | 2 +- .../piece_community_vote_and_comment.xml | 8 +- .../res/layout/piece_question_content.xml | 2 +- .../main/res/layout/piece_setting_divider.xml | 4 +- .../layout/popup_accelerate_notification.xml | 8 +- .../res/layout/popup_filter_game_type.xml | 8 +- .../main/res/layout/popup_history_option.xml | 6 +- .../main/res/layout/popup_server_category.xml | 4 +- .../res/layout/popup_server_category_item.xml | 4 +- .../main/res/layout/popup_server_status.xml | 10 +- app/src/main/res/layout/popup_server_time.xml | 6 +- .../res/layout/popup_simulator_option.xml | 6 +- .../res/layout/popup_simulator_uninstall.xml | 4 +- app/src/main/res/layout/popup_test_time.xml | 10 +- .../main/res/layout/popup_user_home_more.xml | 4 +- app/src/main/res/layout/privacy_item.xml | 4 +- .../question_edit_title_search_item.xml | 2 +- .../res/layout/questioninvite_header_item.xml | 2 +- .../main/res/layout/questions_edit_tag.xml | 6 +- .../res/layout/questionsdedit_tag_item.xml | 2 +- .../main/res/layout/questionsdetail_item.xml | 24 ++-- .../main/res/layout/questionsinvite_item.xml | 10 +- .../main/res/layout/rank_collection_item.xml | 4 +- app/src/main/res/layout/rank_game_item.xml | 2 +- .../main/res/layout/rating_comment_item.xml | 30 ++-- app/src/main/res/layout/rating_item.xml | 32 ++--- .../res/layout/rating_reply_head_item.xml | 8 +- .../res/layout/search_default_rank_item.xml | 2 +- .../res/layout/search_game_index_item.xml | 4 +- .../main/res/layout/search_subject_item.xml | 4 +- .../main/res/layout/simulator_header_view.xml | 6 +- app/src/main/res/layout/simulator_item.xml | 6 +- .../main/res/layout/stairs_comment_item.xml | 10 +- app/src/main/res/layout/sub_catalog_item.xml | 4 +- app/src/main/res/layout/sub_category_item.xml | 2 +- app/src/main/res/layout/toolbar_shadow.xml | 2 +- .../main/res/layout/toolbox_block_item.xml | 6 +- app/src/main/res/layout/toolbox_item.xml | 6 +- .../main/res/layout/user_search_list_item.xml | 12 +- app/src/main/res/layout/video_albums_item.xml | 8 +- app/src/main/res/layout/video_label_item.xml | 6 +- app/src/main/res/layout/video_new_item.xml | 6 +- app/src/main/res/layout/video_verify_item.xml | 2 +- .../main/res/layout/view_simple_toggle.xml | 4 +- app/src/main/res/layout/vote_item.xml | 12 +- app/src/main/res/values-night/colors.xml | 2 +- app/src/main/res/values-night/styles.xml | 26 ++-- app/src/main/res/values/colors.xml | 6 +- app/src/main/res/values/styles.xml | 24 ++-- .../qa_feedback_rg_button_checked.xml | 2 +- .../view/help/HelpAndFeedbackFragment.kt | 14 +- .../feedback/view/help/HelpCategoryAdapter.kt | 2 +- .../feedback/view/help/HelpVideoAdapter.kt | 4 +- .../feedback/view/qa/HelpContainerFragment.kt | 4 +- .../feedback/view/qa/HelpContentAdapter.kt | 9 +- .../feedback/view/qa/HelpItemViewHolder.kt | 2 +- .../feedback/view/qa/HelpQaDefaultAdapter.kt | 6 +- .../feedback/view/qa/HelpQaDefaultFragment.kt | 2 +- .../gamecenter/feedback/view/qa/QaActivity.kt | 4 +- .../view/qa/QaFeedbackDialogFragment.kt | 10 +- .../view/qa/QaFeedbackReasonAdapter.kt | 4 +- .../view/suggest/SuggestAppFragment.kt | 6 +- .../view/suggest/SuggestCopyrightFragment.kt | 8 +- .../view/suggest/SuggestGameFragment.kt | 4 +- .../view/suggest/SuggestionActivity.kt | 2 +- .../view/suggest/SuggestionCategoryAdapter.kt | 6 +- .../suggest/SuggestionCategoryFragment.kt | 2 +- .../copyright_identity_rg_button_selector.xml | 4 +- .../drawable/border_round_stroke_eee_4.xml | 4 +- .../drawable/border_round_stroke_eee_8.xml | 4 +- .../src/main/res/drawable/icon_close.xml | 2 +- .../src/main/res/drawable/icon_menu.xml | 2 +- .../main/res/drawable/icon_my_selected.xml | 4 +- .../main/res/drawable/icon_my_unselected.xml | 4 +- .../qa_feedback_rg_button_checked.xml | 4 +- .../drawable/qa_feedback_rg_button_normal.xml | 4 +- .../main/res/layout/dialog_qa_feedback.xml | 10 +- .../res/layout/fragment_help_and_feedback.xml | 26 ++-- .../res/layout/fragment_help_contaier.xml | 10 +- .../main/res/layout/fragment_help_content.xml | 2 +- .../main/res/layout/fragment_qa_category.xml | 2 +- .../main/res/layout/fragment_suggest_app.xml | 4 +- .../res/layout/fragment_suggest_copyright.xml | 6 +- .../res/layout/fragment_suggest_function.xml | 4 +- .../main/res/layout/fragment_suggest_game.xml | 4 +- .../res/layout/fragment_suggest_update.xml | 4 +- .../main/res/layout/fragment_suggestion.xml | 6 +- .../src/main/res/layout/help_item.xml | 2 +- .../main/res/layout/help_qa_category_item.xml | 10 +- .../src/main/res/layout/help_qa_item.xml | 2 +- .../main/res/layout/item_help_recommend.xml | 4 +- .../src/main/res/layout/item_help_video.xml | 6 +- .../main/res/layout/item_suggest_contact.xml | 10 +- .../main/res/layout/item_suggest_flexbox.xml | 6 +- .../layout/item_suggest_input_multi_line.xml | 10 +- .../layout/item_suggest_input_single_line.xml | 8 +- .../main/res/layout/item_suggest_select.xml | 6 +- .../res/layout/item_suggest_upload_pic.xml | 6 +- .../src/main/res/layout/item_suggestion.xml | 6 +- .../res/layout/layout_option_popup_item.xml | 4 +- .../java/com/lg/realname/RealNameDialog.kt | 4 +- .../main/res/drawable/bg_blue_radius_20.xml | 2 +- .../res/layout/dialog_input_real_name.xml | 12 +- .../src/main/res/layout/dialog_real_name.xml | 6 +- .../src/main/res/layout/dialog_tip.xml | 2 +- .../src/main/res/values/colors.xml | 18 --- .../common/base/activity/BaseActivity.java | 10 +- .../base/activity/BaseActivity_TabLayout.java | 4 +- .../common/base/activity/ToolBarActivity.java | 4 +- .../base/fragment/BaseFragment_TabLayout.java | 6 +- .../base/fragment/BaseLazyTabFragment.kt | 2 +- .../common/baselist/LazyListFragment.java | 2 +- .../common/baselist/ListActivity.java | 2 +- .../common/baselist/ListFragment.java | 4 +- .../gamecenter/common/utils/DialogHelper.kt | 10 +- .../gh/gamecenter/common/utils/Extensions.kt | 8 +- .../common/utils/PermissionHelper.kt | 8 +- .../gh/gamecenter/common/utils/TextHelper.kt | 6 +- .../common/view/CircleProgressBar.java | 9 +- .../gamecenter/common/view/CustomSeekBar.kt | 3 +- .../common/view/ExpandAndCloseTextView.java | 2 +- .../common/view/ExpandTextView.java | 4 +- .../common/view/HighlightableTextView.kt | 2 +- .../common/view/SegmentedFilterView.kt | 5 +- .../common/view/TabIndicatorView.java | 2 +- .../common/view/VerticalItemDecoration.java | 4 +- .../game_server_test_rg_button_selector.xml | 4 +- .../color/game_upload_rg_button_selector.xml | 2 +- .../res/color/line_axis_text_selector.xml | 4 +- .../src/main/res/color/text_tabbar_style.xml | 10 +- .../main/res/drawable/actionbar_search_bg.xml | 2 +- .../res/drawable/ask_tab_indicator_bg.xml | 2 +- .../background_shape_radius_8_top_only.xml | 2 +- .../res/drawable/background_shape_white.xml | 2 +- ...kground_shape_white_radius_12_top_only.xml | 2 +- ...kground_shape_white_radius_16_top_only.xml | 2 +- .../background_shape_white_radius_4.xml | 2 +- .../background_shape_white_radius_5.xml | 2 +- ...ground_shape_white_radius_5_bottm_only.xml | 2 +- ...ckground_shape_white_radius_5_top_only.xml | 2 +- .../background_shape_white_radius_6.xml | 2 +- ...round_shape_white_radius_6_bottom_only.xml | 2 +- ...ckground_shape_white_radius_6_top_only.xml | 2 +- .../background_shape_white_radius_8.xml | 2 +- ...round_shape_white_radius_8_bottom_only.xml | 2 +- ...ckground_shape_white_radius_8_top_only.xml | 2 +- .../background_shape_white_radius_999.xml | 2 +- .../src/main/res/drawable/bg_ad_label.xml | 2 +- .../drawable/bg_choose_option_selector.xml | 2 +- .../res/drawable/bg_gradient_radius_20.xml | 2 +- .../bg_notification_open_btn_style_2.xml | 2 +- ...bg_shape_background_space_2_radius_999.xml | 2 +- .../res/drawable/bg_shape_f5_radius_8.xml | 2 +- .../res/drawable/bg_shape_f5_radius_999.xml | 2 +- .../drawable/bg_shape_space2_radius_999.xml | 2 +- .../res/drawable/bg_shape_space_radius_8.xml | 2 +- .../bg_shape_text_subtitledesc_radius_999.xml | 2 +- .../bg_shape_theme_font_radius_999.xml | 2 +- .../drawable/bg_shape_theme_radius_999.xml | 2 +- .../res/drawable/bg_shape_white_radius_8.xml | 2 +- .../src/main/res/drawable/bg_share_dialog.xml | 2 +- .../main/res/drawable/button_blue_oval.xml | 2 +- .../main/res/drawable/button_round_f5f5f5.xml | 2 +- .../drawable/button_round_theme_alpha_10.xml | 2 +- .../src/main/res/drawable/cursor_color.xml | 2 +- .../drawable/divider_item_line_space_16.xml | 4 +- .../divider_item_line_space_16_h_1px.xml | 4 +- .../drawable/download_button_normal_style.xml | 2 +- .../res/drawable/download_oval_hint_up.xml | 2 +- .../main/res/drawable/ic_all_tabs_close.xml | 4 +- .../src/main/res/drawable/ic_bar_back.xml | 2 +- .../src/main/res/drawable/ic_dialog_close.xml | 2 +- .../res/drawable/ic_icon_star_ratting.xml | 2 +- .../main/res/drawable/ic_search_bar_clear.xml | 2 +- .../main/res/drawable/icon_input_close.xml | 2 +- .../main/res/drawable/icon_section_more.xml | 6 +- .../main/res/drawable/message_unread_hint.xml | 2 +- .../src/main/res/drawable/news_search_btn.xml | 2 +- .../src/main/res/drawable/oval_f5_bg.xml | 2 +- .../drawable/oval_line_axis_dot_selected.xml | 2 +- .../res/drawable/oval_message_hint_bg.xml | 2 +- .../main/res/drawable/popup_divider_line.xml | 4 +- .../drawable/reuse_listview_item_style.xml | 2 +- .../main/res/drawable/suggest_pic_delete.xml | 2 +- .../main/res/drawable/textview_white_dn.xml | 2 +- .../main/res/drawable/textview_white_up.xml | 2 +- .../main/res/drawable/toolbar_search_icon.xml | 2 +- .../activity_tablayout_no_title_viewpager.xml | 2 +- .../layout/activity_tablayout_viewpager.xml | 4 +- .../activity_video_tablayout_viewpager.xml | 2 +- .../src/main/res/layout/dialog_alert.xml | 6 +- .../main/res/layout/dialog_alert_default.xml | 14 +- .../src/main/res/layout/dialog_guide.xml | 10 +- .../src/main/res/layout/dialog_notice.xml | 8 +- .../res/layout/dialog_notification_hint.xml | 4 +- .../src/main/res/layout/dialog_progress.xml | 2 +- .../src/main/res/layout/fragment_download.xml | 4 +- .../main/res/layout/fragment_list_base.xml | 2 +- .../layout/fragment_tablayout_viewpager.xml | 4 +- .../src/main/res/layout/item_icon_tab.xml | 2 +- .../res/layout/layout_popup_container.xml | 2 +- .../src/main/res/layout/popup_all_tabs.xml | 4 +- .../main/res/layout/popup_share_dialog.xml | 16 +-- .../main/res/layout/reuse_data_exception.xml | 4 +- .../main/res/layout/reuse_no_connection.xml | 4 +- .../src/main/res/layout/reuse_none_data.xml | 8 +- .../src/main/res/layout/reuse_toolbar.xml | 2 +- .../main/res/layout/share_popup_layout.xml | 2 +- .../src/main/res/layout/toolbar_search.xml | 8 +- .../main/res/layout/view_line_axis_filter.xml | 2 +- .../src/main/res/values-night/colors.xml | 130 ++++++++++-------- .../src/main/res/values-night/style.xml | 8 +- module_common/src/main/res/values/colors.xml | 121 ++++++++-------- module_common/src/main/res/values/style.xml | 64 ++++++++- .../adapter/MyConcernRecommendAdapter.java | 2 +- .../feature/game/GameItemViewHolder.kt | 14 +- .../feature/game/SelectGameAdapter.java | 2 +- .../feature/game/SuggestSelectGameAdapter.kt | 2 +- .../feature/utils/PlatformUtils.java | 2 +- .../gamecenter/feature/view/DownloadButton.kt | 16 +-- .../bg_advance_download_game_subtitle.xml | 4 +- .../res/drawable/bg_shape_f5_radius_4.xml | 2 +- .../drawable/button_normal_round_border.xml | 2 +- .../drawable/button_round_border_eeeeee.xml | 2 +- .../detail_downloading_normal_style.xml | 6 +- .../drawable/game_item_btn_download_dn.xml | 2 +- .../src/main/res/layout/concern_item.xml | 2 +- .../main/res/layout/dialog_manual_input.xml | 14 +- .../main/res/layout/dialog_select_game.xml | 6 +- .../res/layout/dialog_select_game_item.xml | 2 +- .../src/main/res/layout/game_item.xml | 12 +- .../src/main/res/layout/news_digest_item.xml | 6 +- .../qa_feedback_rg_button_checked.xml | 2 +- .../gh/gamecenter/login/utils/DialogHelper.kt | 6 +- .../login/utils/QuickLoginHelper.kt | 10 +- .../gamecenter/login/view/LoginFragment.java | 8 +- .../src/main/res/drawable/bg_login_edit.xml | 2 +- .../drawable/bg_quick_login_third_party.xml | 4 +- .../src/main/res/drawable/ic_login_close.xml | 2 +- .../src/main/res/layout/fragment_login.xml | 26 ++-- .../main/res/layout/layout_quick_login.xml | 4 +- .../layout/layout_quick_login_navigation.xml | 2 +- .../message/view/KeFuFragmentAdapter.java | 6 +- .../message/view/MessageActivity.kt | 4 +- .../gamecenter/message/view/MessageAdapter.kt | 6 +- .../message/view/MessageInviteActivity.kt | 4 +- .../message/view/MessageKeFuActivity.kt | 4 +- .../message/view/MessageVoteActivity.kt | 4 +- .../message/view/MessageWrapperActivity.kt | 6 +- .../message/view/concern/ConcernAdapter.java | 4 +- .../message/view/concern/ConcernFragment.java | 12 +- .../view/concern/ConcernInfoActivity.java | 4 +- .../view/message/MessageItemViewHolder.java | 18 +-- .../view/message/MessageListActivity.kt | 4 +- .../view/message/MessageListAdapter.kt | 6 +- .../view/message/SortedMessageListAdapter.kt | 6 +- .../view/message/SortedMessageListFragment.kt | 4 +- .../src/main/res/drawable/ic_clean_unread.xml | 6 +- .../drawable/shape_message_unread_hint.xml | 2 +- .../sorted_message_top_item_style.xml | 2 +- .../res/layout/activity_message_wrapper.xml | 2 +- .../res/layout/dialog_ask_follow_more.xml | 6 +- .../layout/dialog_sorted_message_action.xml | 22 +-- .../main/res/layout/fragment_info_concern.xml | 4 +- .../main/res/layout/item_ask_follow_more.xml | 2 +- .../main/res/layout/item_sorted_message.xml | 8 +- .../src/main/res/layout/message_item.xml | 12 +- .../src/main/res/layout/message_item_top.xml | 6 +- .../src/main/res/layout/message_kefu_item.xml | 4 +- .../src/main/res/layout/message_tab_item.xml | 2 +- .../setting/view/AboutActivity.java | 4 +- .../gamecenter/setting/view/AboutFragment.kt | 8 +- .../view/GameDownloadSettingActivity.kt | 4 +- .../view/GameDownloadSettingFragment.kt | 2 +- .../setting/view/NetworkDiagnosisActivity.kt | 2 +- .../setting/view/SettingActivity.kt | 4 +- .../setting/view/SettingsFragment.kt | 6 +- .../setting/view/VideoSettingActivity.kt | 4 +- .../setting/view/VideoSettingFragment.kt | 2 +- .../view/security/BindPhoneActivity.kt | 4 +- .../view/security/BindPhoneFragment.kt | 6 +- .../setting/view/security/SecurityActivity.kt | 4 +- .../res/drawable/bg_hint_red_radius_999.xml | 2 +- .../res/drawable/button_border_blue_oval.xml | 2 +- .../res/layout/activity_network_diagnosis.xml | 2 +- .../main/res/layout/dialog_conflict_guide.xml | 6 +- .../main/res/layout/fragment_bind_phone.xml | 28 ++-- .../layout/fragment_bind_phone_conflict.xml | 28 ++-- .../src/main/res/layout/fragment_security.xml | 6 +- .../src/main/res/layout/fragment_setting.xml | 2 +- .../main/res/layout/layout_setting_item.xml | 8 +- .../res/layout/layout_setting_title_item.xml | 2 +- .../main/res/layout/piece_setting_divider.xml | 4 +- .../activity/ComposeBindPhoneActivity.kt | 3 +- .../activity/ComposeSettingActivity.kt | 4 +- .../activity/NetworkDiagnosisActivity.kt | 2 +- .../compose/base/ComposeBaseActivity.kt | 2 +- .../res/drawable/button_border_blue_oval.xml | 2 +- .../src/main/res/drawable/ic_bar_back.xml | 2 +- .../res/layout/activity_network_diagnosis.xml | 2 +- .../src/main/res/values-night/themes.xml | 2 +- .../src/main/res/values/themes.xml | 2 +- 1366 files changed, 4461 insertions(+), 4449 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index 68f5b20bdb..40e0409e60 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -233,7 +233,7 @@ abstract class BaseRichEditorActivity : ToolBarAct mKeyboardHeightProvider = KeyboardHeightProvider(this) mRichEditor.post { mKeyboardHeightProvider?.start() } mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this)) - mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this)) + mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this)) mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A")) // 防止个别手机在Js里无法获取粘贴内容 mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener") @@ -797,9 +797,9 @@ abstract class BaseRichEditorActivity : ToolBarAct override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this)) - mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this)) + mRichEditor.setEditorBackgroundColor(R.color.ui_surface.toColor(this)) mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A")) } diff --git a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt index 722297d0f3..c3b23771b2 100644 --- a/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt +++ b/app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt @@ -120,13 +120,13 @@ object AddKaiFuBindingAdapter { @BindingAdapter("kaiFuTextColor", "kaiFuTextPosition") fun kaiFuTextColor(view: EditText, dataMark: Int, position: Int) { if (dataMark == 1 && view.id == R.id.kaifu_add_time || dataMark == 2 && view.id == R.id.kaifu_add_first_name || dataMark == 3 && view.id == R.id.kaifu_add_server_name || dataMark == 4) { - view.setTextColor(ContextCompat.getColor(view.context, R.color.theme_red)) - view.setHintTextColor(ContextCompat.getColor(view.context, R.color.theme_red)) + view.setTextColor(ContextCompat.getColor(view.context, R.color.secondary_red)) + view.setHintTextColor(ContextCompat.getColor(view.context, R.color.secondary_red)) } else if (position == 0) { view.setTextColor(ContextCompat.getColor(view.context, R.color.hint)) view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint)) } else { - view.setTextColor(ContextCompat.getColor(view.context, R.color.text_title)) + view.setTextColor(ContextCompat.getColor(view.context, R.color.text_primary)) view.setHintTextColor(ContextCompat.getColor(view.context, R.color.hint)) } } 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 c3208c4da3..fbd93c9683 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -141,7 +141,7 @@ public class BindingAdapters { for (int i = 0; i < list.size() + 1; i++) { // 1 is Title View inflate = LayoutInflater.from(view.getContext()).inflate(R.layout.kaifu_detail_item_row, null); KaifuDetailItemRowBinding binding = KaifuDetailItemRowBinding.bind(inflate); - binding.getRoot().setBackgroundColor(isReadyPatch != null && isReadyPatch ? ExtensionsKt.toColor(R.color.theme) : ExtensionsKt.toColor(R.color.white)); + binding.getRoot().setBackgroundColor(isReadyPatch != null && isReadyPatch ? ExtensionsKt.toColor(R.color.primary_theme) : ExtensionsKt.toColor(R.color.white)); binding.getRoot().setPadding(DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), DisplayUtils.dip2px(1), i == list.size() ? DisplayUtils.dip2px(1) : 0); ServerCalendarEntity serverEntity = list.get(i - 1); binding.timeTv.setText(i == 0 ? "时间" : serverEntity.getFormatTime("HH:mm")); @@ -895,7 +895,7 @@ public class BindingAdapters { view.setText(count + ""); } else { ExtensionsKt.removeDrawable(view); - view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_subtitleDesc)); + view.setTextColor(ContextCompat.getColor(view.getContext(), R.color.text_tertiary)); view.setText("-"); } } diff --git a/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt index 0a5a826b64..b2795a5a5c 100644 --- a/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt @@ -49,7 +49,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() { requireContext(), startText.length, startText.length + mGroupNumber.length, - R.color.theme_font, + R.color.text_theme, true ) { DirectUtils.directToQqGroup( diff --git a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt index 9722e0bdc9..da5cda14d6 100644 --- a/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt @@ -60,7 +60,7 @@ class GameOffServiceDialogFragment : BaseDialogFragment() { if (index == notEmptySite.size - 1) bottomMargin = 8F.dip2px() } siteTv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14F) - siteTv.setTextColor(R.color.theme_font.toColor(requireContext())) + siteTv.setTextColor(R.color.text_theme.toColor(requireContext())) siteTv.text = site.text siteTv.paintFlags = siteTv.paintFlags or Paint.UNDERLINE_TEXT_FLAG siteTv.setOnClickListener { diff --git a/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt index f57542d266..22659e0e52 100644 --- a/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/NewPrivacyPolicyDialogFragment.kt @@ -76,7 +76,7 @@ class NewPrivacyPolicyDialogFragment : BaseDialogFragment() { contentText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font) + ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme) ds.isUnderlineText = false } diff --git a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt index a6579e4d1b..73bae0cc46 100644 --- a/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt @@ -125,7 +125,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() { requireContext(), 0, (link.title ?: "").length, - R.color.theme_font, + R.color.text_theme, true ) { LogUtils.uploadPackageCheck( @@ -391,10 +391,10 @@ class PackageCheckDialogFragment : BaseDialogFragment() { val isAllInstalled = checkDetectionsInstalled(mAllInstalledPackages, entity.packages) if (isAllInstalled) { holder.binding.statusTv.text = "已安装" - holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font)) + holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme)) } else { holder.binding.statusTv.text = "未安装" - holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.theme_red)) + holder.binding.statusTv.setTextColor(ContextCompat.getColor(context, R.color.secondary_red)) } holder.binding.statusTv.visibility = View.VISIBLE } else { diff --git a/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt b/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt index e98b9c93d0..c65b8a7e48 100644 --- a/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt +++ b/app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt @@ -59,7 +59,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() { skipText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font) + ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme) ds.isUnderlineText = false } @@ -101,7 +101,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() { skipText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font) + ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme) ds.isUnderlineText = false } @@ -115,7 +115,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() { skipText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = ContextCompat.getColor(requireContext(), R.color.theme_font) + ds.color = ContextCompat.getColor(requireContext(), R.color.text_theme) ds.isUnderlineText = false } diff --git a/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt b/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt index 5e11cc54d6..61fcd47696 100644 --- a/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt +++ b/app/src/main/java/com/gh/common/simulator/NewSimulatorGameManager.kt @@ -91,7 +91,7 @@ object NewSimulatorGameManager { }, uiModificationCallback = { binding -> binding.contentTv.gravity = Gravity.START - binding.contentTv.setTextColor(R.color.text_subtitle.toColor(context)) + binding.contentTv.setTextColor(R.color.text_secondary.toColor(context)) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) diff --git a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt index 0413f8d37d..bbde2bb380 100644 --- a/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt +++ b/app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt @@ -395,7 +395,7 @@ class SimulatorDownloadManager private constructor() { ToastUtils.showToast("该模拟器暂未提供下载") }, uiModificationCallback = { binding -> - binding.confirmTv.setTextColor(R.color.text_body.toColor(context)) + binding.confirmTv.setTextColor(R.color.text_instance.toColor(context)) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) diff --git a/app/src/main/java/com/gh/common/util/BbsReportHelper.kt b/app/src/main/java/com/gh/common/util/BbsReportHelper.kt index 3ccdc7ab91..3173e52ced 100644 --- a/app/src/main/java/com/gh/common/util/BbsReportHelper.kt +++ b/app/src/main/java/com/gh/common/util/BbsReportHelper.kt @@ -64,7 +64,7 @@ object BbsReportHelper { this, 1f, false, - R.color.background + R.color.ui_background ) ) binding.reasonRv.adapter = reportReasonAdapter @@ -94,7 +94,7 @@ object BbsReportHelper { binding.otherReasonEt.doOnTextChanged { text, start, before, count -> val tvCount: Int = text.toString().length if (tvCount >= 500) { - binding.tvCount.setTextColor(R.color.theme_red.toColor(binding.tvCount.context)) + binding.tvCount.setTextColor(R.color.secondary_red.toColor(binding.tvCount.context)) } binding.tvCount.text = "$tvCount/500" } diff --git a/app/src/main/java/com/gh/common/util/CommentUtils.java b/app/src/main/java/com/gh/common/util/CommentUtils.java index e8b6cc7978..86d52d3aaf 100644 --- a/app/src/main/java/com/gh/common/util/CommentUtils.java +++ b/app/src/main/java/com/gh/common/util/CommentUtils.java @@ -198,7 +198,7 @@ public class CommentUtils { LinearLayout container = new LinearLayout(context); container.setOrientation(LinearLayout.VERTICAL); container.setPadding(0, DisplayUtils.dip2px(context, 12), 0, DisplayUtils.dip2px(context, 12)); - container.setBackgroundColor(ContextCompat.getColor(context, R.color.background_white)); + container.setBackgroundColor(ContextCompat.getColor(context, R.color.ui_surface)); for (final String s : arrReportType) { TextView reportTypeTv = new TextView(context); @@ -248,12 +248,12 @@ public class CommentUtils { public static void postVote(final Context context, final CommentEntity commentEntity, final TextView commentLikeCountTv, final ImageView commentLikeIv, final OnVoteListener listener) { - if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme_font)) { + if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) { ToastUtils.INSTANCE.showToast("已经点过赞啦！"); return; } commentEntity.setVote(commentEntity.getVote() + 1); - commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font)); + commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme)); commentLikeIv.setImageResource(R.drawable.comment_vote_select); commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote())); commentLikeCountTv.setVisibility(View.VISIBLE); @@ -318,12 +318,12 @@ public class CommentUtils { entrance = "视频流-评论-点赞"; } CheckLoginUtils.checkLogin(context, entrance, () -> { - if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.theme_font)) { + if (commentLikeCountTv.getCurrentTextColor() == ContextCompat.getColor(context, R.color.text_theme)) { ToastUtils.INSTANCE.showToast("已经点过赞啦！"); return; } commentEntity.setVote(commentEntity.getVote() + 1); - commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font)); + commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme)); commentLikeIv.setImageResource(R.drawable.comment_vote_select); commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote())); commentLikeCountTv.setVisibility(View.VISIBLE); @@ -444,7 +444,7 @@ public class CommentUtils { public void onFailure(@Nullable HttpException e) { super.onFailure(e); commentEntity.setVote(commentEntity.getVote() + 1); - commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font)); + commentLikeCountTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme)); commentLikeIv.setImageResource(R.drawable.comment_vote_select); commentLikeCountTv.setText(NumberUtils.transSimpleCount(commentEntity.getVote())); commentLikeCountTv.setVisibility(View.VISIBLE); @@ -502,7 +502,7 @@ public class CommentUtils { holder.commentLikeCountTv.setVisibility(View.GONE); } else { // 检查是否已点赞 if (userDataEntity != null && (userDataEntity.isCommentVoted())) { - holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + holder.commentLikeCountTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); holder.commentLikeIv.setImageResource(R.drawable.comment_vote_select); } holder.commentLikeCountTv.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/gh/common/util/DialogUtils.java b/app/src/main/java/com/gh/common/util/DialogUtils.java index 13427c0540..a4349ae6ff 100644 --- a/app/src/main/java/com/gh/common/util/DialogUtils.java +++ b/app/src/main/java/com/gh/common/util/DialogUtils.java @@ -4,7 +4,6 @@ import android.annotation.SuppressLint; import android.app.Activity; import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -34,7 +33,6 @@ import android.widget.LinearLayout; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -406,7 +404,7 @@ public class DialogUtils { @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); - ds.setColor(ContextCompat.getColor(activityContext, R.color.theme_font)); + ds.setColor(ContextCompat.getColor(activityContext, R.color.text_theme)); ds.setUnderlineText(false); } @@ -421,7 +419,7 @@ public class DialogUtils { @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); - ds.setColor(ContextCompat.getColor(activityContext, R.color.theme_font)); + ds.setColor(ContextCompat.getColor(activityContext, R.color.text_theme)); ds.setUnderlineText(false); } @@ -547,8 +545,8 @@ public class DialogUtils { TextView negativeTv = contentView.findViewById(R.id.negative); TextView positiveTv = contentView.findViewById(R.id.positive); TextView content = contentView.findViewById(R.id.content); - positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.background, 999)); - negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.theme, 999)); + positiveTv.setBackground(DrawableView.getOvalDrawable(R.color.ui_background, 999)); + negativeTv.setBackground(DrawableView.getOvalDrawable(R.color.primary_theme, 999)); content.setText(Html.fromHtml(context.getString(R.string.video_upload_draft_dialog_content))); negativeTv.setOnClickListener(view -> { @@ -1251,7 +1249,7 @@ public class DialogUtils { DialogPackageParseErrorBinding binding = DialogPackageParseErrorBinding.inflate(LayoutInflater.from(context), null, false); Context finalContext = context; - SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.theme_font, true, new Function0() { + SpannableStringBuilder builder = new SpanBuilder("您也可以点击提交反馈跟我们联系").click(context, 6, 10, R.color.text_theme, true, new Function0() { @Override public Unit invoke() { SimpleGameEntity entity = new SimpleGameEntity(gameId, gameName, ""); @@ -1310,7 +1308,7 @@ public class DialogUtils { return null; }); binding.reasonRv.setLayoutManager(new LinearLayoutManager(context)); - binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.background)); + binding.reasonRv.addItemDecoration(new VerticalItemDecoration(context, 1F, false, R.color.ui_background)); binding.reasonRv.setAdapter(reportReasonAdapter); binding.negativeBtn.setOnClickListener(v -> { @@ -1332,7 +1330,7 @@ public class DialogUtils { ExtensionsKt.setTextChangedListener(binding.otherReasonEt, (s, start, before, count) -> { int tvCount = s.length(); if (tvCount >= 500) { - binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.theme_red)); + binding.tvCount.setTextColor(ContextCompat.getColor(finalContext, R.color.secondary_red)); } binding.tvCount.setText(tvCount + "/500"); return null; diff --git a/app/src/main/java/com/gh/common/util/ErrorHelper.kt b/app/src/main/java/com/gh/common/util/ErrorHelper.kt index cc185f36b4..3316e863d7 100644 --- a/app/src/main/java/com/gh/common/util/ErrorHelper.kt +++ b/app/src/main/java/com/gh/common/util/ErrorHelper.kt @@ -18,7 +18,6 @@ import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.entity.ErrorEntity import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.utils.SensorsBridge -import com.gh.gamecenter.login.user.LoginTag import com.halo.assistant.fragment.user.UserInfoEditFragment import com.halo.assistant.fragment.user.VerifyPhoneFragment import com.lightgame.utils.AppManager @@ -236,7 +235,7 @@ object ErrorHelper { ) } binding.hintTv.text = errorEntity.data?.text - binding.hintTv.setTextColor(R.color.theme_font.toColor(context)) + binding.hintTv.setTextColor(R.color.text_theme.toColor(context)) binding.hintTv.setOnClickListener { errorEntity.data?.toLinkEntity()?.let { entity -> DirectUtils.directToLinkPage(context, entity, "实名提醒弹窗", "") @@ -297,7 +296,7 @@ object ErrorHelper { ) } binding.hintTv.text = errorEntity.data?.text - binding.hintTv.setTextColor(R.color.theme_font.toColor(context)) + binding.hintTv.setTextColor(R.color.text_theme.toColor(context)) binding.hintTv.setOnClickListener { errorEntity.data?.toLinkEntity()?.let { entity -> DirectUtils.directToLinkPage(context, entity, "手机号验证", "") diff --git a/app/src/main/java/com/gh/common/util/LibaoUtils.java b/app/src/main/java/com/gh/common/util/LibaoUtils.java index ebd11ac94f..6e96f95649 100644 --- a/app/src/main/java/com/gh/common/util/LibaoUtils.java +++ b/app/src/main/java/com/gh/common/util/LibaoUtils.java @@ -183,12 +183,12 @@ public class LibaoUtils { case "coming": libaoBtn.setText(R.string.libao_coming); libaoBtn.setBackgroundResource(R.drawable.button_round_gray_light); - libaoBtn.setTextColor(context.getResources().getColor(R.color.text_subtitleDesc)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.text_tertiary)); break; case "used_up": libaoBtn.setText(R.string.libao_used_up); libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border); - libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme)); break; case "finish": libaoBtn.setText(R.string.libao_finish); @@ -198,12 +198,12 @@ public class LibaoUtils { case "linged": libaoBtn.setText(R.string.libao_linged); libaoBtn.setBackgroundResource(R.drawable.button_round_gray_light); - libaoBtn.setTextColor(context.getResources().getColor(R.color.text_subtitleDesc)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.text_tertiary)); break; case "taoed": libaoBtn.setText(R.string.libao_taoed); libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border); - libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme)); break; case "copy": libaoBtn.setText(R.string.libao_copy); @@ -213,13 +213,13 @@ public class LibaoUtils { case "repeatLinged": libaoBtn.setText(R.string.libao_repeat_ling); libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border); - libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme)); break; case "repeatTao": case "repeatTaoed": libaoBtn.setText(R.string.libao_repeat_tao); libaoBtn.setBackgroundResource(R.drawable.button_normal_round_border); - libaoBtn.setTextColor(context.getResources().getColor(R.color.theme_font)); + libaoBtn.setTextColor(context.getResources().getColor(R.color.text_theme)); break; case "unshelve": libaoBtn.setBackgroundResource(R.drawable.button_border_round_gray); diff --git a/app/src/main/java/com/gh/common/util/ReservationHelper.kt b/app/src/main/java/com/gh/common/util/ReservationHelper.kt index 1cc66011c1..0656e12dd3 100644 --- a/app/src/main/java/com/gh/common/util/ReservationHelper.kt +++ b/app/src/main/java/com/gh/common/util/ReservationHelper.kt @@ -163,7 +163,7 @@ object ReservationHelper { }, cancelClickCallback = { cancelListener?.onCancel() }, uiModificationCallback = { - it.confirmTv.setTextColor(R.color.theme_red.toColor(context)) + it.confirmTv.setTextColor(R.color.secondary_red.toColor(context)) }, extraConfig = DialogHelper.Config(centerContent = true, centerTitle = true) ) } diff --git a/app/src/main/java/com/gh/common/view/CatalogFilterView.kt b/app/src/main/java/com/gh/common/view/CatalogFilterView.kt index adee76f8d7..67229d0ade 100644 --- a/app/src/main/java/com/gh/common/view/CatalogFilterView.kt +++ b/app/src/main/java/com/gh/common/view/CatalogFilterView.kt @@ -95,7 +95,7 @@ class CatalogFilterView @JvmOverloads constructor( } private fun showSelectTypePopupWindow(containerView: View, typeTv: TextView, typeText: String) { - typeTv.setTextColor(R.color.theme_font.toColor(context)) + typeTv.setTextColor(R.color.text_theme.toColor(context)) typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up) val inflater = LayoutInflater.from(typeTv.context) @@ -152,7 +152,7 @@ class CatalogFilterView @JvmOverloads constructor( } private fun showSelectCatalogPopupWindow(containerView: View, catalogTv: TextView, catalogText: String) { - catalogTv.setTextColor(R.color.theme_font.toColor(context)) + catalogTv.setTextColor(R.color.text_theme.toColor(context)) catalogTv.setDrawableEnd(R.drawable.ic_filter_arrow_up) val inflater = LayoutInflater.from(catalogTv.context) @@ -211,7 +211,7 @@ class CatalogFilterView @JvmOverloads constructor( } private fun showSelectSizePopupWindow(containerView: View, sizeTv: TextView, sizeText: String) { - sizeTv.setTextColor(R.color.theme_font.toColor(context)) + sizeTv.setTextColor(R.color.text_theme.toColor(context)) sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up) val inflater = LayoutInflater.from(sizeTv.context) diff --git a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt index 0ea5eca177..7f71790e7a 100644 --- a/app/src/main/java/com/gh/common/view/CategoryFilterView.kt +++ b/app/src/main/java/com/gh/common/view/CategoryFilterView.kt @@ -90,7 +90,7 @@ class CategoryFilterView @JvmOverloads constructor( } private fun showSelectTypePopupWindow(containerView: View, typeTv: TextView, typeText: String) { - typeTv.setTextColor(R.color.theme_font.toColor(context)) + typeTv.setTextColor(R.color.text_theme.toColor(context)) typeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up) val inflater = LayoutInflater.from(typeTv.context) @@ -148,7 +148,7 @@ class CategoryFilterView @JvmOverloads constructor( } private fun showSelectSizePopupWindow(containerView: View, sizeTv: TextView, sizeText: String) { - sizeTv.setTextColor(R.color.theme_font.toColor(context)) + sizeTv.setTextColor(R.color.text_theme.toColor(context)) sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up) val inflater = LayoutInflater.from(sizeTv.context) diff --git a/app/src/main/java/com/gh/common/view/ConfigFilterView.kt b/app/src/main/java/com/gh/common/view/ConfigFilterView.kt index 7c5cd63417..5d873b8238 100644 --- a/app/src/main/java/com/gh/common/view/ConfigFilterView.kt +++ b/app/src/main/java/com/gh/common/view/ConfigFilterView.kt @@ -112,7 +112,7 @@ class ConfigFilterView @JvmOverloads constructor( } private fun showSelectionPopupWindow(containerView: View, sizeTv: TextView, sizeText: String) { - sizeTv.setTextColor(R.color.theme_font.toColor(sizeTv.context)) + sizeTv.setTextColor(R.color.text_theme.toColor(sizeTv.context)) sizeTv.setDrawableEnd(R.drawable.ic_filter_arrow_up) val inflater = LayoutInflater.from(sizeTv.context) diff --git a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java index af49db576a..53bb5ac118 100644 --- a/app/src/main/java/com/gh/common/view/DownloadProgressBar.java +++ b/app/src/main/java/com/gh/common/view/DownloadProgressBar.java @@ -97,7 +97,7 @@ public class DownloadProgressBar extends ProgressBar { super.onDraw(canvas); if (TextUtils.isEmpty(mText)) return; - mPaint.setColor(mDefaultColor == 0 ? ContextCompat.getColor(getContext(), R.color.theme_font) : mDefaultColor); // 初始化颜色 + mPaint.setColor(mDefaultColor == 0 ? ContextCompat.getColor(getContext(), R.color.text_theme) : mDefaultColor); // 初始化颜色 mPaint.setTextSize(mTextSize); mFakeTextPaint.setTextSize(mTextSize); mFakeTextPaint.setStyle(Paint.Style.FILL_AND_STROKE); @@ -187,7 +187,7 @@ public class DownloadProgressBar extends ProgressBar { break; case NONE: setProgressDrawable(getResources().getDrawable(R.drawable.button_round_gray_light)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_subtitleDesc); + mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_tertiary); setProgress(0); break; case LAUNCH_OR_OPEN: @@ -206,12 +206,12 @@ public class DownloadProgressBar extends ProgressBar { mDefaultColor = Color.WHITE; } else { setProgressDrawable(getResources().getDrawable(R.drawable.detail_downloading_normal_style)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme_font); + mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_theme); } break; case DOWNLOADING_PLUGIN: setProgressDrawable(getResources().getDrawable(R.drawable.detail_downloading_normal_style)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.theme_font); + mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_theme); break; case RESERVABLE: setProgressDrawable(getResources().getDrawable(R.drawable.button_reserve)); @@ -223,7 +223,7 @@ public class DownloadProgressBar extends ProgressBar { break; case RESERVED: setProgressDrawable(getResources().getDrawable(R.drawable.button_round_gray_light)); - mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_subtitleDesc); + mDefaultColor = ContextCompat.getColor(getContext(), R.color.text_tertiary); break; case XAPK_FAILURE: case XAPK_SUCCESS: diff --git a/app/src/main/java/com/gh/common/view/FilterView.kt b/app/src/main/java/com/gh/common/view/FilterView.kt index 5d32836a85..c814c5c5b5 100644 --- a/app/src/main/java/com/gh/common/view/FilterView.kt +++ b/app/src/main/java/com/gh/common/view/FilterView.kt @@ -86,7 +86,7 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet mSelectedSubFilter = filter mBinding?.subFilterTv?.text = filter if (filter != mSubFilterList.firstOrNull() && mHighlightSubFilterIfItsNotDefault) { - mBinding?.subFilterTv?.setTextColor(R.color.theme_font.toColor(context)) + mBinding?.subFilterTv?.setTextColor(R.color.text_theme.toColor(context)) } else { mBinding?.subFilterTv?.setTextColor(R.color.text_757575.toColor(context)) } @@ -108,7 +108,7 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet subFilterText: String, selectedCallback: ((String) -> Unit) ) { - subFilterTv.setTextColor(R.color.theme_font.toColor(context)) + subFilterTv.setTextColor(R.color.text_theme.toColor(context)) subFilterTv.setDrawableEnd(R.drawable.ic_filter_arrow_up) val inflater = LayoutInflater.from(subFilterTv.context) @@ -215,7 +215,7 @@ class FilterView @JvmOverloads constructor(context: Context, attrs: AttributeSet holder.binding.titleTv.background = R.drawable.bg_tag_text.toDrawable(context) holder.binding.titleTv.setTextColor(R.color.white.toColor(context)) } else { - holder.binding.titleTv.setBackgroundColor(R.color.background_white.toColor(context)) + holder.binding.titleTv.setBackgroundColor(R.color.ui_surface.toColor(context)) holder.binding.titleTv.setTextColor(R.color.text_777777.toColor(context)) } 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 7bee052ba3..63a5d24521 100644 --- a/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt +++ b/app/src/main/java/com/gh/common/view/FlexLinearLayout.kt @@ -91,7 +91,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 (DarkModeUtils.isDarkModeOn(context)) setColorFilter(R.color.text_title.toColor(context)) + if (DarkModeUtils.isDarkModeOn(context)) setColorFilter(R.color.text_primary.toColor(context)) background = createNormalBackgroundDrawable() scaleType = ImageView.ScaleType.CENTER } @@ -114,7 +114,7 @@ class FlexLinearLayout @JvmOverloads constructor(context: Context, attrs: Attrib setPadding(mPadding, 0, mPadding, 0) layoutParams = params - setTextColor(if (tag.isTop) "#${tag.color}".hexStringToIntColor() else R.color.text_title.toColor(context)) + setTextColor(if (tag.isTop) "#${tag.color}".hexStringToIntColor() else R.color.text_primary.toColor(context)) background = if (tag.isTop) createTopBackgroundDrawable(tag) else createNormalBackgroundDrawable() setOnClickListener { onClickListener?.onItemClickListener(tag, position) diff --git a/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt b/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt index dc8cfd2f1c..6ac3ace563 100644 --- a/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt +++ b/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt @@ -80,7 +80,7 @@ class GameTagFlexLinearLayout @JvmOverloads constructor(context: Context, attrs: includeFontPadding = false textSize = mTextSize gravity = Gravity.CENTER - setTextColor(R.color.text_subtitleDesc.toColor(context)) + setTextColor(R.color.text_tertiary.toColor(context)) val params = LayoutParams(LayoutParams.WRAP_CONTENT, mItemHeight) params.setMargins(0, 0, mMargin, 0) diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt index cb0dbdfd7d..acbe1a0d25 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogAdapter.kt @@ -125,11 +125,11 @@ class DownloadDialogAdapter( rightLink.text = if (links?.size ?: 0 > 1) links?.get(1)?.title else "" leftLink.background = GradientDrawable().apply { cornerRadius = 8F.dip2px().toFloat() - setStroke(0.5F.dip2px(), R.color.divider.toColor(mContext)) + setStroke(0.5F.dip2px(), R.color.ui_divider.toColor(mContext)) } rightLink.background = GradientDrawable().apply { cornerRadius = 8F.dip2px().toFloat() - setStroke(0.5F.dip2px(), R.color.divider.toColor(mContext)) + setStroke(0.5F.dip2px(), R.color.ui_divider.toColor(mContext)) } } } diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt index 426d0c76fa..10d24fbc42 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogInstalledItemViewHolder.kt @@ -70,7 +70,7 @@ class DownloadDialogInstalledItemViewHolder(val binding: DownloadDialogInstalled binding.collection.setTextColor(R.color.text_05CBA3.toColor(binding.collection.context)) gameEntity.pluginDesc + "此版本" } else { - binding.collection.setTextColor(R.color.text_body.toColor(binding.collection.context)) + binding.collection.setTextColor(R.color.text_instance.toColor(binding.collection.context)) "查看合集" } } else "查看详情" diff --git a/app/src/main/java/com/gh/gamecenter/BbsCertificationActivity.kt b/app/src/main/java/com/gh/gamecenter/BbsCertificationActivity.kt index de153f3b01..578f724119 100644 --- a/app/src/main/java/com/gh/gamecenter/BbsCertificationActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/BbsCertificationActivity.kt @@ -12,7 +12,7 @@ class BbsCertificationActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("社区交流身份认证") - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled() = true diff --git a/app/src/main/java/com/gh/gamecenter/BlockActivity.kt b/app/src/main/java/com/gh/gamecenter/BlockActivity.kt index ef2fcd0e44..b75e301051 100644 --- a/app/src/main/java/com/gh/gamecenter/BlockActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/BlockActivity.kt @@ -30,7 +30,7 @@ class BlockActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setToolbarMenu(R.menu.menu_download) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun provideNormalIntent(): Intent { @@ -54,6 +54,6 @@ class BlockActivity : DownloadToolbarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } } diff --git a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java index cd1db417ee..ccfb14df2c 100644 --- a/app/src/main/java/com/gh/gamecenter/CollectionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CollectionActivity.java @@ -21,7 +21,7 @@ public class CollectionActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @Override @@ -32,7 +32,7 @@ public class CollectionActivity extends ToolBarActivity { @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @NonNull diff --git a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java index 65f858d37e..5c17a5fb75 100644 --- a/app/src/main/java/com/gh/gamecenter/ConcernActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ConcernActivity.java @@ -19,7 +19,7 @@ public class ConcernActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @Override @@ -30,7 +30,7 @@ public class ConcernActivity extends ToolBarActivity { @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @NonNull diff --git a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java index 1cbd515990..772107ca3c 100644 --- a/app/src/main/java/com/gh/gamecenter/CropImageActivity.java +++ b/app/src/main/java/com/gh/gamecenter/CropImageActivity.java @@ -75,7 +75,7 @@ public class CropImageActivity extends ToolBarActivity { setToolbarMenu(R.menu.menu_positive); MenuItem menuItem = getMenuItem(R.id.layout_menu_positive); TextView menuButton = menuItem.getActionView().findViewById(R.id.menu_answer_post); - menuButton.setTextColor(getResources().getColor(R.color.theme_font)); + menuButton.setTextColor(getResources().getColor(R.color.text_theme)); float ratio = getIntent().getFloatExtra(EntranceConsts.KEY_IMAGE_CROP_RATIO, 1F); mCropImageCustom.setCropRatio(ratio); diff --git a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java index c316a38ea1..e0ad46b0b1 100644 --- a/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java +++ b/app/src/main/java/com/gh/gamecenter/DownloadManagerActivity.java @@ -12,7 +12,6 @@ import com.gh.gamecenter.common.base.activity.ToolBarActivity; import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout; import com.gh.gamecenter.common.constant.EntranceConsts; import com.gh.gamecenter.common.utils.ExtensionsKt; -import com.gh.gamecenter.common.utils.SensorsBridge; import com.gh.gamecenter.download.DownloadFragment; import com.gh.vspace.VHelper; @@ -33,7 +32,7 @@ public class DownloadManagerActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); if (VHelper.isVGameOn()) { setToolbarMenu(R.menu.menu_download_manager); } @@ -78,7 +77,7 @@ public class DownloadManagerActivity extends ToolBarActivity { @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/InfoActivity.java b/app/src/main/java/com/gh/gamecenter/InfoActivity.java index eecb9b530b..114bd424b9 100644 --- a/app/src/main/java/com/gh/gamecenter/InfoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/InfoActivity.java @@ -20,7 +20,7 @@ public class InfoActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } public static Intent getIntent(Context context) { @@ -30,7 +30,7 @@ public class InfoActivity extends ToolBarActivity { @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java index bc6e3d73fc..7fc3f43dcf 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoActivity.java @@ -23,7 +23,7 @@ public class LibaoActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @NonNull @@ -36,7 +36,7 @@ public class LibaoActivity extends ToolBarActivity { @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java index f50304d965..7fc0692ed0 100644 --- a/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/LibaoDetailActivity.java @@ -208,7 +208,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA if (mLibaoEntity != null) { mLibaoEntity.setClickReceiveBtnIn(isClickReceiveBtnIn); } - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); mIsScroll = true; mSkeleton = Skeleton.bind(mListSkeleton).shimmer(false).load(R.layout.activity_libaodetail_skeleton).show(); @@ -579,8 +579,8 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.setRootBackgroundColor(mContentView, R.color.background); - mDetailBottom.setBackgroundColor(ContextCompat.getColor(this, R.color.background)); + ExtensionsKt.setRootBackgroundColor(mContentView, R.color.ui_background); + mDetailBottom.setBackgroundColor(ContextCompat.getColor(this, R.color.ui_background)); mLibaoDetailRv.getRecycledViewPool().clear(); mAdapter.notifyItemRangeChanged(0, mAdapter.getItemCount()); DetailDownloadUtils.detailInitDownload(getDetailViewHolder(), false); @@ -588,7 +588,7 @@ public class LibaoDetailActivity extends ToolBarActivity implements LibaoDetailA mLibaoDetailRv.removeItemDecorationAt(0); mLibaoDetailRv.addItemDecoration(getItemDecoration()); } - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java index 464b691049..efe3ad5901 100644 --- a/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java @@ -274,7 +274,7 @@ public class NewsDetailActivity extends DownloadToolbarActivity implements OnCli @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); mDetailRv = findViewById(R.id.news_detail_rv_show); mDetailBottomLl = findViewById(R.id.news_detail_ll_bottom); @@ -803,16 +803,16 @@ public class NewsDetailActivity extends DownloadToolbarActivity implements OnCli @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); mNewsShare.setIcon(R.drawable.icon_share_black); mNewsCollection.setIcon(R.drawable.community_content_detail_collect_unselect); mDetailRv.removeItemDecoration(mItemDecoration); mItemDecoration = new VerticalItemDecoration(this, 8, false); mDetailRv.addItemDecoration(mItemDecoration); if (mContentView != null) { - mContentView.setBackgroundColor(ContextCompat.getColor(this, R.color.background)); - findViewById(R.id.bottomContainer).setBackgroundColor(ContextCompat.getColor(this, R.color.background_white)); - ((TextView) findViewById(R.id.commentTv)).setTextColor(ContextCompat.getColor(this, R.color.text_subtitle)); + mContentView.setBackgroundColor(ContextCompat.getColor(this, R.color.ui_background)); + findViewById(R.id.bottomContainer).setBackgroundColor(ContextCompat.getColor(this, R.color.ui_surface)); + ((TextView) findViewById(R.id.commentTv)).setTextColor(ContextCompat.getColor(this, R.color.text_secondary)); } if (adapter != null) { adapter.notifyItemRangeChanged(0, adapter.getItemCount()); diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt index d8fa1d3e1b..ea29355ca1 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt @@ -61,7 +61,7 @@ open class SearchActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) searchEt = findViewById(R.id.searchEt) searchBtn = findViewById(R.id.searchBtn) @@ -304,7 +304,7 @@ open class SearchActivity : BaseActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled() = true diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index 81faf9a5c2..ec3cf57cf2 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -52,7 +52,7 @@ public class ShareGhActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); mGhQrcode = findViewById(R.id.gh_address_qrcode); mGhAddress = findViewById(R.id.gh_address_tv); mContentLl = findViewById(R.id.content_ll); @@ -75,6 +75,6 @@ public class ShareGhActivity extends ToolBarActivity { @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } } diff --git a/app/src/main/java/com/gh/gamecenter/UserAuthActivity.kt b/app/src/main/java/com/gh/gamecenter/UserAuthActivity.kt index d1f8c0a82c..b592c6c2fe 100644 --- a/app/src/main/java/com/gh/gamecenter/UserAuthActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/UserAuthActivity.kt @@ -12,14 +12,14 @@ class UserAuthActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("已获得认证") - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled(): Boolean = false override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt index 7721619d0a..4719dbbef5 100644 --- a/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/UserInfoActivity.kt @@ -11,7 +11,7 @@ class UserInfoActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { @@ -28,6 +28,6 @@ class UserInfoActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/VerifyPhoneActivity.kt b/app/src/main/java/com/gh/gamecenter/VerifyPhoneActivity.kt index c53b4d5811..f504bd3ce4 100644 --- a/app/src/main/java/com/gh/gamecenter/VerifyPhoneActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/VerifyPhoneActivity.kt @@ -11,7 +11,7 @@ class VerifyPhoneActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled() = true diff --git a/app/src/main/java/com/gh/gamecenter/VoteActivity.java b/app/src/main/java/com/gh/gamecenter/VoteActivity.java index 613882dd55..df26766686 100644 --- a/app/src/main/java/com/gh/gamecenter/VoteActivity.java +++ b/app/src/main/java/com/gh/gamecenter/VoteActivity.java @@ -29,13 +29,13 @@ public class VoteActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.kt b/app/src/main/java/com/gh/gamecenter/WebActivity.kt index b382cb22fd..0e7016d6d0 100644 --- a/app/src/main/java/com/gh/gamecenter/WebActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/WebActivity.kt @@ -39,7 +39,7 @@ open class WebActivity : ToolBarActivity() { } else { super.onCreate(savedInstanceState) } - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun provideNormalIntent(): Intent { @@ -72,7 +72,7 @@ open class WebActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java index 013c66dd5c..da549c5c85 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/CleanApkAdapter.java @@ -228,10 +228,10 @@ public class CleanApkAdapter extends BaseRecyclerAdapter if (!mIsChooseApk) { if (gameEntity.getInstallStatus() == INSTALLED) { holder.binding.selectGameSize.setText(R.string.installed); - holder.binding.selectGameSize.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + holder.binding.selectGameSize.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); } else { holder.binding.selectGameSize.setText(R.string.installed_not); - holder.binding.selectGameSize.setTextColor(ContextCompat.getColor(mContext, R.color.theme_red)); + holder.binding.selectGameSize.setTextColor(ContextCompat.getColor(mContext, R.color.secondary_red)); } holder.binding.selectGameDes.setText(mContext.getString(R.string.clean_apk_version, gameEntity.getGameVersion(), sizeName)); holder.binding.selectGameDes.setTextColor(ContextCompat.getColor(mContext, R.color.content)); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java index 3cdd6167d3..f58d967029 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LiBaoCodeAdapter.java @@ -37,7 +37,7 @@ public class LiBaoCodeAdapter extends BaseRecyclerAdapter { @Override public void onBindViewHolder(LiBaoCodeViewHolder holder, int position) { final UserDataLibaoEntity userDataLibaoEntity = mUserDataLibaoList.get(position); - holder.binding.libaoCodeTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitle)); + holder.binding.libaoCodeTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_secondary)); if ("ling".equals(userDataLibaoEntity.getType()) || "linged".equals(userDataLibaoEntity.getType())) { StringBuilder content = new StringBuilder(); if (mUserDataLibaoList.size() > 1) { diff --git a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java index ca3053eff2..9a49d5b883 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/LibaoDetailAdapter.java @@ -159,7 +159,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { SpannableStringBuilder builder = new SpanBuilder("此礼包有问题？点击反馈") - .click(mContext, 7, 11, R.color.theme_font, false, () -> { + .click(mContext, 7, 11, R.color.text_theme, false, () -> { HelpAndFeedbackBridge.startSuggestionActivity(mContext, SuggestType.GAME, "libao", StringUtils.buildString(mLibaoEntity.getName(), "有问题："), new SimpleGameEntity(mLibaoEntity.getGame().getId(), mLibaoEntity.getGame().getName(), mLibaoEntity.getGame().getIcon())); @@ -167,7 +167,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { }) .build(); viewHolder.getHint().setText(builder); - viewHolder.getHint().setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitle)); + viewHolder.getHint().setTextColor(ContextCompat.getColor(mContext, R.color.text_secondary)); viewHolder.getHint().setMovementMethod(new LinkMovementMethod()); } } @@ -199,7 +199,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { } }); - ExtensionsKt.setRootBackgroundColor(holder.binding.getRoot(), R.color.background_white); + ExtensionsKt.setRootBackgroundColor(holder.binding.getRoot(), R.color.ui_surface); if (mLibaoEntity.getGame() != null) { holder.binding.libaodetailGameIcon.displayGameIcon(mLibaoEntity.getGame().getIcon(), mLibaoEntity.getGame().getIconSubscript(), mLibaoEntity.getGame().getIconFloat()); GameEntity gameEntity = mLibaoEntity.getGame().toGameEntity(); @@ -370,7 +370,7 @@ public class LibaoDetailAdapter extends BaseRecyclerAdapter { @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); - ds.setColor(ExtensionsKt.toColor(R.color.theme_font, mContext)); + ds.setColor(ExtensionsKt.toColor(R.color.text_theme, mContext)); ds.setUnderlineText(false); } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java index 4d87230711..9d13c8f3de 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java @@ -217,7 +217,7 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { } else if (holder instanceof FooterViewHolder) { initFooterViewHolder((FooterViewHolder) holder); } else if (holder instanceof CommentHeadViewHolder) { - ((CommentHeadViewHolder) holder).binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.background_white)); + ((CommentHeadViewHolder) holder).binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.ui_surface)); ((CommentHeadViewHolder) holder).binding.commentHeadTitle.setTextColor(ContextCompat.getColor(mContext, R.color.text_3a3a3a)); if (mHotCommentList.size() != 0 && position == 1) { ((CommentHeadViewHolder) holder).binding.commentHeadTitle.setText(R.string.comment_hot); @@ -266,8 +266,8 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { viewHolder.binding.getRoot().setBackground(ContextCompat.getDrawable(mContext, R.drawable.reuse_listview_item_style)); viewHolder.binding.newsDigestTitle.setTextColor(ContextCompat.getColor(mContext, R.color.text_black)); viewHolder.binding.newsDigestContent.setTextColor(ContextCompat.getColor(mContext, R.color.text_3a3a3a)); - viewHolder.binding.newsDigestCommentnum.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); - viewHolder.binding.newsDigestReadNum.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); + viewHolder.binding.newsDigestCommentnum.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); + viewHolder.binding.newsDigestReadNum.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); if (mConcernEntity.getViews() != 0) { viewHolder.binding.newsDigestReadNum.setText(NumberUtils.transSimpleCount(mConcernEntity.getViews())); @@ -355,12 +355,12 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter { private void initCommentViewHolder(final CommentViewHolder holder, int position) { holder.itemView.setBackground(ContextCompat.getDrawable(mContext, R.drawable.reuse_listview_item_style)); - holder.commentContentTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_title)); - holder.commentTimeTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); - holder.commentReply.setTextColor(ContextCompat.getColor(mContext, R.color.text_title)); - holder.commentUserNameTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitle)); - holder.badgeNameTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); - holder.quoteAuthorTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitle)); + holder.commentContentTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_primary)); + holder.commentTimeTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); + holder.commentReply.setTextColor(ContextCompat.getColor(mContext, R.color.text_primary)); + holder.commentUserNameTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_secondary)); + holder.badgeNameTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); + holder.quoteAuthorTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_secondary)); holder.commentLikeIv.setImageResource(R.drawable.comment_vote_unselect); holder.quoteContainer.setBackground(ContextCompat.getDrawable(mContext, R.drawable.community_comment_reply_background)); diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt index fb48bb1f97..61826c8e97 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt @@ -66,7 +66,7 @@ class GameHeadViewHolder(var binding: GameHeadItemBinding) : if (binding.headMore.visibility == View.VISIBLE && (binding.headMore.text == "更多" || binding.headMore.text == "全部" || binding.headMore.text == "游戏单广场")) { binding.arrowIv.visibility = View.VISIBLE } - binding.headTitle.setTextColor(R.color.text_title.toColor(binding.root.context)) + binding.headTitle.setTextColor(R.color.text_primary.toColor(binding.root.context)) binding.adLabelTv.goneIf(!subject.adIconActive) } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java index 8493904aba..b8a70bbc4b 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameViewHolder.java @@ -65,7 +65,7 @@ public class GameViewHolder extends RecyclerView.ViewHolder { gameServerType.setText(serverLabel.getValue()); if (gameEntity.isUseDefaultServerStyle()) { gameServerType.setBackground(ExtensionsKt.toDrawable(R.drawable.server_label_default_bg)); - gameServerType.setTextColor(ExtensionsKt.toColor(R.color.text_server_label)); + gameServerType.setTextColor(ExtensionsKt.toColor(R.color.text_secondary)); } else { gameServerType.setBackground(DrawableView.getServerDrawable(serverLabel.getColor())); gameServerType.setTextColor(ExtensionsKt.toColor(R.color.white)); diff --git a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt index 96e9c0a1ad..a2b7fd88c7 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayAdapter.kt @@ -215,8 +215,8 @@ class AmwayAdapter( binding.gameContainer.background = R.drawable.selector_f8f8f8.toDrawable(context) binding.commentContainer.background = R.drawable.selector_f8f8f8.toDrawable(context) binding.gameNameTv.setTextColor(R.color.title.toColor(context)) - binding.ratingTv.setTextColor(R.color.theme_font.toColor(context)) - binding.tagTv.setTextColor(R.color.text_subtitleDesc.toColor(context)) + binding.ratingTv.setTextColor(R.color.text_theme.toColor(context)) + binding.tagTv.setTextColor(R.color.text_tertiary.toColor(context)) binding.amwayContentTv.setTextColor(R.color.text_3a3a3a.toColor(context)) binding.userNameTv.setTextColor(R.color.title.toColor(context)) binding.likeCountTv.setTextColor(R.color.text_B3B3B3.toColor(context)) @@ -233,7 +233,7 @@ class AmwayAdapter( val m = Pattern.compile(RatingEditActivity.LABEL_REGEX).matcher(amway.comment.content) if (m.find()) { val contents = - TextHelper.getCommentLabelSpannableStringBuilder(amway.comment.content, R.color.theme_font) + TextHelper.getCommentLabelSpannableStringBuilder(amway.comment.content, R.color.text_theme) binding.amwayContentTv.setTextWithHighlightedTextWrappedInsideWrapper(contents, copyClickedText = true) } else { binding.amwayContentTv.setTextWithHighlightedTextWrappedInsideWrapper( @@ -311,7 +311,7 @@ class AmwayAdapter( if (amway.comment.me.isVoted) { binding.likeIv.isChecked = true - binding.likeCountTv.setTextColor(R.color.theme_font.toColor(binding.likeCountTv.context)) + binding.likeCountTv.setTextColor(R.color.text_theme.toColor(binding.likeCountTv.context)) binding.likeClickableView.setOnClickListener { debounceActionWithInterval(binding.likeClickableView.id, 1000L) { binding.likeIv.context.ifLogin("安利墙-取消点赞") { @@ -357,7 +357,7 @@ class AmwayAdapter( likeIv: CheckableImageView, likeAnimView: LottieAnimationView ) { - likeTv.setTextColor(R.color.theme_font.toColor(likeTv.context)) + likeTv.setTextColor(R.color.text_theme.toColor(likeTv.context)) likeIv.isChecked = true likeIv.visibility = View.INVISIBLE likeAnimView.visibility = View.VISIBLE 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 0f4cace91a..9aa9cfb714 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/AmwayFragment.kt @@ -354,13 +354,13 @@ class AmwayFragment : LazyListFragment() { mAlternativeBinding?.firstBackground?.goneIf(mIsDarkModeOn) mAlternativeBinding?.secondBackground?.goneIf(mIsDarkModeOn) mAlternativeBinding?.topBackgroundView?.goneIf(mIsDarkModeOn) - mAlternativeBinding?.listRefresh?.setBackgroundColor(R.color.background.toColor(requireContext())) + mAlternativeBinding?.listRefresh?.setBackgroundColor(R.color.ui_background.toColor(requireContext())) onScrollChanged() } else { 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())) + mDefaultBinding?.appbar?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mDefaultBinding?.collapsingToolbar?.setContentScrimColor(R.color.ui_surface.toColor(requireContext())) + mDefaultBinding?.listRefresh?.setBackgroundColor(R.color.ui_background.toColor(requireContext())) } if (mIsFromMainWrapper) { DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn && mIsCollapsed) diff --git a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt index 9a43acb6c5..bc8e577b17 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchDefaultFragment.kt @@ -64,7 +64,7 @@ class AmwaySearchDefaultFragment : SearchDefaultFragment() { headTitle.text = getString(R.string.search_history) headTitle.textSize = 16F headActionTv.text = "清空" - headActionTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + headActionTv.setTextColor(R.color.text_tertiary.toColor(requireContext())) headActionTv.setDrawableStart( AppCompatResources.getDrawable( requireContext(), diff --git a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewHolder.kt b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewHolder.kt index 50e1177aa8..6a5aa68510 100644 --- a/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/amway/search/AmwaySearchViewHolder.kt @@ -29,10 +29,10 @@ class AmwaySearchViewHolder(var binding: AmwaySearchItemBinding, val mViewModel: binding.hintTv.goneIf(gameEntity.showComment) if (gameEntity.showComment) { - binding.nameTv.setTextColor(ContextCompat.getColor(binding.root.context, R.color.text_title)) + binding.nameTv.setTextColor(ContextCompat.getColor(binding.root.context, R.color.text_primary)) binding.nameTv.setTypeface(binding.nameTv.typeface, Typeface.BOLD) } else { - binding.nameTv.setTextColor(ContextCompat.getColor(binding.root.context, R.color.text_subtitleDesc)) + binding.nameTv.setTextColor(ContextCompat.getColor(binding.root.context, R.color.text_tertiary)) binding.nameTv.setTypeface(binding.nameTv.typeface, Typeface.NORMAL) } diff --git a/app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt b/app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt index a77c8f524e..ddcd0962f8 100644 --- a/app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/authorization/AuthorizationActivity.kt @@ -73,7 +73,7 @@ class AuthorizationActivity : ToolBarActivity() { super.onCreate(savedInstanceState) DisplayUtils.transparentStatusBar(this) setNavigationTitle("光环助手授权登陆") - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mBinding = ActivityAuthorizationBinding.bind(mContentView) checkParam() initView() @@ -102,7 +102,7 @@ class AuthorizationActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun onRestart() { 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 935315c125..dbe7ac9e36 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogActivity.kt @@ -13,7 +13,7 @@ class CatalogActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setToolbarMenu(R.menu.menu_download) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun showDownloadMenu(): Boolean { @@ -26,7 +26,7 @@ class CatalogActivity : DownloadToolbarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled() = true diff --git a/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt index 9346c4fe23..25211385ab 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogAdapter.kt @@ -31,11 +31,11 @@ class CatalogAdapter( recommendTag.goneIf(!catalogEntity.recommended) if (catalogEntity.name == mViewModel.selectedCatalogName) { selectedTag.visibility = View.VISIBLE - catalogName.setTextColor(R.color.theme_font.toColor(mContext)) - root.setBackgroundColor(R.color.background_white.toColor(mContext)) + catalogName.setTextColor(R.color.text_theme.toColor(mContext)) + root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) } else { selectedTag.visibility = View.GONE - catalogName.setTextColor(R.color.text_title.toColor(mContext)) + catalogName.setTextColor(R.color.text_primary.toColor(mContext)) root.background = null } root.setOnClickListener { 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 c087008d65..7e932e6b73 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/CatalogFragment.kt @@ -98,9 +98,9 @@ class CatalogFragment : LazyFragment() { // 嵌入在首页时特殊处理 if (arguments?.getBoolean(EntranceConsts.KEY_IS_HOME) == true) { mBinding?.divider?.visibility = View.GONE - mBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding?.root?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mBinding?.root?.setPadding(0, 8F.dip2px(), 0, 0) - mBinding?.rvCatalog?.setBackgroundColor(R.color.background.toColor(requireContext())) + mBinding?.rvCatalog?.setBackgroundColor(R.color.ui_background.toColor(requireContext())) } } 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 5725d07598..5cff9351d9 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListActivity.kt @@ -14,7 +14,7 @@ class NewCatalogListActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setToolbarMenu(R.menu.menu_download) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun showDownloadMenu(): Boolean { @@ -23,7 +23,7 @@ class NewCatalogListActivity : DownloadToolbarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled() = true 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 21425bb375..f32835296c 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/NewCatalogListFragment.kt @@ -106,7 +106,7 @@ class NewCatalogListFragment : ListFragment mSkeletonScreen = Skeleton.bind(mBinding?.listSkeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) @@ -201,8 +201,8 @@ class NewCatalogListFragment : ListFragment override fun onDarkModeChanged() { super.onDarkModeChanged() mBinding?.filterContainer?.run { - setRootBackgroundColor(R.color.background_white.toColor(requireContext())) - setItemTextColor(R.color.text_subtitle.toColor(requireContext())) + setRootBackgroundColor(R.color.ui_surface.toColor(requireContext())) + setItemTextColor(R.color.text_secondary.toColor(requireContext())) updatePopupWindow() } } diff --git a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt index 8a7ae00bee..dd3270969c 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogAdapter.kt @@ -177,8 +177,8 @@ class SpecialCatalogAdapter( val specialLink = entity.link holder.binding.run { headTitle.text = specialLink.text - headTitle.setTextColor(R.color.text_title.toColor(mContext)) - headMore.setTextColor(R.color.theme_font.toColor(mContext)) + headTitle.setTextColor(R.color.text_primary.toColor(mContext)) + headMore.setTextColor(R.color.text_theme.toColor(mContext)) headMore.setOnClickListener { if (entity.type == "专题合集") { DirectUtils.directToColumnCollection( 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 8eee966107..8c452fcaae 100644 --- a/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/catalog/SpecialCatalogFragment.kt @@ -70,7 +70,7 @@ class SpecialCatalogFragment : ListFragment { val category = mEntityList[position] holder.binding.run { - divider.setBackgroundColor(R.color.background.toColor(mContext)) + divider.setBackgroundColor(R.color.ui_background.toColor(mContext)) containerPrimaryCategory.setOnClickListener { root.context.startActivity(getIntent(root.context, categoryTitle, category, "全部")) } diff --git a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt index cecc829693..d1cc9b4278 100644 --- a/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryFragment.kt @@ -42,7 +42,7 @@ class CategoryDirectoryFragment : LazyListFragment 3) 8F.dip2px() else 0, 0) gameRating.setTextColor( - if (gameEntity.commentCount > 3) R.color.theme_font.toColor(mContext) else R.color.theme.toColor( + if (gameEntity.commentCount > 3) R.color.text_theme.toColor(mContext) else R.color.primary_theme.toColor( mContext ) ) @@ -274,7 +274,7 @@ class CategoryV2ListAdapter( if (gameEntity.isUseDefaultServerStyle()) { binding.gameKaifuType.background = R.drawable.server_label_default_bg.toDrawable(binding.root.context) - binding.gameKaifuType.setTextColor(R.color.text_server_label.toColor(binding.root.context)) + binding.gameKaifuType.setTextColor(R.color.text_secondary.toColor(binding.root.context)) } else { binding.gameKaifuType.background = DrawableView.getServerDrawable(serverLabel.color) binding.gameKaifuType.setTextColor(R.color.white.toColor(binding.root.context)) diff --git a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt index 83db15ff98..b6e7904e3d 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/CategoryV2ListFragment.kt @@ -124,7 +124,7 @@ class CategoryV2ListFragment : ListFragment mSkeletonScreen = Skeleton.bind(mBinding?.listSkeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) @@ -334,8 +334,8 @@ class CategoryV2ListFragment : ListFragment override fun onDarkModeChanged() { super.onDarkModeChanged() mBinding?.filterContainer?.run { - setRootBackgroundColor(R.color.background_white.toColor(requireContext())) - setItemTextColor(R.color.text_subtitle.toColor(requireContext())) + setRootBackgroundColor(R.color.ui_surface.toColor(requireContext())) + setItemTextColor(R.color.text_secondary.toColor(requireContext())) updatePopupWindow() } } diff --git a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt index 532fa8eb8f..f63b2ffee8 100644 --- a/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/category2/SubCategoryAdapter.kt @@ -34,11 +34,11 @@ class SubCategoryAdapter( if (categoryEntity.selected) { selectedIv.visibility = View.VISIBLE container.background = R.drawable.bg_category_selected.toDrawable(mContext) - name.setTextColor(R.color.theme_font.toColor(mContext)) + name.setTextColor(R.color.text_theme.toColor(mContext)) } else { selectedIv.visibility = View.GONE container.background = R.drawable.bg_shape_space_radius_8.toDrawable(mContext) - name.setTextColor(R.color.text_title.toColor(mContext)) + name.setTextColor(R.color.text_primary.toColor(mContext)) } root.setOnClickListener { @@ -49,7 +49,7 @@ class SubCategoryAdapter( categoryEntity.selected = false selectedIv.visibility = View.GONE container.background = R.drawable.bg_shape_space_radius_8.toDrawable(mContext) - name.setTextColor(R.color.text_title.toColor(mContext)) + name.setTextColor(R.color.text_primary.toColor(mContext)) mViewModel.run { if (selectedCount > 0) { selectedCount-- @@ -65,7 +65,7 @@ class SubCategoryAdapter( categoryEntity.primaryIndex = mPrimaryIndex selectedIv.visibility = View.VISIBLE container.background = R.drawable.bg_category_selected.toDrawable(mContext) - name.setTextColor(R.color.theme_font.toColor(mContext)) + name.setTextColor(R.color.text_theme.toColor(mContext)) mViewModel.run { if (selectedCount < 5) { selectedCount++ diff --git a/app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerActivity.kt b/app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerActivity.kt index d1fe2009dc..dc24387868 100644 --- a/app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerActivity.kt @@ -82,7 +82,7 @@ class CloudArchiveManagerActivity : BaseActivity_TabLayout() { mBinding = ActivityCloudArchiveManagerBinding.bind(mContentView) setNavigationTitle("云存档") setToolbarMenu(R.menu.menu_cloud_archive_manager) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) NewFlatLogUtils.logCloudArchiveManagePageShow(mGameEntity?.id ?: "", mGameEntity?.name ?: "", mEntrance) SensorsBridge.trackEvent( "CloudSaveManagePageShow", @@ -364,7 +364,7 @@ class CloudArchiveManagerActivity : BaseActivity_TabLayout() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/app/src/main/java/com/gh/gamecenter/cloudarchive/MyArchiveFragment.kt b/app/src/main/java/com/gh/gamecenter/cloudarchive/MyArchiveFragment.kt index 4d7fb8be6d..be6b8bb984 100644 --- a/app/src/main/java/com/gh/gamecenter/cloudarchive/MyArchiveFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/cloudarchive/MyArchiveFragment.kt @@ -71,10 +71,10 @@ open class MyArchiveFragment : ListFragment() override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - mBinding.reuseNoneData.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.reuseDataException.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.reuseNoConnection.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.reuseNoLogin.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.reuseNoneData.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.reuseDataException.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.reuseNoConnection.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.reuseNoLogin.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mBinding.reuseNoneData.reuseNoneDataTv.text = "还没有存档噢~" mBinding.reuseNoneData.reuseNoneDataDescTv.text = "点击下方按钮上传您的游戏存档吧！" @@ -140,10 +140,10 @@ open class MyArchiveFragment : ListFragment() override fun onDarkModeChanged() { super.onDarkModeChanged() - mBinding.reuseNoneData.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.reuseDataException.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.reuseNoConnection.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.reuseNoLogin.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.reuseNoneData.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.reuseDataException.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.reuseNoConnection.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.reuseNoLogin.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } enum class Type(val value: String) { diff --git a/app/src/main/java/com/gh/gamecenter/cloudarchive/MyArchiveOptionDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/cloudarchive/MyArchiveOptionDialogFragment.kt index 59d5b2e7fc..8995fbe270 100644 --- a/app/src/main/java/com/gh/gamecenter/cloudarchive/MyArchiveOptionDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/cloudarchive/MyArchiveOptionDialogFragment.kt @@ -104,7 +104,7 @@ class MyArchiveOptionDialogFragment( ) }, uiModificationCallback = { - it.confirmTv.setTextColor(R.color.theme_red.toColor(requireContext())) + it.confirmTv.setTextColor(R.color.secondary_red.toColor(requireContext())) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) @@ -264,8 +264,8 @@ class MyArchiveOptionDialogFragment( if (::mBinding.isInitialized) { mBinding.run { root.setRootBackgroundDrawable(R.drawable.background_shape_white_radius_12_top_only) - line1.setBackgroundColor(R.color.divider.toColor(requireContext())) - cancelBtn.setTextColor(R.color.text_subtitle.toColor(requireContext())) + line1.setBackgroundColor(R.color.ui_divider.toColor(requireContext())) + cancelBtn.setTextColor(R.color.text_secondary.toColor(requireContext())) } } } diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java index 63e9b12cc0..e8919b6bec 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java @@ -257,7 +257,7 @@ public class AnswerAdapter extends ListAdapter implements ISyncAda if (mPopupBinding == null) return; mPopupBinding.selectNumTv.setText(selectItems.isEmpty() ? "" : "(" + selectItems.size() + ")"); mPopupBinding.itemDelete.setBackground(selectItems.isEmpty() ? ExtensionsKt.toDrawable(R.drawable.bg_shape_f5_radius_999) : ExtensionsKt.toDrawable(R.drawable.download_button_normal_style)); - mPopupBinding.itemDelete.setTextColor(selectItems.isEmpty() ? ExtensionsKt.toColor(R.color.text_body) : ExtensionsKt.toColor(R.color.white)); + mPopupBinding.itemDelete.setTextColor(selectItems.isEmpty() ? ExtensionsKt.toColor(R.color.text_instance) : ExtensionsKt.toColor(R.color.white)); mPopupBinding.itemDelete.setEnabled(!selectItems.isEmpty()); mPopupBinding.checkAllCb.setChecked(selectItems.size() == mEntityList.size()); } 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 b4a1158031..21120451c5 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerFragment.java @@ -105,6 +105,6 @@ public class AnswerFragment extends ListFragment } private void resetBackgroundColor() { - mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); } } diff --git a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java index 5f5debdb26..02c9d61f25 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleAdapter.java @@ -386,7 +386,7 @@ public class ArticleAdapter extends ListAdapter { if (mPopupBinding == null) return; mPopupBinding.selectNumTv.setText(selectItems.isEmpty() ? "" : "(" + selectItems.size() + ")"); mPopupBinding.itemDelete.setBackground(selectItems.isEmpty() ? ExtensionsKt.toDrawable(R.drawable.bg_shape_f5_radius_999) : ExtensionsKt.toDrawable(R.drawable.download_button_normal_style)); - mPopupBinding.itemDelete.setTextColor(selectItems.isEmpty() ? ExtensionsKt.toColor(R.color.text_body) : ExtensionsKt.toColor(R.color.white)); + mPopupBinding.itemDelete.setTextColor(selectItems.isEmpty() ? ExtensionsKt.toColor(R.color.text_instance) : ExtensionsKt.toColor(R.color.white)); mPopupBinding.itemDelete.setEnabled(!selectItems.isEmpty()); mPopupBinding.checkAllCb.setChecked(selectItems.size() == mEntityList.size()); } 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 ac42479bc4..e2cce7726b 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ArticleFragment.java @@ -129,6 +129,6 @@ public class ArticleFragment extends ListFragment } private void resetBackgroundColor() { - mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); } } diff --git a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt index 6fcd911397..a87aae0903 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleAdapter.kt @@ -17,7 +17,6 @@ import com.gh.gamecenter.common.baselist.ListAdapter import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.databinding.CommunityAnswerItemBinding import com.gh.gamecenter.databinding.PopupHistoryOptionBinding -import com.gh.gamecenter.common.entity.CommunityEntity import com.gh.gamecenter.common.view.DrawableView import com.gh.gamecenter.history.ManageOption import com.gh.gamecenter.qa.answer.CommunityAnswerItemViewHolder @@ -196,7 +195,7 @@ class CommunityArticleAdapter( mContext ) itemDelete.setTextColor( - if (selectItems.isEmpty()) R.color.text_body.toColor(mContext) else R.color.white.toColor( + if (selectItems.isEmpty()) R.color.text_instance.toColor(mContext) else R.color.white.toColor( mContext ) ) 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 bf5ce096bf..98a1fe6b2c 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/CommunityArticleFragment.kt @@ -27,7 +27,7 @@ class CommunityArticleFragment : ListFragment 0) { mListRv?.removeItemDecorationAt(0) diff --git a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt index ca4fe0106b..3fa13b5a3b 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionAdapter.kt @@ -157,7 +157,7 @@ class GamesCollectionAdapter( itemEntity.count?.vote ?: 0, "#" ) voteCount.setTextColor( - if (itemEntity.me?.isVoted == true) R.color.theme_font.toColor(mContext) else R.color.white.toColor( + if (itemEntity.me?.isVoted == true) R.color.text_theme.toColor(mContext) else R.color.white.toColor( mContext ) ) @@ -608,7 +608,7 @@ class GamesCollectionAdapter( mContext ) itemDelete.setTextColor( - if (selectItems.isEmpty()) R.color.text_body.toColor(mContext) else R.color.white.toColor( + if (selectItems.isEmpty()) R.color.text_instance.toColor(mContext) else R.color.white.toColor( mContext ) ) 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 b0c428422a..a076e862fb 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/GamesCollectionFragment.kt @@ -53,9 +53,9 @@ class GamesCollectionFragment : ListFragment 0) { removeItemDecorationAt(0) diff --git a/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java b/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java index f4ae5c382c..ffc24f91f5 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java +++ b/app/src/main/java/com/gh/gamecenter/collection/ToolsFragment.java @@ -42,7 +42,7 @@ public class ToolsFragment extends ListFragment 0) { mListRv.removeItemDecorationAt(0); mListRv.addItemDecoration(getItemDecoration()); diff --git a/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt b/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt index 1be5a7f3ae..9f5804e077 100644 --- a/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/collection/VideoAdapter.kt @@ -3,7 +3,6 @@ package com.gh.gamecenter.collection import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.drawable.StateListDrawable import android.view.Gravity import android.view.LayoutInflater import android.view.View @@ -194,7 +193,7 @@ class VideoAdapter( mContext ) itemDelete.setTextColor( - if (selectItems.isEmpty()) R.color.text_body.toColor(mContext) else R.color.white.toColor( + if (selectItems.isEmpty()) R.color.text_instance.toColor(mContext) else R.color.white.toColor( mContext ) ) diff --git a/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryActivity.kt b/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryActivity.kt index 7ab1cbd8a5..fd4dd5ef20 100644 --- a/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryActivity.kt @@ -16,14 +16,14 @@ class DiscoveryActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled(): Boolean = true override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryAdapter.kt b/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryAdapter.kt index 40c1f438b5..5dbf3757be 100644 --- a/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryAdapter.kt @@ -167,14 +167,14 @@ class DiscoveryAdapter( ) } is RecommendInterestViewHolder -> { - holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.binding.root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) holder.binding.backgroundView.background = R.drawable.bg_shape_space_radius_8.toDrawable(mContext) - holder.binding.interestTv.setTextColor(R.color.text_title.toColor(mContext)) + holder.binding.interestTv.setTextColor(R.color.text_primary.toColor(mContext)) val labels = mEntityList[position].interestCardLabels ?: return val labelTvList = arrayListOf(holder.binding.labelTv1, holder.binding.labelTv2, holder.binding.labelTv3) labelTvList.forEachIndexed { index, labelTv -> labelTv.goneIf(labels.size < index + 1) { - labelTv.setTextColor(R.color.text_subtitle.toColor(mContext)) + labelTv.setTextColor(R.color.text_secondary.toColor(mContext)) labelTv.background = R.drawable.bg_shape_white_radius_4.toDrawable(mContext) labelTv.setDrawableEnd(R.drawable.ic_interest_arrow) labels[index].text = labels[index].linkText @@ -190,7 +190,7 @@ class DiscoveryAdapter( } } is RecommendInterestImageViewHolder -> { - holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.binding.root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) val label = mEntityList[position].interestImageCardLabel ?: return label.text = label.linkText holder.binding.root.setOnClickListener { @@ -203,7 +203,7 @@ class DiscoveryAdapter( val userInterestedGame = Config.getUserInterestedGame() val padTop = if (userInterestedGame) 0 else 16F.dip2px() root.setPadding(16F.dip2px(), padTop, 16F.dip2px(), 16F.dip2px()) - root.setBackgroundColor(R.color.background_white.toColor(mContext)) + root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) interestedGameTv.goneIf(!userInterestedGame) { interestedGameTv.text = mContext.getString(R.string.interested_game_footer_hint).fromHtml() interestedGameTv.setOnClickListener { @@ -313,9 +313,9 @@ class DiscoveryAdapter( fun bindGameItem(gameEntity: GameEntity) { binding.run { root.background = R.drawable.reuse_listview_item_style.toDrawable(root.context) - gameKaifuType.setBackgroundColor(R.color.theme.toColor(root.context)) - gameName.setTextColor(R.color.text_title.toColor(root.context)) - gameDes.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + gameKaifuType.setBackgroundColor(R.color.primary_theme.toColor(root.context)) + gameName.setTextColor(R.color.text_primary.toColor(root.context)) + gameDes.setTextColor(R.color.text_tertiary.toColor(root.context)) gameIconView.displayGameIcon(gameEntity) BindingAdapters.setGameName(gameName, gameEntity, false, null) @@ -329,9 +329,9 @@ class DiscoveryAdapter( gameRating.setPadding(0, 0, if (gameEntity.commentCount > 3) 8F.dip2px() else 0, 0) gameRating.setTextColor( if (gameEntity.commentCount > 3) { - R.color.theme_font.toColor(binding.root.context) + R.color.text_theme.toColor(binding.root.context) } else { - R.color.theme.toColor(binding.root.context) + R.color.primary_theme.toColor(binding.root.context) } ) gameDes.visibleIf(gameEntity.recommendTag.isNotEmpty()) { @@ -344,14 +344,14 @@ class DiscoveryAdapter( if (gameEntity.columnRank != null) { recommendReasonTv.text = "${gameEntity.columnRank!!.name}·第${gameEntity.columnRank!!.position}名" - recommendReasonTv.setTextColor(R.color.theme_yellow.toColor(binding.root.context)) + recommendReasonTv.setTextColor(R.color.secondary_yellow.toColor(binding.root.context)) recommendReasonTv.setDrawableStart(R.drawable.ic_discovery_rank) recommendReasonTv.background = R.drawable.bg_discovery_recommend.toDrawable(binding.root.context) recommendReasonTv.visibility = View.VISIBLE } else if (gameEntity.type == "recommend") { recommendReasonTv.text = "其他玩家推荐" - recommendReasonTv.setTextColor(R.color.theme_font.toColor(binding.root.context)) + recommendReasonTv.setTextColor(R.color.text_theme.toColor(binding.root.context)) recommendReasonTv.removeDrawable() recommendReasonTv.background = R.drawable.bg_discovery_rank.toDrawable(binding.root.context) recommendReasonTv.visibility = View.VISIBLE diff --git a/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt b/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt index 48bead4321..b99395b6af 100644 --- a/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/discovery/DiscoveryFragment.kt @@ -76,7 +76,7 @@ class DiscoveryFragment : LazyListFragment { viewHolder.binding.getRoot().setBackground(ContextCompat.getDrawable(mContext, R.drawable.reuse_listview_item_style)); - viewHolder.binding.dmItemTvTitle.setTextColor(ContextCompat.getColor(mContext, R.color.text_title)); + viewHolder.binding.dmItemTvTitle.setTextColor(ContextCompat.getColor(mContext, R.color.text_primary)); ExtensionsKt.removeDrawable(viewHolder.binding.dmItemTvSpeed); final DownloadEntity downloadEntity; @@ -179,7 +179,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { DownloadStatus status = downloadEntity.getStatus(); String xapkStatus = downloadEntity.getMeta().get(XapkInstaller.XAPK_UNZIP_STATUS); if (status.equals(DownloadStatus.done)) { - viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); + viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); viewHolder.binding.dmItemTvSpeed.setText("加载完成"); // 重置点击事件避免复用问题 viewHolder.binding.dmItemTvSpeed.setOnClickListener(null); @@ -195,14 +195,14 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.binding.dmItemTvStartorpause.setButtonStyle(DownloadButton.ButtonStyle.XAPK_UNZIPPING); viewHolder.binding.dmItemTvStartorpause.setProgress((int) (Float.parseFloat(percent == null ? "0" : percent) * 10)); viewHolder.binding.dmItemTvStartorpause.setText(percent + "%"); - viewHolder.binding.dmItemTvSpeed.setTextColor(mContext.getResources().getColor(R.color.text_subtitleDesc)); + viewHolder.binding.dmItemTvSpeed.setTextColor(mContext.getResources().getColor(R.color.text_tertiary)); viewHolder.binding.dmItemTvSpeed.setText(R.string.unzipping); return; } else if (XapkUnzipStatus.FAILURE.name().equals(xapkStatus)) { viewHolder.binding.dmItemTvStartorpause.setText(R.string.install); viewHolder.binding.dmItemTvStartorpause.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL); viewHolder.binding.dmItemTvStartorpause.setProgress((int) (downloadEntity.getPercent() * 10)); - viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.theme_red)); + viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.secondary_red)); viewHolder.binding.dmItemTvSpeed.setText("解压失败"); viewHolder.binding.dmItemTvSpeed.setOnClickListener(v -> { XapkDialogHelper.INSTANCE.showUnzipFailureDialog(mContext, downloadEntity, true); @@ -229,7 +229,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.binding.dmItemTvStartorpause.setButtonStyle(DownloadButton.ButtonStyle.INSTALL_NORMAL); } } else if (status.equals(DownloadStatus.downloading) || status.equals(DownloadStatus.redirected)) { - viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); viewHolder.binding.dmItemTvSpeed.setText(String.format("%s(剩%s)", SpeedUtils.getSpeed(downloadEntity.getSpeed()), SpeedUtils.getRemainTime(downloadEntity.getSize(), downloadEntity.getProgress(), downloadEntity.getSpeed() * 1024))); @@ -237,7 +237,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.binding.dmItemTvStartorpause.setButtonStyle(DownloadButton.ButtonStyle.DOWNLOADING_NORMAL); viewHolder.binding.dmItemTvStartorpause.setProgress((int) (downloadEntity.getPercent() * 10)); } else if (status.equals(DownloadStatus.waiting)) { - viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); + viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); viewHolder.binding.dmItemTvSpeed.setText(R.string.waiting); viewHolder.binding.dmItemTvStartorpause.setText(R.string.waiting); viewHolder.binding.dmItemTvStartorpause.setButtonStyle(DownloadButton.ButtonStyle.WAITING); @@ -249,7 +249,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { || status.equals(DownloadStatus.subscribe)) { viewHolder.binding.dmItemTvStartorpause.setText(R.string.resume); viewHolder.binding.dmItemTvStartorpause.setButtonStyle(DownloadButton.ButtonStyle.NORMAL); - viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); + viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); if (status.equals(DownloadStatus.timeout) || status.equals(DownloadStatus.neterror) @@ -261,7 +261,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.binding.dmItemTvSpeed.setText("已暂停"); } } else if (status.equals(DownloadStatus.overflow)) { - viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); + viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); viewHolder.binding.dmItemTvSpeed.setText("数据异常，请重新下载"); viewHolder.binding.dmItemTvStartorpause.setText("失败"); viewHolder.binding.dmItemTvStartorpause.setButtonStyle(DownloadButton.ButtonStyle.FAILURE); @@ -338,7 +338,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { notifyItemChanged(mDownloadedList.isEmpty() ? 0 : 1 + mDownloadedList .size()); } else { - viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); viewHolder.binding.dmItemTvSpeed.setText(String.format("%s(剩%s)", SpeedUtils.getSpeed(downloadEntity.getSpeed()), SpeedUtils.getRemainTime(downloadEntity.getSize(), @@ -402,7 +402,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.binding.dmItemTvStartorpause.setText(R.string.resume); viewHolder.binding.dmItemTvStartorpause.setButtonStyle(DownloadButton.ButtonStyle.NORMAL); viewHolder.binding.dmItemTvSpeed.setText("已暂停"); - viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); + viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); statusMap.put(url, DownloadStatus.pause.getStatus()); notifyItemChanged(mDownloadedList.isEmpty() ? 0 : 1 + mDownloadedList.size()); @@ -425,10 +425,10 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { } else if (holder instanceof DownloadHeadViewHolder) { final DownloadHeadViewHolder viewHolder = (DownloadHeadViewHolder) holder; - viewHolder.binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.background_white)); - viewHolder.binding.divider.setBackgroundColor(ContextCompat.getColor(mContext, R.color.background)); + viewHolder.binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.ui_surface)); + viewHolder.binding.divider.setBackgroundColor(ContextCompat.getColor(mContext, R.color.ui_background)); viewHolder.binding.dmItemHeadTvTask.setTextColor(ContextCompat.getColor(mContext, R.color.text_6c6c6c)); - viewHolder.binding.dmItemHeadTvAllstart.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + viewHolder.binding.dmItemHeadTvAllstart.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); if (position == 0 && mDownloadedList.size() != 0) { viewHolder.binding.dmItemHeadTvTask.setText("已完成"); @@ -451,7 +451,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.binding.dmItemHeadTvAllstart.setTextColor(ContextCompat.getColor(mContext, R.color.btn_gray)); } else { viewHolder.binding.dmItemHeadTvAllstart.setText(R.string.download_all_start); - viewHolder.binding.dmItemHeadTvAllstart.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + viewHolder.binding.dmItemHeadTvAllstart.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); } viewHolder.binding.dmItemHeadTvAllstart.setOnClickListener(v -> { @@ -502,7 +502,7 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { // DownloadManager.getInstance().pauseAll(); viewHolder.binding.dmItemHeadTvAllstart.setText("全部开始"); - viewHolder.binding.dmItemHeadTvAllstart.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + viewHolder.binding.dmItemHeadTvAllstart.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); } 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 47f78b6ae3..fc25182729 100644 --- a/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/NewInstalledGameFragment.kt @@ -128,7 +128,7 @@ class NewInstalledGameFragment : ToolbarFragment() { } else { mBinding.fmInstallRvShow.visibility = View.GONE mBinding.reuseNoneData.reuseNoneData.visibility = View.VISIBLE - mBinding.reuseNoneData.reuseNoneData.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.reuseNoneData.reuseNoneData.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } } } @@ -227,10 +227,10 @@ class NewInstalledGameFragment : ToolbarFragment() { 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())) - mBinding.reuseNoneData.reuseNoneDataDescTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + mBinding.root.setBackgroundColor(R.color.ui_background.toColor(requireContext())) + mBinding.reuseNoneData.reuseNoneData.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(R.color.text_primary.toColor(requireContext())) + mBinding.reuseNoneData.reuseNoneDataDescTv.setTextColor(R.color.text_tertiary.toColor(requireContext())) mBinding.reuseNoneData.reuseNoneDataIv.setImageResource(R.drawable.ic_empty_data) mAdapter?.let { it.notifyItemRangeChanged(0, it.itemCount) } mBinding.fmInstallRvShow.run { diff --git a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt index 0de76fb56e..f09eca5c63 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameAdapter.kt @@ -123,7 +123,7 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : holder.binding.infoTv.text = itemData.header ?: itemData.ignoredUpdateHeader ?: itemData.landPageAddressDialogHeader if (itemData.header != null) { - holder.binding.infoTv.setTextColor(R.color.text_title.toColor(mContext)) + holder.binding.infoTv.setTextColor(R.color.text_primary.toColor(mContext)) (holder.binding.infoTv.layoutParams as ConstraintLayout.LayoutParams).apply { bottomToBottom = ConstraintLayout.LayoutParams.UNSET } @@ -131,7 +131,7 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : holder.binding.root.setPadding(16F.dip2px(), 16F.dip2px(), 16F.dip2px(), 0) holder.binding.infoTv.removeDrawable() } else if (itemData.landPageAddressDialogHeader != null) { - holder.binding.infoTv.setTextColor(R.color.theme_yellow.toColor(mContext)) + holder.binding.infoTv.setTextColor(R.color.secondary_yellow.toColor(mContext)) (holder.binding.infoTv.layoutParams as ConstraintLayout.LayoutParams).apply { bottomToBottom = ConstraintLayout.LayoutParams.PARENT_ID } @@ -139,7 +139,7 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : holder.binding.root.setPadding(16F.dip2px(), 0, 16F.dip2px(), 0) holder.binding.root.setBackgroundColor(R.color.home_realname_error.toColor(mContext)) } else { - holder.binding.infoTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + holder.binding.infoTv.setTextColor(R.color.text_tertiary.toColor(mContext)) (holder.binding.infoTv.layoutParams as ConstraintLayout.LayoutParams).apply { bottomToBottom = ConstraintLayout.LayoutParams.UNSET } @@ -160,11 +160,11 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : is BlankDividerViewHolder -> { if (itemData.divider == UpdatableGameViewModel.GREY) { - holder.binding.container.setBackgroundColor(R.color.background.toColor(holder.binding.root.context)) + holder.binding.container.setBackgroundColor(R.color.ui_background.toColor(holder.binding.root.context)) } else if (itemData.divider == UpdatableGameViewModel.BLUE) { holder.binding.container.setBackgroundColor(R.color.update_other_version_highlight.toColor(holder.binding.root.context)) } else { - holder.binding.container.setBackgroundColor(R.color.background_white.toColor(holder.binding.root.context)) + holder.binding.container.setBackgroundColor(R.color.ui_surface.toColor(holder.binding.root.context)) } } @@ -179,9 +179,9 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : val downloadManager = DownloadManager.getInstance() holder.binding.run { - nameTv.setTextColor(R.color.text_title.toColor(context)) - currentVersionTv.setTextColor(R.color.text_subtitleDesc.toColor(context)) - newVersionTv.setTextColor(R.color.text_subtitleDesc.toColor(context)) + nameTv.setTextColor(R.color.text_primary.toColor(context)) + currentVersionTv.setTextColor(R.color.text_tertiary.toColor(context)) + newVersionTv.setTextColor(R.color.text_tertiary.toColor(context)) otherVersionHintIv.goneIf(itemData.normalUpdateWithArrow == null) container.setOnClickListener { @@ -196,7 +196,7 @@ class UpdatableGameAdapter(private var mViewModel: UpdatableGameViewModel) : if (itemData.otherVersionUpdate != null) { container.setBackgroundColor(R.color.update_other_version_highlight.toColor(context)) } else { - container.setBackgroundColor(R.color.background_white.toColor(context)) + container.setBackgroundColor(R.color.ui_surface.toColor(context)) } iconIv.displayGameIcon(update.rawIcon ?: update.icon, update.iconSubscript, update.iconFloat) 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 dc63bd3c8a..ca6d0ccd73 100644 --- a/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/download/UpdatableGameFragment.kt @@ -141,9 +141,9 @@ class UpdatableGameFragment : LazyFragment() { 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())) + mBinding?.recyclerView?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding?.noDataContainer?.reuseNoneDataTv?.setTextColor(R.color.text_primary.toColor(requireContext())) + mBinding?.noDataContainer?.reuseNoneDataDescTv?.setTextColor(R.color.text_tertiary.toColor(requireContext())) mBinding?.noDataContainer?.reuseNoneDataIv?.setImageResource(R.drawable.ic_empty_data) mAdapter?.let { it.notifyItemRangeChanged(0, it.itemCount) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt index 256c16c390..d106a0995c 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt @@ -222,8 +222,8 @@ class ForumArticleAskListAdapter( val articleListHead = if (path == "全部") { viewModel.selectedSection.name } else path - holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext)) - holder.binding.articleListHeadTv.setTextColor(R.color.text_title.toColor(mContext)) + holder.binding.root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) + holder.binding.articleListHeadTv.setTextColor(R.color.text_primary.toColor(mContext)) holder.binding.articleListHeadTv.text = "${articleListHead}列表" if (path != "精华") { @@ -232,8 +232,8 @@ class ForumArticleAskListAdapter( setContainerBackground(R.drawable.button_round_f5f5f5.toDrawable(mContext)) setIndicatorBackground(R.drawable.bg_game_collection_sfv_indicator.toDrawable(mContext)) setTextColor( - R.color.text_subtitle.toColor(mContext), - R.color.text_subtitleDesc.toColor(mContext) + R.color.text_secondary.toColor(mContext), + R.color.text_tertiary.toColor(mContext) ) setItemList(if (path == "视频") mVideoOrderList else mDefOrderList, mFilterPosition) 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 53940dfe07..e5437b007d 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 @@ -14,19 +14,16 @@ import com.gh.gamecenter.common.utils.safelyGetInRelease import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.common.utils.tryCatchInRelease import com.gh.gamecenter.common.utils.viewModelProvider -import com.gh.gamecenter.core.AppExecutor import com.gh.gamecenter.core.iinterface.IScrollable import com.gh.gamecenter.core.utils.MD5Utils import com.gh.gamecenter.databinding.FragmentListBaseSkeletonBinding import com.gh.gamecenter.entity.ForumDetailEntity import com.gh.gamecenter.eventbus.EBDeleteDetail -import com.gh.gamecenter.eventbus.EBTypeChange import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper import com.gh.gamecenter.feature.entity.AnswerEntity import com.gh.gamecenter.video.detail.CustomManager import com.shuyu.gsyvideoplayer.video.base.GSYVideoView -import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -80,15 +77,15 @@ class ForumArticleAskListFragment : LazyListFragment(R.id.titleTv) if (highlightIt) { targetView.background = R.drawable.button_round_theme_alpha_10.toDrawable(requireContext()) - sectionTv?.setTextColor(R.color.theme_font.toColor(requireContext())) + sectionTv?.setTextColor(R.color.text_theme.toColor(requireContext())) } else { targetView.background = R.drawable.button_round_gray_light.toDrawable(requireContext()) - sectionTv?.setTextColor(R.color.text_subtitle.toColor(requireContext())) + sectionTv?.setTextColor(R.color.text_secondary.toColor(requireContext())) } } diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumSectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumSectionAdapter.kt index 0d756e9838..06f612135c 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumSectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumSectionAdapter.kt @@ -40,7 +40,7 @@ class ForumSectionAdapter(context: Context, val viewModel: ForumDetailViewModel, holder.binding.titleTv.run { text = entity.name setTextColor( - if (entity.id == viewModel.selectedSection.id) R.color.theme_font.toColor(mContext) else R.color.text_subtitle.toColor( + if (entity.id == viewModel.selectedSection.id) R.color.text_theme.toColor(mContext) else R.color.text_secondary.toColor( mContext ) ) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt index 4d2329a26a..6dd1b764bb 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt @@ -225,7 +225,7 @@ class CommunityHomeFragment : LazyFragment() { communityEditBtn.goneIf(position != 0) when (position) { TAB_RECOMMEND_INDEX -> { - root.setBackgroundColor(R.color.background.toColor(requireContext())) + root.setBackgroundColor(R.color.ui_background.toColor(requireContext())) topBg.translationY = 0F changeNavigationBg() NewLogUtils.logCommunityHomeEvent("click_for_you_tab") @@ -233,7 +233,7 @@ class CommunityHomeFragment : LazyFragment() { } TAB_FORUM_INDEX -> { - root.setBackgroundColor(R.color.background_white.toColor(requireContext())) + root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) (mFragmentList[1] as ForumFragment).translationY.run { topBg.translationY = -this.toFloat() changeNavigationBg(this) @@ -243,7 +243,7 @@ class CommunityHomeFragment : LazyFragment() { } TAB_ACTIVITY_INDEX -> { - root.setBackgroundColor(R.color.background.toColor(requireContext())) + root.setBackgroundColor(R.color.ui_background.toColor(requireContext())) (mFragmentList[2] as ForumActivityFragment).translationY.run { topBg.translationY = -this.toFloat() changeNavigationBg(this) @@ -614,9 +614,9 @@ class CommunityHomeFragment : LazyFragment() { if (navigationBg.drawable == null) { navigationBg.setBackgroundColor( if (viewPager.currentItem == TAB_FORUM_INDEX) { - R.color.background_white.toColor(requireContext()) + R.color.ui_surface.toColor(requireContext()) } else { - R.color.background.toColor(requireContext()) + R.color.ui_background.toColor(requireContext()) } ) navigationBg.setImageBitmap(mNavigationBitmap) @@ -626,13 +626,13 @@ class CommunityHomeFragment : LazyFragment() { navigationBg.setImageDrawable(null) } else if (viewPager.currentItem == TAB_RECOMMEND_INDEX) { navigationBg.setBackgroundColor( - if (mIsDarkModeOn && y > 0) R.color.background_white.toColor(requireContext()) else if (mIsDarkModeOn && y == 0) R.color.background.toColor( + if (mIsDarkModeOn && y > 0) R.color.ui_surface.toColor(requireContext()) else if (mIsDarkModeOn && y == 0) R.color.ui_background.toColor( requireContext() ) else R.color.transparent.toColor(requireContext()) ) navigationBg.setImageDrawable(null) } else if (mIsDarkModeOn) { - navigationBg.setBackgroundColor(R.color.background_white.toColor(requireContext())) + navigationBg.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) navigationBg.setImageDrawable(null) } } @@ -651,7 +651,7 @@ class CommunityHomeFragment : LazyFragment() { } mBinding?.run { root.setBackgroundColor( - if (viewPager.currentItem == TAB_FORUM_INDEX) R.color.background_white.toColor(requireContext()) else R.color.background.toColor( + if (viewPager.currentItem == TAB_FORUM_INDEX) R.color.ui_surface.toColor(requireContext()) else R.color.ui_background.toColor( requireContext() ) ) @@ -670,15 +670,15 @@ class CommunityHomeFragment : LazyFragment() { } } } - searchTv.setHintTextColor(R.color.text_body.toColor(requireContext())) - searchTv.setTextColor(R.color.text_body.toColor(requireContext())) + searchTv.setHintTextColor(R.color.text_instance.toColor(requireContext())) + searchTv.setTextColor(R.color.text_instance.toColor(requireContext())) } } fun getTopBgView() = mBinding?.topBg companion object { - var TAB_SELECTED_COLOR: Int = R.color.text_title + var TAB_SELECTED_COLOR: Int = R.color.text_primary var TAB_DEFAULT_COLOR: Int = R.color.community_forum_more var DEFAULT_TAB_TEXT_SIZE = 18F var DEFAULT_TAB_TEXT_WIDTH = 60F.dip2px() 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 89f68a581c..8463c17fed 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 @@ -62,9 +62,9 @@ class ForumActivityAdapter( val activityEntity = mEntityList[position] ImageUtils.display(introPic, activityEntity.image.cover) title.text = activityEntity.title - title.setTextColor(R.color.text_title.toColor(mContext)) - startTimeTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - endTimeTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + title.setTextColor(R.color.text_primary.toColor(mContext)) + startTimeTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + endTimeTv.setTextColor(R.color.text_tertiary.toColor(mContext)) var status = "" val currentTime = TimeUtil.currentTime() @@ -72,10 +72,10 @@ class ForumActivityAdapter( // 未开始 currentTime < activityEntity.effectTime.start -> { status = "未开始" - statusContainer.setCardBackgroundColor(R.color.background_space.toColor(mContext)) + statusContainer.setCardBackgroundColor(R.color.ui_container_1.toColor(mContext)) statusIv.setImageResource(R.drawable.ic_activity_waiting) statusTv.text = "未开始" - statusTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + statusTv.setTextColor(R.color.text_tertiary.toColor(mContext)) val startTime = TimeUtils.getFormatTime(activityEntity.effectTime.start, "yyyy.MM.dd") val endTime = TimeUtils.getFormatTime(activityEntity.effectTime.end, "yyyy.MM.dd") timeIv.visibility = View.VISIBLE @@ -143,10 +143,10 @@ class ForumActivityAdapter( // 已结束 currentTime > activityEntity.awardTime.end -> { status = "已结束" - statusContainer.setCardBackgroundColor(R.color.background_space.toColor(mContext)) + statusContainer.setCardBackgroundColor(R.color.ui_container_1.toColor(mContext)) statusIv.setImageResource(R.drawable.ic_activity_end) statusTv.text = "已结束" - statusTv.setTextColor(R.color.text_body.toColor(mContext)) + statusTv.setTextColor(R.color.text_instance.toColor(mContext)) val startTime = TimeUtils.getFormatTime(activityEntity.effectTime.start, "yyyy.MM.dd") val endTime = TimeUtils.getFormatTime(activityEntity.effectTime.end, "yyyy.MM.dd") timeIv.visibility = View.VISIBLE 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 8324389e38..091e4baa30 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 @@ -80,7 +80,7 @@ class ForumActivityFragment : LazyListFragment R.color.theme_alpha_80 - entity.status == "pending" -> R.color.text_subtitleDesc + entity.status == "pending" -> R.color.text_tertiary else -> R.color.text_CCFF5269 }.toColor(statusTv.context) ) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt index 36030ee926..b454e3d2e6 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt @@ -11,7 +11,6 @@ import com.gh.gamecenter.R import com.gh.gamecenter.common.base.activity.BaseActivity import com.gh.gamecenter.common.baselist.ListAdapter import com.gh.gamecenter.common.constant.ItemViewType -import com.gh.gamecenter.common.entity.CommunityEntity import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.viewholder.FooterViewHolder @@ -74,7 +73,7 @@ class ForumArticleListAdapter( if (position == 0) { root.background = R.drawable.background_shape_white_radius_12_top_only.toDrawable(mContext) } else { - root.setBackgroundColor(R.color.background_white.toColor(mContext)) + root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) } rightContainer.setBackgroundColor(Color.TRANSPARENT) topLine.goneIf(position == 0) 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 872750f315..62bfb0f372 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 @@ -21,7 +21,6 @@ import com.gh.gamecenter.databinding.FragmentForumListBinding import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.eventbus.EBDeleteDetail import com.gh.gamecenter.eventbus.EBForumRecordChange -import com.gh.gamecenter.eventbus.EBTypeChange import com.gh.gamecenter.eventbus.EBUserFollow import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper.Companion.getPlaySchedule import com.gh.gamecenter.forum.home.ForumScrollCalculatorHelper.Companion.savePlaySchedule @@ -30,7 +29,6 @@ import com.gh.gamecenter.login.user.UserViewModel import com.gh.gamecenter.video.detail.CustomManager import com.google.android.material.appbar.AppBarLayout import com.shuyu.gsyvideoplayer.video.base.GSYVideoView -import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import kotlin.math.abs @@ -110,7 +108,7 @@ class ForumArticleListFragment : LazyListFragment { holder.binding.run { - root.setBackgroundColor(R.color.background_white.toColor(mContext)) - forumNameTv.setTextColor(R.color.text_title.toColor(mContext)) - topLine.setBackgroundColor(R.color.divider.toColor(mContext)) + root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) + forumNameTv.setTextColor(R.color.text_primary.toColor(mContext)) + topLine.setBackgroundColor(R.color.ui_divider.toColor(mContext)) val forumEntity = mEntityList[position] forumNameTv.text = forumEntity.name @@ -83,11 +83,11 @@ class ForumListAdapter( followTv.run { text = if (forumEntity.me.isFollowForum) { background = R.drawable.button_round_gray_light.toDrawable(mContext) - setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + setTextColor(R.color.text_tertiary.toColor(mContext)) "已关注" } else { background = R.drawable.button_round_primary_light.toDrawable(mContext) - setTextColor(R.color.theme_font.toColor(mContext)) + setTextColor(R.color.text_theme.toColor(mContext)) "关注" } } @@ -99,7 +99,7 @@ class ForumListAdapter( mViewModel?.unFollowForum(forumEntity.id) { forumEntity.me.isFollowForum = false followTv.setBackgroundResource(R.drawable.button_round_primary_light) - followTv.setTextColor(R.color.theme_font.toColor(mContext)) + followTv.setTextColor(R.color.text_theme.toColor(mContext)) followTv.text = "关注" EventBus.getDefault().post(EBForumFollowChange(forumEntity, false)) } @@ -107,7 +107,7 @@ class ForumListAdapter( mViewModel?.followForum(forumEntity.id) { forumEntity.me.isFollowForum = true followTv.setBackgroundResource(R.drawable.button_round_gray_light) - followTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + followTv.setTextColor(R.color.text_tertiary.toColor(mContext)) followTv.text = "已关注" ToastUtils.showToast("关注成功") EventBus.getDefault().post(EBForumFollowChange(forumEntity, true)) diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt index f882803f81..da89462f2a 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ApplyModeratorActivity.kt @@ -42,7 +42,7 @@ class ApplyModeratorActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } private fun setStatusBarTransparent() { diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt index b05587aee5..97b7bdbc82 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListActivity.kt @@ -37,7 +37,7 @@ class ModeratorListActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) hideToolbar(true) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled(): Boolean = true @@ -45,6 +45,6 @@ class ModeratorListActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt index 6c86ff8b38..031e7113ec 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListAdapter.kt @@ -49,7 +49,7 @@ class ModeratorListAdapter(context: Context, val mViewModel: ModeratorListViewMo ) followTv.text = if (personalEntity.me.isFollower) "已关注" else "关注" followTv.setTextColor( - if (personalEntity.me.isFollower) R.color.text_subtitleDesc.toColor(mContext) else R.color.theme_font.toColor( + if (personalEntity.me.isFollower) R.color.text_tertiary.toColor(mContext) else R.color.text_theme.toColor( mContext ) ) diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt index d581c7539a..d48c69b652 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorListFragment.kt @@ -43,7 +43,7 @@ class ModeratorListFragment : ToolbarFragment() { mViewModel?.isModerators?.observe(this, Observer { if (it) { mBinding.applyTv.background = R.drawable.bg_forum_follow.toDrawable() - mBinding.applyTv.setTextColor(R.color.theme_font.toColor(requireContext())) + mBinding.applyTv.setTextColor(R.color.text_theme.toColor(requireContext())) mBinding.applyTv.text = "您已是版主" mBinding.applyTv.setOnClickListener { NewLogUtils.logForumModeratorClick("click_member") @@ -137,7 +137,7 @@ class ModeratorListFragment : ToolbarFragment() { override fun onDarkModeChanged() { super.onDarkModeChanged() mBinding.toolbar.setNavigationIcon(R.drawable.ic_bar_back) - mBinding.toolbar.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.toolbar.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mBinding.title.setTextColor(R.color.text_black.toColor(requireContext())) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorTaskAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorTaskAdapter.kt index 255ad2f77b..315db4ff3c 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorTaskAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/moderator/ModeratorTaskAdapter.kt @@ -44,7 +44,7 @@ class ModeratorTaskAdapter(context: Context) : ) finishTv.text = if (taskEntity.finishedTask) "已完成" else "去完成" finishTv.setTextColor( - if (taskEntity.finishedTask) R.color.text_subtitleDesc.toColor(mContext) else R.color.white.toColor( + if (taskEntity.finishedTask) R.color.text_tertiary.toColor(mContext) else R.color.white.toColor( mContext ) ) diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt index f879ddf8a7..f16b997e12 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt @@ -265,7 +265,7 @@ class ForumContentSearchListAdapter( statusTv.setTextColor( when { answer.me.isFollower -> R.color.theme_alpha_80 - answer.status == "pending" -> R.color.text_subtitleDesc + answer.status == "pending" -> R.color.text_tertiary else -> R.color.text_CCFF5269 }.toColor(statusTv.context) ) diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt index 50b6bec9cc..d112333f08 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListFragment.kt @@ -81,8 +81,8 @@ class ForumContentSearchListFragment : LazyListFragment= 1F && color != R.color.background_white.toColor(requireContext())) { + if ((currentTab?.offsetRatio ?: 0F) >= 1F && color != R.color.ui_surface.toColor(requireContext())) { currentTab?.currentSelectColor = color currentTab?.primaryColor = color } - updateAppBarStyle(color, color != R.color.background_white.toColor(requireContext())) + updateAppBarStyle(color, color != R.color.ui_surface.toColor(requireContext())) } fun changeAppBarColor(color: Int) { @@ -912,7 +912,7 @@ class HomeSearchToolWrapperFragment : HomeTabWrapperFragment() { homeTab?.currentSelectColor = color if (homeTab?.isTopViewShow == true) { val colorInBetween = - ColorUtils.blendARGB(color, R.color.background_white.toColor(requireContext()), homeTab.offsetRatio) + ColorUtils.blendARGB(color, R.color.ui_surface.toColor(requireContext()), homeTab.offsetRatio) homeTab.primaryColor = colorInBetween } } else { @@ -921,11 +921,11 @@ class HomeSearchToolWrapperFragment : HomeTabWrapperFragment() { val colorInBetween = ColorUtils.blendARGB( color, - R.color.background_white.toColor(requireContext()), + R.color.ui_surface.toColor(requireContext()), currentTab.offsetRatio ) currentTab.primaryColor = colorInBetween - updateAppBarStyle(colorInBetween, colorInBetween != R.color.background_white.toColor(requireContext())) + updateAppBarStyle(colorInBetween, colorInBetween != R.color.ui_surface.toColor(requireContext())) } } } @@ -960,7 +960,7 @@ class HomeSearchToolWrapperFragment : HomeTabWrapperFragment() { private fun updateTabAndToolbarStyle() { mViewModel?.tabs?.value?.forEach { if (it.type != "top_game_comment") { - it.primaryColor = R.color.background_white.toColor(requireContext()) + it.primaryColor = R.color.ui_surface.toColor(requireContext()) } } mBinding?.viewPager?.currentItem?.let { @@ -973,8 +973,8 @@ class HomeSearchToolWrapperFragment : HomeTabWrapperFragment() { } } mBinding?.run { - tabBackground.setOnlyTopRoundedColorBackground(R.color.background_white.toColor(requireContext()), 8F) - toolbarBackground.setBackgroundColor(R.color.background_white.toColor(requireContext())) + tabBackground.setOnlyTopRoundedColorBackground(R.color.ui_surface.toColor(requireContext()), 8F) + toolbarBackground.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) if (mShowTwoLevel) { updateBackgroundAlpha(mHeaderOffset) } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeTabWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeTabWrapperFragment.kt index ed9277e500..5d85931d3c 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeTabWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeTabWrapperFragment.kt @@ -87,8 +87,8 @@ abstract class HomeTabWrapperFragment : SearchToolWrapperFragment() { override fun onFragmentFirstVisible() { super.onFragmentFirstVisible() - mBackgroundColor = R.color.background.toColor(requireContext()) - mBackgroundWhiteColor = R.color.background_white.toColor(requireContext()) + mBackgroundColor = R.color.ui_background.toColor(requireContext()) + mBackgroundWhiteColor = R.color.ui_surface.toColor(requireContext()) mAmwayPrimaryColor = R.color.amway_primary_color.toColor(requireContext()) mTabDefaultColor = TAB_DEFAULT_COLOR.toColor(requireContext()) mTabSelectedColor = TAB_SELECTED_COLOR.toColor(requireContext()) @@ -558,8 +558,8 @@ abstract class HomeTabWrapperFragment : SearchToolWrapperFragment() { override fun onDarkModeChanged() { super.onDarkModeChanged() - mBackgroundColor = R.color.background.toColor(requireContext()) - mBackgroundWhiteColor = R.color.background_white.toColor(requireContext()) + mBackgroundColor = R.color.ui_background.toColor(requireContext()) + mBackgroundWhiteColor = R.color.ui_surface.toColor(requireContext()) mAmwayPrimaryColor = R.color.amway_primary_color.toColor(requireContext()) mTabDefaultColor = TAB_DEFAULT_COLOR.toColor(requireContext()) mTabSelectedColor = TAB_SELECTED_COLOR.toColor(requireContext()) @@ -569,8 +569,8 @@ abstract class HomeTabWrapperFragment : SearchToolWrapperFragment() { companion object { const val LAST_SELECTED_POSITION = "last_selected_position" - var TAB_SELECTED_COLOR: Int = R.color.text_title - var TAB_DEFAULT_COLOR: Int = R.color.text_subtitle + var TAB_SELECTED_COLOR: Int = R.color.text_primary + var TAB_DEFAULT_COLOR: Int = R.color.text_secondary var TAB_DEFAULT_COLOR_LIGHT: Int = R.color.search_text_color_light diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeToolbarWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeToolbarWrapperFragment.kt index 3f6be6175e..d3e44feb48 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeToolbarWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeToolbarWrapperFragment.kt @@ -247,7 +247,7 @@ class HomeToolbarWrapperFragment: LazyFragment(), ToolbarController { override fun onDarkModeChanged() { super.onDarkModeChanged() DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn) - mToolbar?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mToolbar?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mTitleTv?.setTextColor(R.color.text_black.toColor(requireContext())) if (mShowDownloadMenu && getMenuItem(R.id.menu_download) != null) { (getMenuItem(R.id.menu_download)?.actionView?.findViewById(R.id.menu_download_iv) as ImageView).setImageResource( diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.kt index bc46da9412..0b0b106e50 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.kt @@ -536,7 +536,7 @@ class MainWrapperFragment : BaseFragment_ViewPager_Checkable(), OnBackPressedLis changeTabImageColor(R.color.text_A1A5B7, PorterDuff.Mode.SRC_ATOP, toCheck) } else { mBinding.viewShadow.visibility = if (mIsDarkModeOn) View.GONE else View.VISIBLE - mCheckableGroup.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)) + mCheckableGroup.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)) changeTabImageColor( if (mIsDarkModeOn) R.color.text_A1A5B7 else R.color.text_50556B, if (mIsDarkModeOn) PorterDuff.Mode.SRC_ATOP else PorterDuff.Mode.DST, @@ -620,7 +620,7 @@ class MainWrapperFragment : BaseFragment_ViewPager_Checkable(), OnBackPressedLis if (checkableView != null) { val unselectColor: Int = if (mFourthFragment is HomeVideoFragment && toCheck == INDEX_VIDEO) R.color.text_A1A5B7 else R.color.tab_text_unselect checkableView.setTextColor( - ContextCompat.getColor(requireContext(), if (isChecked) R.color.theme_font else unselectColor) + ContextCompat.getColor(requireContext(), if (isChecked) R.color.text_theme else unselectColor) ) } } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java index 760dcb8d6f..2e089fe3fe 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolWrapperFragment.java @@ -127,7 +127,7 @@ public class SearchToolWrapperFragment extends LazyFragment { if (isSupportVisible()) DisplayUtils.setLightStatusBar(requireActivity(), !mIsDarkModeOn); View statusBar = getView().findViewById(R.id.statusBar); if (statusBar != null) { - statusBar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + statusBar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); } } } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java index 77e6a584f3..ad8e2c48ef 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -409,7 +409,7 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl ((ImageView) mCachedView.findViewById(R.id.actionbar_download)).setImageResource(R.drawable.toolbar_download); ((ImageView) mCachedView.findViewById(R.id.actionbar_message)).setImageResource(R.drawable.toolbar_message); ((ImageView) mCachedView.findViewById(R.id.actionbar_teenager_model_iv)).setImageResource(R.drawable.toolbar_teenager); - ((TextView) mCachedView.findViewById(R.id.actionbar_teenager_model_tv)).setTextColor(ContextCompat.getColor(requireContext(), R.color.text_subtitle)); + ((TextView) mCachedView.findViewById(R.id.actionbar_teenager_model_tv)).setTextColor(ContextCompat.getColor(requireContext(), R.color.text_secondary)); mSearchRightView.setImageResource(R.drawable.toolbar_search); mTeenagerModelView.setBackgroundResource(R.drawable.button_round_f2f4f7); mSearchHintTv.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.search_text_color_default)); @@ -424,7 +424,7 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl return; } updateStyle(mIsDarkModeOn); - updateSearchToolbarColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + updateSearchToolbarColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); } } diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt index e91ee0a1f7..80fa137a2e 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragment.kt @@ -110,7 +110,7 @@ open class GameFragment : LazyFragment() { mBinding.root.setBackgroundColor(Color.TRANSPARENT) mSkeleton.hide() } else { - mBinding.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mSkeleton.show() mViewModel.resetOffset() } @@ -137,7 +137,7 @@ open class GameFragment : LazyFragment() { mBinding = FragmentGameBinding.bind(mCachedView) mScrollCalculatorHelper = ScrollCalculatorHelper(mBinding.gameList, R.id.autoVideoView, 0) - mBinding.gameRefresh.setColorSchemeColors(ContextCompat.getColor(requireContext(), R.color.theme)) + mBinding.gameRefresh.setColorSchemeColors(ContextCompat.getColor(requireContext(), R.color.primary_theme)) mLayoutManager = FixLinearLayoutManager(context) val exposureSourceList = arrayListOf().apply { arguments?.getParcelable(EntranceConsts.KEY_EXPOSURE_SOURCE)?.let { @@ -220,7 +220,7 @@ open class GameFragment : LazyFragment() { mSkeleton = Skeleton.bind(mBinding.gameSkeletonContainer) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) @@ -369,7 +369,7 @@ open class GameFragment : LazyFragment() { super.onDarkModeChanged() if (::mListAdapter.isInitialized && ::mBinding.isInitialized) { mListAdapter.notifyItemRangeChanged(0, mListAdapter.itemCount) - mBinding.gameList.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.gameList.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } } diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt index 3eba299a63..8d672bd8ac 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailActivity.kt @@ -14,7 +14,7 @@ class ColumnCollectionDetailActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun provideNormalIntent(): Intent { @@ -30,7 +30,7 @@ class ColumnCollectionDetailActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun getBusinessId(): Pair { diff --git a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt index 8e3aee5a51..546531a9c6 100644 --- a/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/columncollection/detail/ColumnCollectionDetailFragment.kt @@ -60,7 +60,7 @@ class ColumnCollectionDetailFragment : LazyListFragment { diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt index 9aaaed8039..599308b3b8 100644 --- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/detail/CommonCollectionDetailFragment.kt @@ -85,7 +85,7 @@ class CommonCollectionDetailFragment : LazyListFragment Unit ) { binding.titleTv.text = subjectEntity.name - binding.titleTv.setTextColor(R.color.text_title.toColor(binding.root.context)) + binding.titleTv.setTextColor(R.color.text_primary.toColor(binding.root.context)) val gameIconList = arrayListOf( binding.iconIv1, @@ -73,7 +73,7 @@ class GameGalleryViewHolder(val cell: GameGalleryItemCell) : } binding.cardView.setCardBackgroundColor(R.color.text_FAFAFA.toColor(binding.root.context)) - binding.titleTv.setTextColor(R.color.text_title.toColor(binding.root.context)) + binding.titleTv.setTextColor(R.color.text_primary.toColor(binding.root.context)) } class GameGalleryItemCell(context: Context) : AsyncCell(context) { 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 37e17f6c1d..0ac4eb801e 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 @@ -22,7 +22,7 @@ class GameHorizontalItemViewHolder(val binding: GameHorizontalItemBinding) : }) binding.firstRemark.text = gameEntity.assignRemark.firstLine binding.firstRemark.setTextColor( - if (gameEntity.assignRemark.markedRed) Color.parseColor("#F10000") else R.color.text_title.toColor( + if (gameEntity.assignRemark.markedRed) Color.parseColor("#F10000") else R.color.text_primary.toColor( binding.root.context ) ) @@ -59,9 +59,9 @@ class GameHorizontalItemViewHolder(val binding: GameHorizontalItemBinding) : if (startTime < currentTime && (endTime > currentTime || startTime > endTime) ) { - binding.remarkDot.setRoundedColorBackground(R.color.theme, 5F) + binding.remarkDot.setRoundedColorBackground(R.color.primary_theme, 5F) } else if (startTime == 0L && endTime > currentTime) { - binding.remarkDot.setRoundedColorBackground(R.color.theme, 5F) + binding.remarkDot.setRoundedColorBackground(R.color.primary_theme, 5F) } else { if (isDarkModeOn) { binding.remarkDot.background = GradientDrawable().apply { @@ -69,7 +69,7 @@ class GameHorizontalItemViewHolder(val binding: GameHorizontalItemBinding) : setColor(Color.parseColor("#555555")) } } else { - binding.remarkDot.setRoundedColorBackground(R.color.text_body, 5F) + binding.remarkDot.setRoundedColorBackground(R.color.text_instance, 5F) } } } else { diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt index 2ae637b016..5048b84abb 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideAdapter.kt @@ -54,7 +54,7 @@ class GameHorizontalSlideAdapter( override fun onBindViewHolder(holder: GameHorizontalItemViewHolder, position: Int) { holder.binding.remarkLine.setBackgroundColor(R.color.btn_gray_light.toColor(holder.binding.root.context)) - holder.binding.secondRemark.setTextColor(R.color.text_subtitleDesc.toColor(holder.binding.root.context)) + holder.binding.secondRemark.setTextColor(R.color.text_tertiary.toColor(holder.binding.root.context)) holder.binding.root.setPadding(0, 8F.dip2px(), 0, 8F.dip2px()) holder.binding.simpleGameContainer.root.setPadding(8F.dip2px(), 0, 8F.dip2px(), 0) holder.binding.root.layoutParams = @@ -64,7 +64,7 @@ class GameHorizontalSlideAdapter( val gameEntity = mSubjectEntity.data!![position + getIndex()] holder.binding.simpleGameContainer.run { - gameName.setTextColor(R.color.text_title.toColor(root.context)) + gameName.setTextColor(R.color.text_primary.toColor(root.context)) gameIcon.displayGameIcon(gameEntity) GameHorizontalSimpleItemViewHolder.setHorizontalNameAndGravity(gameName, gameEntity.name) } diff --git a/app/src/main/java/com/gh/gamecenter/game/imageslide/ImageSlideAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/imageslide/ImageSlideAdapter.kt index ca23f3bee8..2f87e29ec3 100644 --- a/app/src/main/java/com/gh/gamecenter/game/imageslide/ImageSlideAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/imageslide/ImageSlideAdapter.kt @@ -39,7 +39,7 @@ class ImageSlideAdapter( val padR = if (position == itemCount - 1) 20F.dip2px() else 0 val padL = if (position == 0) 180F.dip2px() else 16F.dip2px() holder.binding.root.setPadding(padL, 0, padR, 24F.dip2px()) - holder.binding.gameName.setTextColor(R.color.text_title.toColor(holder.binding.root.context)) + holder.binding.gameName.setTextColor(R.color.text_primary.toColor(holder.binding.root.context)) val gameEntity = subject.games?.get(position) gameEntity?.let { diff --git a/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt index abe3b66fad..071cff1cab 100644 --- a/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/rank/RankCollectionAdapter.kt @@ -140,11 +140,11 @@ class RankCollectionAdapter( viewHolder.checkResetData(updateDate.columns.safelyGetInRelease(position)) (viewHolder.itemView as RankCollectionItemCell).binding?.run { background.hierarchy?.setPlaceholderImage(R.drawable.bg_rank_list.toDrawable(mContext)) - rankTitle.setTextColor(R.color.text_title.toColor(root.context)) - rankTitleIndicator.setTextColor(R.color.text_title.toColor(root.context)) + rankTitle.setTextColor(R.color.text_primary.toColor(root.context)) + rankTitleIndicator.setTextColor(R.color.text_primary.toColor(root.context)) for (item in viewHolder.gameItemList) { item.rankItemUi.orderTv.setTextColor(R.color.title.toColor(root.context)) - item.rankItemUi.nameTv.setTextColor(R.color.text_title.toColor(root.context)) + item.rankItemUi.nameTv.setTextColor(R.color.text_primary.toColor(root.context)) } } } diff --git a/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt index 056bf74e8c..bc42672d01 100644 --- a/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/rank/RankGameItemUi.kt @@ -119,7 +119,7 @@ class RankGameItemUi(override val ctx: Context) : Ui { private fun initNameTv() = textView { setSingleLine() - setTextColor(ContextCompat.getColor(context, R.color.text_title)) + setTextColor(ContextCompat.getColor(context, R.color.text_primary)) textSize = 13F typeface = Typeface.DEFAULT_BOLD ellipsize = TextUtils.TruncateAt.END 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 ac6ce4e4cc..a74e36211c 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 @@ -27,7 +27,7 @@ class GameSubmissionActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun provideNormalIntent(): Intent { @@ -38,6 +38,6 @@ class GameSubmissionActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt index e4e0588b6d..01bc123739 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameUploadFragment.kt @@ -169,7 +169,7 @@ class GameUploadFragment : ToolbarFragment() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = resources.getColor(R.color.theme_font) + ds.color = resources.getColor(R.color.text_theme) ds.isUnderlineText = false } diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt index 116fba9dc3..aa4eeee98c 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameItemUi.kt @@ -177,7 +177,7 @@ class GameItemUi(override val ctx: Context) : Ui { typeface = Typeface.DEFAULT_BOLD textSize = 14F ellipsize = TextUtils.TruncateAt.END - setTextColor(ContextCompat.getColor(context, R.color.text_title)) + setTextColor(ContextCompat.getColor(context, R.color.text_primary)) } private fun initGameSubtitleTv() = textView { @@ -188,7 +188,7 @@ class GameItemUi(override val ctx: Context) : Ui { endPadding = dip(2) ellipsize = TextUtils.TruncateAt.END background = ContextCompat.getDrawable(context, R.drawable.bg_advance_download_game_subtitle) - setTextColor(ContextCompat.getColor(context, R.color.text_subtitle)) + setTextColor(ContextCompat.getColor(context, R.color.text_secondary)) visibility = View.GONE } @@ -209,7 +209,7 @@ class GameItemUi(override val ctx: Context) : Ui { setTextColor(Color.WHITE) gravity = Gravity.CENTER maxLines = 1 - backgroundColor = ContextCompat.getColor(context, R.color.theme) + backgroundColor = ContextCompat.getColor(context, R.color.primary_theme) visibility = View.GONE @@ -223,7 +223,7 @@ class GameItemUi(override val ctx: Context) : Ui { setSingleLine() includeFontPadding = false ellipsize = TextUtils.TruncateAt.END - setTextColor(ContextCompat.getColor(context, R.color.text_subtitleDesc)) + setTextColor(ContextCompat.getColor(context, R.color.text_tertiary)) } private fun initDownloadTv() = DownloadButton(ctx).apply { diff --git a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt index c382b0cbe0..5ce73ac30b 100644 --- a/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/vertical/GameVerticalAdapter.kt @@ -5,18 +5,12 @@ import android.graphics.drawable.Drawable import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView.ViewHolder -import com.alibaba.android.arouter.launcher.ARouter import com.gh.common.databind.BindingAdapters import com.gh.common.util.DownloadItemUtils -import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.GameViewHolder -import com.gh.gamecenter.common.base.GlobalActivityManager -import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.common.utils.* import com.gh.gamecenter.common.view.AsyncUi -import com.gh.gamecenter.core.provider.IQGameProvider -import com.gh.gamecenter.core.utils.StringUtils import com.gh.gamecenter.entity.SubjectEntity import com.gh.gamecenter.feature.entity.GameEntity import com.gh.gamecenter.feature.entity.GameSubjectData @@ -167,10 +161,10 @@ class GameVerticalAdapter( (itemView as AsyncGameItemUi).bindWhenInflated { (itemView as AsyncGameItemUi).ui!!.run { - gameNameTv.setTextColor(R.color.text_title.toColor(context)) - serverTypeTv.setTextColor(R.color.theme.toColor(context)) + gameNameTv.setTextColor(R.color.text_primary.toColor(context)) + serverTypeTv.setTextColor(R.color.primary_theme.toColor(context)) downloadTv.background = R.drawable.download_button_normal_style.toDrawable(context) - gameDesTv.setTextColor(R.color.text_subtitleDesc.toColor(context)) + gameDesTv.setTextColor(R.color.text_tertiary.toColor(context)) BindingAdapters.setGameName( gameNameTv, @@ -193,7 +187,7 @@ class GameVerticalAdapter( var gameRatingPaddingEnd = 0 var gameRatingDrawableStart: Drawable? = null - var gameRatingTextColor = R.color.theme.toColor(context) + var gameRatingTextColor = R.color.primary_theme.toColor(context) var gameRatingText = "" gameRatingTv.textSize = if (gameEntity.commentCount > 3) 12F else 10F @@ -201,7 +195,7 @@ class GameVerticalAdapter( if (gameEntity.commentCount > 3) { gameRatingPaddingEnd = 8F.dip2px() gameRatingDrawableStart = R.drawable.game_horizontal_rating.toDrawable() - gameRatingTextColor = R.color.theme_font.toColor(context) + gameRatingTextColor = R.color.text_theme.toColor(context) gameRatingText = if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString() } 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 c62c17d1e5..d021add5b4 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 @@ -11,7 +11,7 @@ class AddGamesActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun provideNormalIntent(): Intent { @@ -20,7 +20,7 @@ class AddGamesActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt index 74470b7785..b51d71c6fa 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/AddSearchAndPlayedGameAdapter.kt @@ -45,7 +45,7 @@ class AddSearchAndPlayedGameAdapter(context: Context, val mChooseGamesViewModel: mContext ) holder.binding.downloadBtn.setTextColor( - if (isSelected) R.color.text_subtitleDesc.toColor(mContext) else R.color.white.toColor( + if (isSelected) R.color.text_tertiary.toColor(mContext) else R.color.white.toColor( mContext ) ) 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 595cabf074..97eb0738c5 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 @@ -102,16 +102,16 @@ class AddSearchGameFragment : GameFragment() { super.onDarkModeChanged() mAdapter?.let { it.notifyItemRangeChanged(0, it.itemCount) } if (::mBinding.isInitialized) { - mBinding.searchContainer.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.listRv.setBackgroundColor(R.color.background.toColor(requireContext())) - mBinding.divider.setBackgroundColor(R.color.divider.toColor(requireContext())) - mBinding.promptTv.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.searchContainer.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.listRv.setBackgroundColor(R.color.ui_background.toColor(requireContext())) + mBinding.divider.setBackgroundColor(R.color.ui_divider.toColor(requireContext())) + mBinding.promptTv.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) // mBinding.reuseNoneData.reuseResetLoadTv.background = R.drawable.game_detail_btn_receive.toDrawable(requireContext()) mBinding.searchInput.background = R.drawable.community_editor_insert_search_background.toDrawable(requireContext()) - mBinding.searchInput.setTextColor(R.color.text_title.toColor(requireContext())) - mBinding.searchButton.setTextColor(R.color.theme_font.toColor(requireContext())) - mBinding.promptTv.setTextColor(R.color.text_body.toColor(requireContext())) + mBinding.searchInput.setTextColor(R.color.text_primary.toColor(requireContext())) + mBinding.searchButton.setTextColor(R.color.text_theme.toColor(requireContext())) + mBinding.promptTv.setTextColor(R.color.text_instance.toColor(requireContext())) // mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(R.color.text_body.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 f6ff69d4a9..5235b3e6bb 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 @@ -37,7 +37,7 @@ class AddUserPlayedGameFragment : ListFragment( override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - mCachedView.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mCachedView.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } override fun provideListAdapter(): ListAdapter { @@ -59,8 +59,8 @@ class AddUserPlayedGameFragment : ListFragment( override fun onDarkModeChanged() { super.onDarkModeChanged() - mCachedView?.setRootBackgroundColor(R.color.background_white) - mCachedView?.findViewById(R.id.divider)?.setBackgroundColor(R.color.divider.toColor(requireContext())) + mCachedView?.setRootBackgroundColor(R.color.ui_surface) + mCachedView?.findViewById(R.id.divider)?.setBackgroundColor(R.color.ui_divider.toColor(requireContext())) mAdapter?.let { it.notifyItemRangeChanged(0, it.itemCount) } } } \ No newline at end of file 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 a48805d5f5..0dc3be5eb9 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 @@ -11,7 +11,7 @@ class ChooseGamesActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("选择游戏") - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun provideNormalIntent(): Intent { @@ -20,7 +20,7 @@ class ChooseGamesActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesAdapter.kt index f93aec90f1..62103a47af 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/choose/ChooseGamesAdapter.kt @@ -37,12 +37,12 @@ class ChooseGamesAdapter(context: Context, val dragListener: ItemDragListener) : @SuppressLint("ClickableViewAccessibility") override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { if (holder is ChooseGamesViewHolder) { - holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.binding.root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) holder.binding.recommendContainer.background = R.drawable.bg_shape_f5_radius_6.toDrawable(mContext) - holder.binding.gameNameTv.setTextColor(R.color.text_title.toColor(mContext)) - holder.binding.recommendReasonEt.setTextColor(R.color.text_title.toColor(mContext)) - holder.binding.ratingScoreTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - holder.binding.recommendReasonEt.setHintTextColor(R.color.text_subtitleDesc.toColor(mContext)) + holder.binding.gameNameTv.setTextColor(R.color.text_primary.toColor(mContext)) + holder.binding.recommendReasonEt.setTextColor(R.color.text_primary.toColor(mContext)) + holder.binding.ratingScoreTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + holder.binding.recommendReasonEt.setHintTextColor(R.color.text_tertiary.toColor(mContext)) val gameEntity = mEntityList[position] holder.binding.root.tag = gameEntity.id 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 be109ccde7..6353453ca0 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 @@ -154,10 +154,10 @@ class ChooseGamesFragment : ToolbarFragment(), ChooseGamesAdapter.ItemDragListen super.onDarkModeChanged() if (::mBinding.isInitialized) { mBinding.run { - root.setBackgroundColor(R.color.background_white.toColor(requireContext())) - gameCountTv.setTextColor(R.color.text_title.toColor(requireContext())) - addGamesButton.setTextColor(R.color.theme_font.toColor(requireContext())) - addGamesTv.setTextColor(R.color.text_body.toColor(requireContext())) + root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + gameCountTv.setTextColor(R.color.text_primary.toColor(requireContext())) + addGamesButton.setTextColor(R.color.text_theme.toColor(requireContext())) + addGamesTv.setTextColor(R.color.text_instance.toColor(requireContext())) gamesRv.adapter?.run { notifyItemRangeChanged(0, itemCount) } } } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt index 7c45d3da00..d72cb380f8 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/GameCollectionDetailAdapter.kt @@ -142,8 +142,8 @@ open class GameCollectionDetailAdapter( is GameCollectionGameEmptyViewHolder -> { mViewModel.postFirstItemInitOver() - holder.binding.noneGameContainer.setBackgroundColor(R.color.background_white.toColor(mContext)) - holder.binding.noneGameTv.setTextColor(R.color.text_body.toColor(mContext)) + holder.binding.noneGameContainer.setBackgroundColor(R.color.ui_surface.toColor(mContext)) + holder.binding.noneGameTv.setTextColor(R.color.text_instance.toColor(mContext)) } is CommentItemViewHolder -> { @@ -181,7 +181,7 @@ open class GameCollectionDetailAdapter( } is GameCollectionDividerViewHolder -> { - holder.itemView.setBackgroundColor(R.color.background.toColor(mContext)) + holder.itemView.setBackgroundColor(R.color.ui_background.toColor(mContext)) } else -> super.onBindViewHolder(holder, position) @@ -246,10 +246,10 @@ open class GameCollectionDetailAdapter( binding.root.context, 0, prefix.length, - R.color.text_title + R.color.text_primary ).build() val parentUserNameSpan = SpanBuilder(parentUserName) - .click(mContext, 0, parentUserName.length, R.color.text_subtitleDesc) { + .click(mContext, 0, parentUserName.length, R.color.text_tertiary) { DirectUtils.directToHomeActivity( binding.root.context, comment.user.id, @@ -263,7 +263,7 @@ open class GameCollectionDetailAdapter( binding.root.context, 0, colon.length, - R.color.text_title + R.color.text_primary ).build() val authorSpan = if (comment.parentUser?.me?.isCommentOwner == true) { SpanBuilder("作者").image(0, "作者".length, R.drawable.ic_hint_author).build() @@ -290,21 +290,21 @@ open class GameCollectionDetailAdapter( deleteCallBack: ((comment: CommentEntity) -> Unit)? = null ) { binding.run { - root.setBackgroundColor(R.color.background_white.toColor(mContext)) - subCommentContainer.setBackgroundColor(R.color.background_space_2.toColor(mContext)) - divider.setBackgroundColor(R.color.background_space.toColor(mContext)) - bottomDivider.setBackgroundColor(R.color.divider.toColor(mContext)) - userNameTv.setTextColor(R.color.text_subtitle.toColor(mContext)) - badgeTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - floorHintTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - contentTv.setTextColor(R.color.text_title.toColor(mContext)) - collapseTv.setTextColor(R.color.theme_font.toColor(mContext)) - firstSubCommentTv.setTextColor(R.color.text_subtitle.toColor(mContext)) - secondSubCommentTv.setTextColor(R.color.text_subtitle.toColor(mContext)) - moreSubCommentBtn.setTextColor(R.color.theme_font.toColor(mContext)) - timeTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - likeCountTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - commentCountTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) + subCommentContainer.setBackgroundColor(R.color.ui_container_2.toColor(mContext)) + divider.setBackgroundColor(R.color.ui_container_1.toColor(mContext)) + bottomDivider.setBackgroundColor(R.color.ui_divider.toColor(mContext)) + userNameTv.setTextColor(R.color.text_secondary.toColor(mContext)) + badgeTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + floorHintTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + contentTv.setTextColor(R.color.text_primary.toColor(mContext)) + collapseTv.setTextColor(R.color.text_theme.toColor(mContext)) + firstSubCommentTv.setTextColor(R.color.text_secondary.toColor(mContext)) + secondSubCommentTv.setTextColor(R.color.text_secondary.toColor(mContext)) + moreSubCommentBtn.setTextColor(R.color.text_theme.toColor(mContext)) + timeTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + likeCountTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + commentCountTv.setTextColor(R.color.text_tertiary.toColor(mContext)) if (comment.isHighlight) { comment.isHighlight = false @@ -328,7 +328,7 @@ open class GameCollectionDetailAdapter( GridSpacingItemColorDecoration( context, 2, - R.color.background_white + R.color.ui_surface ).apply { mItemDecoration = this }) } visibility = View.VISIBLE @@ -340,7 +340,7 @@ open class GameCollectionDetailAdapter( GridSpacingItemColorDecoration( commentPictureRv.context, 2, - R.color.background_white + R.color.ui_surface ).apply { mItemDecoration = this }) } } else { @@ -403,10 +403,10 @@ open class GameCollectionDetailAdapter( ) if (comment.me?.isCommentVoted == true) { - likeCountTv.setTextColor(R.color.theme_font.toColor(likeCountTv.context)) + likeCountTv.setTextColor(R.color.text_theme.toColor(likeCountTv.context)) likeCountTv.setDrawableStart(R.drawable.comment_vote_select) } else { - likeCountTv.setTextColor(R.color.text_subtitleDesc.toColor(likeCountTv.context)) + likeCountTv.setTextColor(R.color.text_tertiary.toColor(likeCountTv.context)) likeCountTv.setDrawableStart(R.drawable.comment_vote_unselect) } @@ -416,8 +416,8 @@ open class GameCollectionDetailAdapter( likeCountTv.setDrawableStart(if (comment.me?.isCommentVoted == true) R.drawable.comment_vote_select else R.drawable.comment_vote_unselect) likeCountTv.text = mViewModel.getLikeText(comment.vote) likeCountTv.setTextColor( - if (comment.me?.isCommentVoted == true) R.color.theme_font.toColor(likeCountTv.context) - else R.color.text_subtitleDesc.toColor(likeCountTv.context) + if (comment.me?.isCommentVoted == true) R.color.text_theme.toColor(likeCountTv.context) + else R.color.text_tertiary.toColor(likeCountTv.context) ) } } @@ -479,7 +479,7 @@ open class GameCollectionDetailAdapter( binding.subCommentContainer.goneIf(subCommentList.isNullOrEmpty()) binding.firstSubCommentTv.goneIf(subCommentList?.firstOrNull() == null) binding.secondSubCommentTv.goneIf(subCommentList?.secondOrNull() == null) - binding.subCommentContainer.setRoundedColorBackground(R.color.background_space_2, 5F) + binding.subCommentContainer.setRoundedColorBackground(R.color.ui_container_2, 5F) subCommentList?.firstOrNull()?.let { binding.firstSubCommentTv.text = getSubCommentSpanned( @@ -519,13 +519,13 @@ open class GameCollectionDetailAdapter( val colon = " ：" val nameSpan = - SpanBuilder(finalName).color(mContext, 0, finalName.length, R.color.theme_font).build() + SpanBuilder(finalName).color(mContext, 0, finalName.length, R.color.text_theme).build() val authorSpan = if (finalAuthor.isNotEmpty()) SpanBuilder(finalAuthor).image( 0, finalAuthor.length, R.drawable.ic_hint_author ).build() else "" - val colonSpan = SpanBuilder(colon).color(mContext, 0, colon.length, R.color.theme_font).build() + val colonSpan = SpanBuilder(colon).color(mContext, 0, colon.length, R.color.text_theme).build() return SpannableStringBuilder().append(nameSpan).append(authorSpan).append(colonSpan) .append(content) } @@ -565,13 +565,13 @@ open class GameCollectionDetailAdapter( binding.run { container.background = R.drawable.reuse_listview_item_style.toDrawable(mContext) gameCollectionRecommendTv.background = R.drawable.bg_shape_space_radius_8.toDrawable(mContext) - gameCollectionRecommendTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + gameCollectionRecommendTv.setTextColor(R.color.text_tertiary.toColor(mContext)) gameItemIncluded.run { root.background = R.drawable.reuse_listview_item_style.toDrawable(mContext) - gameKaifuType.setBackgroundColor(R.color.theme.toColor(mContext)) - gameName.setTextColor(R.color.text_title.toColor(mContext)) - gameDes.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - recommendStarPref.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + gameKaifuType.setBackgroundColor(R.color.primary_theme.toColor(mContext)) + gameName.setTextColor(R.color.text_primary.toColor(mContext)) + gameDes.setTextColor(R.color.text_tertiary.toColor(mContext)) + recommendStarPref.setTextColor(R.color.text_tertiary.toColor(mContext)) gameIconView.displayGameIcon(gameEntity) BindingAdapters.setGameName(gameName, gameEntity, false, null) @@ -585,7 +585,7 @@ open class GameCollectionDetailAdapter( if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString() } else "" gameRating.setTextColor( - if (gameEntity.commentCount > 3) R.color.theme_font.toColor(mContext) else R.color.theme.toColor( + if (gameEntity.commentCount > 3) R.color.text_theme.toColor(mContext) else R.color.primary_theme.toColor( mContext ) ) @@ -679,7 +679,7 @@ open class GameCollectionDetailAdapter( if (gameEntity.isUseDefaultServerStyle()) { binding.gameItemIncluded.gameKaifuType.background = R.drawable.server_label_default_bg.toDrawable(binding.root.context) - binding.gameItemIncluded.gameKaifuType.setTextColor(R.color.text_server_label.toColor(binding.root.context)) + binding.gameItemIncluded.gameKaifuType.setTextColor(R.color.text_secondary.toColor(binding.root.context)) } else { binding.gameItemIncluded.gameKaifuType.background = DrawableView.getServerDrawable(serverLabel.color) 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 dc5117f63f..37bc4bb349 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 @@ -158,11 +158,11 @@ class GameCollectionDetailFragment : insets.consumeSystemWindowInsets() } - root.setBackgroundColor(R.color.background_white.toColor(requireContext())) + root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mSkeletonScreen = Skeleton.bind(listSkeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) @@ -270,12 +270,12 @@ class GameCollectionDetailFragment : mListViewModel.getGameCollectionDetail() mReuseNoConn?.visibility = View.GONE showSkeleton(true) - mBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding?.root?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } } - DisplayUtils.setStatusBarColor(requireActivity(), R.color.background_white, !mIsDarkModeOn) - mBinding?.toolbarContainer?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + DisplayUtils.setStatusBarColor(requireActivity(), R.color.ui_surface, !mIsDarkModeOn) + mBinding?.toolbarContainer?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mBinding?.backIv?.setImageResource(R.drawable.ic_bar_back) mListLoading?.visibility = View.GONE @@ -358,8 +358,8 @@ class GameCollectionDetailFragment : squareIv.setImageResource(R.drawable.ic_game_collection_square_light) toolbarUserContainer.visibility = View.GONE } else { - DisplayUtils.setStatusBarColor(requireActivity(), R.color.background_white, !mIsDarkModeOn) - toolbarContainer.setBackgroundColor(R.color.background_white.toColor(requireContext())) + DisplayUtils.setStatusBarColor(requireActivity(), R.color.ui_surface, !mIsDarkModeOn) + toolbarContainer.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) backIv.setImageResource(R.drawable.ic_bar_back) squareIv.setImageResource(if (mIsDarkModeOn) R.drawable.ic_game_collection_square_light else R.drawable.ic_game_collection_square) toolbarUserContainer.visibility = View.VISIBLE @@ -574,7 +574,7 @@ class GameCollectionDetailFragment : divider.goneIf(isLast) divider.setBackgroundColor(R.color.theme_alpha_20.toColor(requireContext())) contentTv.text = content - contentTv.setTextColor(R.color.theme_font.toColor(requireContext())) + contentTv.setTextColor(R.color.text_theme.toColor(requireContext())) }.root } @@ -597,7 +597,7 @@ class GameCollectionDetailFragment : text = if (isFollow) "已关注" else "关注" setBackgroundResource(if (isFollow) R.drawable.button_round_f5f5f5 else R.drawable.button_round_2496ff_alpha_10) setTextColor( - if (isFollow) R.color.text_subtitleDesc.toColor(requireContext()) else R.color.theme.toColor( + if (isFollow) R.color.text_tertiary.toColor(requireContext()) else R.color.primary_theme.toColor( requireContext() ) ) @@ -646,10 +646,10 @@ class GameCollectionDetailFragment : bottomStarTv.text = mListViewModel.getStarText() if (mEntity?.me?.isFavorite == true) { bottomStarIv.setImageResource(R.drawable.ic_article_detail_stared_bottom_bar) - bottomStarTv.setTextColor(R.color.theme_font.toColor(requireContext())) + bottomStarTv.setTextColor(R.color.text_theme.toColor(requireContext())) } else { bottomStarIv.setImageResource(R.drawable.ic_article_detail_star_bottom_bar) - bottomStarTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) + bottomStarTv.setTextColor(R.color.text_secondary.toColor(requireContext())) } } } @@ -659,10 +659,10 @@ class GameCollectionDetailFragment : bottomLikeTv.text = mListViewModel.getLikeText() if (mEntity?.me?.isVoted == true) { bottomLikeIv.setImageResource(R.drawable.ic_article_detail_liked_bottom_bar) - bottomLikeTv.setTextColor(R.color.theme_font.toColor(requireContext())) + bottomLikeTv.setTextColor(R.color.text_theme.toColor(requireContext())) } else { bottomLikeIv.setImageResource(R.drawable.ic_article_detail_like_bottom_bar) - bottomLikeTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) + bottomLikeTv.setTextColor(R.color.text_secondary.toColor(requireContext())) } } } 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 a92e47872a..43b680d299 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 @@ -123,18 +123,18 @@ class GameCollectionShareDialog : BaseDraggableDialogFragment() { mBinding.run { container.background = R.drawable.game_detail_more_dialog_background.toDrawable(requireContext()) cancelTv.background = R.drawable.button_round_gray_light.toDrawable(requireContext()) - dividerLine1.setBackgroundColor(R.color.divider.toColor(requireContext())) - cancelTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) - titleTv.setTextColor(R.color.text_title.toColor(requireContext())) + dividerLine1.setBackgroundColor(R.color.ui_divider.toColor(requireContext())) + cancelTv.setTextColor(R.color.text_secondary.toColor(requireContext())) + titleTv.setTextColor(R.color.text_primary.toColor(requireContext())) handleView.background = R.drawable.download_dialog_close_hint.toDrawable(requireContext()) shareContainerOne.children.forEach { if (it is LinearLayout && it.getChildAt(1) is TextView) { - (it.getChildAt(1) as TextView).setTextColor(R.color.text_subtitle.toColor(requireContext())) + (it.getChildAt(1) as TextView).setTextColor(R.color.text_secondary.toColor(requireContext())) } } shareContainerTwo.children.forEach { if (it is LinearLayout && it.getChildAt(1) is TextView) { - (it.getChildAt(1) as TextView).setTextColor(R.color.text_subtitle.toColor(requireContext())) + (it.getChildAt(1) as TextView).setTextColor(R.color.text_secondary.toColor(requireContext())) } } } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt index bd7727b974..72d6980e6e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/detail/conversation/GameCollectionCommentConversationAdapter.kt @@ -50,7 +50,7 @@ class GameCollectionCommentConversationAdapter( } is CommentFooterViewHolder -> { - holder.itemView.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.itemView.setBackgroundColor(R.color.ui_surface.toColor(mContext)) holder.bindView(mIsLoading, mIsNetworkError, mIsOver) } 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 2944c6b8ac..72885fd84c 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 @@ -111,7 +111,7 @@ class GameCollectionCommentConversationFragment : inputContainer.bottomStarIv.visibility = View.GONE inputContainer.bottomStarTv.visibility = View.GONE - inputContainer.replyTv.setRoundedColorBackground(R.color.background_space_2, 19F) + inputContainer.replyTv.setRoundedColorBackground(R.color.ui_container_2, 19F) inputContainer.replyTv.setDebouncedClickListener { mViewModel.commentDetail?.let { startCommentActivity(it) } } @@ -253,24 +253,24 @@ class GameCollectionCommentConversationFragment : mBinding.container.background = R.drawable.game_detail_more_dialog_background.toDrawable(requireContext()) mBinding.toolbarContainer.commentDialogCountTv.setTextColor( - R.color.text_title.toColor( + R.color.text_primary.toColor( requireContext() ) ) mBinding.inputContainer.run { - bottomContainer.setBackgroundColor(R.color.background_white.toColor(requireContext())) - replyTv.setRoundedColorBackground(R.color.background_space_2, 19F) - replyTv.setTextColor(R.color.text_body.toColor(requireContext())) - bottomShareTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) - bottomLikeTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) - bottomStarTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) - bottomCommentTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) + bottomContainer.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + replyTv.setRoundedColorBackground(R.color.ui_container_2, 19F) + replyTv.setTextColor(R.color.text_instance.toColor(requireContext())) + bottomShareTv.setTextColor(R.color.text_secondary.toColor(requireContext())) + bottomLikeTv.setTextColor(R.color.text_secondary.toColor(requireContext())) + bottomStarTv.setTextColor(R.color.text_secondary.toColor(requireContext())) + bottomCommentTv.setTextColor(R.color.text_secondary.toColor(requireContext())) } mBinding.fixedTopFilterView.run { - filterView.setBackgroundColor(R.color.background_white.toColor(requireContext())) - divider.setBackgroundColor(R.color.divider.toColor(requireContext())) - commentHintTv.setTextColor(R.color.text_title.toColor(requireContext())) - commentHintCountTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + filterView.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + divider.setBackgroundColor(R.color.ui_divider.toColor(requireContext())) + commentHintTv.setTextColor(R.color.text_primary.toColor(requireContext())) + commentHintCountTv.setTextColor(R.color.text_tertiary.toColor(requireContext())) orderSfv.run { setContainerBackground(R.drawable.button_round_f5f5f5.toDrawable(requireContext())) setIndicatorBackground( @@ -279,8 +279,8 @@ class GameCollectionCommentConversationFragment : ) ) setTextColor( - R.color.text_subtitle.toColor(requireContext()), - R.color.text_subtitleDesc.toColor(requireContext()) + R.color.text_secondary.toColor(requireContext()), + R.color.text_tertiary.toColor(requireContext()) ) } } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionHotListAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionHotListAdapter.kt index 21cbb151cb..aef90ab021 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionHotListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionHotListAdapter.kt @@ -74,7 +74,7 @@ class GameCollectionHotListAdapter( root.setPadding(0, if (mIsFromDetail) 16F.dip2px() else 0, 0, 12F.dip2px()) tipsIv.visibility = View.GONE tipsTv.text = mGameCollectionListEntity?.explain - tipsTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + tipsTv.setTextColor(R.color.text_tertiary.toColor(mContext)) } } @@ -84,9 +84,9 @@ class GameCollectionHotListAdapter( val entity = itemData.gameCollectionItem holder.binding.run { root.background = R.drawable.background_shape_white_radius_8.toDrawable(mContext) - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - userTv.setTextColor(R.color.text_subtitle.toColor(mContext)) - gameCountTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + userTv.setTextColor(R.color.text_secondary.toColor(mContext)) + gameCountTv.setTextColor(R.color.text_tertiary.toColor(mContext)) rankIv.goneIf(realPosition > 2 || mIsFromDetail) { rankIv.setImageResource( @@ -131,7 +131,7 @@ class GameCollectionHotListAdapter( exposureEventList.add(exposureEvent) gameIcon.displayGameIcon(gameEntity) - gameIcon.setBorderColor(R.color.background_white) + gameIcon.setBorderColor(R.color.ui_surface) gameIcon.setOnClickListener { NewFlatLogUtils.logGameCollectionHotListClick( mGameCollectionListEntity?.name ?: "", diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionHotListFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionHotListFragment.kt index f2667e7340..2a57f4f2ed 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionHotListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionHotListFragment.kt @@ -68,7 +68,7 @@ class GameCollectionHotListFragment : ListFragment(R.id.tab_title)?.run { setTextColor( - if (isChecked) R.color.theme_font.toColor(requireContext()) else R.color.text_subtitleDesc.toColor( + if (isChecked) R.color.text_theme.toColor(requireContext()) else R.color.text_tertiary.toColor( requireContext() ) ) diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionPlayerCreationAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionPlayerCreationAdapter.kt index 5c8a014d60..8d841890bd 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionPlayerCreationAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/hotlist/GameCollectionPlayerCreationAdapter.kt @@ -64,7 +64,7 @@ class GameCollectionPlayerCreationAdapter( mTipLinkEntity?.let { link -> holder.binding.run { tipsTv.text = link.text - tipsTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + tipsTv.setTextColor(R.color.text_tertiary.toColor(mContext)) tipsIv.setOnClickListener { DirectUtils.directToLinkPage(mContext, link, "", "") } @@ -76,14 +76,14 @@ class GameCollectionPlayerCreationAdapter( val realPosition = position - 1 val entity = mEntityList[realPosition] holder.binding.run { - root.setCardBackgroundColor(R.color.background_white.toColor(mContext)) - gameCollectionCv.setCardBackgroundColor(R.color.background_space.toColor(mContext)) - rankTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - userNameTv.setTextColor(R.color.text_title.toColor(mContext)) - authTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - userFansAndVoteCountTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - gameCollectionCountTv.setTextColor(R.color.text_subtitle.toColor(mContext)) - gameCollectionTitleTv.setTextColor(R.color.text_subtitle.toColor(mContext)) + root.setCardBackgroundColor(R.color.ui_surface.toColor(mContext)) + gameCollectionCv.setCardBackgroundColor(R.color.ui_container_1.toColor(mContext)) + rankTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + userNameTv.setTextColor(R.color.text_primary.toColor(mContext)) + authTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + userFansAndVoteCountTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + gameCollectionCountTv.setTextColor(R.color.text_secondary.toColor(mContext)) + gameCollectionTitleTv.setTextColor(R.color.text_secondary.toColor(mContext)) rankIv.goneIf(realPosition > 2) { rankIv.setImageResource( @@ -121,7 +121,7 @@ class GameCollectionPlayerCreationAdapter( entity?.user?.me?.let { followTv.text = if (it.isFollower) "已关注" else "关注" followTv.setTextColor( - if (it.isFollower) R.color.text_subtitleDesc.toColor(mContext) else R.color.theme_font.toColor( + if (it.isFollower) R.color.text_tertiary.toColor(mContext) else R.color.text_theme.toColor( mContext ) ) 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 3f18a9bf23..1ca9bb5f29 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 @@ -11,7 +11,7 @@ class MyGameCollectionActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun provideNormalIntent(): Intent { @@ -20,7 +20,7 @@ class MyGameCollectionActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 423c5ea9d0..be5758a007 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 @@ -100,7 +100,7 @@ class MyGameCollectionFragment : ListFragment(R.id.postTv)?.background = R.drawable.textview_concern_red_up_round.toDrawable(this) if (::mBinding.isInitialized) { mBinding.run { - root.setBackgroundColor(R.color.background_white.toColor(this@GameCollectionEditActivity)) - labelDivider.setBackgroundColor(R.color.divider.toColor(this@GameCollectionEditActivity)) - gameDivider.setBackgroundColor(R.color.divider.toColor(this@GameCollectionEditActivity)) - activityDivider.setBackgroundColor(R.color.divider.toColor(this@GameCollectionEditActivity)) - titleDivider.setBackgroundColor(R.color.divider.toColor(this@GameCollectionEditActivity)) - introduceDivider.setBackgroundColor(R.color.divider.toColor(this@GameCollectionEditActivity)) + root.setBackgroundColor(R.color.ui_surface.toColor(this@GameCollectionEditActivity)) + labelDivider.setBackgroundColor(R.color.ui_divider.toColor(this@GameCollectionEditActivity)) + gameDivider.setBackgroundColor(R.color.ui_divider.toColor(this@GameCollectionEditActivity)) + activityDivider.setBackgroundColor(R.color.ui_divider.toColor(this@GameCollectionEditActivity)) + titleDivider.setBackgroundColor(R.color.ui_divider.toColor(this@GameCollectionEditActivity)) + introduceDivider.setBackgroundColor(R.color.ui_divider.toColor(this@GameCollectionEditActivity)) placeholderView.background = R.drawable.bg_shape_f5_radius_8.toDrawable(this@GameCollectionEditActivity) selfOnlyCb.background = R.drawable.border_round_stroke_0dot5_eee_999.toDrawable(this@GameCollectionEditActivity) - uploadPictureTv.setTextColor(R.color.text_body.toColor(this@GameCollectionEditActivity)) - labelTipTv.setTextColor(R.color.text_body.toColor(this@GameCollectionEditActivity)) - gamesTv.setTextColor(R.color.text_title.toColor(this@GameCollectionEditActivity)) - gamesTipTv.setTextColor(R.color.text_body.toColor(this@GameCollectionEditActivity)) - activityTv.setTextColor(R.color.text_title.toColor(this@GameCollectionEditActivity)) - gameCollectionTitleEt.setTextColor(R.color.text_title.toColor(this@GameCollectionEditActivity)) - gameCollectionIntroduceEt.setTextColor(R.color.text_title.toColor(this@GameCollectionEditActivity)) - introduceSizeTv.setTextColor(R.color.text_body.toColor(this@GameCollectionEditActivity)) - normsLinkTv.setTextColor(R.color.theme_font.toColor(this@GameCollectionEditActivity)) - selfOnlyCb.setTextColor(R.color.text_subtitleDesc.toColor(this@GameCollectionEditActivity)) - labelTipTv.setHintTextColor(R.color.text_subtitleDesc.toColor(this@GameCollectionEditActivity)) - gamesTipTv.setHintTextColor(R.color.text_subtitleDesc.toColor(this@GameCollectionEditActivity)) - activityTipTv.setHintTextColor(R.color.text_subtitleDesc.toColor(this@GameCollectionEditActivity)) - gameCollectionTitleEt.setHintTextColor(R.color.text_body.toColor(this@GameCollectionEditActivity)) - gameCollectionIntroduceEt.setHintTextColor(R.color.text_body.toColor(this@GameCollectionEditActivity)) + uploadPictureTv.setTextColor(R.color.text_instance.toColor(this@GameCollectionEditActivity)) + labelTipTv.setTextColor(R.color.text_instance.toColor(this@GameCollectionEditActivity)) + gamesTv.setTextColor(R.color.text_primary.toColor(this@GameCollectionEditActivity)) + gamesTipTv.setTextColor(R.color.text_instance.toColor(this@GameCollectionEditActivity)) + activityTv.setTextColor(R.color.text_primary.toColor(this@GameCollectionEditActivity)) + gameCollectionTitleEt.setTextColor(R.color.text_primary.toColor(this@GameCollectionEditActivity)) + gameCollectionIntroduceEt.setTextColor(R.color.text_primary.toColor(this@GameCollectionEditActivity)) + introduceSizeTv.setTextColor(R.color.text_instance.toColor(this@GameCollectionEditActivity)) + normsLinkTv.setTextColor(R.color.text_theme.toColor(this@GameCollectionEditActivity)) + selfOnlyCb.setTextColor(R.color.text_tertiary.toColor(this@GameCollectionEditActivity)) + labelTipTv.setHintTextColor(R.color.text_tertiary.toColor(this@GameCollectionEditActivity)) + gamesTipTv.setHintTextColor(R.color.text_tertiary.toColor(this@GameCollectionEditActivity)) + activityTipTv.setHintTextColor(R.color.text_tertiary.toColor(this@GameCollectionEditActivity)) + gameCollectionTitleEt.setHintTextColor(R.color.text_instance.toColor(this@GameCollectionEditActivity)) + gameCollectionIntroduceEt.setHintTextColor(R.color.text_instance.toColor(this@GameCollectionEditActivity)) for (i in 0 until mBinding.gameCollectionTagsContainer.childCount) { mBinding.gameCollectionTagsContainer.getChildAt(i)?.findViewById(R.id.tagNameTv) - ?.setTextColor(R.color.text_title.toColor(this@GameCollectionEditActivity)) + ?.setTextColor(R.color.text_primary.toColor(this@GameCollectionEditActivity)) mBinding.gameCollectionTagsContainer.getChildAt(i)?.findViewById(R.id.divider) - ?.setBackgroundColor(R.color.text_title.toColor(this@GameCollectionEditActivity)) + ?.setBackgroundColor(R.color.text_primary.toColor(this@GameCollectionEditActivity)) } } } diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt index 13286977f6..6fd3675cea 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/square/GameCollectionSquareAdapter.kt @@ -370,8 +370,8 @@ class GameCollectionSquareAdapter( setContainerBackground(R.drawable.button_round_f5f5f5.toDrawable(context)) setIndicatorBackground(R.drawable.bg_game_collection_sfv_indicator.toDrawable(context)) setTextColor( - R.color.text_subtitle.toColor(context), - R.color.text_subtitleDesc.toColor(context) + R.color.text_secondary.toColor(context), + R.color.text_tertiary.toColor(context) ) } binding.orderSfv.post { 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 965bf3b21b..590893da1d 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 @@ -250,7 +250,7 @@ class GameCollectionSquareFragment : LazyListFragment { @@ -691,7 +691,7 @@ class GameCollectionSquareFragment : LazyListFragment { - holder.binding.hintTv.setTextColor(R.color.text_body.toColor(holder.binding.root.context)) + holder.binding.hintTv.setTextColor(R.color.text_instance.toColor(holder.binding.root.context)) holder.binding.selectedTagFlexbox.removeAllViews() holder.binding.hintTv.goneIf(selectedTagEntityList.size != 0) for (tag in selectedTagEntityList) { @@ -74,7 +74,7 @@ class GameCollectionTagAdapter( val data = mTagList[if (singleChoice) position else position - 1] holder.binding.tagFlexbox.removeAllViews() holder.binding.titleTv.text = data.categoryName - holder.binding.titleTv.setTextColor(R.color.text_title.toColor(holder.binding.root.context)) + holder.binding.titleTv.setTextColor(R.color.text_primary.toColor(holder.binding.root.context)) holder.binding.titleTv.setPadding( 16F.dip2px(), if (position == 0) 40F.dip2px() else 10F.dip2px(), diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt index 43ea9f5158..9e81064aa7 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectActivity.kt @@ -12,7 +12,7 @@ class GameCollectionTagSelectActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) setNavigationTitle("选择标签") if (intent.getBundleExtra(NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_SINGLE_CHOICE) == false) { setToolbarMenu(R.menu.menu_save) @@ -23,7 +23,7 @@ class GameCollectionTagSelectActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt index 220bff2649..8a991a6d47 100644 --- a/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamecollection/tag/GameCollectionTagSelectFragment.kt @@ -139,8 +139,8 @@ class GameCollectionTagSelectFragment : ToolbarFragment() { override fun onDarkModeChanged() { super.onDarkModeChanged() - mBinding.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.selectedTagScrollView.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.selectedTagScrollView.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) if (::mAdapter.isInitialized) { mAdapter.notifyItemRangeChanged(0, mAdapter.itemCount) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailContentCardContentAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailContentCardContentAdapter.kt index 9a979bc299..f4a09129a6 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailContentCardContentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailContentCardContentAdapter.kt @@ -24,7 +24,7 @@ class GameDetailContentCardContentAdapter( override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { if (holder is GameDetailContentCardContentItemViewHolder) { holder.binding.root.setTextColor( - if (isHighlightBg) R.color.text_subtitle.toColor(mContext) else R.color.text_subtitleDesc.toColor( + if (isHighlightBg) R.color.text_secondary.toColor(mContext) else R.color.text_tertiary.toColor( mContext ) ) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index 77030a00a0..ad13fab703 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -455,7 +455,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { mSkeleton = Skeleton.bind(mBinding.listSkeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) @@ -613,7 +613,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { } } } else { - setTextColor(R.color.text_subtitle.toColor(requireContext())) + setTextColor(R.color.text_secondary.toColor(requireContext())) background = R.drawable.bg_advance_download_game_subtitle.toDrawable(requireContext()) } } @@ -1305,7 +1305,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { mBodyBinding.gameBigEvent.setTextColor( ContextCompat.getColor( requireContext(), - R.color.text_subtitleDesc + R.color.text_tertiary ) ) mBodyBinding.gameBigEvent.background = @@ -1426,7 +1426,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { contentTv.text = if (contentCardEntity.type == "func_libao" && contentCardEntity.des.isEmpty()) "${contentCardEntity.libao?.total}个游戏礼包" else contentCardEntity.des contentTv.setTextColor( - if (isHighlightBg) R.color.text_subtitle.toColor(requireContext()) else R.color.text_subtitleDesc.toColor( + if (isHighlightBg) R.color.text_secondary.toColor(requireContext()) else R.color.text_tertiary.toColor( requireContext() ) ) @@ -1633,7 +1633,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { mBodyBinding.toolbar.post { if (context != null) { mBodyBinding.toolbar.setBackgroundColor( - if (isToolbarWhite) R.color.background_white.toColor(requireContext()) else R.color.transparent.toColor( + if (isToolbarWhite) R.color.ui_surface.toColor(requireContext()) else R.color.transparent.toColor( requireContext() ) ) @@ -1641,7 +1641,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { } DisplayUtils.setStatusBarColor( requireActivity(), - if (isToolbarWhite) R.color.background_white else R.color.transparent, + if (isToolbarWhite) R.color.ui_surface else R.color.transparent, true ) updateConcernMenuIcon(mNewGameDetailEntity?.me?.isGameConcerned ?: false) @@ -2444,21 +2444,21 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { if (detailViewHolder.mDownloadTips.visibility == View.VISIBLE) { detailViewHolder.mDownloadTips.setDownloadTipsAnimation(detailViewHolder.mDownloadTips.isAnimating) } - mBodyBinding.collapsingToolbar.setContentScrimColor(R.color.background_white.toColor(requireContext())) - mBodyBinding.gamedetailAppbar.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBodyBinding.toolbarGapView.setBackgroundColor(R.color.background.toColor(requireContext())) - mBodyBinding.gamedetailTvName.setTextColor(R.color.text_title.toColor(requireContext())) + mBodyBinding.collapsingToolbar.setContentScrimColor(R.color.ui_surface.toColor(requireContext())) + mBodyBinding.gamedetailAppbar.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBodyBinding.toolbarGapView.setBackgroundColor(R.color.ui_background.toColor(requireContext())) + mBodyBinding.gamedetailTvName.setTextColor(R.color.text_primary.toColor(requireContext())) mBodyBinding.gameBigEvent.background = R.drawable.bg_game_big_event.toDrawable(requireContext()) - mBodyBinding.gameBigEvent.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + mBodyBinding.gameBigEvent.setTextColor(R.color.text_tertiary.toColor(requireContext())) mBodyBinding.gamedetailGametag.children.forEach { if (it is TextView) { - it.setTextColor(R.color.text_title.toColor(requireContext())) + it.setTextColor(R.color.text_primary.toColor(requireContext())) it.background = (it.background as GradientDrawable).apply { setStroke(0.5F.dip2px(), Color.parseColor(if (mIsDarkModeOn) "#33FFFFFF" else "#CCCCCC")) } } if (it is ImageView) { - if (mIsDarkModeOn) it.setColorFilter(R.color.text_title.toColor(requireContext())) else it.colorFilter = + if (mIsDarkModeOn) it.setColorFilter(R.color.text_primary.toColor(requireContext())) else it.colorFilter = null it.background = (it.background as GradientDrawable).apply { setStroke(0.5F.dip2px(), Color.parseColor(if (mIsDarkModeOn) "#33FFFFFF" else "#CCCCCC")) @@ -2470,7 +2470,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { val textView = tab.customView?.findViewById(R.id.tab_title) as? TextView ?: break TextViewCompat.setTextAppearance(textView, R.style.TabLayoutTextAppearance) } - mBinding.detailLlBottom.detailLlBottom.setBackgroundColor(R.color.background.toColor(requireContext())) + mBinding.detailLlBottom.detailLlBottom.setBackgroundColor(R.color.ui_background.toColor(requireContext())) updateToolbarStyle(!mViewModel.displayTopVideo || mBodyBinding.gamedetailThumbSmall.visibility == View.VISIBLE) mViewModel.gameDetailLiveData.value?.data?.let { if (it.isShowContentCard(mGameEntity)) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt index 797b72343d..165c2f1b33 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescAdapter.kt @@ -224,8 +224,8 @@ class DescAdapter( val customColumn = itemData.customColumn!! viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - titleHintTv.setTextColor(R.color.theme_font.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + titleHintTv.setTextColor(R.color.text_theme.toColor(mContext)) val paddingTop = if (itemData.shouldBoundWithPreviousItem) 0 else itemData.paddingTop val paddingBottom = if (itemData.shouldBoundWithNextItem) 0 else itemData.paddingBottom @@ -255,8 +255,8 @@ class DescAdapter( val subjectEntity = itemData.recommendedGames viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - moreTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + moreTv.setTextColor(R.color.text_tertiary.toColor(mContext)) moreTv.setDrawableEnd(R.drawable.ic_right_arrow_darker) galleryRv.isNestedScrollingEnabled = false @@ -321,12 +321,12 @@ class DescAdapter( val itemDecoration = HorizontalDividerItemDecoration.Builder(mContext) .size(0.5F.dip2px()) .margin(16F.dip2px()) - .color(R.color.divider.toColor(mContext)) + .color(R.color.ui_divider.toColor(mContext)) .build() viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - tvAll.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + tvAll.setTextColor(R.color.text_tertiary.toColor(mContext)) containerWrapper.setPadding(0, itemData.paddingTop, 0, itemData.paddingBottom) recyclerview.background = R.drawable.background_shape_white_radius_5.toDrawable(mContext) @@ -353,8 +353,8 @@ class DescAdapter( itemData.paddingBottom = 16F.dip2px() viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - moreTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + moreTv.setTextColor(R.color.text_tertiary.toColor(mContext)) moreTv.setDrawableEnd(R.drawable.ic_right_arrow_darker) containerWrapper.setPadding(0, itemData.paddingTop, 0, itemData.paddingBottom) galleryRv.isNestedScrollingEnabled = false @@ -404,9 +404,9 @@ class DescAdapter( val recommendedImage = itemData.imageRecommend!! viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) containerWrapper.setPadding(mDefaultHorizontalPadding, 0, mDefaultHorizontalPadding, itemData.paddingBottom) - containerWrapper.setBackgroundColor(R.color.background.toColor(mContext)) + containerWrapper.setBackgroundColor(R.color.ui_background.toColor(mContext)) titleTv.setPadding(0, itemData.paddingTop, 0, 11F.dip2px()) titleTv.text = recommendedImage.title imageIv.display(recommendedImage.image) @@ -432,8 +432,8 @@ class DescAdapter( val videos = itemData.video viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - moreTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + moreTv.setTextColor(R.color.text_tertiary.toColor(mContext)) moreTv.setDrawableEnd(R.drawable.ic_right_arrow_darker) containerWrapper.setPadding(0, itemData.paddingTop, 0, itemData.paddingBottom) @@ -477,8 +477,8 @@ class DescAdapter( val gallery = itemData.gallery viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - moreTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + moreTv.setTextColor(R.color.text_tertiary.toColor(mContext)) moreTv.setDrawableEnd(R.drawable.ic_right_arrow_darker) galleryRv.isNestedScrollingEnabled = false containerWrapper.setPadding(0, itemData.paddingTop, 0, itemData.paddingBottom) @@ -514,11 +514,11 @@ class DescAdapter( mDefaultHorizontalPadding, itemData.paddingBottom ) - containerWrapper.setBackgroundColor(R.color.background.toColor(mContext)) + containerWrapper.setBackgroundColor(R.color.ui_background.toColor(mContext)) - titleTv.setTextColor(R.color.text_title.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) contentTv.text = updateContent.updateDes - contentTv.setTextColor(R.color.text_subtitle.toColor(mContext)) + contentTv.setTextColor(R.color.text_secondary.toColor(mContext)) val maxDesLines = if (mExpandableTextExpandStatusSparseBooleanArray.get(holder.bindingAdapterPosition)) Int.MAX_VALUE else 4 contentTv.setExpandMaxLines(maxDesLines) @@ -528,7 +528,7 @@ class DescAdapter( MtaHelper.onEvent(MTA_KEY_GAME_NEW, "展开更新内容", mGameName) NewLogUtils.logGameDetailUpdatedClick(mViewModel.game?.name ?: "", mViewModel.game?.id ?: "", "全部") } - historyVersionTv.setTextColor(R.color.theme_font.toColor(mContext)) + historyVersionTv.setTextColor(R.color.text_theme.toColor(mContext)) historyVersionTv.setOnClickListener { MtaHelper.onEvent("历史版本", "进入", mGameName) MtaHelper.onEvent(MTA_KEY_GAME_NEW, "更新内容_历史版本", mGameName) @@ -555,9 +555,9 @@ class DescAdapter( val server = itemData.server!! viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - moreTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - tipsTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + moreTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + tipsTv.setTextColor(R.color.text_tertiary.toColor(mContext)) moreTv.setDrawableEnd(R.drawable.ic_right_arrow_darker) tipsTv.setDrawableStart(R.drawable.servers_calendar_hint) serviceRv.isNestedScrollingEnabled = false @@ -567,7 +567,7 @@ class DescAdapter( mDefaultHorizontalPadding, itemData.paddingBottom ) - containerWrapper.setBackgroundColor(R.color.background.toColor(mContext)) + containerWrapper.setBackgroundColor(R.color.ui_background.toColor(mContext)) if (!server.calendar.isNullOrEmpty()) { serviceRv.visibility = View.VISIBLE if (serviceRv.adapter == null) { @@ -615,8 +615,8 @@ class DescAdapter( val article = itemData.article!! viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - moreTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + moreTv.setTextColor(R.color.text_tertiary.toColor(mContext)) moreTv.setDrawableEnd(R.drawable.ic_right_arrow_darker) galleryRv.isNestedScrollingEnabled = false containerWrapper.setPadding(0, itemData.paddingTop, 0, itemData.paddingBottom) @@ -670,8 +670,8 @@ class DescAdapter( val libao = itemData.libao!! viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - moreTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + moreTv.setTextColor(R.color.text_tertiary.toColor(mContext)) moreTv.setDrawableEnd(R.drawable.ic_right_arrow_darker) containerWrapper.setPadding(0, itemData.paddingTop, 0, itemData.paddingBottom) @@ -683,7 +683,7 @@ class DescAdapter( val itemDecoration = HorizontalDividerItemDecoration.Builder(mContext) .size(0.5F.dip2px()) .margin(16F.dip2px()) - .color(R.color.divider.toColor(mContext)) + .color(R.color.ui_divider.toColor(mContext)) .build() if (itemDecorationCount != 0) { removeItemDecorationAt(0) @@ -700,8 +700,8 @@ class DescAdapter( val info = itemData.info!! viewHolder.binding.run { - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - tipsTv.setTextColor(R.color.text_subtitle.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + tipsTv.setTextColor(R.color.text_secondary.toColor(mContext)) val paddingBottom = if (itemData.shouldBoundWithNextItem) 0 else itemData.paddingBottom containerWrapper.setPadding( @@ -710,7 +710,7 @@ class DescAdapter( mDefaultHorizontalPadding, paddingBottom ) - containerWrapper.setBackgroundColor(R.color.background.toColor(mContext)) + containerWrapper.setBackgroundColor(R.color.ui_background.toColor(mContext)) if (!info.topTags.isNullOrEmpty()) { labelsLl.visibility = View.VISIBLE labelsLl.removeAllViews() @@ -738,10 +738,10 @@ class DescAdapter( val recommendGameList = itemData.recommendGameList ?: return holder.binding.run { titleTv.text = "游戏单推荐" - titleTv.setTextColor(R.color.text_title.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) moreTv.run { text = "游戏单广场" - setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + setTextColor(R.color.text_tertiary.toColor(mContext)) visibility = View.VISIBLE setDrawableEnd(R.drawable.ic_right_arrow_darker) setOnClickListener { @@ -795,11 +795,11 @@ class DescAdapter( val columnGames = itemData.columnGames ?: return holder.binding.run { titleTv.text = itemData.columnTitle - titleTv.setTextColor(R.color.text_title.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) moreTv.run { goneIf(itemData.displayHome.isEmpty()) { text = itemData.displayHome - setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + setTextColor(R.color.text_tertiary.toColor(mContext)) setDrawableEnd(R.drawable.ic_right_arrow_darker) setOnClickListener { NewFlatLogUtils.logGameDetailColumnRecommendUpperRightClick( @@ -933,7 +933,7 @@ class DescAdapter( contentHintContainer.goneIf(customColumn.title == null || TextUtils.isEmpty(customColumn.title?.value)) contentTv.run { - setTextColor(R.color.text_subtitle.toColor(mContext)) + setTextColor(R.color.text_secondary.toColor(mContext)) val goneMarginTop = if (linkTextContainer.visibility == View.GONE && contentHintContainer.visibility == View.GONE ) { @@ -1109,7 +1109,7 @@ class DescAdapter( } linkHintIv.display(customColumn.link?.icon, true) linkHintTv.background = ColorDrawable(Color.TRANSPARENT) - linkHintTv.setTextColor(R.color.theme_font.toColor(mContext)) + linkHintTv.setTextColor(R.color.text_theme.toColor(mContext)) } linkHintTv.setOnClickListener { @@ -1143,7 +1143,7 @@ class DescAdapter( params.weight = 1F layoutParams = params textSize = 13F - setTextColor(R.color.text_subtitle.toColor(mContext)) + setTextColor(R.color.text_secondary.toColor(mContext)) text = label if (hasDividingLine) { compoundDrawablePadding = 12F.dip2px() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt index 48345912dc..65d93c70ca 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescCommentsAdapter.kt @@ -77,7 +77,7 @@ class DescCommentsAdapter( val m = p.matcher(commentData.content) if (m.find()) { val contents = - TextHelper.getCommentLabelSpannableStringBuilder(commentData.content, R.color.theme_font) + TextHelper.getCommentLabelSpannableStringBuilder(commentData.content, R.color.text_theme) content.setTextWithHighlightedTextWrappedInsideWrapper(text = contents, copyClickedText = true) } else { content.setTextWithHighlightedTextWrappedInsideWrapper( @@ -99,11 +99,11 @@ class DescCommentsAdapter( ipRegionTv.text = " · ${commentData.source?.region}" when { commentData.isEditContent == null -> { - time.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)) + time.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)) time.text = if (commentData.ignore) { val s = "${NewsUtils.getFormattedTime(commentData.time)} 保护期评论不计入总分" SpanBuilder(s).image(s.length - 12, s.length - 11, R.drawable.ic_ignore_rating_tips) - .color(mContext, s.length - 10, s.length, R.color.text_subtitle).build() + .color(mContext, s.length - 10, s.length, R.color.text_secondary).build() } else { NewsUtils.getFormattedTime(commentData.time) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt index faedf5420e..b138ddab95 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/DescFragment.kt @@ -298,7 +298,7 @@ class DescFragment: LazyFragment(), IScrollable { override fun onDarkModeChanged() { super.onDarkModeChanged() - mBinding.recyclerview.setBackgroundColor(R.color.background.toColor(requireContext())) + mBinding.recyclerview.setBackgroundColor(R.color.ui_background.toColor(requireContext())) mBinding.recyclerview.recycledViewPool.clear() mAdapter?.let { it.notifyItemRangeChanged(0, it.itemCount) } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameCollectionAdapter.kt index 2f906fa641..cd6e54933b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameCollectionAdapter.kt @@ -41,7 +41,7 @@ class GameCollectionAdapter( val entity = mRecommendGameList[position] holder.binding.run { root.background = R.drawable.background_shape_white_radius_5.toDrawable(root.context) - titleTv.setTextColor(R.color.text_title.toColor(root.context)) + titleTv.setTextColor(R.color.text_primary.toColor(root.context)) titleTv.text = entity.title ImageUtils.display(coverImage, entity.cover) val gameIcons = arrayListOf(gameImage1, gameImage2, gameImage3) @@ -60,7 +60,7 @@ class GameCollectionAdapter( ) ExposureManager.log(event) gameIcon.displayGameIcon(gameEntity) - gameIcon.setBorderColor(R.color.background_white) + gameIcon.setBorderColor(R.color.ui_surface) gameIcon.setOnClickListener { GameDetailActivity.startGameDetailActivity( root.context, diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt index cec3eed518..cedbadbc70 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailInfoItemAdapter.kt @@ -107,25 +107,25 @@ class GameDetailInfoItemAdapter( override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { val gameInfoItemData = datas[position] if (holder is GameDetailInfoItemViewHolder) { - holder.binding.divider.setBackgroundColor(R.color.divider.toColor(holder.binding.divider.context)) + holder.binding.divider.setBackgroundColor(R.color.ui_divider.toColor(holder.binding.divider.context)) holder.binding.infoTv.isSelected = true holder.binding.infoTv.text = gameInfoItemData.info holder.binding.titleTv.text = gameInfoItemData.title - holder.binding.infoTv.setTextColor(R.color.text_title.toColor(holder.binding.infoTv.context)) - holder.binding.titleTv.setTextColor(R.color.text_title.toColor(holder.binding.infoTv.context)) + holder.binding.infoTv.setTextColor(R.color.text_primary.toColor(holder.binding.infoTv.context)) + holder.binding.titleTv.setTextColor(R.color.text_primary.toColor(holder.binding.infoTv.context)) holder.binding.actionTv.goneIf(gameInfoItemData.actionStr.isEmpty()) { holder.binding.actionTv.text = gameInfoItemData.actionStr - holder.binding.actionTv.setTextColor(R.color.theme_font.toColor(holder.binding.infoTv.context)) + holder.binding.actionTv.setTextColor(R.color.text_theme.toColor(holder.binding.infoTv.context)) } holder.binding.action2Tv.goneIf(gameInfoItemData.action2Str.isEmpty()) { holder.binding.action2Tv.text = gameInfoItemData.action2Str - holder.binding.action2Tv.setTextColor(R.color.theme_font.toColor(holder.binding.infoTv.context)) + holder.binding.action2Tv.setTextColor(R.color.text_theme.toColor(holder.binding.infoTv.context)) } holder.binding.infoTv.layoutParams = (holder.binding.infoTv.layoutParams as MarginLayoutParams).apply { rightMargin = if (!holder.binding.actionTv.isVisible && !holder.binding.action2Tv.isVisible) 0 else 8F.dip2px() } if (gameInfoItemData.title == "权限及用途" || gameInfoItemData.title == "隐私政策") { - holder.binding.infoTv.setTextColor(ContextCompat.getColor(context, R.color.theme_font)) + holder.binding.infoTv.setTextColor(ContextCompat.getColor(context, R.color.text_theme)) } holder.binding.root.setOnClickListener { when (gameInfoItemData.title) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt index 5db3c22933..57aea86bb2 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameGalleryAdapter.kt @@ -87,7 +87,7 @@ class GameGalleryAdapter( is VideoViewHolder -> { val video = mVideo?.get(position) ImageUtils.display(holder.binding.screenshotItemIv, mVideo?.get(position)!!.poster) - holder.binding.videoTitleTv.setTextColor(R.color.text_title.toColor(holder.binding.videoTitleTv.context)) + holder.binding.videoTitleTv.setTextColor(R.color.text_primary.toColor(holder.binding.videoTitleTv.context)) holder.binding.usernameTv.text = video?.user?.name holder.binding.videoTitleTv.text = video?.title holder.binding.voteCountTv.text = video?.vote.toString() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt index 5f30b2761f..e9ca50e0c9 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameLibaoAdapter.kt @@ -75,7 +75,7 @@ class GameLibaoAdapter( holder.binding.root.context, 4, text.length, - R.color.theme_font + R.color.text_theme ).build() holder.binding.copyLibaoCodeIv.visibility = View.VISIBLE holder.binding.copyLibaoCodeIv.setOnClickListener { @@ -100,7 +100,7 @@ class GameLibaoAdapter( holder.binding.root.context, 4, text.length, - R.color.theme_font + R.color.text_theme ).build() holder.binding.copyLibaoCodeIv.visibility = View.VISIBLE holder.binding.copyLibaoCodeIv.setOnClickListener { @@ -134,7 +134,7 @@ class GameLibaoAdapter( holder.binding.root.context, 4, text.length, - R.color.theme_font + R.color.text_theme ).build() holder.binding.copyLibaoCodeIv.visibility = View.VISIBLE holder.binding.copyLibaoCodeIv.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt index 7582c29f5f..ad07edc9bc 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRaidersAdapter.kt @@ -59,10 +59,10 @@ class GameRaidersAdapter( if (holder is RaidersViewHolder) { val newsEntity = articles[position] holder.binding.root.setRootBackgroundDrawable(R.drawable.background_shape_white_radius_5) - holder.binding.titleTv.setTextColor(R.color.text_title.toColor(context)) - holder.binding.contentTv.setTextColor(R.color.text_subtitleDesc.toColor(context)) - holder.binding.timeTv.setTextColor(R.color.text_subtitleDesc.toColor(context)) - holder.binding.line.setBackgroundColor(R.color.divider.toColor(context)) + holder.binding.titleTv.setTextColor(R.color.text_primary.toColor(context)) + holder.binding.contentTv.setTextColor(R.color.text_tertiary.toColor(context)) + holder.binding.timeTv.setTextColor(R.color.text_tertiary.toColor(context)) + holder.binding.line.setBackgroundColor(R.color.ui_divider.toColor(context)) holder.binding.titleTv.text = newsEntity.title ?: "" holder.binding.contentTv.text = newsEntity.intro ?: "" holder.binding.timeTv.text = @@ -73,8 +73,8 @@ class GameRaidersAdapter( } else if (holder is RaidersFixedTopViewHolder) { val newsEntity = articles[position] holder.binding.root.setRootBackgroundDrawable(R.drawable.background_shape_white_radius_5) - holder.binding.titleTv.setTextColor(R.color.text_title.toColor(context)) - holder.binding.descTv.setTextColor(R.color.text_subtitleDesc.toColor(context)) + holder.binding.titleTv.setTextColor(R.color.text_primary.toColor(context)) + holder.binding.descTv.setTextColor(R.color.text_tertiary.toColor(context)) holder.binding.titleTv.text = newsEntity.title ?: "" ImageUtils.display(holder.binding.backgroundIv, newsEntity.thumb) holder.binding.descTv.text = newsEntity.type diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRelatedVersionAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRelatedVersionAdapter.kt index fbe8f65089..a04a589ea5 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRelatedVersionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameRelatedVersionAdapter.kt @@ -53,11 +53,11 @@ class GameRelatedVersionAdapter( } holder.binding.root.setPadding(paddingStart, 8F.dip2px(), paddingEnd, 8F.dip2px()) val gameEntity = relatedVersion.game ?: return - holder.binding.gameNameTv.setTextColor(R.color.text_title.toColor(mContext)) + holder.binding.gameNameTv.setTextColor(R.color.text_primary.toColor(mContext)) holder.binding.gameNameTv.text = gameEntity.name BindingAdapters.setGameTags(holder.binding.gameLabelLl, gameEntity) holder.binding.gameIconView.displayGameIcon(gameEntity) - holder.binding.gameIconView.setBorderColor(R.color.border) + holder.binding.gameIconView.setBorderColor(R.color.resource_border) holder.itemView.setOnClickListener { MtaHelper.onEvent("游戏详情_新", "相关游戏版本", "${mGameName}+${relatedVersion.gameName}") GameDetailActivity.startGameDetailActivity( diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventAdapter.kt index 7ca1acfebe..a1391114df 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventAdapter.kt @@ -10,8 +10,6 @@ import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.DirectUtils -import com.gh.common.util.NewFlatLogUtils import com.gh.gamecenter.core.utils.TimeUtils import com.gh.gamecenter.common.utils.toBinding import com.gh.gamecenter.R @@ -41,7 +39,7 @@ class GameBigEventAdapter( val builder = SpannableStringBuilder(content) builder.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { - ds.color = ContextCompat.getColor(context, R.color.theme_font) + ds.color = ContextCompat.getColor(context, R.color.text_theme) ds.isUnderlineText = true } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt index 487aac6778..1d35818741 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameBigEventDialog.kt @@ -55,7 +55,7 @@ class GameBigEventDialog( val bigEventRv = contentView.findViewById(R.id.bigEventRv) bigEventRv.adapter = GameBigEventAdapter(context, bigEvents, onLinkClick) bigEventRv.layoutManager = LinearLayoutManager(context) - bigEventRv.addItemDecoration(VerticalItemDecoration(context, 19F, false, R.color.background_white)) + bigEventRv.addItemDecoration(VerticalItemDecoration(context, 19F, false, R.color.ui_surface)) val closeTv = contentView.findViewById(R.id.dialog_close) closeTv.setOnClickListener { 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 0fbe0415af..cab08619de 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 @@ -162,30 +162,30 @@ class GameDetailMoreDialog : BaseDraggableDialogFragment() { 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.gameNameTv.setTextColor(R.color.text_primary.toColor(requireContext())) binding.handleView.background = R.drawable.download_dialog_close_hint.toDrawable(requireContext()) - binding.dividerLine1.setBackgroundColor(R.color.divider.toColor(requireContext())) - binding.dividerLine2.setBackgroundColor(R.color.divider.toColor(requireContext())) + binding.dividerLine1.setBackgroundColor(R.color.ui_divider.toColor(requireContext())) + binding.dividerLine2.setBackgroundColor(R.color.ui_divider.toColor(requireContext())) (binding.shareContainer.getChildAt(0) as LinearLayout).children.forEach { if (it is TextView) { - it.setTextColor(R.color.text_subtitle.toColor(requireContext())) + it.setTextColor(R.color.text_secondary.toColor(requireContext())) } } binding.copyLinkTv.run { - setTextColor(R.color.text_subtitle.toColor(requireContext())) + setTextColor(R.color.text_secondary.toColor(requireContext())) setDrawableTop(R.drawable.icon_gamedetail_copy_link) } binding.feedbackTv.run { - setTextColor(R.color.text_subtitle.toColor(requireContext())) + setTextColor(R.color.text_secondary.toColor(requireContext())) setDrawableTop(R.drawable.icon_gamedetail_feedback) } binding.copyrightTv.run { - setTextColor(R.color.text_subtitle.toColor(requireContext())) + setTextColor(R.color.text_secondary.toColor(requireContext())) setDrawableTop(R.drawable.icon_gamedetail_copyright) } binding.cancelTv.run { background = R.drawable.button_round_gray_light.toDrawable(requireContext()) - setTextColor(R.color.text_subtitle.toColor(requireContext())) + setTextColor(R.color.text_secondary.toColor(requireContext())) } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt index 8f17fef21e..89a9152e7e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GamePermissionAdapter.kt @@ -48,7 +48,7 @@ class GamePermissionAdapter(context: Context, val permissions: List) layoutParams = params textSize = 14F typeface = Typeface.DEFAULT_BOLD - setTextColor(ContextCompat.getColor(mContext, R.color.text_title)) + setTextColor(ContextCompat.getColor(mContext, R.color.text_primary)) text = title } } @@ -62,7 +62,7 @@ class GamePermissionAdapter(context: Context, val permissions: List) params.topMargin = 6F.dip2px() layoutParams = params textSize = 12F - setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)) + setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)) text = desc } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt index 5e1fb0eef6..e1145a8613 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameTagsDialog.kt @@ -21,7 +21,6 @@ import com.gh.gamecenter.common.view.divider.HorizontalDividerItemDecoration import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.core.utils.MtaHelper import com.gh.gamecenter.databinding.DialogGameTagsBinding -import com.gh.gamecenter.feature.entity.GameEntity import com.gh.gamecenter.feature.entity.TagStyleEntity import com.gh.gamecenter.tag.TagsActivity import com.halo.assistant.HaloApp @@ -73,7 +72,7 @@ class GameTagsDialog : BaseDialogFragment() { val itemDecoration = HorizontalDividerItemDecoration.Builder(requireContext()) .margin(DisplayUtils.dip2px(20f)) .size(DisplayUtils.dip2px(1f)) - .color(ContextCompat.getColor(requireContext(), R.color.background)).build() + .color(ContextCompat.getColor(requireContext(), R.color.ui_background)).build() addItemDecoration(itemDecoration) val gameTagsAdapter = GameTagsAdapter(requireContext(), mTagStyles) adapter = gameTagsAdapter diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt index 660451ca58..02be843a38 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/FuLiAdapter.kt @@ -128,7 +128,7 @@ class FuLiAdapter( if (isShowAnswerHint) { answerItemHint.visibility = View.VISIBLE } - holder.binding.root.setRootBackgroundColor(R.color.background_white) + holder.binding.root.setRootBackgroundColor(R.color.ui_surface) holder.itemView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.transparent)) answerItemList.background = ContextCompat.getDrawable(mContext, R.drawable.background_shape_white_radius_5) answerItemList.layoutManager = LinearLayoutManager(mContext) 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 e74ed977fb..4572c6379d 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 @@ -89,7 +89,7 @@ class FuLiFragment : LazyFragment(), IScrollable { mBinding?.containerRl?.setBackgroundColor( ContextCompat.getColor( requireContext(), - R.color.background_white + R.color.ui_surface ) ) mBinding?.reuseNoneData?.root?.visibility = View.VISIBLE @@ -185,7 +185,7 @@ class FuLiFragment : LazyFragment(), IScrollable { override fun onDarkModeChanged() { super.onDarkModeChanged() - mBinding?.containerRl?.setBackgroundColor(R.color.background.toColor(requireContext())) + mBinding?.containerRl?.setBackgroundColor(R.color.ui_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/GameNewsAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt index cd24ae9f45..916e833332 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/GameNewsAdapter.kt @@ -38,7 +38,7 @@ class GameNewsAdapter( } else { holder.binding.newsTypeTv.background = DrawableView.getCornerGradientDrawable( ContextCompat.getColor(context, R.color.text_3CB9FF), - ContextCompat.getColor(context, R.color.theme), 5f + ContextCompat.getColor(context, R.color.primary_theme), 5f ) } holder.itemView.setOnClickListener { 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 7681d450f3..a979001b81 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 @@ -86,7 +86,7 @@ class ServersCalendarActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) setNavigationTitle("开服日历表") mBinding = ActivityServersCalendarBinding.bind(mContentView) @@ -214,9 +214,9 @@ class ServersCalendarActivity : ToolBarActivity() { mBinding.nextMonth.setTextColor(Color.WHITE) mBinding.curMonth.setBackgroundColor(0) - mBinding.curMonth.setTextColor(R.color.text_title.toColor(this)) + mBinding.curMonth.setTextColor(R.color.text_primary.toColor(this)) mBinding.previousMonth.setBackgroundColor(0) - mBinding.previousMonth.setTextColor(R.color.text_title.toColor(this)) + mBinding.previousMonth.setTextColor(R.color.text_primary.toColor(this)) mBinding.year.text = formatYearText.format(previousTime) } @@ -232,9 +232,9 @@ class ServersCalendarActivity : ToolBarActivity() { mBinding.curMonth.setTextColor(Color.WHITE) mBinding.nextMonth.setBackgroundColor(0) - mBinding.nextMonth.setTextColor(R.color.text_title.toColor(this)) + mBinding.nextMonth.setTextColor(R.color.text_primary.toColor(this)) mBinding.previousMonth.setBackgroundColor(0) - mBinding.previousMonth.setTextColor(R.color.text_title.toColor(this)) + mBinding.previousMonth.setTextColor(R.color.text_primary.toColor(this)) mBinding.year.text = formatYearText.format(curTime) } @@ -250,9 +250,9 @@ class ServersCalendarActivity : ToolBarActivity() { mBinding.previousMonth.setTextColor(Color.WHITE) mBinding.nextMonth.setBackgroundColor(0) - mBinding.nextMonth.setTextColor(R.color.text_title.toColor(this)) + mBinding.nextMonth.setTextColor(R.color.text_primary.toColor(this)) mBinding.curMonth.setBackgroundColor(0) - mBinding.curMonth.setTextColor(R.color.text_title.toColor(this)) + mBinding.curMonth.setTextColor(R.color.text_primary.toColor(this)) mBinding.year.text = formatYearText.format(curTime) } @@ -404,15 +404,15 @@ class ServersCalendarActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) - mBinding.root.setRootBackgroundColor(R.color.background) - mBinding.hint.setBackgroundColor(R.color.background.toColor(this)) - mBinding.hint.setTextColor(R.color.text_subtitleDesc.toColor(this)) - mBinding.contentContainer.setBackgroundColor(R.color.background_white.toColor(this)) - mBinding.divider.setBackgroundColor(R.color.background.toColor(this)) - mBinding.dividerLine1.setBackgroundColor(R.color.background.toColor(this)) - mBinding.dividerLine2.setBackgroundColor(R.color.background.toColor(this)) - mBinding.year.setTextColor(R.color.text_title.toColor(this)) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) + mBinding.root.setRootBackgroundColor(R.color.ui_background) + mBinding.hint.setBackgroundColor(R.color.ui_background.toColor(this)) + mBinding.hint.setTextColor(R.color.text_tertiary.toColor(this)) + mBinding.contentContainer.setBackgroundColor(R.color.ui_surface.toColor(this)) + mBinding.divider.setBackgroundColor(R.color.ui_background.toColor(this)) + mBinding.dividerLine1.setBackgroundColor(R.color.ui_background.toColor(this)) + mBinding.dividerLine2.setBackgroundColor(R.color.ui_background.toColor(this)) + mBinding.year.setTextColor(R.color.text_primary.toColor(this)) mBinding.recyclerView.recycledViewPool.clear() mBinding.recyclerView.adapter?.notifyItemRangeChanged(0, mBinding.recyclerView.adapter?.itemCount ?: 0) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt index 221d9f1279..b52e933356 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarAdapter.kt @@ -45,7 +45,7 @@ class ServersCalendarAdapter( val textView = TextView(mContext) textView.setPadding(0, 16F.dip2px(), 0, 21F.dip2px()) textView.gravity = Gravity.CENTER - textView.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + textView.setTextColor(R.color.text_tertiary.toColor(mContext)) textView.textSize = 12F WeekViewHolder(textView) } else { @@ -66,7 +66,7 @@ class ServersCalendarAdapter( val day = entity.day if (day == viewModel.curDay && viewModel.selectedMonth == MonthType.CUR_MONTH) { holder.binding.calendarDay.text = "今天" - holder.binding.calendarDay.setTextColor(R.color.theme_font.toColor(mContext)) + holder.binding.calendarDay.setTextColor(R.color.text_theme.toColor(mContext)) holder.binding.calendarKaifu.setBackgroundResource(R.drawable.textview_blue_style) } else { holder.binding.calendarDay.text = day.toString() @@ -74,11 +74,11 @@ class ServersCalendarAdapter( holder.binding.calendarDay.setTextColor( ContextCompat.getColor( mContext, - R.color.text_subtitleDesc + R.color.text_tertiary ) ) } else { - holder.binding.calendarDay.setTextColor(ContextCompat.getColor(mContext, R.color.text_title)) + holder.binding.calendarDay.setTextColor(ContextCompat.getColor(mContext, R.color.text_primary)) } } val calendarServer: List = entity.server @@ -94,7 +94,7 @@ class ServersCalendarAdapter( holder.binding.calendarKaifu.text = if (TextUtils.isEmpty(remark)) if (calendarServer.size > 1) "新服×" + calendarServer.size else "新服" else remark if (day < viewModel.curDay && viewModel.selectedMonth == MonthType.CUR_MONTH || viewModel.selectedMonth == MonthType.PREVIOUS_MONTH) { - holder.binding.calendarKaifu.background = DrawableView.getOvalDrawable(R.color.text_body, 6F) + holder.binding.calendarKaifu.background = DrawableView.getOvalDrawable(R.color.text_instance, 6F) } else { holder.binding.calendarKaifu.background = DrawableView.getOvalDrawable( if (TextUtils.isEmpty(remark)) R.color.tag_yellow else R.color.tag_orange, diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailReportViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailReportViewHolder.kt index ae7ac30072..b2636b4ae6 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailReportViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailReportViewHolder.kt @@ -1,17 +1,10 @@ package com.gh.gamecenter.gamedetail.fuli.kaifu -import android.app.Activity -import android.graphics.Paint import com.gh.gamecenter.common.base.BaseRecyclerViewHolder import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.R -import com.gh.gamecenter.databinding.DialogServersCalendearDetailItemBinding import com.gh.gamecenter.databinding.DialogServersCalendearDetailReportItemBinding -import com.gh.gamecenter.feature.entity.GameEntity -import com.gh.gamecenter.feature.entity.MeEntity import com.gh.gamecenter.feature.entity.ServerCalendarEntity -import com.gh.gamecenter.servers.patch.PatchKaifuActivity -import com.lightgame.utils.Utils class ServersDetailReportViewHolder(val binding: DialogServersCalendearDetailReportItemBinding) : BaseRecyclerViewHolder(binding.root) { @@ -21,8 +14,8 @@ class ServersDetailReportViewHolder(val binding: DialogServersCalendearDetailRep binding.time.text = data.getFormatTime("HH:mm") binding.remark.text = data.remark - binding.name.setTextColor(R.color.text_title.toColor(binding.root.context)) - binding.time.setTextColor(R.color.text_title.toColor(binding.root.context)) - binding.remark.setTextColor(R.color.text_title.toColor(binding.root.context)) + binding.name.setTextColor(R.color.text_primary.toColor(binding.root.context)) + binding.time.setTextColor(R.color.text_primary.toColor(binding.root.context)) + binding.remark.setTextColor(R.color.text_primary.toColor(binding.root.context)) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt index 15d442474d..9fada20c56 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersDetailViewHolder.kt @@ -20,9 +20,9 @@ class ServersDetailViewHolder(val binding: DialogServersCalendearDetailItemBindi binding.time.text = data.getFormatTime("HH:mm") binding.remark.text = data.remark - binding.name.setTextColor(R.color.text_title.toColor(binding.root.context)) - binding.time.setTextColor(R.color.text_title.toColor(binding.root.context)) - binding.remark.setTextColor(R.color.text_title.toColor(binding.root.context)) + binding.name.setTextColor(R.color.text_primary.toColor(binding.root.context)) + binding.time.setTextColor(R.color.text_primary.toColor(binding.root.context)) + binding.remark.setTextColor(R.color.text_primary.toColor(binding.root.context)) if (meEntity?.isPartTime == true) { binding.name.paint.flags = Paint.UNDERLINE_TEXT_FLAG diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt index ce43b169a0..42ccd4fede 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/history/HistoryApkListAdapter.kt @@ -67,7 +67,7 @@ class HistoryApkListAdapter( val exposureEvent = ExposureEvent.createEvent(gameEntity = gameEntity, source = listOf(mBasicExposureSource)) - holder.binding.root.setRootBackgroundColor(R.color.background_white) + holder.binding.root.setRootBackgroundColor(R.color.ui_surface) holder.binding.updateDescTv.text = apkEntity.updateDesc holder.binding.versionTv.text = "版本${apkEntity.version}" holder.binding.updateDescTv.setExpandMaxLines(maxDesLines) 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 68b479f15a..f682c99cd7 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 @@ -117,7 +117,7 @@ class HistoryApkListFragment : ListFragment override fun onDarkModeChanged() { super.onDarkModeChanged() - mBinding.root.setRootBackgroundColor(R.color.background_white) + mBinding.root.setRootBackgroundColor(R.color.ui_surface) mListRv.recycledViewPool.clear() mAdapter?.notifyItemRangeChanged(0, mAdapter?.itemCount ?: 0) if (mListRv.itemDecorationCount > 0) { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt index d74e8b5e83..0771242592 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/myrating/MyRatingAdapter.kt @@ -66,7 +66,7 @@ class MyRatingAdapter( val m = Pattern.compile(RatingEditActivity.LABEL_REGEX).matcher(rating.content) if (m.find()) { - val contents = TextHelper.getCommentLabelSpannableStringBuilder(rating.content, R.color.theme_font) + val contents = TextHelper.getCommentLabelSpannableStringBuilder(rating.content, R.color.text_theme) holder.binding.tvComment.setTextWithHighlightedTextWrappedInsideWrapper( text = contents, copyClickedText = true 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 934403f4cb..8795064908 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 @@ -86,8 +86,8 @@ class MyRatingFragment : ListFragment() { 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.reuseNoneDataTv.setTextColor(R.color.text_primary.toColor(requireContext())) + mBinding.reuseNoneData.reuseNoneDataDescTv.setTextColor(R.color.text_tertiary.toColor(requireContext())) mBinding.reuseNoneData.reuseNoneDataIv.setImageResource(R.drawable.ic_empty_data) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt index c8dbbd957b..e0e97dea88 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingAdapter.kt @@ -134,7 +134,7 @@ class RatingAdapter( holder.loading.visibility = View.GONE holder.hint.text = "查看折叠评价>" holder.hint.textSize = 12F - holder.hint.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)) + holder.hint.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)) holder.itemView.setOnClickListener { MtaHelper.onEvent("游戏详情_新", "评论Tab-查看折叠评论", mListViewModel.game.name) val intent = RatingFoldActivity.getIntent(mContext, mListViewModel.game, mEntrance, path) @@ -298,8 +298,8 @@ class RatingAdapter( val maxDesLines = if (mExpandSparseBooleanArray.get(holder.adapterPosition)) Int.MAX_VALUE else 4 holder.binding.content.setExpandMaxLines(maxDesLines) holder.binding.content.setIsExpanded(Int.MAX_VALUE == maxDesLines) - holder.binding.replyContent.setTextColor(R.color.text_subtitle.toColor(mContext)) - holder.binding.content.setTextColor(R.color.text_subtitle.toColor(mContext)) + holder.binding.replyContent.setTextColor(R.color.text_secondary.toColor(mContext)) + holder.binding.content.setTextColor(R.color.text_secondary.toColor(mContext)) holder.setContent(commentData, mListViewModel, dataPosition, mEntrance, path) { deleteMyComment(commentData.id) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt index bea6c9556c..eb99e36af4 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt @@ -70,7 +70,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR val p = Pattern.compile(LABEL_REGEX) val m = p.matcher(commentData.content) if (m.find()) { - val contents = TextHelper.getCommentLabelSpannableStringBuilder(commentData.content, R.color.theme_font) + val contents = TextHelper.getCommentLabelSpannableStringBuilder(commentData.content, R.color.text_theme) content.setTextWithHighlightedTextWrappedInsideWrapper(text = contents, copyClickedText = true) } else { content.setTextWithHighlightedTextWrappedInsideWrapper( @@ -84,14 +84,14 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR private fun initItemView(commentData: RatingComment) { binding.run { val context = itemView.context - commentItem.setBackgroundColor(R.color.background_white.toColor(context)) + commentItem.setBackgroundColor(R.color.ui_surface.toColor(context)) commentItem.setPadding( 0, 0, 0, if (!commentData.active || commentData.replyData != null) 16f.dip2px() else 0 ) - userName.setTextColor(R.color.text_title.toColor(context)) + userName.setTextColor(R.color.text_primary.toColor(context)) userName.text = commentData.user.name ratingStart.rating = commentData.star.toFloat() device.text = commentData.getDevice() @@ -121,11 +121,11 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR val context = itemView.context when { commentData.isEditContent == null -> { - time.setTextColor(ContextCompat.getColor(context, R.color.text_subtitleDesc)) + time.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary)) time.text = if (commentData.ignore) { val s = "${NewsUtils.getFormattedTime(commentData.time)} 保护期评论不计入总分" SpanBuilder(s).image(s.length - 12, s.length - 11, R.drawable.ic_ignore_rating_tips) - .color(context, s.length - 10, s.length, R.color.text_subtitle).build() + .color(context, s.length - 10, s.length, R.color.text_secondary).build() } else { NewsUtils.getFormattedTime(commentData.time) } @@ -174,7 +174,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR contentBadge.visibleIf(commentData.replyData!!.isService) contentBadge.background = DrawableView.getCornerGradientDrawable( ContextCompat.getColor(context, R.color.text_4BC7FF), - ContextCompat.getColor(context, R.color.theme), + ContextCompat.getColor(context, R.color.primary_theme), 5f ) replyContent.movementMethod = CustomLinkMovementMethod.getInstance() @@ -256,7 +256,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR badge.text = "我的评价" badge.background = DrawableView.getCornerGradientDrawable( ContextCompat.getColor(context, R.color.text_4BC7FF), - ContextCompat.getColor(context, R.color.theme), + ContextCompat.getColor(context, R.color.primary_theme), 5f ) } else if (commentData.order > 0 && commentData.isWonderful) { @@ -272,7 +272,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR badge.text = "客服" badge.background = DrawableView.getCornerGradientDrawable( ContextCompat.getColor(context, R.color.text_4BC7FF), - ContextCompat.getColor(context, R.color.theme), + ContextCompat.getColor(context, R.color.primary_theme), 5f ) } else { @@ -534,7 +534,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR auditText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = R.color.theme_font.toColor(context) + ds.color = R.color.text_theme.toColor(context) } override fun onClick(widget: View) { @@ -551,7 +551,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR auditText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = R.color.theme_font.toColor(context) + ds.color = R.color.text_theme.toColor(context) } override fun onClick(widget: View) { @@ -588,7 +588,7 @@ class RatingCommentItemViewHolder(val binding: RatingCommentItemBinding) : BaseR private fun getSpan(context: Context, name: String, commentData: RatingComment): SpannableStringBuilder { val spanned = SpanBuilder(name) - .color(context, 0, commentData.replyData?.user?.name!!.length, R.color.text_title) + .color(context, 0, commentData.replyData?.user?.name!!.length, R.color.text_primary) .bold(0, commentData.replyData?.user?.name!!.length) .size(0, commentData.replyData?.user?.name!!.length, 13) .build() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingDetailCommentItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingDetailCommentItemViewHolder.kt index 01a620e7c0..ef9768e6a0 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingDetailCommentItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingDetailCommentItemViewHolder.kt @@ -78,7 +78,7 @@ class RatingDetailCommentItemViewHolder(val binding: ItemArticleDetailCommentBin val p = Pattern.compile(LABEL_REGEX) val m = p.matcher(commentData.content) if (m.find()) { - val contents = TextHelper.getCommentLabelSpannableStringBuilder(commentData.content, R.color.theme_font) + val contents = TextHelper.getCommentLabelSpannableStringBuilder(commentData.content, R.color.text_theme) contentTv.setTextWithHighlightedTextWrappedInsideWrapper(text = contents, copyClickedText = true) } else { contentTv.setTextWithHighlightedTextWrappedInsideWrapper( @@ -86,8 +86,8 @@ class RatingDetailCommentItemViewHolder(val binding: ItemArticleDetailCommentBin copyClickedText = true ) } - root.setBackgroundColor(R.color.background_white.toColor(context)) - userNameTv.setTextColor(R.color.text_title.toColor(context)) + root.setBackgroundColor(R.color.ui_surface.toColor(context)) + userNameTv.setTextColor(R.color.text_primary.toColor(context)) userNameTv.text = commentData.user.name ratingStar.visibility = View.VISIBLE ratingStar.rating = commentData.star.toFloat() @@ -97,10 +97,10 @@ class RatingDetailCommentItemViewHolder(val binding: ItemArticleDetailCommentBin version.visibility = if (commentData.active && commentData.gameVersion.isNotEmpty()) View.VISIBLE else View.GONE if (commentData.me.isVoted) { - likeCountTv.setTextColor(R.color.theme_font.toColor(likeCountTv.context)) + likeCountTv.setTextColor(R.color.text_theme.toColor(likeCountTv.context)) likeCountTv.setDrawableStart(R.drawable.comment_vote_select) } else { - likeCountTv.setTextColor(R.color.text_subtitleDesc.toColor(likeCountTv.context)) + likeCountTv.setTextColor(R.color.text_tertiary.toColor(likeCountTv.context)) likeCountTv.setDrawableStart(R.drawable.comment_vote_unselect) } likeCountTv.text = if (commentData.vote > 0) NumberUtils.transSimpleCount(commentData.vote) else "" @@ -114,11 +114,11 @@ class RatingDetailCommentItemViewHolder(val binding: ItemArticleDetailCommentBin time.visibility = View.VISIBLE when { commentData.isEditContent == null -> { - time.setTextColor(ContextCompat.getColor(context, R.color.text_subtitleDesc)) + time.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary)) time.text = if (commentData.ignore) { val s = "${NewsUtils.getFormattedTime(commentData.time)} 保护期评论不计入总分" SpanBuilder(s).image(s.length - 12, s.length - 11, R.drawable.ic_ignore_rating_tips) - .color(context, s.length - 10, s.length, R.color.text_subtitle).build() + .color(context, s.length - 10, s.length, R.color.text_secondary).build() } else { NewsUtils.getFormattedTime(commentData.time) } @@ -162,7 +162,7 @@ class RatingDetailCommentItemViewHolder(val binding: ItemArticleDetailCommentBin commentBadge.text = "我的评价" commentBadge.background = DrawableView.getCornerGradientDrawable( ContextCompat.getColor(context, R.color.text_4BC7FF), - ContextCompat.getColor(context, R.color.theme), + ContextCompat.getColor(context, R.color.primary_theme), 5f ) } else if (commentData.order > 0 && commentData.isWonderful) { @@ -178,7 +178,7 @@ class RatingDetailCommentItemViewHolder(val binding: ItemArticleDetailCommentBin commentBadge.text = "客服" commentBadge.background = DrawableView.getCornerGradientDrawable( ContextCompat.getColor(context, R.color.text_4BC7FF), - ContextCompat.getColor(context, R.color.theme), + ContextCompat.getColor(context, R.color.primary_theme), 5f ) } else { @@ -341,7 +341,7 @@ class RatingDetailCommentItemViewHolder(val binding: ItemArticleDetailCommentBin auditText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = R.color.theme_font.toColor(context) + ds.color = R.color.text_theme.toColor(context) } override fun onClick(widget: View) { @@ -358,7 +358,7 @@ class RatingDetailCommentItemViewHolder(val binding: ItemArticleDetailCommentBin auditText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = R.color.theme_font.toColor(context) + ds.color = R.color.text_theme.toColor(context) } override fun onClick(widget: View) { 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 67a705b3d3..d82bc949ca 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 @@ -145,7 +145,7 @@ class RatingFragment : LazyListFragment(), IScro if (mRatingType == RatingViewModel.RatingType.FOLD_RATING) { val foldRatingReasonTv = requireView().findViewById(R.id.foldRatingReasonTv) val text = "折叠原因：因违反《光环助手评论规则》被管理员折叠" - foldRatingReasonTv.text = SpanBuilder(text).click(requireContext(), 8, 18, R.color.theme_font) { + foldRatingReasonTv.text = SpanBuilder(text).click(requireContext(), 8, 18, R.color.text_theme) { MtaHelper.onEvent("折叠评论", "点击评论规则", mListViewModel.game.name) requireContext().startActivity( WebActivity.getWebIntent( @@ -240,7 +240,7 @@ class RatingFragment : LazyListFragment(), IScro override fun onDarkModeChanged() { super.onDarkModeChanged() - mListRv?.background = R.color.background.toDrawable(requireContext()) + mListRv?.background = R.color.ui_background.toDrawable(requireContext()) mListRv?.recycledViewPool?.clear() mAdapter?.notifyItemRangeChanged(0, mAdapter?.itemCount ?: 0) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt index 7d48618a11..a84e428ce5 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingItemViewHolder.kt @@ -44,7 +44,7 @@ class RatingItemViewHolder(val binding: RatingItemBinding) : BaseRecyclerViewHol hitText.setTextColor( ContextCompat.getColor( view.context, - if (text == selectedValue) R.color.theme_font else R.color.text_subtitle + if (text == selectedValue) R.color.text_theme else R.color.text_secondary ) ) 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 a0575a963e..9cb44f2eb8 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 @@ -185,7 +185,7 @@ class RatingReplyActivity : ListActivity @@ -197,7 +197,7 @@ class RatingReplyActivity : ListActivity 0) NumberUtils.transSimpleCount(replyEntity.vote) else "" @@ -312,10 +312,10 @@ class RatingReplyAdapter( root.context, 0, prefix.length, - R.color.text_title + R.color.text_primary ).build() val parentUserNameSpan = SpanBuilder(parentUserName) - .click(mContext, 0, parentUserName.length, R.color.text_subtitleDesc) { + .click(mContext, 0, parentUserName.length, R.color.text_tertiary) { DirectUtils.directToHomeActivity( root.context, parent.user.id, @@ -329,7 +329,7 @@ class RatingReplyAdapter( root.context, 0, colon.length, - R.color.text_title + R.color.text_primary ).build() contentCharSequence = SpannableStringBuilder() @@ -368,7 +368,7 @@ class RatingReplyAdapter( if (!replyEntity.me.isVoted) { viewModel.voteReply(replyEntity.id, callback = { likeCountTv.setDrawableStart(R.drawable.comment_vote_select) - likeCountTv.setTextColor(R.color.theme_font.toColor(likeCountTv.context)) + likeCountTv.setTextColor(R.color.text_theme.toColor(likeCountTv.context)) likeCountTv.text = (replyEntity.vote).toString() }) NewLogUtils.logCommentTabOrCommentDetailClick( @@ -380,7 +380,7 @@ class RatingReplyAdapter( } else { viewModel.voteReply(replyEntity.id, false, callback = { likeCountTv.setDrawableStart(R.drawable.comment_vote_unselect) - likeCountTv.setTextColor(R.color.text_subtitleDesc.toColor(likeCountTv.context)) + likeCountTv.setTextColor(R.color.text_tertiary.toColor(likeCountTv.context)) likeCountTv.text = if (replyEntity.vote == 0) "" else (replyEntity.vote).toString() }) logGameDetailCommentDetailCommentClick("回复取消点赞") @@ -512,16 +512,16 @@ class RatingReplyAdapter( is ListSectionItemViewHolder -> { holder.binding.run { - root.setRootBackgroundColor(R.color.background_white) + root.setRootBackgroundColor(R.color.ui_surface) divider.visibility = View.GONE - commentHintTv.setTextColor(R.color.text_title.toColor(mContext)) - commentHintCountTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + commentHintTv.setTextColor(R.color.text_primary.toColor(mContext)) + commentHintCountTv.setTextColor(R.color.text_tertiary.toColor(mContext)) orderSfv.run { setContainerBackground(R.drawable.button_round_f5f5f5.toDrawable(mContext)) setIndicatorBackground(R.drawable.bg_game_collection_sfv_indicator.toDrawable(mContext)) setTextColor( - R.color.text_subtitle.toColor(mContext), - R.color.text_subtitleDesc.toColor(mContext) + R.color.text_secondary.toColor(mContext), + R.color.text_tertiary.toColor(mContext) ) } @@ -549,7 +549,7 @@ class RatingReplyAdapter( } is FooterViewHolder -> { - holder.itemView.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.itemView.setBackgroundColor(R.color.ui_surface.toColor(mContext)) when { mIsNetworkError -> { holder.loading.visibility = View.GONE diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt index 66b7eb4db9..c84811368f 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt @@ -632,7 +632,7 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mBinding.mWebView.enableForceDark(DarkModeUtils.isDarkModeOn(this)) } 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 01b5cc4cb3..61bab6093d 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 @@ -61,7 +61,7 @@ class CommentLogsActivity : ListActivity holder.initFooterViewHolder(viewModel, mIsLoading, isNetworkError, mIsOver) @@ -142,7 +141,7 @@ class CommentLogsAdapter( Spanned.SPAN_EXCLUSIVE_EXCLUSIVE ) msp.setSpan( - BackgroundColorSpan(R.color.theme_font.toColor(mContext)), + BackgroundColorSpan(R.color.text_theme.toColor(mContext)), (msp.length - value.length), msp.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE 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 9c7d3b1c46..836f0d94d5 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryActivity.kt @@ -13,14 +13,14 @@ class HistoryActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled() = true override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt index 43a95062ab..9707c49322 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListAdapter.kt @@ -176,7 +176,7 @@ class HistoryGameListAdapter(context: Context, private val mViewModel: HistoryGa mContext ) itemDelete.setTextColor( - if (selectItems.isEmpty()) R.color.text_body.toColor(mContext) else R.color.white.toColor( + if (selectItems.isEmpty()) R.color.text_instance.toColor(mContext) else R.color.white.toColor( mContext ) ) diff --git a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt index 1c13ea70d8..055354de08 100644 --- a/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/history/HistoryGameListFragment.kt @@ -34,7 +34,7 @@ open class HistoryGameListFragment : ListFragment holder.bindView( item.blankDivider!!, if (mOuterType == OuterType.NEW_HOME) { - R.color.background_white.toColor(mContext) + R.color.ui_surface.toColor(mContext) } else { - R.color.background.toColor(mContext) + R.color.ui_background.toColor(mContext) } ) @@ -681,7 +681,7 @@ class LegacyHomeFragmentAdapterAssistant( } } holder.binding.root.background = R.drawable.reuse_listview_item_style.toDrawable(holder.binding.root.context) - holder.binding.gameName.setTextColor(R.color.text_title.toColor(holder.binding.root.context)) + holder.binding.gameName.setTextColor(R.color.text_primary.toColor(holder.binding.root.context)) } private fun bindHeadView(holder: GameHeadViewHolder, item: LegacyHomeItemData, position: Int) { @@ -927,11 +927,11 @@ class LegacyHomeFragmentAdapterAssistant( if (mPluginDisplayStatus == PluginDisplayStatus.OPEN_TWO_AND_BUTTON) { holder.binding.pluginExtend.text = "展开" holder.binding.pluginExtend.setDrawableEnd(R.drawable.home_plugin_bottom_open) - holder.binding.pluginExtend.setTextColor(R.color.theme.toColor(mContext)) + holder.binding.pluginExtend.setTextColor(R.color.primary_theme.toColor(mContext)) } else { holder.binding.pluginExtend.text = "收起" holder.binding.pluginExtend.setDrawableEnd(R.drawable.home_plugin_bottom_close) - holder.binding.pluginExtend.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + holder.binding.pluginExtend.setTextColor(R.color.text_tertiary.toColor(mContext)) } } else { holder.binding.pluginExtendContainer.visibility = View.GONE @@ -1290,7 +1290,7 @@ class LegacyHomeFragmentAdapterAssistant( } class BlankDividerViewHolder(var binding: ItemBlankDividerBinding) : ViewHolder(binding.root) { - fun bindView(height: Float, color: Int = R.color.background_white.toColor(binding.root.context)) { + fun bindView(height: Float, color: Int = R.color.ui_surface.toColor(binding.root.context)) { binding.container.setBackgroundColor(color) binding.container.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, height.dip2px()) } diff --git a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayItemViewHolder.kt index 7ab64efede..e1d167f189 100644 --- a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayItemViewHolder.kt @@ -36,7 +36,7 @@ class HomeAmwayItemViewHolder(val binding: HomeAmwayItemBinding) : BaseRecyclerV val m = Pattern.compile(RatingEditActivity.LABEL_REGEX).matcher(amway.comment.content) if (m.find()) { - val contents = TextHelper.getCommentLabelSpannableStringBuilder(amway.comment.content, R.color.theme_font) + val contents = TextHelper.getCommentLabelSpannableStringBuilder(amway.comment.content, R.color.text_theme) binding.content.text = contents } else { binding.content.text = amway.comment.content @@ -45,11 +45,11 @@ class HomeAmwayItemViewHolder(val binding: HomeAmwayItemBinding) : BaseRecyclerV amwayBackground.background = R.drawable.home_amway_selector.toDrawable(root.context) ratingBlock.background = R.drawable.home_amway_rating_selector.toDrawable(root.context) all.background = R.drawable.home_amway_selector.toDrawable(root.context) - gameName.setTextColor(R.color.text_title.toColor(root.context)) - content.setTextColor(R.color.text_title.toColor(root.context)) - userName.setTextColor(R.color.text_subtitle.toColor(root.context)) - ratingName.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) - all.setTextColor(R.color.text_title.toColor(root.context)) + gameName.setTextColor(R.color.text_primary.toColor(root.context)) + content.setTextColor(R.color.text_primary.toColor(root.context)) + userName.setTextColor(R.color.text_secondary.toColor(root.context)) + ratingName.setTextColor(R.color.text_tertiary.toColor(root.context)) + all.setTextColor(R.color.text_primary.toColor(root.context)) } GameItemViewHolder.initGameSubtitleAndAdLabel(gameEntity, binding.gameSubtitleTv) } diff --git a/app/src/main/java/com/gh/gamecenter/home/discovercard/DiscoverCardGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/discovercard/DiscoverCardGameAdapter.kt index cf87f91b77..2bce2b2cf9 100644 --- a/app/src/main/java/com/gh/gamecenter/home/discovercard/DiscoverCardGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/discovercard/DiscoverCardGameAdapter.kt @@ -134,7 +134,7 @@ class DiscoverCardGameAdapter( text = reason textSize = 12F includeFontPadding = false - setTextColor(R.color.text_subtitle.toColor(mContext)) + setTextColor(R.color.text_secondary.toColor(mContext)) gravity = Gravity.CENTER setPadding(12F.dip2px(), 0F.dip2px(), 12F.dip2px(), 0F.dip2px()) background = R.drawable.bg_shape_space_radius_8.toDrawable(mContext) diff --git a/app/src/main/java/com/gh/gamecenter/home/discovercard/HomeDiscoverCardViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/discovercard/HomeDiscoverCardViewHolder.kt index d05f7257f2..8cab6f6f4d 100644 --- a/app/src/main/java/com/gh/gamecenter/home/discovercard/HomeDiscoverCardViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/discovercard/HomeDiscoverCardViewHolder.kt @@ -106,7 +106,7 @@ class HomeDiscoverCardViewHolder(val binding: HomeDiscoverCardItemBinding) : Bas position: Int ) { textView.background = R.drawable.bg_shape_space_radius_4.toDrawable(context) - textView.setTextColor(R.color.text_subtitle.toColor(context)) + textView.setTextColor(R.color.text_secondary.toColor(context)) if (textView.text == label.title) return diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/refresh/HomeGameCollectionRefreshAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/refresh/HomeGameCollectionRefreshAdapter.kt index dd1ee44241..2244e7b82e 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/refresh/HomeGameCollectionRefreshAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/refresh/HomeGameCollectionRefreshAdapter.kt @@ -94,7 +94,7 @@ class HomeGameCollectionRefreshAdapter( holder.binding.run { val padR = if (position == itemCount - 1) 16F.dip2px() else 0 root.setPadding(16F.dip2px(), 0, padR, 0) - gameName.setTextColor(R.color.text_title.toColor(mContext)) + gameName.setTextColor(R.color.text_primary.toColor(mContext)) gameIcon.displayGameIcon(gameEntity) GameHorizontalSimpleItemViewHolder.setHorizontalNameAndGravity(gameName, gameEntity.name) root.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/refresh/HomeGameCollectionRefreshViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/refresh/HomeGameCollectionRefreshViewHolder.kt index ff2e979acf..47cf5cf9ad 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/refresh/HomeGameCollectionRefreshViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/refresh/HomeGameCollectionRefreshViewHolder.kt @@ -48,8 +48,8 @@ class HomeGameCollectionRefreshViewHolder(val binding: HomeGameCollectionRefresh if (DarkModeUtils.isDarkModeOn(binding.root.context) != mDarkMode) { mDarkMode = DarkModeUtils.isDarkModeOn(binding.root.context) binding.run { - titleTv.setTextColor(R.color.text_title.toColor(root.context)) - userTv.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + titleTv.setTextColor(R.color.text_primary.toColor(root.context)) + userTv.setTextColor(R.color.text_tertiary.toColor(root.context)) refreshLottie.cancelAnimation() refreshLottie.setAnimation(if (DarkModeUtils.isDarkModeOn(root.context)) "lottie/icon_title_change_dark.json" else "lottie/icon_title_change_light.json") refreshLottie.progress = 0F diff --git a/app/src/main/java/com/gh/gamecenter/home/gamecollection/slide/HomeGameCollectionSlideAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/gamecollection/slide/HomeGameCollectionSlideAdapter.kt index 022d0244d6..e4bc63a90c 100644 --- a/app/src/main/java/com/gh/gamecenter/home/gamecollection/slide/HomeGameCollectionSlideAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/gamecollection/slide/HomeGameCollectionSlideAdapter.kt @@ -138,8 +138,8 @@ class HomeGameCollectionSlideAdapter( params.leftMargin = if (position == 0) 0 else (-24F).dip2px() container.background = R.drawable.bg_item_game_test_v2.toDrawable(mContext) - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - userTv.setTextColor(R.color.text_subtitle.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + userTv.setTextColor(R.color.text_secondary.toColor(mContext)) ImageUtils.display(coverImage, entity?.cover) ImageUtils.display(userIv, entity?.user?.icon) @@ -173,7 +173,7 @@ class HomeGameCollectionSlideAdapter( gameIcon.goneIf(games.size < index + 1) { val gameEntity = games[index] gameIcon.displayGameIcon(gameEntity) - gameIcon.setBorderColor(R.color.background_white) + gameIcon.setBorderColor(R.color.ui_surface) gameIcon.setOnClickListener { NewFlatLogUtils.logGameListCollectionClick( mEntrance, @@ -252,8 +252,8 @@ class HomeGameCollectionSlideAdapter( ) (viewHolder.itemView as HomeGameCollectionBigSlideCardCell).binding?.run { container.background = R.drawable.bg_item_game_test_v2.toDrawable(mContext) - divider.setBackgroundColor(R.color.divider.toColor(mContext)) - moreTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + divider.setBackgroundColor(R.color.ui_divider.toColor(mContext)) + moreTv.setTextColor(R.color.text_tertiary.toColor(mContext)) moreTv.setDrawableEnd( AppCompatResources.getDrawable( mContext, @@ -261,9 +261,9 @@ class HomeGameCollectionSlideAdapter( ) ) listOf(gameItem1, gameItem2, gameItem3).forEach { binding -> - binding.gameIconIv.setBorderColor(R.color.border) - binding.gameNameTv.setTextColor(R.color.text_title.toColor(mContext)) - binding.gameDesTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + binding.gameIconIv.setBorderColor(R.color.resource_border) + binding.gameNameTv.setTextColor(R.color.text_primary.toColor(mContext)) + binding.gameDesTv.setTextColor(R.color.text_tertiary.toColor(mContext)) } } } diff --git a/app/src/main/java/com/gh/gamecenter/home/horizontalslidevideo/HomeHorizontalSlideVideoItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/horizontalslidevideo/HomeHorizontalSlideVideoItemViewHolder.kt index d2b6420cdc..5bc79567dc 100644 --- a/app/src/main/java/com/gh/gamecenter/home/horizontalslidevideo/HomeHorizontalSlideVideoItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/horizontalslidevideo/HomeHorizontalSlideVideoItemViewHolder.kt @@ -76,7 +76,7 @@ class HomeHorizontalSlideVideoItemViewHolder(val binding: ItemHomeHorizontalSlid ) { binding.gameIcon.displayGameIcon(gameEntity) binding.gameName.text = gameEntity.name - binding.gameName.setTextColor(R.color.text_title.toColor(binding.root.context)) + binding.gameName.setTextColor(R.color.text_primary.toColor(binding.root.context)) BindingAdapters.setGameTags(binding.gameTags, gameEntity) GameItemViewHolder.initGameSubtitleAndAdLabel(gameEntity, binding.gameSubtitleTv) diff --git a/app/src/main/java/com/gh/gamecenter/home/recommend/HomeRecommendItemGridAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/recommend/HomeRecommendItemGridAdapter.kt index 90bdd41f5d..bdcbeb1edb 100644 --- a/app/src/main/java/com/gh/gamecenter/home/recommend/HomeRecommendItemGridAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/recommend/HomeRecommendItemGridAdapter.kt @@ -52,7 +52,7 @@ class HomeRecommendItemGridAdapter : BaseAdapter() { if (data != null) { ImageUtils.display(binding.iconIv, data.icon) binding.nameTv.text = data.name - binding.nameTv.setTextColor(R.color.text_title.toColor(binding.root.context)) + binding.nameTv.setTextColor(R.color.text_primary.toColor(binding.root.context)) } initEvent(binding, position) return binding.root diff --git a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt index b177413f41..45c8fe94f7 100644 --- a/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/skip/PackageSkipAdapter.kt @@ -107,7 +107,7 @@ class PackageSkipAdapter( } } else if (holder is FooterViewHolder) { holder.initFooterViewHolder(false, false, true) - holder.hint.setTextColor(ContextCompat.getColor(context, R.color.text_subtitleDesc)) + holder.hint.setTextColor(ContextCompat.getColor(context, R.color.text_tertiary)) holder.hint.textSize = 12f } } 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 2ba9e871f9..43514eaa7a 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 @@ -120,10 +120,10 @@ class PackageSkipFragment : BaseFragment() { 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())) - mBinding.tipTv2.setTextColor(R.color.text_title.toColor(requireContext())) + mBinding.root.setBackgroundColor(R.color.ui_background.toColor(requireContext())) + mBinding.normalTitle.setTextColor(R.color.text_primary.toColor(requireContext())) + mBinding.tipTv1.setTextColor(R.color.text_tertiary.toColor(requireContext())) + mBinding.tipTv2.setTextColor(R.color.text_primary.toColor(requireContext())) if (::mAdapter.isInitialized) { mAdapter.notifyItemRangeChanged(0, mAdapter.itemCount) } diff --git a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListViewHolder.kt index e5d89ea513..5226d68bcf 100644 --- a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideListViewHolder.kt @@ -55,7 +55,7 @@ class HomeSlideListViewHolder( } updateImmersiveColor( slideList.safelyGetInRelease(curPosition)?.placeholderColor?.hexStringToIntColor() - ?: R.color.background_white.toColor(binding.root.context) + ?: R.color.ui_surface.toColor(binding.root.context) ) } @@ -157,7 +157,7 @@ class HomeSlideListViewHolder( lastScrollState = scrollState updateImmersiveColor( slideList.safelyGetInRelease(curPosition)?.placeholderColor?.hexStringToIntColor() - ?: R.color.background_white.toColor(binding.root.context) + ?: R.color.ui_surface.toColor(binding.root.context) ) } else if (scrollState == RecyclerView.SCROLL_STATE_DRAGGING) { lastScrollState = scrollState @@ -174,7 +174,7 @@ class HomeSlideListViewHolder( val currentColor = slideList.safelyGetInRelease(currentPosition)?.placeholderColor?.hexStringToIntColor() - ?: R.color.background_white.toColor(binding.root.context) + ?: R.color.ui_surface.toColor(binding.root.context) val nextColor = slideList.safelyGetInRelease(nextPosition)?.placeholderColor?.hexStringToIntColor() ?: currentColor @@ -192,7 +192,7 @@ class HomeSlideListViewHolder( callback.invoke(color) val gradientDrawable = DrawableView.getGradientDrawable( color, - R.color.background_white.toColor(binding.root.context), GradientDrawable.Orientation.TOP_BOTTOM, 0f + R.color.ui_surface.toColor(binding.root.context), GradientDrawable.Orientation.TOP_BOTTOM, 0f ) binding.placeholderView.background = gradientDrawable } diff --git a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideWithCardsViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideWithCardsViewHolder.kt index 473eeca33a..3f0890cc46 100644 --- a/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideWithCardsViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/slide/HomeSlideWithCardsViewHolder.kt @@ -78,7 +78,7 @@ class HomeSlideWithCardsViewHolder( } updateImmersiveColor( slideList.safelyGetInRelease(curPosition)?.placeholderColor?.hexStringToIntColor() - ?: R.color.background_white.toColor(binding.root.context) + ?: R.color.ui_surface.toColor(binding.root.context) ) } @@ -177,7 +177,7 @@ class HomeSlideWithCardsViewHolder( lastScrollState = scrollState updateImmersiveColor( slideList.safelyGetInRelease(curPosition)?.placeholderColor?.hexStringToIntColor() - ?: R.color.background_white.toColor(binding.root.context) + ?: R.color.ui_surface.toColor(binding.root.context) ) } else if (scrollState == RecyclerView.SCROLL_STATE_DRAGGING) { lastScrollState = scrollState @@ -196,7 +196,7 @@ class HomeSlideWithCardsViewHolder( val currentColor = slideList.safelyGetInRelease(currentPosition)?.placeholderColor?.hexStringToIntColor() - ?: R.color.background_white.toColor(binding.root.context) + ?: R.color.ui_surface.toColor(binding.root.context) val nextColor = slideList.safelyGetInRelease(nextPosition)?.placeholderColor?.hexStringToIntColor() ?: currentColor @@ -254,8 +254,8 @@ class HomeSlideWithCardsViewHolder( val gameIconGroup = listOf(gameIconIv1, gameIconIv2, gameIconIv3) titleTv.text = homeSubSlide.title - titleTv.setTextColor(R.color.text_title.toColor(titleTv.context)) - descTv.setTextColor(R.color.text_subtitle.toColor(descTv.context)) + titleTv.setTextColor(R.color.text_primary.toColor(titleTv.context)) + descTv.setTextColor(R.color.text_secondary.toColor(descTv.context)) val exposureEvent = ExposureEvent.createEventWithSourceConcat( gameEntity = GameEntity().apply { @@ -507,7 +507,7 @@ class HomeSlideWithCardsViewHolder( callback.invoke(color) val gradientDrawable = DrawableView.getGradientDrawable( color, - R.color.background_white.toColor(binding.root.context), GradientDrawable.Orientation.TOP_BOTTOM, 0f + R.color.ui_surface.toColor(binding.root.context), GradientDrawable.Orientation.TOP_BOTTOM, 0f ) binding.placeholderView.background = gradientDrawable } diff --git a/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2GameListPlaceHolderViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2GameListPlaceHolderViewHolder.kt index 2e068181e2..166ae1e572 100644 --- a/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2GameListPlaceHolderViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2GameListPlaceHolderViewHolder.kt @@ -30,7 +30,7 @@ class HomeGameTestV2GameListPlaceHolderViewHolder( mSkeletonView = Skeleton.bind(view) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) diff --git a/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2GameListViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2GameListViewHolder.kt index bd9f007ada..19df7626ee 100644 --- a/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2GameListViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2GameListViewHolder.kt @@ -56,9 +56,9 @@ class HomeGameTestV2GameListViewHolder( gameRating.setPadding(0, 0, if (gameEntity.commentCount > 3) 8F.dip2px() else 0, 0) gameRating.setTextColor( if (gameEntity.commentCount > 3) { - R.color.theme_font.toColor(gameRating.context) + R.color.text_theme.toColor(gameRating.context) } else { - R.color.theme.toColor(gameRating.context) + R.color.primary_theme.toColor(gameRating.context) } ) @@ -77,12 +77,12 @@ class HomeGameTestV2GameListViewHolder( */ private fun fixViewHolderTheme(gameEntity: GameEntity) { val context = mBinding.root.context - gameName.setTextColor(R.color.text_title.toColor(context)) + gameName.setTextColor(R.color.text_primary.toColor(context)) gameDownloadBtn.background = R.drawable.download_button_normal_style.toDrawable(context) - gameDes.setTextColor(R.color.text_title.toColor(context)) - var gameRatingTextColor = R.color.theme.toColor(context) + gameDes.setTextColor(R.color.text_primary.toColor(context)) + var gameRatingTextColor = R.color.primary_theme.toColor(context) if (gameEntity.commentCount > 3) { - gameRatingTextColor = R.color.theme_font.toColor(context) + gameRatingTextColor = R.color.text_theme.toColor(context) } gameRating?.setTextColor(gameRatingTextColor) } diff --git a/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2RecommendViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2RecommendViewHolder.kt index 7d8e962507..daaf0bffb6 100644 --- a/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2RecommendViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeGameTestV2RecommendViewHolder.kt @@ -24,7 +24,7 @@ class HomeGameTestV2RecommendViewHolder( fun bind(data: RecommendLabel) { val context = mBinding.tvLabel.context mBinding.tvLabel.text = data.text - mBinding.tvLabel.setTextColor(R.color.text_subtitle.toColor(context)) + mBinding.tvLabel.setTextColor(R.color.text_secondary.toColor(context)) mBinding.tvLabel.background = ContextCompat.getDrawable( context, diff --git a/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeItemGameTestV2ViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeItemGameTestV2ViewHolder.kt index 9a38d80d6e..172b07f201 100644 --- a/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeItemGameTestV2ViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/test_v2/HomeItemGameTestV2ViewHolder.kt @@ -325,7 +325,7 @@ class HomeItemGameTestV2ViewHolder( mSkeletonView = Skeleton.bind(view) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyDialogAdapter.java b/app/src/main/java/com/gh/gamecenter/info/StrategyDialogAdapter.java index dfa461ca83..966ea0e7b3 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyDialogAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyDialogAdapter.java @@ -44,7 +44,7 @@ class StrategyDialogAdapter extends BaseRecyclerAdapter(); - mBinding.strategyRefresh.setColorSchemeResources(R.color.theme); + mBinding.strategyRefresh.setColorSchemeResources(R.color.primary_theme); mBinding.strategyRefresh.setOnRefreshListener(this); - mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); mStrategyAdapter = new StrategyAdapter(getContext(), this, this); mLayoutManager = new LinearLayoutManager(getContext()); @@ -291,17 +291,17 @@ public class StrategyFragment extends BaseFragment implements SwipeRefreshLayout @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); - mBinding.container.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + mCachedView.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); + mBinding.container.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); mStrategyAdapter.notifyItemRangeChanged(0, mStrategyAdapter.getItemCount()); if (dialog != null && dialogContentView != null && mStrategyDialogAdapter != null) { DialogStrategySelectGameBinding binding = DialogStrategySelectGameBinding.bind(dialogContentView); mStrategyDialogAdapter.notifyItemRangeChanged(0, mStrategyDialogAdapter.getItemCount()); - binding.dialogStrategySelectGameRv.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); - binding.dialogStrategySelectGameRl.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + binding.dialogStrategySelectGameRv.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); + binding.dialogStrategySelectGameRl.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); binding.desTv.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.cutting_line)); binding.desTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.title)); - binding.titleTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)); + binding.titleTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_theme)); } } } 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 3385ebb80c..7224535524 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao1Fragment.java @@ -51,7 +51,7 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); mBinding = FragmentLibao1Binding.bind(mCachedView); - mBinding.libaoRefresh.setColorSchemeResources(R.color.theme); + mBinding.libaoRefresh.setColorSchemeResources(R.color.primary_theme); mBinding.libaoRefresh.setOnRefreshListener(this); mBinding.libaoRefresh.setEnabled(false); mBinding.searchBar.tvBack.setOnClickListener(this); @@ -184,11 +184,11 @@ public class Libao1Fragment extends BaseFragment implements SwipeRefreshLayout.O @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.background_white); - ExtensionsKt.setRootBackgroundColor(mBinding.searchBar.getRoot(), R.color.background_white); + ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.ui_surface); + ExtensionsKt.setRootBackgroundColor(mBinding.searchBar.getRoot(), R.color.ui_surface); mBinding.searchBar.searchBackground.setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.actionbar_search_bg)); - mBinding.searchBar.etSearch.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.text_body)); - mBinding.searchBar.etSearch.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_title)); + mBinding.searchBar.etSearch.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.text_instance)); + mBinding.searchBar.etSearch.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_primary)); mBinding.searchBar.searchIv.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.toolbar_search_icon)); mBinding.searchBar.tvBack.setImageDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.ic_search_bar_clear)); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { 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 ab7fad5ab1..6750611645 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2Fragment.java @@ -63,7 +63,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O protected void initView(View view) { super.initView(view); mBinding = FragmentLibao2Binding.bind(view); - mBinding.libao2SrlRefresh.setColorSchemeResources(R.color.theme); + mBinding.libao2SrlRefresh.setColorSchemeResources(R.color.primary_theme); mBinding.libao2SrlRefresh.setOnRefreshListener(this); mBinding.reuseNoConnection.reuseNoConnection.setOnClickListener(this); mBinding.reuseNoneData.reuseNoneDataTv.setOnClickListener(this); @@ -136,7 +136,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O mBinding.reuseLoading.getRoot().setVisibility(View.GONE); mBinding.reuseNoneData.getRoot().setVisibility(View.VISIBLE); mBinding.reuseNoneData.reuseNoneDataTv.setText(R.string.login_hint); - mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(getResources().getColor(R.color.theme_font)); + mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(getResources().getColor(R.color.text_theme)); } @Override @@ -224,7 +224,7 @@ public class Libao2Fragment extends BaseFragment implements SwipeRefreshLayout.O @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.background_white); + ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.ui_surface); mBinding.libao2RvList.getRecycledViewPool().clear(); adapter.notifyItemRangeChanged(0, adapter.getItemCount()); if (mBinding.libao2RvList.getItemDecorationCount() > 0) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java index 435314abda..278e7609ff 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao2FragmentAdapter.java @@ -205,7 +205,7 @@ class Libao2FragmentAdapter extends BaseRecyclerAdapter { private void initLibaoViewHolder(final LibaoNormalViewHolder holder, final int position) { LibaoEntity libaoEntity = mLibaoList.get(position); holder.setClickData(libaoEntity); - ExtensionsKt.setRootBackgroundColor(holder.binding.getRoot(), R.color.background_white); + ExtensionsKt.setRootBackgroundColor(holder.binding.getRoot(), R.color.ui_surface); holder.binding.libaoName.setText(libaoEntity.getName()); holder.binding.libaoGameIcon.displayGameIcon(libaoEntity.getIcon(), libaoEntity.getIconSubscript(), libaoEntity.getGame().getIconFloat()); if (TextUtils.isEmpty(libaoEntity.getPlatform())) { 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 6bd63c606a..200f2fca3a 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3Fragment.java @@ -54,7 +54,7 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O super.onCreate(savedInstanceState); mBinding = FragmentLibao3Binding.bind(mCachedView); - mBinding.libao3SrlRefresh.setColorSchemeResources(R.color.theme); + mBinding.libao3SrlRefresh.setColorSchemeResources(R.color.primary_theme); mBinding.libao3SrlRefresh.setOnRefreshListener(this); mBinding.reuseNoConnection.getRoot().setOnClickListener(this); mBinding.reuseNoneData.reuseNoneDataTv.setOnClickListener(this); @@ -128,7 +128,7 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O mBinding.radiogroup.setVisibility(View.GONE); mBinding.reuseNoneData.getRoot().setVisibility(View.VISIBLE); mBinding.reuseNoneData.reuseNoneDataTv.setText(R.string.login_hint); - mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme_font)); + mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.text_theme)); } public void onClick(View v) { // 重新连接 @@ -179,8 +179,8 @@ public class Libao3Fragment extends BaseFragment implements SwipeRefreshLayout.O @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.background_white); - mBinding.radiogroup.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.ui_surface); + mBinding.radiogroup.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); mBinding.receivedRb.setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.bg_button_round_selector)); mBinding.receivedRb.setTextColor(ContextCompat.getColorStateList(requireContext(), R.color.libao_rg_button_selector)); mBinding.expiredRb.setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.bg_button_round_selector)); diff --git a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java index f0350c4744..46438e564f 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java @@ -203,7 +203,7 @@ class Libao3FragmentAdapter extends BaseRecyclerAdapter if (viewHolder instanceof LibaoNormalViewHolder) { LibaoNormalViewHolder holder = (LibaoNormalViewHolder) viewHolder; final LibaoEntity libaoEntity = mLibaoList.get(position); - ExtensionsKt.setRootBackgroundColor(holder.binding.getRoot(), R.color.background_white); + ExtensionsKt.setRootBackgroundColor(holder.binding.getRoot(), R.color.ui_surface); holder.binding.libaoName.setText(libaoEntity.getName()); holder.binding.libaoGameIcon.displayGameIcon(libaoEntity.getIcon(), libaoEntity.getIconSubscript(), libaoEntity.getGame().getIconFloat()); if (mFilter.equals("expires:false") && libaoEntity.getExpires() > 0) { 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 a885350387..f3ced4660b 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoFragment.java @@ -151,15 +151,15 @@ public class LibaoFragment extends BaseFragment_TabLayout { @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - mBinding.fragmentTabRl.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); - mBinding.divider.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.divider)); + mBinding.fragmentTabRl.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); + mBinding.divider.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_divider)); ExtensionsKt.updateStatusBarColor(requireActivity(), R.color.black, R.color.white); for (int i = 0; i < mTabLayout.getTabCount(); i++) { TabLayout.Tab tab = mTabLayout.getTabAt(i); if (tab == null || tab.getCustomView() == null) continue; View tabTitle = tab.getCustomView().findViewById(R.id.tab_title); if (tabTitle instanceof CheckedTextView) { - ((CheckedTextView) tabTitle).setTextColor(ContextCompat.getColor(requireContext(), tab.isSelected() ? R.color.theme_font : R.color.text_subtitle)); + ((CheckedTextView) tabTitle).setTextColor(ContextCompat.getColor(requireContext(), tab.isSelected() ? R.color.text_theme : R.color.text_secondary)); } } } diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java index 89aae312fd..146296664f 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoHistoryAdapter.java @@ -143,7 +143,7 @@ public class LibaoHistoryAdapter extends BaseRecyclerAdapter { if (holder instanceof LibaoNormalViewHolder) { LibaoNormalViewHolder viewHolder = (LibaoNormalViewHolder) holder; LibaoEntity libaoEntity = mLibaoList.get(position); - ExtensionsKt.setRootBackgroundColor(viewHolder.binding.getRoot(), R.color.background_white); + ExtensionsKt.setRootBackgroundColor(viewHolder.binding.getRoot(), R.color.ui_surface); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT , LinearLayout.LayoutParams.WRAP_CONTENT); if (position == 0 || position == getItemCount() - 1) { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt index 85f7d70a9b..2d73193b6f 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoNewAdapter.kt @@ -191,7 +191,7 @@ class LibaoNewAdapter( val libaoEntity = mLibaoList[position] holder.setClickData(libaoEntity) holder.binding.libaoName.text = libaoEntity.name - holder.binding.root.setRootBackgroundColor(R.color.background_white) + holder.binding.root.setRootBackgroundColor(R.color.ui_surface) if (TextUtils.isEmpty(libaoEntity.platform)) { holder.binding.libaoGameName.text = libaoEntity.game?.name } else { diff --git a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt index 9f1dc61273..bda5a5c774 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchAdapter.kt @@ -212,7 +212,7 @@ class LibaoSearchAdapter( private fun initLibaoViewHolder(holder: LibaoNormalViewHolder, position: Int) { val libaoEntity = mLibaoList[position] holder.setClickData(libaoEntity) - holder.binding.root.setRootBackgroundColor(R.color.background_white) + holder.binding.root.setRootBackgroundColor(R.color.ui_surface) holder.binding.libaoName.text = libaoEntity.name if (TextUtils.isEmpty(libaoEntity.platform)) { holder.binding.libaoGameName.text = libaoEntity.game?.name 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 0d8c0aad08..d9febfae51 100644 --- a/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java +++ b/app/src/main/java/com/gh/gamecenter/libao/LibaoSearchFragment.java @@ -170,7 +170,7 @@ public class LibaoSearchFragment extends BaseFragment implements SwipeRefreshLay @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.background); + ExtensionsKt.setRootBackgroundColor(mBinding.getRoot(), R.color.ui_background); mBinding.libaoSearchRvList.getRecycledViewPool().clear(); mAdapter.notifyItemRangeChanged(0, mAdapter.getItemCount()); if (mBinding.libaoSearchRvList.getItemDecorationCount() > 0) { diff --git a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java index 80ee73adf9..971f9247f1 100644 --- a/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java +++ b/app/src/main/java/com/gh/gamecenter/manager/UpdateManager.java @@ -352,7 +352,7 @@ public class UpdateManager { .click(mContext, defaultText.length(), defaultText.length() + appEntity.getSpareLink().length(), - R.color.theme_font, + R.color.text_theme, false, () -> { DirectUtils.directToExternalBrowser(context, appEntity.getSpareLink()); 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 4a5e94484e..2a84653668 100644 --- a/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java +++ b/app/src/main/java/com/gh/gamecenter/message/MessageDetailFragment.java @@ -163,7 +163,7 @@ public class MessageDetailFragment extends ToolbarFragment implements OnCommentC if (hasFocus) { mBinding.pieceCommentTypingContainer.answerCommentEt.setHintTextColor(ContextCompat.getColor(getContext(), R.color.hint)); } else { - mBinding.pieceCommentTypingContainer.answerCommentEt.setHintTextColor(ContextCompat.getColor(getContext(), R.color.theme_font)); + mBinding.pieceCommentTypingContainer.answerCommentEt.setHintTextColor(ContextCompat.getColor(getContext(), R.color.text_theme)); } }); @@ -478,7 +478,7 @@ public class MessageDetailFragment extends ToolbarFragment implements OnCommentC if (isPopup) { mBinding.pieceCommentTypingContainer.answerContent.setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.bg_shape_white_radius_10_top_only)); } else { - mBinding.pieceCommentTypingContainer.answerContent.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + mBinding.pieceCommentTypingContainer.answerContent.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); mOffset = Math.abs(height); } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt index c06451872a..a31a30e95c 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameAdapter.kt @@ -72,10 +72,10 @@ class MyFollowedGameAdapter(context: Context, var mViewModel: MyFollowedGameView binding.run { gameItemIncluded.run { root.background = null - gameKaifuType.setBackgroundColor(R.color.theme.toColor(root.context)) - gameName.setTextColor(R.color.text_title.toColor(root.context)) - gameDes.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) - recommendStarPref.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + gameKaifuType.setBackgroundColor(R.color.primary_theme.toColor(root.context)) + gameName.setTextColor(R.color.text_primary.toColor(root.context)) + gameDes.setTextColor(R.color.text_tertiary.toColor(root.context)) + recommendStarPref.setTextColor(R.color.text_tertiary.toColor(root.context)) cardContainer.background = R.drawable.bg_shape_space_radius_8.toDrawable(root.context) gameIconView.displayGameIcon(gameEntity) @@ -88,7 +88,7 @@ class MyFollowedGameAdapter(context: Context, var mViewModel: MyFollowedGameView if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString() } else "" gameRating.setTextColor( - if (gameEntity.commentCount > 3) R.color.theme_font.toColor(mContext) else R.color.theme.toColor( + if (gameEntity.commentCount > 3) R.color.text_theme.toColor(mContext) else R.color.primary_theme.toColor( mContext ) ) @@ -98,7 +98,7 @@ class MyFollowedGameAdapter(context: Context, var mViewModel: MyFollowedGameView } root.background = R.drawable.reuse_listview_item_style.toDrawable(root.context) listOf(forumTv, trendsTv, commentsTv).forEach { - it.setTextColor(R.color.text_subtitle.toColor(mContext)) + it.setTextColor(R.color.text_secondary.toColor(mContext)) } initServerType(gameEntity) initShortcut(gameEntity, mEntrance, path, newPath) @@ -154,7 +154,7 @@ class MyFollowedGameViewHolder(var binding: ItemFollowedGameBinding) : RecyclerV height = 28F.dip2px() } gameItemIncluded.downloadBtn.text = "关联关注" - gameItemIncluded.downloadBtn.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + gameItemIncluded.downloadBtn.setTextColor(R.color.text_tertiary.toColor(root.context)) gameItemIncluded.downloadBtn.background = R.drawable.button_round_border_eeeeee.toDrawable(root.context) gameItemIncluded.downloadBtn.setOnClickListener { } @@ -164,7 +164,7 @@ class MyFollowedGameViewHolder(var binding: ItemFollowedGameBinding) : RecyclerV height = 28F.dip2px() } gameItemIncluded.downloadBtn.text = "已关注" - gameItemIncluded.downloadBtn.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + gameItemIncluded.downloadBtn.setTextColor(R.color.text_tertiary.toColor(root.context)) gameItemIncluded.downloadBtn.background = R.drawable.button_round_gray_light.toDrawable(root.context) gameItemIncluded.downloadBtn.setOnClickListener { @@ -188,7 +188,7 @@ class MyFollowedGameViewHolder(var binding: ItemFollowedGameBinding) : RecyclerV gameEntity.name ?: "" ) }, uiModificationCallback = { - it.confirmTv.setTextColor(R.color.theme_red.toColor(root.context)) + it.confirmTv.setTextColor(R.color.secondary_red.toColor(root.context)) }, extraConfig = DialogHelper.Config(centerContent = true, centerTitle = true) ) } @@ -209,7 +209,7 @@ class MyFollowedGameViewHolder(var binding: ItemFollowedGameBinding) : RecyclerV if (gameEntity.isUseDefaultServerStyle()) { binding.gameItemIncluded.gameKaifuType.background = R.drawable.server_label_default_bg.toDrawable(binding.root.context) - binding.gameItemIncluded.gameKaifuType.setTextColor(R.color.text_server_label.toColor(binding.root.context)) + binding.gameItemIncluded.gameKaifuType.setTextColor(R.color.text_secondary.toColor(binding.root.context)) } else { binding.gameItemIncluded.gameKaifuType.background = DrawableView.getServerDrawable(serverLabel.color) 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 2f658c593f..dee2cba59a 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyFollowedGameFragment.kt @@ -40,7 +40,7 @@ class MyFollowedGameFragment : ListFragment mBinding.fragmentListBase.reuseNoneData.reuseNoneDataTv.setTextColor( ContextCompat.getColor( requireContext(), - R.color.theme_font + R.color.text_theme ) ) } else { @@ -48,7 +48,7 @@ class MyFollowedGameFragment : ListFragment mBinding.fragmentListBase.reuseNoneData.reuseNoneDataTv.setTextColor( ContextCompat.getColor( requireContext(), - R.color.text_title + R.color.text_primary ) ) } @@ -72,7 +72,7 @@ class MyFollowedGameFragment : ListFragment // 不需要分页 mListRv.clearOnScrollListeners() mListRv.addOnScrollListener(mExposureListener!!) - mCachedView.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mCachedView.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mBinding.concernRvRecommend.setHasFixedSize(true) mBinding.concernRvRecommend.layoutManager = GridLayoutManager(context, 4) 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 33a78f4704..a64e0eb4e5 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyGameActivity.kt @@ -30,7 +30,7 @@ class MyGameActivity : BaseActivity_TabLayout() { setToolbarMenu(R.menu.menu_my_game) mDividerLineView?.visibility = View.VISIBLE showGuide() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun initFragmentList(fragments: MutableList?) { @@ -65,7 +65,7 @@ class MyGameActivity : BaseActivity_TabLayout() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) getMenuItem(R.id.menu_create_game_collection).setIcon(R.drawable.ic_create_game_collection) } diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt index 8be84042c3..64430a708d 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyPlayedGameFragment.kt @@ -41,7 +41,7 @@ class MyPlayedGameFragment : PlayedGameFragment() { runOnIoThread { UsageStatsHelper.checkAndPostUsageStats() } - mCachedView.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mCachedView.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } override fun provideListAdapter(): ListAdapter { diff --git a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt index 3c450c4b79..00593ade74 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationAdapter.kt @@ -75,14 +75,14 @@ class MyReservationAdapter(context: Context, var mViewModel: MyReservationViewMo holder.binding.run { root.background = R.drawable.reuse_listview_item_style.toDrawable(root.context) listOf(forumTv, trendsTv, commentsTv).forEach { - it.setTextColor(R.color.text_subtitle.toColor(mContext)) + it.setTextColor(R.color.text_secondary.toColor(mContext)) } gameItemIncluded.run { root.background = null - gameKaifuType.setBackgroundColor(R.color.theme.toColor(root.context)) - gameName.setTextColor(R.color.text_title.toColor(root.context)) - gameDes.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) - recommendStarPref.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + gameKaifuType.setBackgroundColor(R.color.primary_theme.toColor(root.context)) + gameName.setTextColor(R.color.text_primary.toColor(root.context)) + gameDes.setTextColor(R.color.text_tertiary.toColor(root.context)) + recommendStarPref.setTextColor(R.color.text_tertiary.toColor(root.context)) gameIconView.displayGameIcon(gameEntity) BindingAdapters.setGameName(gameName, gameEntity, false, null) @@ -96,7 +96,7 @@ class MyReservationAdapter(context: Context, var mViewModel: MyReservationViewMo if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString() } else "" gameRating.setTextColor( - if (gameEntity.commentCount > 3) R.color.theme_font.toColor(mContext) else R.color.theme.toColor( + if (gameEntity.commentCount > 3) R.color.text_theme.toColor(mContext) else R.color.primary_theme.toColor( mContext ) ) 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 b9f919b26a..3919cc20ac 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/MyReservationFragment.kt @@ -56,7 +56,7 @@ class MyReservationFragment : ListFragment() mBinding.reuseNoneData.reuseNoneDataTv.setOnClickListener(this) mListRv.addOnScrollListener(mExposureListener!!) - mListRv.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mListRv.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } override fun onStart() { @@ -66,7 +66,7 @@ class MyReservationFragment : ListFragment() mBinding.reuseNoneData.reuseNoneDataTv.setTextColor( ContextCompat.getColor( requireContext(), - R.color.theme_font + R.color.text_theme ) ) } else { @@ -74,7 +74,7 @@ class MyReservationFragment : ListFragment() mBinding.reuseNoneData.reuseNoneDataTv.setTextColor( ContextCompat.getColor( requireContext(), - R.color.text_title + R.color.text_primary ) ) } @@ -152,6 +152,6 @@ class MyReservationFragment : ListFragment() override fun onDarkModeChanged() { super.onDarkModeChanged() - mListRv.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mListRv.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt index 05a3959a7f..f1115003f3 100644 --- a/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mygame/PlayedGameAdapter.kt @@ -108,9 +108,9 @@ open class PlayedGameAdapter( holder.initServerType(gameEntity) holder.binding.gameItemIncluded.run { root.background = R.drawable.reuse_listview_item_style.toDrawable(root.context) - gameName.setTextColor(R.color.text_title.toColor(root.context)) - gameDes.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) - recommendStarPref.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + gameName.setTextColor(R.color.text_primary.toColor(root.context)) + gameDes.setTextColor(R.color.text_tertiary.toColor(root.context)) + recommendStarPref.setTextColor(R.color.text_tertiary.toColor(root.context)) downloadBtn.layoutParams = downloadBtn.layoutParams.apply { width = 56F.dip2px() @@ -126,7 +126,7 @@ open class PlayedGameAdapter( if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString() } else "" gameRating.setTextColor( - if (gameEntity.commentCount > 3) R.color.theme_font.toColor(mContext) else R.color.theme.toColor( + if (gameEntity.commentCount > 3) R.color.text_theme.toColor(mContext) else R.color.primary_theme.toColor( mContext ) ) @@ -158,7 +158,7 @@ open class PlayedGameAdapter( val runTimeView = TextView(mContext) runTimeView.isSingleLine = true runTimeView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 11f) - runTimeView.setTextColor(R.color.text_subtitle.toColor(mContext)) + runTimeView.setTextColor(R.color.text_secondary.toColor(mContext)) runTimeView.text = "游戏时长 ${NumberUtils.transSimpleUsageTime(gameEntity.playedTime)}" labelList.addView(runTimeView) } @@ -232,7 +232,7 @@ open class PlayedGameAdapter( NewFlatLogUtils.logMyGamePlayedTabClearGameDialogClick("暂不清除", game.id, game.name ?: "") }, uiModificationCallback = { - it.confirmTv.setTextColor(R.color.theme_red.toColor(mContext)) + it.confirmTv.setTextColor(R.color.secondary_red.toColor(mContext)) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) )?.setOnCancelListener { @@ -289,7 +289,7 @@ open class PlayedGameAdapter( is FooterViewHolder -> { holder.initItemPadding() holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) - holder.hint.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + holder.hint.setTextColor(R.color.text_tertiary.toColor(mContext)) } } } @@ -329,7 +329,7 @@ open class PlayedGameAdapter( if (gameEntity.isUseDefaultServerStyle()) { binding.gameItemIncluded.gameKaifuType.background = R.drawable.server_label_default_bg.toDrawable(binding.root.context) - binding.gameItemIncluded.gameKaifuType.setTextColor(R.color.text_server_label.toColor(binding.root.context)) + binding.gameItemIncluded.gameKaifuType.setTextColor(R.color.text_secondary.toColor(binding.root.context)) } else { binding.gameItemIncluded.gameKaifuType.background = DrawableView.getServerDrawable(serverLabel.color) diff --git a/app/src/main/java/com/gh/gamecenter/mypost/MyPostActivity.kt b/app/src/main/java/com/gh/gamecenter/mypost/MyPostActivity.kt index daceae408a..a1f8a1a7c5 100644 --- a/app/src/main/java/com/gh/gamecenter/mypost/MyPostActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/mypost/MyPostActivity.kt @@ -13,14 +13,14 @@ class MyPostActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled() = true override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun updateStaticViewBackground(view: View?) { diff --git a/app/src/main/java/com/gh/gamecenter/mypost/MyPostAdapter.kt b/app/src/main/java/com/gh/gamecenter/mypost/MyPostAdapter.kt index afd8e9ceac..aa8ff321e7 100644 --- a/app/src/main/java/com/gh/gamecenter/mypost/MyPostAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/mypost/MyPostAdapter.kt @@ -99,7 +99,7 @@ class MyPostAdapter( statusTv.setTextColor( when { historyEntity.me.isFollower -> R.color.theme_alpha_80 - historyEntity.status == "pending" -> R.color.text_subtitleDesc + historyEntity.status == "pending" -> R.color.text_tertiary else -> R.color.text_CCFF5269 }.toColor(mContext) ) diff --git a/app/src/main/java/com/gh/gamecenter/mypost/MyPostFragment.kt b/app/src/main/java/com/gh/gamecenter/mypost/MyPostFragment.kt index 9e01fed56a..7ee21369a2 100644 --- a/app/src/main/java/com/gh/gamecenter/mypost/MyPostFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/mypost/MyPostFragment.kt @@ -38,7 +38,7 @@ class MyPostFragment : ListFragment mCurrentType = UserHistoryViewModel.TYPE.fromValue(requireArguments().getString(TYPE) ?: "") super.onCreate(savedInstanceState) mScrollCalculatorHelper = ForumScrollCalculatorHelper(R.id.horizontalVideoView, R.id.verticalVideoView, 0) - mListRv.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mListRv.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -244,7 +244,7 @@ class MyPostFragment : ListFragment override fun onDarkModeChanged() { super.onDarkModeChanged() - mListRv.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mListRv.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } companion object { 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 3b968bcaf8..900aaf1e65 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -11,7 +11,6 @@ import android.text.TextUtils; import android.view.Gravity; import android.view.View; import android.view.ViewGroup; -import android.webkit.JavascriptInterface; import android.webkit.WebSettings; import android.webkit.WebView; import android.widget.LinearLayout; @@ -28,6 +27,11 @@ import com.gh.common.databind.BindingAdapters; import com.gh.common.history.HistoryHelper; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.CommentUtils; +import com.gh.gamecenter.databinding.FragmentWebWarningBinding; +import com.gh.gamecenter.databinding.GamedetailItemNewsBinding; +import com.gh.gamecenter.databinding.NewsDetailCommentBinding; +import com.gh.gamecenter.databinding.NewsdetailItemContentBinding; +import com.gh.gamecenter.databinding.NewsdetailItemGameBinding; import com.gh.gamecenter.feature.utils.ConcernUtils; import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DialogUtils; @@ -59,11 +63,6 @@ import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.gamecenter.core.utils.NumberUtils; import com.gh.gamecenter.core.utils.RandomUtils; import com.gh.gamecenter.core.utils.StringUtils; -import com.gh.gamecenter.databinding.FragmentWebWarningBinding; -import com.gh.gamecenter.databinding.GamedetailItemNewsBinding; -import com.gh.gamecenter.databinding.NewsDetailCommentBinding; -import com.gh.gamecenter.databinding.NewsdetailItemContentBinding; -import com.gh.gamecenter.databinding.NewsdetailItemGameBinding; import com.gh.gamecenter.feature.eventbus.EBDeleteComment; import com.gh.gamecenter.feature.entity.ApkEntity; import com.gh.gamecenter.feature.entity.ArticleCommentParent; @@ -235,7 +234,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } private void initNewsDetailContentViewHolder(NewsDetailContentViewHolder viewHolder) { - viewHolder.binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.background_white)); + viewHolder.binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.ui_surface)); viewHolder.binding.newsdetailItemTvTitle.setTextColor(ContextCompat.getColor(mContext, R.color.text_black)); viewHolder.binding.newsdetailItemTvTime.setTextColor(ContextCompat.getColor(mContext, R.color.hint)); viewHolder.binding.newsdetailItemTvAuthor.setTextColor(ContextCompat.getColor(mContext, R.color.hint)); @@ -294,7 +293,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } private void initGameViewHolder(final NewsDetailGameViewHolder viewHolder) { - viewHolder.binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.background_white)); + viewHolder.binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.ui_surface)); viewHolder.binding.gameTvName.setTextColor(ContextCompat.getColor(mContext, R.color.text_black)); viewHolder.binding.gameServerType.setTextColor(ContextCompat.getColor(mContext, R.color.text_white)); viewHolder.binding.gameTvInfo.setTextColor(ContextCompat.getColor(mContext, R.color.hint)); @@ -318,7 +317,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { if (mNewsDetailEntity.getMe() != null && mNewsDetailEntity.getMe().isGameConcerned()) { viewHolder.binding.gameTvConcern.setText(R.string.cancel_concern); viewHolder.binding.gameTvConcern.setBackgroundResource(R.drawable.button_normal_border); - viewHolder.binding.gameTvConcern.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + viewHolder.binding.gameTvConcern.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); } else { viewHolder.binding.gameTvConcern.setText(R.string.concern); viewHolder.binding.gameTvConcern.setBackgroundResource(R.drawable.button_normal_style); @@ -370,7 +369,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { concern.setText(R.string.cancel_concern); concern.setBackgroundResource(R.drawable.button_normal_border); - concern.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + concern.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); Utils.toast(mContext, R.string.concern_success); viewHolder.binding.gameTvConcern.setEnabled(true); @@ -420,7 +419,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } private void initNewsDetailNewsViewHolder(GameDetailNewsViewHolder viewHolder) { - viewHolder.binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.background_white)); + viewHolder.binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.ui_surface)); viewHolder.binding.gamedetailItemLineNews1.setBackgroundColor(ContextCompat.getColor(mContext, R.color.cutting_line)); viewHolder.binding.gamedetailItemLineNews2.setBackgroundColor(ContextCompat.getColor(mContext, R.color.cutting_line)); viewHolder.binding.gamedetailItemLineNews3.setBackgroundColor(ContextCompat.getColor(mContext, R.color.cutting_line)); @@ -431,7 +430,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { viewHolder.binding.gamedetailItemNewsType2.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_normal_border)); viewHolder.binding.gamedetailItemNewsType3.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_normal_border)); viewHolder.binding.gamedetailItemNewsTitle.setTextColor(ContextCompat.getColor(mContext, R.color.text_black)); - viewHolder.binding.allTv.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + viewHolder.binding.allTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); viewHolder.binding.gamedetailItemNewsType1.setTextColor(ContextCompat.getColor(mContext, R.color.text_white)); viewHolder.binding.gamedetailItemNewsTitle1.setTextColor(ContextCompat.getColor(mContext, R.color.text_3a3a3a)); viewHolder.binding.gamedetailItemNewsType2.setTextColor(ContextCompat.getColor(mContext, R.color.text_white)); @@ -492,7 +491,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { } private void initNewsDetailNewsCommentViewHolder(final NewsDetailCommentListViewHolder holder) { - holder.binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.background_white)); + holder.binding.getRoot().setBackgroundColor(ContextCompat.getColor(mContext, R.color.ui_surface)); holder.binding.newsdetailCommentLine.setBackgroundColor(ContextCompat.getColor(mContext, R.color.cutting_line)); holder.binding.newsdetailCommentTitle.setTextColor(ContextCompat.getColor(mContext, R.color.text_3a3a3a)); @@ -633,7 +632,7 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { , ViewGroup.LayoutParams.WRAP_CONTENT)); textView.setText(("查看全部评论（" + NumberUtils.transSimpleCount(mCommentNum) + "）")); textView.setPadding(0, DisplayUtils.dip2px(mContext, 12), 0, DisplayUtils.dip2px(mContext, 12)); - textView.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + textView.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); textView.setTextSize(15); linearLayout.addView(textView); 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 864b6707e6..f2b8843816 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoActivity.kt @@ -12,12 +12,12 @@ class DeliveryInfoActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle(R.string.delivery_info) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 00e6189bb5..ee38fcd638 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/DeliveryInfoFragment.kt @@ -41,14 +41,14 @@ class DeliveryInfoFragment : ToolbarFragment() { 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())) - mBinding.divider4.setBackgroundColor(R.color.background.toColor(requireContext())) - mBinding.root.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.container.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.addressTv.setTextColor(R.color.text_title.toColor(requireContext())) - mBinding.prizeTv.setTextColor(R.color.text_title.toColor(requireContext())) - mBinding.withdrawTv.setTextColor(R.color.text_title.toColor(requireContext())) + mBinding.divider.setBackgroundColor(R.color.ui_background.toColor(requireContext())) + mBinding.divider2.setBackgroundColor(R.color.ui_background.toColor(requireContext())) + mBinding.divider3.setBackgroundColor(R.color.ui_background.toColor(requireContext())) + mBinding.divider4.setBackgroundColor(R.color.ui_background.toColor(requireContext())) + mBinding.root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.container.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.addressTv.setTextColor(R.color.text_primary.toColor(requireContext())) + mBinding.prizeTv.setTextColor(R.color.text_primary.toColor(requireContext())) + mBinding.withdrawTv.setTextColor(R.color.text_primary.toColor(requireContext())) } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt index 0cd8bc480d..1060a06521 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFragment.kt @@ -632,7 +632,7 @@ class HaloPersonalFragment : BaseLazyFragment() { mStubBinding.listRefresh.setColorSchemeColors( ContextCompat.getColor( requireContext(), - R.color.theme + R.color.primary_theme ) ) mStubBinding.listRefresh.setProgressViewOffset( @@ -939,16 +939,16 @@ class HaloPersonalFragment : BaseLazyFragment() { sdkListItem.iconIv.setImageResource(R.drawable.ic_personal_sdk) permissionAndUsageItem.iconIv.setImageResource(R.drawable.ic_personal_permission) childrenPolicyItem.iconIv.setImageResource(R.drawable.ic_personal_children_policy) - whiteBg.setBackgroundColor(R.color.background_white.toColor(requireContext())) + whiteBg.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) gradientBg.background = R.drawable.bg_personal_top_gradient.toDrawable(requireContext()) - personalUserName.setTextColor(R.color.text_title.toColor(requireContext())) - userIdTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + personalUserName.setTextColor(R.color.text_primary.toColor(requireContext())) + userIdTv.setTextColor(R.color.text_tertiary.toColor(requireContext())) darkModeIv.setImageResource(if (mIsDarkModeOn) R.drawable.ic_personal_light_mode else R.drawable.ic_personal_dark_mode) - myGameTv.setTextColor(R.color.text_title.toColor(requireContext())) - myGameCollectionTv.setTextColor(R.color.text_title.toColor(requireContext())) - myCollectionTv.setTextColor(R.color.text_title.toColor(requireContext())) - historyTv.setTextColor(R.color.text_title.toColor(requireContext())) - myPostTv.setTextColor(R.color.text_title.toColor(requireContext())) + myGameTv.setTextColor(R.color.text_primary.toColor(requireContext())) + myGameCollectionTv.setTextColor(R.color.text_primary.toColor(requireContext())) + myCollectionTv.setTextColor(R.color.text_primary.toColor(requireContext())) + historyTv.setTextColor(R.color.text_primary.toColor(requireContext())) + myPostTv.setTextColor(R.color.text_primary.toColor(requireContext())) myGameTv.setDrawableTop( AppCompatResources.getDrawable( requireContext(), diff --git a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt index 1e41f9295f..fa0e76bb4e 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/HaloPersonalFunctionAdapter.kt @@ -52,7 +52,7 @@ class HaloPersonalFunctionAdapter(context: Context) : BaseRecyclerAdapter { holder.binding.leftDivider.visibility = View.GONE diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt index 4c5d11dae9..d3c755547a 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/FollowersOrFansAdapter.kt @@ -72,17 +72,17 @@ class FollowersOrFansAdapter(context: Context, val mViewModel: FollowersOrFansVi entity.id == UserManager.getInstance().userId -> { setText(R.string.myself) background = R.drawable.button_round_gray_light.toDrawable(mContext) - setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)) + setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)) } entity?.me?.isFollower!! -> { setText(R.string.concerned) background = R.drawable.button_round_gray_light.toDrawable(mContext) - setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)) + setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)) } else -> { setText(R.string.concern) background = R.drawable.button_round_primary_light.toDrawable(mContext) - setTextColor(R.color.theme_font.toColor(mContext)) + setTextColor(R.color.text_theme.toColor(mContext)) } } } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt index 4d1cd191c3..adc2bb2626 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt @@ -328,7 +328,7 @@ class UserHomeFragment : ToolbarFragment() { toolbar.setBackgroundColor( ContextCompat.getColor( requireContext(), - R.color.theme + R.color.primary_theme ) ) } @@ -801,12 +801,12 @@ class UserHomeFragment : ToolbarFragment() { val tab = getTabAt(i) if (tab != null) { tab.customView?.findViewById(R.id.tab_title)?.setTextColor( - if (tab.isSelected) R.color.theme_font.toColor(requireContext()) else R.color.text_subtitle.toColor( + if (tab.isSelected) R.color.text_theme.toColor(requireContext()) else R.color.text_secondary.toColor( requireContext() ) ) tab.customView?.findViewById(R.id.tab_count)?.setTextColor( - if (tab.isSelected) R.color.theme_font.toColor(requireContext()) else R.color.text_subtitle.toColor( + if (tab.isSelected) R.color.text_theme.toColor(requireContext()) else R.color.text_secondary.toColor( requireContext() ) ) 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 ff631c8356..f667619a4d 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 @@ -12,14 +12,14 @@ class PersonalityBackgroundActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("个性背景") - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled(): Boolean = true override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 187856f9c7..0b42e20ad0 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 @@ -67,7 +67,7 @@ class PersonalityBackgroundFragment : ToolbarFragment() { } private fun getItemDecoration(): RecyclerView.ItemDecoration { - return GridSpacingItemColorDecoration(requireContext(), 8, 20, R.color.background_white) + return GridSpacingItemColorDecoration(requireContext(), 8, 20, R.color.ui_surface) } private fun selectPic(activity: Activity) { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt index e2f8bf5024..5a734032d1 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/AvatarBorderFragment.kt @@ -197,7 +197,7 @@ class AvatarBorderFragment : ToolbarFragment() { userAvatar.displayBorder(UserManager.getInstance().userInfoEntity?.iconBorder?.url) commitTv.text = "使用" commitTv.isEnabled = false - commitTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_body)) + commitTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_instance)) commitTv.background = ContextCompat.getDrawable(requireContext(), R.drawable.border_round_eee_999) } } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt index 782a9f49b3..222cb11ad3 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/border/ChooseAvatarBorderAdapter.kt @@ -60,7 +60,7 @@ class ChooseAvatarBorderAdapter( isEnable = false holder.binding.descTv.run { visibility = View.VISIBLE - setTextColor(R.color.theme_red.toColor(mContext)) + setTextColor(R.color.secondary_red.toColor(mContext)) text = "${borderEntity.energy}光能" } } @@ -72,7 +72,7 @@ class ChooseAvatarBorderAdapter( isEnable = true holder.binding.descTv.run { visibility = View.VISIBLE - setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + setTextColor(R.color.text_tertiary.toColor(mContext)) text = if (borderEntity.expire!! == 0L) { "有效期9999天" } else { 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 5690a37ec0..aaa9ae0666 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 @@ -14,14 +14,14 @@ class FansActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled(): Boolean = true override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 d52e9574dc..81bda63042 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 @@ -14,14 +14,14 @@ class FollowersActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled(): Boolean = true override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt index bd2db5dcde..c0cc0b88fb 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/UserHistoryAdapter.kt @@ -120,7 +120,7 @@ class UserHistoryAdapter( statusTv.setTextColor( when { historyEntity.me.isFollower -> R.color.theme_alpha_80 - historyEntity.status == "pending" -> R.color.text_subtitleDesc + historyEntity.status == "pending" -> R.color.text_tertiary else -> R.color.text_CCFF5269 }.toColor(mContext) ) @@ -294,7 +294,7 @@ class UserHistoryAdapter( val m = Pattern.compile(RatingEditActivity.LABEL_REGEX).matcher(historyEntity.comment.content) if (m.find()) { val contents = - TextHelper.getCommentLabelSpannableStringBuilder(historyEntity.comment.content, R.color.theme_font) + TextHelper.getCommentLabelSpannableStringBuilder(historyEntity.comment.content, R.color.text_theme) holder.binding.content.setTextWithHighlightedTextWrappedInsideWrapper( text = contents, copyClickedText = true 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 b5d818f25a..9836dae782 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 @@ -186,10 +186,10 @@ class UserHistoryFragment : ListFragment 0) rating.game.star.toString() else "评分过少" - holder.binding.amwayScoreNumber.setTextColor(Color.parseColor(if (rating.game.star > 0) "#1383EB" else "#2496FF")) + val color = if (rating.game.star > 0) R.color.text_theme else R.color.primary_theme + holder.binding.amwayScoreNumber.setTextColor(color.toColor(holder.itemView.context)) holder.binding.ratingStart.rating = rating.star.toFloat() holder.binding.comment.text = if (rating.reply > 0) NumberUtils.transSimpleCount(rating.reply) else "" holder.binding.vote.isChecked = rating.me.isVoted @@ -91,7 +91,7 @@ class UserCommentHistoryAdapter( val m = Pattern.compile(RatingEditActivity.LABEL_REGEX).matcher(rating.content) if (m.find()) { - val contents = TextHelper.getCommentLabelSpannableStringBuilder(rating.content, R.color.theme_font) + val contents = TextHelper.getCommentLabelSpannableStringBuilder(rating.content, R.color.text_theme) holder.binding.tvComment.setTextWithHighlightedTextWrappedInsideWrapper( text = contents, copyClickedText = true diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryFragment.kt index 3c3e5bb2cd..524adf493d 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserCommentHistoryFragment.kt @@ -30,7 +30,7 @@ class UserCommentHistoryFragment : ListFragment { commentSubType.visibility = View.GONE arrowIv.visibility = View.GONE gameCollectionType.background = R.drawable.bg_user_game_type_unselect.toDrawable(requireContext()) - gameCollectionType.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + gameCollectionType.setTextColor(R.color.text_tertiary.toColor(requireContext())) gameType.background = R.drawable.bg_user_game_type_selected.toDrawable(requireContext()) - gameType.setTextColor(R.color.theme_font.toColor(requireContext())) + gameType.setTextColor(R.color.text_theme.toColor(requireContext())) commentType.background = R.drawable.bg_user_game_type_unselect.toDrawable(requireContext()) - commentType.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + commentType.setTextColor(R.color.text_tertiary.toColor(requireContext())) } else -> { commentSubType.visibility = View.VISIBLE arrowIv.visibility = View.VISIBLE gameCollectionType.background = R.drawable.bg_user_game_type_unselect.toDrawable(requireContext()) - gameCollectionType.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + gameCollectionType.setTextColor(R.color.text_tertiary.toColor(requireContext())) gameType.background = R.drawable.bg_user_game_type_unselect.toDrawable(requireContext()) - gameType.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + gameType.setTextColor(R.color.text_tertiary.toColor(requireContext())) commentType.background = R.drawable.bg_user_game_type_selected.toDrawable(requireContext()) - commentType.setTextColor(R.color.theme_font.toColor(requireContext())) + commentType.setTextColor(R.color.text_theme.toColor(requireContext())) } } } @@ -172,9 +172,9 @@ class UserGameFragment : ToolbarFragment() { for (text in contentList) { val item = inflater.inflate(R.layout.layout_popup_option_item, container, false) if (mFilter == text) { - (item as TextView).setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) + (item as TextView).setTextColor(ContextCompat.getColor(requireContext(), R.color.text_theme)) } else { - (item as TextView).setTextColor(ContextCompat.getColor(requireContext(), R.color.text_subtitle)) + (item as TextView).setTextColor(ContextCompat.getColor(requireContext(), R.color.text_secondary)) } container.addView(item) diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt index 447fff1d11..39018d9c80 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameAdapter.kt @@ -89,7 +89,7 @@ class UserPlayedGameAdapter( gameDes.run { setTextSize(TypedValue.COMPLEX_UNIT_SP, 11F) - setTextColor(R.color.text_subtitle.toColor(mContext)) + setTextColor(R.color.text_secondary.toColor(mContext)) } if (gameEntity.playedTime == 0L) { @@ -114,7 +114,7 @@ class UserPlayedGameAdapter( val runTimeView = TextView(mContext) runTimeView.isSingleLine = true runTimeView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 11f) - runTimeView.setTextColor(R.color.text_subtitle.toColor(mContext)) + runTimeView.setTextColor(R.color.text_secondary.toColor(mContext)) runTimeView.text = "游戏时长 ${NumberUtils.transSimpleUsageTime(gameEntity.playedTime)}" labelList.addView(runTimeView) } diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameFragment.kt index 938d97a4c0..1a601de645 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/home/game/UserPlayedGameFragment.kt @@ -52,7 +52,7 @@ open class UserPlayedGameFragment : ListFragment>() { } else { setNavigationTitle("Ta的评分") } - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun provideListAdapter(): RatingAdapter { @@ -50,7 +50,7 @@ class RatingActivity : ListActivity>() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt index 92ad020300..25f3f7c7e3 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt @@ -308,24 +308,24 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH if (entity.type != "question") { if (!entity.active) { voteIcon.setImageResource(R.drawable.community_vote_unavailable) - voteCount.setTextColor(R.color.text_body.toColor(voteCount.context)) + voteCount.setTextColor(R.color.text_instance.toColor(voteCount.context)) } else if (entity.me.isCommunityArticleVote || entity.me.isAnswerVoted || entity.me.isVoted) { voteIcon.setImageResource(R.drawable.community_vote_selector) voteIcon.isChecked = true - voteCount.setTextColor(R.color.theme_font.toColor(voteCount.context)) + voteCount.setTextColor(R.color.text_theme.toColor(voteCount.context)) } else { voteIcon.setImageResource(R.drawable.community_vote_selector) voteIcon.isChecked = false - voteCount.setTextColor(R.color.text_subtitleDesc.toColor(voteCount.context)) + voteCount.setTextColor(R.color.text_tertiary.toColor(voteCount.context)) } } if (entity.commentable && entity.active) { commentCount.setDrawableStart(R.drawable.community_comment_count) - commentCount.setTextColor(R.color.text_subtitleDesc.toColor(commentCount.context)) + commentCount.setTextColor(R.color.text_tertiary.toColor(commentCount.context)) } else { commentCount.setDrawableStart(R.drawable.community_comment_count_unavailable) - commentCount.setTextColor(R.color.text_body.toColor(commentCount.context)) + commentCount.setTextColor(R.color.text_instance.toColor(commentCount.context)) } } @@ -546,7 +546,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH entity.count.vote = entity.count.vote - 1 entity.me.isCommunityArticleVote = false voteIcon.isChecked = false - voteCount.setTextColor(R.color.text_subtitleDesc.toColor(voteCount.context)) + voteCount.setTextColor(R.color.text_tertiary.toColor(voteCount.context)) voteCount.text = if (entity.count.vote > 0) entity.count.vote.toString() else "赞同" RetrofitManager.getInstance().api @@ -606,7 +606,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH } private fun playVoteAnimation() { - voteCount.setTextColor(R.color.theme_font.toColor(voteCount.context)) + voteCount.setTextColor(R.color.text_theme.toColor(voteCount.context)) voteIcon.isChecked = true voteIcon.visibility = View.GONE voteAnimation.visibility = View.VISIBLE diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt index 80da1e46c1..c4ab5567b5 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/CommunityAnswerItemViewHolder.kt @@ -69,7 +69,7 @@ class CommunityAnswerItemViewHolder(val binding: CommunityAnswerItemBinding) : binding.title.visibility = View.GONE binding.content.textSize = 14F binding.content.setLineSpacing(DisplayUtils.sp2px(binding.root.context, 4F).toFloat(), 1.0F) - binding.content.setTextColor(R.color.text_title.toColor(binding.content.context)) + binding.content.setTextColor(R.color.text_primary.toColor(binding.content.context)) binding.content.maxLines = 3 } @@ -99,7 +99,7 @@ class CommunityAnswerItemViewHolder(val binding: CommunityAnswerItemBinding) : statusTv.setTextColor( when { entity.me.isFollower -> R.color.theme_alpha_80 - entity.status == "pending" -> R.color.text_subtitleDesc + entity.status == "pending" -> R.color.text_tertiary else -> R.color.text_CCFF5269 }.toColor(statusTv.context) ) @@ -201,7 +201,7 @@ class CommunityAnswerItemViewHolder(val binding: CommunityAnswerItemBinding) : binding.content.setTextColor(ContextCompat.getColor(itemView.context, R.color.hint)) } else { binding.content.paint.flags = Paint.ANTI_ALIAS_FLAG - binding.content.setTextColor(ContextCompat.getColor(itemView.context, R.color.text_subtitle)) + binding.content.setTextColor(ContextCompat.getColor(itemView.context, R.color.text_secondary)) } } } \ No newline at end of file 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 154cd81ec2..565e2d5b7d 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 @@ -10,7 +10,6 @@ import android.view.Gravity import android.view.LayoutInflater import android.view.MenuItem import android.view.View -import android.webkit.JavascriptInterface import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView @@ -113,7 +112,7 @@ open class AnswerDetailFragment : ToolbarFragment() { mBinding.richEditor.setInputEnabled(false) mBinding.richEditor.setPadding(20, 15, 20, 15) mBinding.bottomController.replyTv.text = "说点什么吧" - mBinding.bottomController.replyTv.setRoundedColorBackground(R.color.background_space_2, 19F) + mBinding.bottomController.replyTv.setRoundedColorBackground(R.color.ui_container_2, 19F) mElapsedHelper = TimeElapsedHelper(this) // 只对显示在屏幕上的 fragment 计时 @@ -452,7 +451,7 @@ open class AnswerDetailFragment : ToolbarFragment() { // 是否已回答 when (mAnswerStatus) { ANSWERED_MY_ANSWER -> { - mBinding.statusTv.setTextColor(R.color.theme_font.toColor(mBinding.statusTv.context)) + mBinding.statusTv.setTextColor(R.color.text_theme.toColor(mBinding.statusTv.context)) DrawableView.setTextDrawable( mBinding.statusTv, R.drawable.community_question_edit_my_answer, @@ -460,7 +459,7 @@ open class AnswerDetailFragment : ToolbarFragment() { ) } ANSWERED_NOT_MY_ANSWER -> { - mBinding.statusTv.setTextColor(R.color.text_subtitleDesc.toColor(mBinding.statusTv.context)) + mBinding.statusTv.setTextColor(R.color.text_tertiary.toColor(mBinding.statusTv.context)) DrawableView.setTextDrawable( mBinding.statusTv, R.drawable.question_detail_myanswer_icon, @@ -468,7 +467,7 @@ open class AnswerDetailFragment : ToolbarFragment() { ) } NOT_ANSWERED_BUT_HAVE_DRAFT -> { - mBinding.statusTv.setTextColor(R.color.theme_font.toColor(mBinding.statusTv.context)) + mBinding.statusTv.setTextColor(R.color.text_theme.toColor(mBinding.statusTv.context)) DrawableView.setTextDrawable( mBinding.statusTv, R.drawable.community_question_edit_icon, @@ -476,7 +475,7 @@ open class AnswerDetailFragment : ToolbarFragment() { ) } NOT_ANSWERED_YET -> { - mBinding.statusTv.setTextColor(R.color.theme_font.toColor(mBinding.statusTv.context)) + mBinding.statusTv.setTextColor(R.color.text_theme.toColor(mBinding.statusTv.context)) DrawableView.setTextDrawable( mBinding.statusTv, R.drawable.community_question_edit_icon, @@ -499,7 +498,7 @@ open class AnswerDetailFragment : ToolbarFragment() { mBinding.bottomController.bottomCommentTv.setTextColor( ContextCompat.getColor( requireContext(), - R.color.text_subtitle + R.color.text_secondary ) ) mBinding.bottomController.bottomCommentTv.text = if (commentCount > 0) commentCount.toString() else "评论" @@ -780,7 +779,7 @@ open class AnswerDetailFragment : ToolbarFragment() { actionNameTv.setTextColor( ContextCompat.getColor( requireContext(), - if (item.disableIcon > 0) R.color.text_subtitleDesc else R.color.text_title + if (item.disableIcon > 0) R.color.text_tertiary else R.color.text_primary ) ) view.isEnabled = item.disableIcon == 0 @@ -975,7 +974,7 @@ open class AnswerDetailFragment : ToolbarFragment() { mBinding.bottomController.bottomStarTv.setTextColor( ContextCompat.getColor( requireContext(), - R.color.theme_font + R.color.text_theme ) ) } else { @@ -984,7 +983,7 @@ open class AnswerDetailFragment : ToolbarFragment() { mBinding.bottomController.bottomStarTv.setTextColor( ContextCompat.getColor( requireContext(), - R.color.text_subtitle + R.color.text_secondary ) ) } @@ -1193,10 +1192,10 @@ open class AnswerDetailFragment : ToolbarFragment() { mBinding.followTv.visibility = View.VISIBLE if (isFollowed) { DrawableView.setTextDrawable(mBinding.followTv, null, "已关注") - mBinding.followTv.setTextColor(R.color.text_subtitleDesc.toColor(mBinding.followTv.context)) + mBinding.followTv.setTextColor(R.color.text_tertiary.toColor(mBinding.followTv.context)) } else { - mBinding.followTv.background = DrawableView.getOvalDrawable(R.color.background, 2F) - mBinding.followTv.setTextColor(R.color.theme_font.toColor(mBinding.followTv.context)) + mBinding.followTv.background = DrawableView.getOvalDrawable(R.color.ui_background, 2F) + mBinding.followTv.setTextColor(R.color.text_theme.toColor(mBinding.followTv.context)) DrawableView.setTextDrawable( mBinding.followTv, R.drawable.answer_detail_follow_icon, @@ -1214,7 +1213,7 @@ open class AnswerDetailFragment : ToolbarFragment() { mBinding.bottomController.bottomLikeTv.setTextColor( ContextCompat.getColor( requireContext(), - R.color.theme_font + R.color.text_theme ) ) } else { @@ -1223,7 +1222,7 @@ open class AnswerDetailFragment : ToolbarFragment() { mBinding.bottomController.bottomLikeTv.setTextColor( ContextCompat.getColor( requireContext(), - R.color.text_subtitle + R.color.text_secondary ) ) } 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 00481508ea..4172d9eb61 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 @@ -13,7 +13,7 @@ class SimpleAnswerDetailActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun provideNormalIntent(): Intent? { @@ -28,7 +28,7 @@ class SimpleAnswerDetailActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 f2f67e2d5d..d48aa40a09 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 @@ -81,7 +81,7 @@ class MyArticleFragment : ListFragment { approvalStatusTv.text = "内容审核中" - approvalStatusTv.setTextColor(R.color.theme_green.toColor(approvalStatusTv.context)) + approvalStatusTv.setTextColor(R.color.secondary_green.toColor(approvalStatusTv.context)) approvalStatusTv.background = R.drawable.bg_approval_status_pending.toDrawable(approvalStatusTv.context) } "fail" -> { approvalStatusTv.text = "审核不通过" - approvalStatusTv.setTextColor(R.color.theme_red.toColor(approvalStatusTv.context)) + approvalStatusTv.setTextColor(R.color.secondary_red.toColor(approvalStatusTv.context)) approvalStatusTv.background = R.drawable.bg_approval_status_fail.toDrawable(approvalStatusTv.context) } @@ -321,10 +321,10 @@ class ArticleDetailContentViewHolder( if (followBtn.visibility == View.GONE) return followBtn.text = "已关注" followBtn.background = null - followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.text_subtitleDesc)) + followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.text_tertiary)) } else { followBtn.setRoundedColorBackground(R.color.text_EEF5FB, 14F) - followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.theme_font)) + followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.text_theme)) followBtn.setText(R.string.concern) } } 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 1d92252971..2d7267aebe 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 @@ -229,7 +229,7 @@ class ArticleDetailFragment : BaseCommentFragment(), Keyb @SuppressLint("ClickableViewAccessibility") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mBinding = ActivityCommunityArticleEditBinding.bind(mContentView) setToolbarMenu(R.menu.menu_answer_post) mMenuDraft = getMenuItem(R.id.menu_draft) @@ -388,7 +388,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb mViewModel.selectActivityLabelEntity = it mBinding.activityTv.text = it?.name ?: "添加话题标签" mBinding.activityTv.setTextColor( - if (it != null) R.color.text_FA8500.toColor(this) else R.color.text_title.toColor( + if (it != null) R.color.text_FA8500.toColor(this) else R.color.text_primary.toColor( this ) ) @@ -649,7 +649,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb private fun setForumUI() { mBinding.forumIconView.visibility = View.VISIBLE mBinding.forumContainer.background = ContextCompat.getDrawable(this, R.drawable.bg_shape_f5_radius_999) - mBinding.articleGameName.setTextColor(ContextCompat.getColor(this, R.color.text_subtitle)) + mBinding.articleGameName.setTextColor(ContextCompat.getColor(this, R.color.text_secondary)) } private fun setSectionUI(isEmpty: Boolean) { @@ -659,7 +659,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb this@ArticleEditActivity ) articleSectionName.setTextColor( - if (isEmpty) R.color.theme_font.toColor(this@ArticleEditActivity) else R.color.text_subtitle.toColor( + if (isEmpty) R.color.text_theme.toColor(this@ArticleEditActivity) else R.color.text_secondary.toColor( this@ArticleEditActivity ) ) @@ -743,10 +743,10 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) setSectionUI(mViewModel.selectSection == null) mBinding.activityTv.setTextColor( - if (mViewModel.selectActivityLabelEntity != null) R.color.text_FA8500.toColor(this) else R.color.text_title.toColor( + if (mViewModel.selectActivityLabelEntity != null) R.color.text_FA8500.toColor(this) else R.color.text_primary.toColor( this ) ) @@ -755,9 +755,9 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb this ) mBinding.articleGameName.setTextColor( - if (mViewModel.mSelectCommunityData == null) R.color.theme_font.toColor( + if (mViewModel.mSelectCommunityData == null) R.color.text_theme.toColor( this - ) else R.color.text_subtitle.toColor(this) + ) else R.color.text_secondary.toColor(this) ) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt index fcb8d8f937..11fa3d48b2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleTagsSelectFragment.kt @@ -172,7 +172,7 @@ class ArticleTagsSelectFragment : BaseFragment() { mViewModel?.selectedTags?.add(tag) mViewModel?.selectedTagsChange?.postValue(true) tagView.setBackgroundResource(R.drawable.bg_article_edit_label_select) - tagView.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) + tagView.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_theme)) } } } @@ -190,10 +190,10 @@ class ArticleTagsSelectFragment : BaseFragment() { tagTv.setOnClickListener { if (mViewModel?.selectTag(tagTv.text.toString())!!) { tagTv.setBackgroundResource(R.drawable.bg_article_edit_label_select) - tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) + tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_theme)) } else { tagTv.setBackgroundResource(R.drawable.bg_article_edit_label_unselect) - tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_subtitle)) + tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_secondary)) } } @@ -201,7 +201,7 @@ class ArticleTagsSelectFragment : BaseFragment() { mViewModel?.selectedTags?.add(tag) mViewModel?.selectedTagsChange?.postValue(true) tagTv.setBackgroundResource(R.drawable.bg_article_edit_label_select) - tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) + tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_theme)) } mAllTags.add(tag) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt index 5c4eed82ba..1baf3d0126 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentAdapter.kt @@ -76,10 +76,10 @@ class NewCommentAdapter( holder.itemView.context, 0, prefix.length, - R.color.text_subtitleDesc + R.color.text_tertiary ).build() val parentUserNameSpan = SpanBuilder(parentUserName) - .click(mContext, 0, parentUserName.length, R.color.text_subtitle) { + .click(mContext, 0, parentUserName.length, R.color.text_secondary) { DirectUtils.directToHomeActivity( holder.itemView.context, commentEntity.user.id, @@ -92,7 +92,7 @@ class NewCommentAdapter( holder.itemView.context, 0, colon.length, - R.color.text_subtitleDesc + R.color.text_tertiary ).build() val authorSpan = if (commentEntity.parentUser?.me?.isCommentOwner == true) { SpanBuilder("作者").image(0, "作者".length, R.drawable.ic_hint_author).build() diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt index 7b5330f797..df100e47de 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentDetailActivity.kt @@ -14,7 +14,7 @@ class NewCommentDetailActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) if (intent?.getBundleExtra(NORMAL_FRAGMENT_BUNDLE)?.getString(CommentActivity.QUESTION_ID) ?.isNotBlank() == true ) { @@ -26,7 +26,7 @@ class NewCommentDetailActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun getBusinessId(): Pair { diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt index 95babcb31e..cf61818cd7 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/NewCommentFragment.kt @@ -345,7 +345,7 @@ open class NewCommentFragment : ListFragment } val emptyHint = mCachedView?.findViewById(R.id.reuseNoneDataTv) emptyHint?.text = "这里还没有人评论噢~" - emptyHint?.setTextColor(R.color.background_white.toColor(requireContext())) + emptyHint?.setTextColor(R.color.ui_surface.toColor(requireContext())) val emptyHintDesc = mCachedView?.findViewById(R.id.reuseNoneDataDescTv) emptyHintDesc?.visibility = View.VISIBLE emptyHintDesc?.text = "说说你的看法吧" diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt index 6c014f1422..4e295aab57 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/StairsCommentViewHolder.kt @@ -46,7 +46,7 @@ class StairsCommentViewHolder( binding.commentLikeCount.setTextColor( ContextCompat.getColor( mContext, - R.color.theme_font + R.color.text_theme ) ) binding.commentLike.setImageResource(R.drawable.comment_vote_select) @@ -76,7 +76,7 @@ class StairsCommentViewHolder( binding.root.context, (entity.user.name?.length ?: 0) + 1, (entity.user.name?.length ?: 0) + 3, - R.color.text_subtitle + R.color.text_secondary ).build() } else { binding.commentUserName.text = userInfo.name @@ -98,7 +98,7 @@ class StairsCommentViewHolder( binding.root.context, (entity.user.name?.length ?: 0) + 1, (entity.user.name?.length ?: 0) + 3, - R.color.text_subtitle + R.color.text_secondary ).build() } else { binding.commentUserName.text = entity.user.name @@ -204,14 +204,14 @@ class StairsCommentViewHolder( var isVote = holder.binding.commentLikeCount.currentTextColor == ContextCompat.getColor( context, - R.color.theme_font + R.color.text_theme ) holder.binding.commentLikeContainer.setOnClickListener { FastClickUtils.click { if (!it) { if (holder.binding.commentLikeCount.currentTextColor == ContextCompat.getColor( context, - R.color.theme_font + R.color.text_theme ) ) { commentEntity.vote = commentEntity.vote - 1 @@ -230,7 +230,7 @@ class StairsCommentViewHolder( holder.binding.commentLikeCount.setTextColor( ContextCompat.getColor( context, - R.color.theme_font + R.color.text_theme ) ) holder.binding.commentLike.setImageResource(R.drawable.comment_vote_select) @@ -240,7 +240,7 @@ class StairsCommentViewHolder( } else { if (isVote && holder.binding.commentLikeCount.currentTextColor != ContextCompat.getColor( context, - R.color.theme_font + R.color.text_theme ) ) { //取消点赞 @@ -253,7 +253,7 @@ class StairsCommentViewHolder( ) } else if (!isVote && holder.binding.commentLikeCount.currentTextColor == ContextCompat.getColor( context, - R.color.theme_font + R.color.text_theme ) ) { //点赞 @@ -272,7 +272,7 @@ class StairsCommentViewHolder( isVote = holder.binding.commentLikeCount.currentTextColor == ContextCompat.getColor( context, - R.color.theme_font + R.color.text_theme ) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt index dca3afd063..ff8b2bc9bd 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/base/BaseCommentAdapter.kt @@ -208,12 +208,12 @@ abstract class BaseCommentAdapter( } is CommentFooterViewHolder -> { - holder.itemView.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.itemView.setBackgroundColor(R.color.ui_surface.toColor(mContext)) holder.bindView(mIsLoading, mIsNetworkError, mIsOver) } is CommentErrorViewHolder -> { - holder.binding.container.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.binding.container.setBackgroundColor(R.color.ui_surface.toColor(mContext)) // holder.binding.hintTv.setTextColor(R.color.text_body.toColor(mContext)) } } @@ -268,14 +268,14 @@ abstract class BaseCommentAdapter( commentDetail: Boolean? = null ) { binding.run { - filterView.setBackgroundColor(R.color.background_white.toColor(mContext)) - divider.setBackgroundColor(R.color.divider.toColor(mContext)) - commentHintTv.setTextColor(R.color.text_title.toColor(mContext)) - commentHintCountTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + filterView.setBackgroundColor(R.color.ui_surface.toColor(mContext)) + divider.setBackgroundColor(R.color.ui_divider.toColor(mContext)) + commentHintTv.setTextColor(R.color.text_primary.toColor(mContext)) + commentHintCountTv.setTextColor(R.color.text_tertiary.toColor(mContext)) orderSfv.run { setContainerBackground(R.drawable.button_round_f5f5f5.toDrawable(mContext)) setIndicatorBackground(R.drawable.bg_game_collection_sfv_indicator.toDrawable(mContext)) - setTextColor(R.color.text_subtitle.toColor(mContext), R.color.text_subtitleDesc.toColor(mContext)) + setTextColor(R.color.text_secondary.toColor(mContext), R.color.text_tertiary.toColor(mContext)) } val commentCount = mViewModel.commentCount @@ -455,10 +455,10 @@ abstract class BaseCommentAdapter( binding.root.context, 0, prefix.length, - R.color.text_title + R.color.text_primary ).build() val parentUserNameSpan = SpanBuilder(parentUserName) - .click(binding.root.context, 0, parentUserName.length, R.color.text_subtitleDesc) { + .click(binding.root.context, 0, parentUserName.length, R.color.text_tertiary) { DirectUtils.directToHomeActivity( binding.root.context, comment.user.id, @@ -472,7 +472,7 @@ abstract class BaseCommentAdapter( binding.root.context, 0, colon.length, - R.color.text_title + R.color.text_primary ).build() val authorSpan = if (comment.parentUser?.me?.isCommentOwner == true) { SpanBuilder("作者").image(0, "作者".length, R.drawable.ic_hint_author).build() @@ -515,7 +515,7 @@ abstract class BaseCommentAdapter( binding.subCommentContainer.goneIf(subCommentList.isNullOrEmpty()) binding.firstSubCommentTv.goneIf(subCommentList?.firstOrNull() == null) binding.secondSubCommentTv.goneIf(subCommentList?.secondOrNull() == null) - binding.subCommentContainer.setRoundedColorBackground(R.color.background_space_2, 5F) + binding.subCommentContainer.setRoundedColorBackground(R.color.ui_container_2, 5F) subCommentList?.firstOrNull()?.let { binding.firstSubCommentTv.text = getSubCommentSpanned( @@ -561,13 +561,13 @@ abstract class BaseCommentAdapter( val finalName = "$name " val colon = " ：" - val nameSpan = SpanBuilder(finalName).color(context, 0, finalName.length, R.color.text_subtitleDesc).build() + val nameSpan = SpanBuilder(finalName).color(context, 0, finalName.length, R.color.text_tertiary).build() val authorSpan = if (finalAuthor.isNotEmpty()) SpanBuilder(finalAuthor).image( 0, finalAuthor.length, R.drawable.ic_hint_author ).build() else "" - val colonSpan = SpanBuilder(colon).color(context, 0, colon.length, R.color.text_subtitleDesc).build() + val colonSpan = SpanBuilder(colon).color(context, 0, colon.length, R.color.text_tertiary).build() return SpannableStringBuilder().append(nameSpan).append(authorSpan).append(colonSpan) .append(content) } @@ -575,29 +575,29 @@ abstract class BaseCommentAdapter( companion object { fun bindView(binding: ItemArticleDetailCommentBinding, comment: CommentEntity) { - binding.root.setBackgroundColor(R.color.background_white.toColor(binding.root.context)) - binding.commentBadge.setBackgroundColor(R.color.theme.toColor(binding.root.context)) - binding.divider.setBackgroundColor(R.color.background.toColor(binding.root.context)) - binding.bottomDivider.setBackgroundColor(R.color.divider.toColor(binding.root.context)) - binding.userNameTv.setTextColor(R.color.text_subtitle.toColor(binding.root.context)) - binding.badgeTv.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.floorHintTv.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.bottomFloorHintTv.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.commentTopTimeTv.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.authTv.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.time.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.ipRegionTv.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.contentTv.setTextColor(R.color.text_title.toColor(binding.root.context)) - binding.collapseTv.setTextColor(R.color.theme_font.toColor(binding.root.context)) - binding.firstSubCommentTv.setTextColor(R.color.text_subtitle.toColor(binding.root.context)) - binding.secondSubCommentTv.setTextColor(R.color.text_subtitle.toColor(binding.root.context)) - binding.moreSubCommentBtn.setTextColor(R.color.theme_font.toColor(binding.root.context)) - binding.timeTv.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.originalTv.setTextColor(R.color.theme_font.toColor(binding.root.context)) - binding.device.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.version.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.commentCountTv.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) - binding.audit.setTextColor(R.color.theme_red.toColor(binding.root.context)) + binding.root.setBackgroundColor(R.color.ui_surface.toColor(binding.root.context)) + binding.commentBadge.setBackgroundColor(R.color.primary_theme.toColor(binding.root.context)) + binding.divider.setBackgroundColor(R.color.ui_background.toColor(binding.root.context)) + binding.bottomDivider.setBackgroundColor(R.color.ui_divider.toColor(binding.root.context)) + binding.userNameTv.setTextColor(R.color.text_secondary.toColor(binding.root.context)) + binding.badgeTv.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.floorHintTv.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.bottomFloorHintTv.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.commentTopTimeTv.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.authTv.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.time.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.ipRegionTv.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.contentTv.setTextColor(R.color.text_primary.toColor(binding.root.context)) + binding.collapseTv.setTextColor(R.color.text_theme.toColor(binding.root.context)) + binding.firstSubCommentTv.setTextColor(R.color.text_secondary.toColor(binding.root.context)) + binding.secondSubCommentTv.setTextColor(R.color.text_secondary.toColor(binding.root.context)) + binding.moreSubCommentBtn.setTextColor(R.color.text_theme.toColor(binding.root.context)) + binding.timeTv.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.originalTv.setTextColor(R.color.text_theme.toColor(binding.root.context)) + binding.device.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.version.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.commentCountTv.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) + binding.audit.setTextColor(R.color.secondary_red.toColor(binding.root.context)) binding.userNameTv.text = comment.user.name binding.authorHintIv.goneIf(comment.me?.isContentOwner == false || comment.me?.isContentOwner == null) @@ -734,10 +734,10 @@ abstract class BaseCommentAdapter( viewModel.getLikeText(comment.vote, if (viewModel is CommentConversationViewModel) "" else "赞同") if (comment.me?.isCommentVoted == true) { - binding.likeCountTv.setTextColor(R.color.theme_font.toColor(binding.likeCountTv.context)) + binding.likeCountTv.setTextColor(R.color.text_theme.toColor(binding.likeCountTv.context)) binding.likeCountTv.setDrawableStart(R.drawable.comment_vote_select) } else { - binding.likeCountTv.setTextColor(R.color.text_subtitleDesc.toColor(binding.likeCountTv.context)) + binding.likeCountTv.setTextColor(R.color.text_tertiary.toColor(binding.likeCountTv.context)) binding.likeCountTv.setDrawableStart(R.drawable.comment_vote_unselect) } diff --git a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt index 009757e771..2cff9dca0b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/comment/conversation/CommentConversationFragment.kt @@ -123,7 +123,7 @@ class CommentConversationFragment : } } - inputContainer.replyTv.setRoundedColorBackground(R.color.background_space_2, 19F) + inputContainer.replyTv.setRoundedColorBackground(R.color.ui_container_2, 19F) inputContainer.replyTv.setDebouncedClickListener { mViewModel.commentDetail?.let { startCommentActivity(it) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt index 60ab20db88..8ee5d6d887 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerAdapter.kt @@ -67,7 +67,7 @@ class ChooseForumContainerAdapter( if (forumEntity.isFollow) R.drawable.button_round_gray_light.toDrawable() else R.drawable.bg_forum_follow.toDrawable() holder.binding.followTv.text = if (forumEntity.isFollow) "已关注" else "关注" holder.binding.followTv.setTextColor( - if (forumEntity.isFollow) R.color.text_subtitleDesc.toColor(mContext) else R.color.theme_font.toColor( + if (forumEntity.isFollow) R.color.text_tertiary.toColor(mContext) else R.color.text_theme.toColor( mContext ) ) diff --git a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerFragment.kt index 03b37bed03..63b6d312d6 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/dialog/ChooseForumContainerFragment.kt @@ -4,7 +4,6 @@ import androidx.core.content.ContextCompat import androidx.core.os.bundleOf import androidx.fragment.app.Fragment import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.NewFlatLogUtils import com.gh.common.util.NewLogUtils import com.gh.gamecenter.R import com.gh.gamecenter.SearchActivity.Companion.trackSearchResultClick @@ -15,8 +14,6 @@ import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.viewModelProvider import com.gh.gamecenter.entity.ForumEntity import com.gh.gamecenter.forum.detail.ForumDetailActivity -import com.gh.gamecenter.forum.search.CommunitySearchEventListener.Companion.SEARCH_BUTTON_VIEW_FORUM_DETAIL -import com.gh.gamecenter.forum.search.ForumOrUserSearchActivity.Companion.LOCATION_COMMUNITY class ChooseForumContainerFragment : LazyListFragment() { @@ -28,7 +25,7 @@ class ChooseForumContainerFragment : LazyListFragment) { @@ -35,7 +35,7 @@ class CommunityDraftWrapperActivity : BaseActivity_TabLayout() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 9d0538f8b7..c6bd472f5e 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 @@ -12,7 +12,7 @@ import com.gh.gamecenter.common.utils.updateStatusBarColor class GameActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun provideNormalIntent(): Intent { @@ -23,7 +23,7 @@ class GameActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 5f867ff537..4878f3966f 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 @@ -13,7 +13,7 @@ class InsertAnswerWrapperActivity : BaseActivity_TabLayout() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager @@ -32,7 +32,7 @@ class InsertAnswerWrapperActivity : BaseActivity_TabLayout() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 16e6ee1c45..817417c0bb 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 @@ -13,7 +13,7 @@ class InsertArticleWrapperActivity : BaseActivity_TabLayout() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager @@ -32,7 +32,7 @@ class InsertArticleWrapperActivity : BaseActivity_TabLayout() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 68dbe661ba..bf2284821a 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 @@ -16,7 +16,7 @@ class InsertGameCollectionWrapperActivity : BaseActivity_TabLayout() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager @@ -52,7 +52,7 @@ class InsertGameCollectionWrapperActivity : BaseActivity_TabLayout() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 77850ae37d..a7f9c0e60b 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 @@ -15,7 +15,7 @@ class InsertVideoWrapperActivity : BaseActivity_TabLayout() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun getLayoutId(): Int = R.layout.activity_tablayout_no_title_viewpager @@ -48,7 +48,7 @@ class InsertVideoWrapperActivity : BaseActivity_TabLayout() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 1eaddd8076..bd07d1846b 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 @@ -32,7 +32,7 @@ class LocalMediaActivity : ToolBarActivity(), AlbumCollection.AlbumCallbacks { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mChooseType = intent.getStringExtra(EntranceConsts.KEY_TYPE) ?: "" if (mChooseType == ChooseType.VIDEO.value) { setNavigationTitle("本地视频") @@ -125,7 +125,7 @@ class LocalMediaActivity : ToolBarActivity(), AlbumCollection.AlbumCallbacks { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt index b588796930..4958ec06c8 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/editor/LocalMediaFragment.kt @@ -56,10 +56,10 @@ class LocalMediaFragment : BaseFragment(), AlbumMediaCollection.AlbumMediaC mBinding.previewTv.isEnabled = it.isNotEmpty() mBinding.confirmTv.isEnabled = it.isNotEmpty() if (it.isEmpty()) { - mBinding.previewTv.setTextColor(R.color.text_body.toColor(requireContext())) + mBinding.previewTv.setTextColor(R.color.text_instance.toColor(requireContext())) mBinding.confirmTv.alpha = 0.6f } else { - mBinding.previewTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) + mBinding.previewTv.setTextColor(R.color.text_secondary.toColor(requireContext())) mBinding.confirmTv.alpha = 1f } mBinding.numTv.text = "(${it.size}/${mAdapter.maxChooseSize})" 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 83d6df9f11..024b1cba51 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 @@ -53,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.background_white)) + containerView.background = ColorDrawable(ContextCompat.getColor(context, R.color.ui_surface)) 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 1569677c4c..5a75fa9623 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 @@ -55,7 +55,7 @@ public class MyAnswerFragment extends ListFragment(), @SuppressLint("ClickableViewAccessibility") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) setToolbarMenu(R.menu.menu_question_post) mToolbar.navigationIcon = null mMenuDraft = getMenuItem(R.id.menu_draft) @@ -329,7 +329,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), mViewModel.selectActivityLabelEntity = it mBinding.activityTv.text = it?.name mBinding.activityTv.setTextColor( - if (it != null) R.color.text_FA8500.toColor(this) else R.color.text_title.toColor( + if (it != null) R.color.text_FA8500.toColor(this) else R.color.text_primary.toColor( this ) ) @@ -847,7 +847,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), mBinding.forumIconView.visibility = View.VISIBLE mBinding.forumContainer.background = ContextCompat.getDrawable(this, R.drawable.bg_shape_f5_radius_999) - mBinding.chooseForumTv.setTextColor(ContextCompat.getColor(this, R.color.text_subtitle)) + mBinding.chooseForumTv.setTextColor(ContextCompat.getColor(this, R.color.text_secondary)) } private fun setSectionUI(isEmpty: Boolean) { @@ -857,7 +857,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), this@QuestionEditActivity ) sectionName.setTextColor( - if (isEmpty) R.color.theme_font.toColor(this@QuestionEditActivity) else R.color.text_subtitle.toColor( + if (isEmpty) R.color.text_theme.toColor(this@QuestionEditActivity) else R.color.text_secondary.toColor( this@QuestionEditActivity ) ) @@ -899,10 +899,10 @@ class QuestionEditActivity : BaseRichEditorActivity(), override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) setSectionUI(mViewModel.selectSection == null) mBinding.activityTv.setTextColor( - if (mViewModel.selectActivityLabelEntity != null) R.color.text_FA8500.toColor(this) else R.color.text_title.toColor( + if (mViewModel.selectActivityLabelEntity != null) R.color.text_FA8500.toColor(this) else R.color.text_primary.toColor( this ) ) @@ -911,7 +911,7 @@ class QuestionEditActivity : BaseRichEditorActivity(), this ) mBinding.chooseForumTv.setTextColor( - if (mViewModel.communityEntity == null) R.color.theme_font.toColor(this) else R.color.text_subtitle.toColor( + if (mViewModel.communityEntity == null) R.color.text_theme.toColor(this) else R.color.text_secondary.toColor( this ) ) diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt index 72def6e718..0fa274cf6b 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/edit/TagsSelectFragment.kt @@ -303,7 +303,7 @@ class TagsSelectFragment : BaseFragment() { mViewModel?.selectedTags?.add(tag) mViewModel?.selectedTagsChange?.postValue(true) tagView.setBackgroundResource(R.drawable.bg_article_edit_label_select) - tagView.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) + tagView.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_theme)) } } } @@ -321,10 +321,10 @@ class TagsSelectFragment : BaseFragment() { tagTv.setOnClickListener { if (mViewModel?.selectTag(tagTv.text.toString())!!) { tagTv.setBackgroundResource(R.drawable.bg_article_edit_label_select) - tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) + tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_theme)) } else { tagTv.setBackgroundResource(R.drawable.bg_article_edit_label_unselect) - tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_subtitle)) + tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_secondary)) } } @@ -332,7 +332,7 @@ class TagsSelectFragment : BaseFragment() { mViewModel?.selectedTags?.add(tag) mViewModel?.selectedTagsChange?.postValue(true) tagTv.setBackgroundResource(R.drawable.bg_article_edit_label_select) - tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) + tagTv.setTextColor(ContextCompat.getColor(requireContext(), R.color.text_theme)) } mAllTags.add(tag) } 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 51fb9d62a1..29ddcc8078 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 @@ -24,7 +24,7 @@ public class QuestionsInviteActivity extends ToolBarActivity { @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } public static Intent getIntent(Context context, QuestionsDetailEntity entity, String entrance) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java index 66c8b60afd..bd5a3d5872 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/qa/questions/invite/QuestionsInviteViewHolder.java @@ -51,7 +51,7 @@ public class QuestionsInviteViewHolder extends BaseRecyclerViewHolder { approvalStatusTv.text = "内容审核中" - approvalStatusTv.setTextColor(R.color.theme_green.toColor(approvalStatusTv.context)) + approvalStatusTv.setTextColor(R.color.secondary_green.toColor(approvalStatusTv.context)) approvalStatusTv.background = R.drawable.bg_approval_status_pending.toDrawable() } "fail" -> { approvalStatusTv.text = "审核不通过" - approvalStatusTv.setTextColor(R.color.theme_red.toColor(approvalStatusTv.context)) + approvalStatusTv.setTextColor(R.color.secondary_red.toColor(approvalStatusTv.context)) approvalStatusTv.background = R.drawable.bg_approval_status_fail.toDrawable() } } @@ -261,10 +261,10 @@ class QuestionDetailContentViewHolder( if (followBtn.visibility == View.GONE) return followBtn.text = "已关注" followBtn.background = null - followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.text_subtitleDesc)) + followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.text_tertiary)) } else { followBtn.setRoundedColorBackground(R.color.text_EEF5FB, 14F) - followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.theme_font)) + followBtn.setTextColor(ContextCompat.getColor(root.context, R.color.text_theme)) followBtn.setText(R.string.concern) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt index 3c78dbf8bd..d093f8dd5e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt @@ -152,7 +152,7 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { mSkeleton = Skeleton.bind(mBinding.skeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) @@ -856,12 +856,12 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { val tab = mTabLayout.getTabAt(i) if (tab != null) { tab.customView?.findViewById(R.id.tab_title)?.setTextColor( - if (tab.isSelected) R.color.theme_font.toColor(requireContext()) else R.color.text_subtitle.toColor( + if (tab.isSelected) R.color.text_theme.toColor(requireContext()) else R.color.text_secondary.toColor( requireContext() ) ) tab.customView?.findViewById(R.id.tab_count)?.setTextColor( - if (tab.isSelected) R.color.theme_font.toColor(requireContext()) else R.color.text_subtitle.toColor( + if (tab.isSelected) R.color.text_theme.toColor(requireContext()) else R.color.text_secondary.toColor( requireContext() ) ) diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt index 189ec97312..16e466cd56 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/comment/VideoCommentFragment.kt @@ -223,8 +223,8 @@ class VideoCommentFragment : LazyListFragment(R.id.backBtn).setOnClickListener { onBackPressed() } } @@ -28,7 +28,7 @@ class VideoPublishActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun updateStaticViewBackground(view: View?) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt index 9b2ff4592d..6e2a10af88 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/publish/VideoPublishFragment.kt @@ -239,7 +239,7 @@ class VideoPublishFragment : ToolbarFragment(), KeyboardHeightObserver { mViewModel.selectActivityLabelEntity = it mBinding.activityTv.text = it?.name ?: "添加话题标签" mBinding.activityTv.setTextColor( - if (it != null) R.color.text_FA8500.toColor(requireContext()) else R.color.text_title.toColor( + if (it != null) R.color.text_FA8500.toColor(requireContext()) else R.color.text_primary.toColor( requireContext() ) ) @@ -272,7 +272,7 @@ class VideoPublishFragment : ToolbarFragment(), KeyboardHeightObserver { mBinding.activityTv.setTextColor( if (mViewModel.selectActivityLabelEntity != null) R.color.text_FA8500.toColor( requireContext() - ) else R.color.text_title.toColor(requireContext()) + ) else R.color.text_primary.toColor(requireContext()) ) } @@ -652,7 +652,7 @@ class VideoPublishFragment : ToolbarFragment(), KeyboardHeightObserver { private fun setForumUI() { mBinding.forumIconView.visibility = View.VISIBLE mBinding.forumContainer.background = R.drawable.bg_shape_f5_radius_999.toDrawable(requireContext()) - mBinding.chooseForumTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) + mBinding.chooseForumTv.setTextColor(R.color.text_secondary.toColor(requireContext())) } private fun setSectionUI(isEmpty: Boolean) { @@ -662,7 +662,7 @@ class VideoPublishFragment : ToolbarFragment(), KeyboardHeightObserver { requireContext() ) sectionName.setTextColor( - if (isEmpty) R.color.theme_font.toColor(requireContext()) else R.color.text_subtitle.toColor( + if (isEmpty) R.color.text_theme.toColor(requireContext()) else R.color.text_secondary.toColor( requireContext() ) ) @@ -953,7 +953,7 @@ class VideoPublishFragment : ToolbarFragment(), KeyboardHeightObserver { super.onDarkModeChanged() setSectionUI(mViewModel.selectSection == null) mBinding.activityTv.setTextColor( - if (mViewModel.selectActivityLabelEntity != null) R.color.text_FA8500.toColor(requireContext()) else R.color.text_title.toColor( + if (mViewModel.selectActivityLabelEntity != null) R.color.text_FA8500.toColor(requireContext()) else R.color.text_primary.toColor( requireContext() ) ) @@ -962,9 +962,9 @@ class VideoPublishFragment : ToolbarFragment(), KeyboardHeightObserver { requireContext() ) mBinding.chooseForumTv.setTextColor( - if (mViewModel.communityEntity == null) R.color.theme_font.toColor( + if (mViewModel.communityEntity == null) R.color.text_theme.toColor( requireContext() - ) else R.color.text_subtitle.toColor(requireContext()) + ) else R.color.text_secondary.toColor(requireContext()) ) } diff --git a/app/src/main/java/com/gh/gamecenter/qgame/QGameHomeWrapperActivity.kt b/app/src/main/java/com/gh/gamecenter/qgame/QGameHomeWrapperActivity.kt index 429ee85e54..fb01636902 100644 --- a/app/src/main/java/com/gh/gamecenter/qgame/QGameHomeWrapperActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qgame/QGameHomeWrapperActivity.kt @@ -18,12 +18,12 @@ class QGameHomeWrapperActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListActivity.kt b/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListActivity.kt index 376097c61d..7c22eb83e8 100644 --- a/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListActivity.kt @@ -16,7 +16,7 @@ class GameArchiveListActivity : BaseActivity_TabLayout() { super.onCreate(savedInstanceState) setNavigationTitle("游戏存档") mDividerLineView?.visibility = View.VISIBLE - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun initFragmentList(fragments: MutableList?) { @@ -39,7 +39,7 @@ class GameArchiveListActivity : BaseActivity_TabLayout() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListInstalledAdapter.kt b/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListInstalledAdapter.kt index ae2642b69d..6c56eb16b0 100644 --- a/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListInstalledAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListInstalledAdapter.kt @@ -44,9 +44,9 @@ class GameArchiveListInstalledAdapter(context: Context, var mViewModel: GameArch holder.itemView.setPadding(16F.dip2px(), padTop, 16F.dip2px(), 8F.dip2px()) holder.binding.run { root.background = R.drawable.reuse_listview_item_style.toDrawable(root.context) - nameTv.setTextColor(R.color.text_title.toColor(root.context)) + nameTv.setTextColor(R.color.text_primary.toColor(root.context)) downloadBtn.text = "存档" - downloadBtn.setTextColor(R.color.theme_font.toColor(root.context)) + downloadBtn.setTextColor(R.color.text_theme.toColor(root.context)) iconIv.displayGameIcon(gameEntity) nameTv.text = gameEntity.name downloadBtn.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListInstalledFragment.kt b/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListInstalledFragment.kt index 2a33af7ab9..970ef7d474 100644 --- a/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListInstalledFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/savegame/GameArchiveListInstalledFragment.kt @@ -31,7 +31,7 @@ class GameArchiveListInstalledFragment : LazyListFragment() { headTitle.text = getString(R.string.search_history) headTitle.textSize = 16F headActionTv.text = "清空" - headActionTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + headActionTv.setTextColor(R.color.text_tertiary.toColor(requireContext())) headActionTv.setDrawableStart( AppCompatResources.getDrawable( requireContext(), @@ -387,7 +387,7 @@ open class SearchDefaultFragment : BaseFragment() { flexCell.gravity = Gravity.CENTER flexCell.textSize = 12F flexCell.text = StringUtils.shrinkStringWithDot(contentList[index], 6) - flexCell.setTextColor(R.color.text_subtitle.toColor(requireContext())) + flexCell.setTextColor(R.color.text_secondary.toColor(requireContext())) } flexCell.setPadding(8F.dip2px(), 0, 8F.dip2px(), 0) flexCell.background = if (mIsDarkModeOn) GradientDrawable().apply { @@ -437,7 +437,7 @@ open class SearchDefaultFragment : BaseFragment() { override fun onDarkModeChanged() { super.onDarkModeChanged() initHeadView() - mBinding.rootContainer.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.rootContainer.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mBinding.hotList.adapter?.run { notifyItemRangeChanged(0, itemCount) } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultRankAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultRankAdapter.kt index be609488be..312899149f 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchDefaultRankAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchDefaultRankAdapter.kt @@ -42,7 +42,7 @@ class SearchDefaultRankAdapter( 1 -> R.color.text_ff5151 2 -> R.color.text_f67722 3 -> R.color.text_ffbf00 - else -> R.color.text_subtitleDesc + else -> R.color.text_tertiary }.toColor() ) } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt index 2fa072c162..cb40fd41ed 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexAdapter.kt @@ -138,9 +138,9 @@ class SearchGameIndexAdapter( } else "" gameRating.setTextColor( if (gameEntity.commentCount > 3) { - R.color.theme_font.toColor(mContext) + R.color.text_theme.toColor(mContext) } else { - R.color.theme.toColor( + R.color.primary_theme.toColor( mContext ) } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt index fd81180ee2..601b7334c7 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameIndexFragment.kt @@ -94,7 +94,7 @@ class SearchGameIndexFragment : ListFragment 3) { - R.color.theme_font.toColor(mContext) + R.color.text_theme.toColor(mContext) } else { - R.color.theme.toColor( + R.color.primary_theme.toColor( mContext ) } diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt index d49eed9ad0..77f473d0c3 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt @@ -102,7 +102,7 @@ open class SearchGameResultFragment : ListFragment { - holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext)) - holder.binding.kaifuItemTimeTv.setTextColor(R.color.text_title.toColor(mContext)) + holder.binding.root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) + holder.binding.kaifuItemTimeTv.setTextColor(R.color.text_primary.toColor(mContext)) if (mIsShowPullDownTip && position == 1) { holder.binding.emptyView.visibility = View.VISIBLE } else { @@ -235,7 +235,7 @@ class GameServersContentAdapter( is FooterViewHolder -> { holder.run { - itemView.setBackgroundColor(R.color.background.toColor(mContext)) + itemView.setBackgroundColor(R.color.ui_background.toColor(mContext)) if (position == 0) { when { mPrevIsNetworkError -> { @@ -285,8 +285,8 @@ class GameServersContentAdapter( private fun initGameTestViewHolder(gameEntity: GameEntity, viewHolder: GameTestViewHolder) { viewHolder.run { binding.contentContainer.background = R.drawable.reuse_listview_item_style.toDrawable(mContext) - gameName.setTextColor(R.color.text_title.toColor(mContext)) - gameDes.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + gameName.setTextColor(R.color.text_primary.toColor(mContext)) + gameDes.setTextColor(R.color.text_tertiary.toColor(mContext)) } viewHolder.gameName.text = gameEntity.name 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 7aaef0ac83..fe9e7bfae2 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersContentFragment.kt @@ -125,11 +125,11 @@ class GameServersContentFragment : BaseFragment() { mAdapter?.loadChange(it) } - mBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding?.root?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mSkeleton = Skeleton.bind(mBinding?.skeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) @@ -354,7 +354,7 @@ class GameServersContentFragment : BaseFragment() { private fun onRefreshPage() { mIsRefresh = true mAdapter?.resetStatus() - mBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding?.root?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mSkeleton?.show() mBinding?.loadingContainer?.reuseLlLoading?.visibility = View.VISIBLE mBinding?.noConnectionContainer?.reuseNoConnection?.visibility = View.GONE diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt index 143ae45df6..c022735c7b 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersPublishFragment.kt @@ -95,7 +95,7 @@ class GameServersPublishFragment : LazyFragment() { private fun showCategoryPopupWindow(v: CheckedTextView, callback: (String?) -> Unit) { v.isChecked = true - v.setTextColor(R.color.theme_font.toColor(requireContext())) + v.setTextColor(R.color.text_theme.toColor(requireContext())) val inflater = LayoutInflater.from(context) val layout = inflater.inflate(R.layout.popup_server_category, null) @@ -109,8 +109,8 @@ class GameServersPublishFragment : LazyFragment() { val complete = layout.findViewById(R.id.complete) val contentContainer = layout.findViewById(R.id.content_container) - reset.background = DrawableView.getStrokeDrawable(R.color.text_body, context = requireContext()) - complete.background = DrawableView.getOvalDrawable(R.color.theme, context = requireContext()) + reset.background = DrawableView.getStrokeDrawable(R.color.text_instance, context = requireContext()) + complete.background = DrawableView.getOvalDrawable(R.color.primary_theme, context = requireContext()) contentContainer.removeAllViews() for (entity in mCategoryList) { @@ -126,11 +126,11 @@ class GameServersPublishFragment : LazyFragment() { label.textSize = 13F label.text = name label.background = - DrawableView.getOvalSelectorStyle(R.color.background, R.color.text_e6f3ff, requireContext()) + DrawableView.getOvalSelectorStyle(R.color.ui_background, R.color.text_e6f3ff, requireContext()) label.setTextColor( DrawableView.getSelectorColorStyle( - R.color.text_title, - R.color.theme_font, + R.color.text_primary, + R.color.text_theme, requireContext() ) ) @@ -195,7 +195,7 @@ class GameServersPublishFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mTags.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor(requireContext())) + if (mTags.isNullOrEmpty()) v.setTextColor(R.color.text_primary.toColor(requireContext())) } popupWindow.showAsDropDown(mBinding?.divider) } @@ -203,7 +203,7 @@ class GameServersPublishFragment : LazyFragment() { // day, hour private fun showServersTimePopupWindow(v: CheckedTextView, callback: (String?, String?) -> Unit) { v.isChecked = true - v.setTextColor(R.color.theme_font.toColor(requireContext())) + v.setTextColor(R.color.text_theme.toColor(requireContext())) val inflater = LayoutInflater.from(v.context) val layout = inflater.inflate(R.layout.popup_server_time, null) @@ -241,7 +241,7 @@ class GameServersPublishFragment : LazyFragment() { // position = 0: all val hour = TextView(v.context) hour.textSize = 14F - hour.setTextColor(R.color.text_title.toColor(requireContext())) + hour.setTextColor(R.color.text_primary.toColor(requireContext())) hour.gravity = Gravity.CENTER_VERTICAL hour.setPadding(24F.dip2px(), 0, 0, 0) hourContainer.addView(hour, ViewGroup.LayoutParams.MATCH_PARENT, 43F.dip2px()) @@ -272,15 +272,15 @@ class GameServersPublishFragment : LazyFragment() { } } - today.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font, requireContext())) + today.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_primary, R.color.text_theme, requireContext())) tomorrow.setTextColor( DrawableView.getSelectorColorStyle( - R.color.text_title, - R.color.theme_font, + R.color.text_primary, + R.color.text_theme, requireContext() ) ) - after.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_title, R.color.theme_font, requireContext())) + after.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_primary, R.color.text_theme, requireContext())) layout.setOnClickListener { popupWindow.dismiss() @@ -308,7 +308,7 @@ class GameServersPublishFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor(requireContext())) + if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_primary.toColor(requireContext())) } popupWindow.showAsDropDown(mBinding?.divider) } @@ -319,8 +319,8 @@ class GameServersPublishFragment : LazyFragment() { mTags = null mBinding?.run { serverTime.text = "开服时间" - serverTime.setTextColor(R.color.text_title.toColor(requireContext())) - serverStatus.setTextColor(R.color.text_title.toColor(requireContext())) + serverTime.setTextColor(R.color.text_primary.toColor(requireContext())) + serverStatus.setTextColor(R.color.text_primary.toColor(requireContext())) } mContentFragment.filterData(mDay, mHour, mType, mTags) } diff --git a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt index cec4cec90f..483deccf6f 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestAdapter.kt @@ -101,8 +101,8 @@ class GameServersTestAdapter( initViewHolder(gameEntity, holder) } is GameServerTimeViewHolder -> { - holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext)) - holder.binding.kaifuItemTimeTv.setTextColor(R.color.text_title.toColor(mContext)) + holder.binding.root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) + holder.binding.kaifuItemTimeTv.setTextColor(R.color.text_primary.toColor(mContext)) holder.binding.kaifuItemHeader.setImageResource(R.drawable.kaifu_time_icon) holder.binding.kaifuItemTimeTv.text = mDataList[position].time } @@ -110,7 +110,7 @@ class GameServersTestAdapter( initFooterViewHolder(holder) } is TextViewHolder -> { - holder.binding.root.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.binding.root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) holder.binding.contentTv.text = mDataList[position].text } } 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 05ed83a28a..ae5e24e2b1 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/GameServersTestFragment.kt @@ -135,11 +135,11 @@ class GameServersTestFragment : LazyFragment() { mSubBinding = mBinding?.layoutFragmentContent - mSubBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mSubBinding?.root?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mSkeleton = Skeleton.bind(mSubBinding?.skeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) @@ -192,7 +192,7 @@ class GameServersTestFragment : LazyFragment() { mViewModel?.updateTimeFilter(filterDay) mBinding?.filterView?.updateSelectedMainFilter(filterDay) mBinding?.serverTime?.text = filterDay - mBinding?.serverTime?.setTextColor(R.color.theme_font.toColor(requireContext())) + mBinding?.serverTime?.setTextColor(R.color.text_theme.toColor(requireContext())) } // 悬挂的文案 @@ -224,7 +224,7 @@ class GameServersTestFragment : LazyFragment() { mViewModel?.updateTimeFilter(mSupremeSelectedDay!!) mBinding?.filterView?.updateSelectedMainFilter(mSupremeSelectedDay!!) mBinding?.serverTime?.text = mSupremeSelectedDay - mBinding?.serverTime?.setTextColor(R.color.theme_font.toColor(requireContext())) + mBinding?.serverTime?.setTextColor(R.color.text_theme.toColor(requireContext())) mSupremeSelectedDay = null } if (newState == RecyclerView.SCROLL_STATE_DRAGGING) { @@ -319,7 +319,7 @@ class GameServersTestFragment : LazyFragment() { MtaHelper.onEvent("开服表", "开测Tab", "测试状态") v.isChecked = true - v.setTextColor(R.color.theme_font.toColor(requireContext())) + v.setTextColor(R.color.text_theme.toColor(requireContext())) val binding = PopupServerStatusBinding.inflate(LayoutInflater.from(context)) val layout = binding.root @@ -334,7 +334,7 @@ class GameServersTestFragment : LazyFragment() { for ((index, tv) in tvList.withIndex()) { tv.text = typeList[index] if (tv.text.toString() == mType) { - tv.setTextColor(R.color.theme_font.toColor(requireContext())) + tv.setTextColor(R.color.text_theme.toColor(requireContext())) } tv.setOnClickListener { callback.invoke(tv.text.toString()) @@ -352,7 +352,7 @@ class GameServersTestFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mType == "全部") v.setTextColor(R.color.text_title.toColor(requireContext())) + if (mType == "全部") v.setTextColor(R.color.text_primary.toColor(requireContext())) } popupWindow.showAsDropDown(v) } @@ -361,7 +361,7 @@ class GameServersTestFragment : LazyFragment() { MtaHelper.onEvent("开服表", "开测Tab", "开测时间") v.isChecked = true - v.setTextColor(R.color.theme_font.toColor(requireContext())) + v.setTextColor(R.color.text_theme.toColor(requireContext())) val binding = PopupTestTimeBinding.inflate(LayoutInflater.from(v.context)) val layout = binding.root @@ -377,8 +377,8 @@ class GameServersTestFragment : LazyFragment() { tv.text = dayList[index] tv.setTextColor( DrawableView.getSelectorColorStyle( - R.color.text_title, - R.color.theme_font, + R.color.text_primary, + R.color.text_theme, requireContext() ) ) @@ -400,7 +400,7 @@ class GameServersTestFragment : LazyFragment() { popupWindow.setOnDismissListener { v.isChecked = false - if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_title.toColor(requireContext())) + if (mDay.isNullOrEmpty()) v.setTextColor(R.color.text_primary.toColor(requireContext())) } popupWindow.showAsDropDown(v) } @@ -410,8 +410,8 @@ class GameServersTestFragment : LazyFragment() { // mBinding?.serverTime?.text = "开测时间" mBinding?.serverStatus?.text = "测试状态" mBinding?.filterView?.updateSelectedSubFilter(mViewModel!!.typeList.first()) - mBinding?.serverTime?.setTextColor(R.color.text_title.toColor(requireContext())) - mBinding?.serverStatus?.setTextColor(R.color.text_title.toColor(requireContext())) + mBinding?.serverTime?.setTextColor(R.color.text_primary.toColor(requireContext())) + mBinding?.serverStatus?.setTextColor(R.color.text_primary.toColor(requireContext())) mSubBinding?.run { reuseNoneData.reuseNoneData?.visibility = View.GONE noConnectionContainer.root.visibility = View.GONE @@ -437,7 +437,7 @@ class GameServersTestFragment : LazyFragment() { mSubBinding?.reuseNoneData?.reuseNoneData?.visibility = View.GONE mSubBinding?.noConnectionContainer?.root?.visibility = View.VISIBLE mSubBinding?.noConnectionContainer?.root?.setOnClickListener { - mSubBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mSubBinding?.root?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mSkeleton?.show() resetFilter() } @@ -452,7 +452,7 @@ class GameServersTestFragment : LazyFragment() { mSubBinding?.reuseNoneData?.reuseResetLoadTv?.visibility = View.VISIBLE mSubBinding?.reuseNoneData?.reuseNoneData?.visibility = View.VISIBLE mSubBinding?.reuseNoneData?.reuseNoneData?.setOnClickListener { - mSubBinding?.root?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mSubBinding?.root?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mSkeleton?.show() resetFilter() } @@ -506,9 +506,9 @@ class GameServersTestFragment : LazyFragment() { override fun onDarkModeChanged() { super.onDarkModeChanged() mBinding?.run { - root.setBackgroundColor(R.color.background.toColor(requireContext())) + root.setBackgroundColor(R.color.ui_background.toColor(requireContext())) filterView.run { - setRootBackgroundColor(R.color.background_white.toColor(requireContext())) + setRootBackgroundColor(R.color.ui_surface.toColor(requireContext())) updateFilterRecyclerView() updatePopupWindow() } @@ -516,15 +516,15 @@ class GameServersTestFragment : LazyFragment() { mSubBinding?.run { kaifuTimeContainer.run { - root.setBackgroundColor(R.color.background_white.toColor(requireContext())) - kaifuItemTimeTv.setTextColor(R.color.text_title.toColor(requireContext())) + root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + kaifuItemTimeTv.setTextColor(R.color.text_primary.toColor(requireContext())) } recyclerView.adapter?.run { recyclerView.recycledViewPool.clear() notifyItemRangeChanged(0, itemCount) } - reuseNoneData.reuseNoneDataTv.setTextColor(R.color.text_title.toColor(requireContext())) - reuseNoneData.reuseNoneDataDescTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + reuseNoneData.reuseNoneDataTv.setTextColor(R.color.text_primary.toColor(requireContext())) + reuseNoneData.reuseNoneDataDescTv.setTextColor(R.color.text_tertiary.toColor(requireContext())) reuseNoneData.reuseNoneDataIv.setImageResource(R.drawable.ic_empty_data) } } 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 91af6a7843..ba888cbe95 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 @@ -52,7 +52,7 @@ class AddKaiFuActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) setNavigationTitle("新增开服") mSelectTime = intent.getLongExtra(EntranceConsts.KEY_KAIFU_SELECT_TIME, 0) @@ -153,10 +153,10 @@ class AddKaiFuActivity : ToolBarActivity() { .setTitleSize(15) .setOutSideCancelable(false) .isCyclic(false) - .setSubmitColor(R.color.theme_font.toColor(this)) + .setSubmitColor(R.color.text_theme.toColor(this)) .setCancelColor(R.color.hint.toColor(this)) - .setTitleBgColor(R.color.background_white.toColor(this)) - .setBgColor(R.color.background_white.toColor(this)) + .setTitleBgColor(R.color.ui_surface.toColor(this)) + .setBgColor(R.color.ui_surface.toColor(this)) .setDate(selectedDate) .setRangDate(startDate, endDate) .setLabel("年", "月", "日", "时", "分", "") @@ -205,10 +205,10 @@ class AddKaiFuActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mBinding?.run { - root.setBackgroundColor(R.color.background.toColor(this@AddKaiFuActivity)) - container.setBackgroundColor(R.color.background_white.toColor(this@AddKaiFuActivity)) + root.setBackgroundColor(R.color.ui_background.toColor(this@AddKaiFuActivity)) + container.setBackgroundColor(R.color.ui_surface.toColor(this@AddKaiFuActivity)) kaifuAddContainer.run { for (i in 1 until childCount) { (getChildAt(i) as? LinearLayout)?.run { diff --git a/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameBigImageViewHolder.kt b/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameBigImageViewHolder.kt index 88ee2fa4c9..5b39a50059 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameBigImageViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameBigImageViewHolder.kt @@ -85,26 +85,26 @@ class GameBigImageViewHolder(val binding: ItemGameServerTestBigImageBinding) : binding.gameName.text = gameEntity.name binding.gameBrief.text = gameEntity.brief binding.timeTv.text = TimeUtils.getFormatTime(gameEntity.time?.time ?: 0L, "HH:mm") - binding.gameName.setTextColor(R.color.text_title.toColor(binding.root.context)) - binding.gameBrief.setTextColor(R.color.text_subtitleDesc.toColor(binding.root.context)) + binding.gameName.setTextColor(R.color.text_primary.toColor(binding.root.context)) + binding.gameBrief.setTextColor(R.color.text_tertiary.toColor(binding.root.context)) val color: Int when (gameEntity.eventType) { "test" -> { color = "#2906CEA8".hexStringToIntColor() binding.statusTv.background = DrawableView.getCornerGradientDrawable(color, color, 8F) - binding.statusTv.setTextColor(R.color.theme_green.toColor(binding.statusTv.context)) + binding.statusTv.setTextColor(R.color.secondary_green.toColor(binding.statusTv.context)) binding.statusTv.text = "测试" } "first" -> { color = "#292496FF".hexStringToIntColor() binding.statusTv.background = DrawableView.getCornerGradientDrawable(color, color, 8F) - binding.statusTv.setTextColor(R.color.theme_font.toColor(binding.statusTv.context)) + binding.statusTv.setTextColor(R.color.text_theme.toColor(binding.statusTv.context)) binding.statusTv.text = "首发" } "update" -> { color = "#29FFA142".hexStringToIntColor() binding.statusTv.background = DrawableView.getCornerGradientDrawable(color, color, 8F) - binding.statusTv.setTextColor(R.color.theme_yellow.toColor(binding.statusTv.context)) + binding.statusTv.setTextColor(R.color.secondary_yellow.toColor(binding.statusTv.context)) binding.statusTv.text = "更新" } else -> { diff --git a/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2Activity.kt b/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2Activity.kt index cb7032a544..65efdd7a0f 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2Activity.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2Activity.kt @@ -14,7 +14,7 @@ class GameServerTestV2Activity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) setNavigationTitle("新游开测") } @@ -24,7 +24,7 @@ class GameServerTestV2Activity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2Fragment.kt b/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2Fragment.kt index d7e2467806..06e95c82ad 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2Fragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2Fragment.kt @@ -17,7 +17,6 @@ import com.gh.gamecenter.common.base.fragment.LazyFragment import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.* -import com.gh.gamecenter.core.utils.DisplayUtils import com.gh.gamecenter.core.utils.SPUtils import com.gh.gamecenter.databinding.FragmentGameServerTestV2Binding import com.gh.gamecenter.databinding.PopupFilterGameTypeBinding @@ -153,11 +152,11 @@ class GameServerTestV2Fragment : LazyFragment() { private fun updateCategoryStyle() { val drawable = VectorDrawableCompat.create(resources, R.drawable.ic_filter_arrow, null) if (!mViewModel?.selectedCategoryFilterSet.isNullOrEmpty()) { - mBinding?.categoryTv?.setTextColor(R.color.theme_font.toColor(requireContext())) - drawable?.setTint(R.color.theme_font.toColor(requireContext())) + mBinding?.categoryTv?.setTextColor(R.color.text_theme.toColor(requireContext())) + drawable?.setTint(R.color.text_theme.toColor(requireContext())) } else { - mBinding?.categoryTv?.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) - drawable?.setTint(R.color.text_subtitleDesc.toColor(requireContext())) + mBinding?.categoryTv?.setTextColor(R.color.text_tertiary.toColor(requireContext())) + drawable?.setTint(R.color.text_tertiary.toColor(requireContext())) } mBinding?.arrowIv?.setImageDrawable(drawable) } diff --git a/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2ListAdapter.kt b/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2ListAdapter.kt index e9b05250f9..cf248d7540 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2ListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2ListAdapter.kt @@ -86,7 +86,7 @@ class GameServerTestV2ListAdapter( if (isTheLastOfTheLatestConsecutiveGame) 16F.dip2px() else 8F.dip2px() ) holder.bindGameItem(gameEntity, forceShowSubtitle = true) - holder.binding.gameDes.setTextColor(R.color.text_title.toColor(context)) + holder.binding.gameDes.setTextColor(R.color.text_primary.toColor(context)) initGameItemViewHolder(gameEntity, holder, position) } is GameBigImageViewHolder -> { @@ -176,7 +176,7 @@ class GameServerTestV2ListAdapter( private fun initFooterViewHolder(viewHolder: FooterViewHolder) { viewHolder.run { - itemView.setBackgroundColor(R.color.background.toColor(mContext)) + itemView.setBackgroundColor(R.color.ui_background.toColor(mContext)) loading.visibility = View.GONE itemView.isClickable = false hint.setText(R.string.load_over_hint) diff --git a/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2ListFragment.kt b/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2ListFragment.kt index edc3287bb7..fe4896926a 100644 --- a/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2ListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/servers/gametest2/GameServerTestV2ListFragment.kt @@ -106,7 +106,7 @@ class GameServerTestV2ListFragment : mSkeletonScreen = Skeleton.bind(mBinding?.skeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) 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 9266feb406..05f102c876 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 @@ -29,7 +29,7 @@ class PatchKaifuActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) setNavigationTitle("修改开服") mViewModel = ViewModelProviders.of(this).get(PatchKaifuViewModel::class.java) @@ -107,9 +107,9 @@ class PatchKaifuActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mBinding?.run { - root.setBackgroundColor(R.color.background.toColor(this@PatchKaifuActivity)) + root.setBackgroundColor(R.color.ui_background.toColor(this@PatchKaifuActivity)) kaifuAddItemTitle.root.setBackgroundColor(R.color.title.toColor(this@PatchKaifuActivity)) patchName.setHintTextColor(R.color.title.toColor(this@PatchKaifuActivity)) patchName.setTextColor(R.color.title.toColor(this@PatchKaifuActivity)) 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 ff2fb98f88..8722f8be4b 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameActivity.kt @@ -12,14 +12,14 @@ class SimulatorGameActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("模拟器游戏") - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled() = true override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt index ca2bef6f02..afb15ddd94 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameFragment.kt @@ -1,7 +1,6 @@ package com.gh.gamecenter.simulatorgame import android.app.Dialog -import android.graphics.Paint import android.os.Bundle import android.view.Gravity import android.view.LayoutInflater @@ -85,7 +84,7 @@ class SimulatorGameFragment : ToolbarFragment() { mViewModel.isSimulatorGameFirstLoad = false } mBinding.reuseNoneData.reuseNoneData.visibility = View.VISIBLE - mBinding.reuseNoneData.reuseNoneData.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.reuseNoneData.reuseNoneData.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mBinding.reuseNoneData.reuseResetLoadTv.text = "下载模拟器游戏" val param = mBinding.reuseNoneData.reuseResetLoadTv.layoutParams param.width = DisplayUtils.dip2px(180F) diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt index 5a1a64f370..a4ee38298e 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorGameListAdapter.kt @@ -128,7 +128,7 @@ class SimulatorGameListAdapter( PackageUtils.isInstalledApkMatchedMd5(simulator.apk?.packageName, simulator.apk?.md5) text = if (shouldShowUpdate) "更新模拟器" else "" setTextColor( - if (shouldShowUpdate) R.color.theme.toColor(mContext) else R.color.text_subtitleDesc.toColor( + if (shouldShowUpdate) R.color.primary_theme.toColor(mContext) else R.color.text_tertiary.toColor( mContext ) ) @@ -160,7 +160,7 @@ class SimulatorGameListAdapter( } else { if (simulator.active) { text = "安装模拟器" - setTextColor(R.color.theme.toColor(mContext)) + setTextColor(R.color.primary_theme.toColor(mContext)) setOnClickListener { SimulatorDownloadManager.getInstance().showDownloadDialog( context, @@ -192,7 +192,7 @@ class SimulatorGameListAdapter( if (gameEntity.star == 10.0F) "10" else gameEntity.star.toString() } else "" gameRating.setTextColor( - if (gameEntity.commentCount > 3) R.color.theme_font.toColor(mContext) else R.color.theme.toColor( + if (gameEntity.commentCount > 3) R.color.text_theme.toColor(mContext) else R.color.primary_theme.toColor( mContext ) ) 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 de2b175b71..90119e20d1 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementActivity.kt @@ -12,14 +12,14 @@ class SimulatorManagementActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("模拟器管理") - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled() = true override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt index 8770833012..40de562e91 100644 --- a/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/simulatorgame/SimulatorManagementAdapter.kt @@ -58,10 +58,10 @@ class SimulatorManagementAdapter( // val versionFromInstalledApp = PackageUtils.getVersionNameByPackageName(simulator.apk?.packageName) shouldShowUpdate = PackageUtils.isInstalledApkMatchedMd5(simulator.apk?.packageName, simulator.apk?.md5) text = if (shouldShowUpdate) "更新" else "卸载" - setTextColor(if (shouldShowUpdate) R.color.theme.toColor(mContext) else R.color.text_subtitleDesc.toColor(mContext)) + setTextColor(if (shouldShowUpdate) R.color.primary_theme.toColor(mContext) else R.color.text_tertiary.toColor(mContext)) } else { text = "安装" - setTextColor(R.color.theme.toColor(mContext)) + setTextColor(R.color.primary_theme.toColor(mContext)) } setOnClickListener { @@ -116,7 +116,7 @@ class SimulatorManagementAdapter( if (mSingleSelectFlag && position == mSingleSelectedPosition) { holder.binding.container.setBackgroundColor(R.color.bg_F6FBFF.toColor(mContext)) } else { - holder.binding.container.setBackgroundColor(R.color.background_white.toColor(mContext)) + holder.binding.container.setBackgroundColor(R.color.ui_surface.toColor(mContext)) } holder.itemView.setOnClickListener { @@ -144,9 +144,9 @@ class SimulatorManagementAdapter( NewFlatLogUtils.logSimulatorUninstallAlertClick("卸载") }, uiModificationCallback = { binding -> - binding.cancelTv.setTextColor(R.color.theme_red.toColor(mContext)) - binding.confirmTv.setTextColor(R.color.text_subtitle.toColor(mContext)) - binding.contentTv.setTextColor(R.color.text_subtitle.toColor(mContext)) + binding.cancelTv.setTextColor(R.color.secondary_red.toColor(mContext)) + binding.confirmTv.setTextColor(R.color.text_secondary.toColor(mContext)) + binding.contentTv.setTextColor(R.color.text_secondary.toColor(mContext)) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)) if (!mShowSelectFlag) mSingleSelectFlag = true @@ -191,9 +191,9 @@ class SimulatorManagementAdapter( "卸载", cancelClickCallback = { unInstallSimulator() }, uiModificationCallback = { binding -> - binding.cancelTv.setTextColor(R.color.theme_red.toColor(mContext)) - binding.confirmTv.setTextColor(R.color.text_subtitle.toColor(mContext)) - binding.contentTv.setTextColor(R.color.text_subtitle.toColor(mContext)) + binding.cancelTv.setTextColor(R.color.secondary_red.toColor(mContext)) + binding.confirmTv.setTextColor(R.color.text_secondary.toColor(mContext)) + binding.contentTv.setTextColor(R.color.text_secondary.toColor(mContext)) }, extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true) ) 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 9488ec021b..6b645977fe 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectActivity.kt @@ -15,7 +15,7 @@ open class SubjectActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun showDownloadMenu() = true @@ -38,7 +38,7 @@ open class SubjectActivity : DownloadToolbarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt index 272cb9f385..5399689e88 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListFragment.kt @@ -100,7 +100,7 @@ class SubjectListFragment : LazyListFragment() (mListViewModel as SubjectListViewModel).lastPageDataMap = arguments?.get(SubjectFragment.LAST_PAGE_DATA) as? HashMap - mCachedView?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mCachedView?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) val skeletonLayoutId = when (arguments?.getString(EntranceConsts.KEY_SUBJECT_TYPE) ?: "") { "detail" -> R.layout.fragment_subject_detail_skeleton "tab" -> R.layout.fragment_subject_tab_skeleton @@ -110,7 +110,7 @@ class SubjectListFragment : LazyListFragment() .bind(mCachedView.findViewById(R.id.list_skeleton)) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) 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 de6e2c993f..9891895d4b 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 @@ -154,11 +154,11 @@ class SubjectTabFragment : BaseFragment() { if (i == 0) { tab.customView?.background = R.drawable.border_round_theme_14.toDrawable(requireContext()) tab.customView?.findViewById(R.id.tab_title) - ?.setTextColor(R.color.theme_font.toColor(requireContext())) + ?.setTextColor(R.color.text_theme.toColor(requireContext())) } else { tab.customView?.background = R.drawable.border_round_eee_14.toDrawable(requireContext()) tab.customView?.findViewById(R.id.tab_title) - ?.setTextColor(R.color.text_title.toColor(requireContext())) + ?.setTextColor(R.color.text_primary.toColor(requireContext())) } when (i) { @@ -176,13 +176,13 @@ class SubjectTabFragment : BaseFragment() { override fun onTabUnselected(tab: TabLayout.Tab?) { tab?.customView?.background = R.drawable.border_round_eee_14.toDrawable(requireContext()) tab?.customView?.findViewById(R.id.tab_title) - ?.setTextColor(R.color.text_title.toColor(requireContext())) + ?.setTextColor(R.color.text_primary.toColor(requireContext())) } override fun onTabSelected(tab: TabLayout.Tab?) { tab?.customView?.background = R.drawable.border_round_theme_14.toDrawable(requireContext()) tab?.customView?.findViewById(R.id.tab_title) - ?.setTextColor(R.color.theme_font.toColor(requireContext())) + ?.setTextColor(R.color.text_theme.toColor(requireContext())) } }) } @@ -207,7 +207,7 @@ class SubjectTabFragment : BaseFragment() { ) tab.customView?.findViewById(R.id.tab_title) ?.setTextColor( - if (tab.isSelected) R.color.theme_font.toColor(requireContext()) else R.color.text_title.toColor( + if (tab.isSelected) R.color.text_theme.toColor(requireContext()) else R.color.text_primary.toColor( requireContext() ) ) 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 0cc204420c..082f253433 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsActivity.kt @@ -52,7 +52,7 @@ class TagsActivity : DownloadToolbarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setToolbarMenu(R.menu.menu_download) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun showDownloadMenu(): Boolean { @@ -65,7 +65,7 @@ class TagsActivity : DownloadToolbarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } enum class From(val value: String) { 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 3d6047236c..c8dcf0db3d 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListFragment.kt @@ -65,11 +65,11 @@ class TagsListFragment : ListFragment() { setNavigationTitle("标签详情") - mCachedView?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mCachedView?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mSkeletonScreen = Skeleton.bind(mBinding.listSkeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) @@ -173,7 +173,7 @@ class TagsListFragment : ListFragment() { mBaseHandler.postDelayed({ mListViewModel.load(LoadType.REFRESH) }, 200) } - mCachedView?.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mCachedView?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mSkeletonScreen?.show() mReuseNoConn?.visibility = View.GONE mReuseNoData?.visibility = View.GONE @@ -220,18 +220,18 @@ class TagsListFragment : ListFragment() { mSkeletonScreen = Skeleton.bind(mBinding.listSkeleton) .shimmer(true) .angle(Constants.SHIMMER_ANGLE) - .color(R.color.skeleton_shimmer_color) + .color(R.color.ui_skeleton_highlight) .duration(Constants.SHIMMER_DURATION) .maskWidth(Constants.MASK_WIDTH) .gradientCenterColorWidth(Constants.GRADIENT_CENTER_COLOR_WIDTH) .load(R.layout.fragment_tags_skeleton) .show().apply { hide() } - mCachedView?.setBackgroundColor(R.color.background_white.toColor(requireContext())) - mBinding.tagsRecyclerView.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mCachedView?.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) + mBinding.tagsRecyclerView.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mBinding.tagsRecyclerView.adapter?.notifyDataSetChanged() - mBinding.divider.setBackgroundColor(R.color.background.toColor(requireContext())) + mBinding.divider.setBackgroundColor(R.color.ui_background.toColor(requireContext())) mBinding.configContainer.run { - container.setBackgroundColor(R.color.background_white.toColor(requireContext())) + container.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) updateAllTextView(mViewModel.mSortType) updatePopupWindow() } 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 df5218d0eb..289aee11b6 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/PasswordSettingFragment.kt @@ -78,7 +78,7 @@ class PasswordSettingFragment : ToolbarFragment() { } } else { mBinding?.hintTv?.text = "与第一次输入的密码不一致" - mBinding?.hintTv?.setTextColor(R.color.theme_red.toColor(requireContext())) + mBinding?.hintTv?.setTextColor(R.color.secondary_red.toColor(requireContext())) clearContent() } } @@ -113,7 +113,7 @@ class PasswordSettingFragment : ToolbarFragment() { }, { clearContent() mBinding?.hintTv?.text = "密码错误请重新输入" - mBinding?.hintTv?.setTextColor(R.color.theme_red.toColor(requireContext())) + mBinding?.hintTv?.setTextColor(R.color.secondary_red.toColor(requireContext())) }) } } @@ -143,7 +143,7 @@ class PasswordSettingFragment : ToolbarFragment() { clearContent() mBinding?.titleTv?.text = "请输入新密码" mBinding?.hintTv?.text = "设置新的独立密码" - mBinding?.hintTv?.setTextColor(R.color.text_subtitle.toColor(requireContext())) + mBinding?.hintTv?.setTextColor(R.color.text_secondary.toColor(requireContext())) addInputCompleteListener(object : VerifyEditText.InputCompleteListener { override fun onComplete(content: String) { mBinding?.nextTv?.alpha = 1F @@ -168,7 +168,7 @@ class PasswordSettingFragment : ToolbarFragment() { } else { mBinding?.hintTv?.text = "与第一次输入的密码不一致" mBinding?.hintTv?.setTextColor( - R.color.theme_red.toColor( + R.color.secondary_red.toColor( requireContext() ) ) @@ -183,7 +183,7 @@ class PasswordSettingFragment : ToolbarFragment() { }, { clearContent() mBinding?.hintTv?.text = "密码错误请重新输入" - mBinding?.hintTv?.setTextColor(R.color.theme_red.toColor(requireContext())) + mBinding?.hintTv?.setTextColor(R.color.secondary_red.toColor(requireContext())) }) } } @@ -203,16 +203,16 @@ class PasswordSettingFragment : ToolbarFragment() { override fun onDarkModeChanged() { super.onDarkModeChanged() mBinding?.run { - root.setBackgroundColor(R.color.background_white.toColor(requireContext())) + root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) include.backBtn.setImageResource(R.drawable.ic_bar_back) - titleTv.setTextColor(R.color.text_title.toColor(requireContext())) - hintTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) - resetPwdTv.setTextColor(R.color.theme_font.toColor(requireContext())) + titleTv.setTextColor(R.color.text_primary.toColor(requireContext())) + hintTv.setTextColor(R.color.text_secondary.toColor(requireContext())) + resetPwdTv.setTextColor(R.color.text_theme.toColor(requireContext())) nextTv.background = R.drawable.download_button_normal_style.toDrawable(requireContext()) verifyEt.setTextViewStyle( R.drawable.bg_verify_password.toDrawable(requireContext()), R.drawable.bg_verify_password_select.toDrawable(requireContext()), - R.color.text_title.toColor(requireContext()) + R.color.text_primary.toColor(requireContext()) ) } } 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 20717f6e3f..b93ed597b0 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeActivity.kt @@ -16,7 +16,7 @@ class TeenagerModeActivity : BaseActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mContainerFragment = supportFragmentManager.findFragmentByTag(TeenagerModeFragment::class.java.name) ?: TeenagerModeFragment().with(intent.extras) if (mContainerFragment?.isAdded == false) { @@ -30,7 +30,7 @@ class TeenagerModeActivity : BaseActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { 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 78d2262ecf..00e9966539 100644 --- a/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/teenagermode/TeenagerModeFragment.kt @@ -65,7 +65,7 @@ class TeenagerModeFragment : ToolbarFragment() { requireContext(), hintText.length - clickText.length, hintText.length, - R.color.theme_font, + R.color.text_theme, false ) { startActivity(WebActivity.getWebIntent(requireContext(), "儿童/青少年使用须知", Constants.TEEN_MODE_RULE)) @@ -105,12 +105,12 @@ class TeenagerModeFragment : ToolbarFragment() { override fun onDarkModeChanged() { super.onDarkModeChanged() mBinding?.run { - root.setBackgroundColor(R.color.background_white.toColor(requireContext())) + root.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) include.backBtn.setImageResource(R.drawable.ic_bar_back) - titleTv.setTextColor(R.color.text_title.toColor(requireContext())) - desTv.setTextColor(R.color.text_title.toColor(requireContext())) - hintTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) - changePwdTv.setTextColor(R.color.theme_font.toColor(requireContext())) + titleTv.setTextColor(R.color.text_primary.toColor(requireContext())) + desTv.setTextColor(R.color.text_primary.toColor(requireContext())) + hintTv.setTextColor(R.color.text_secondary.toColor(requireContext())) + changePwdTv.setTextColor(R.color.text_theme.toColor(requireContext())) switchTv.background = R.drawable.download_button_normal_style.toDrawable(requireContext()) } } 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 c43f670636..db65fa30f0 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockActivity.kt @@ -49,7 +49,7 @@ class ToolBoxBlockActivity : ToolBarActivity() { mSearchAdapter = ToolBoxItemAdapter(this, false, mViewModel) mLayoutManager = LinearLayoutManager(this@ToolBoxBlockActivity) setNavigationTitle("光环工具箱") - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) // 跳转到工具箱 https://gitlab.ghzs.com/pm/halo-app-issues/issues/636 val gameId = intent.getStringExtra(EntranceConsts.KEY_GAMEID) @@ -66,11 +66,11 @@ class ToolBoxBlockActivity : ToolBarActivity() { } mBinding.run { - toolboxRefresh.setColorSchemeResources(R.color.theme) + toolboxRefresh.setColorSchemeResources(R.color.primary_theme) toolboxRefresh.setOnRefreshListener { refresh() } - feedbackTv.text = SpanBuilder("需要其他工具，点击反馈").click(this@ToolBoxBlockActivity, 7, 11, R.color.theme, false) { + feedbackTv.text = SpanBuilder("需要其他工具，点击反馈").click(this@ToolBoxBlockActivity, 7, 11, R.color.primary_theme, false) { HelpAndFeedbackBridge.startSuggestionActivity( this@ToolBoxBlockActivity, SuggestType.UPDATE, @@ -270,11 +270,11 @@ class ToolBoxBlockActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) if (::mBinding.isInitialized) { mBinding.run { toolboxRv.adapter?.run { notifyItemRangeChanged(0, itemCount) } - feedbackCv.setCardBackgroundColor(R.color.background_white.toColor(this@ToolBoxBlockActivity)) + feedbackCv.setCardBackgroundColor(R.color.ui_surface.toColor(this@ToolBoxBlockActivity)) } } } diff --git a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockAdapter.kt b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockAdapter.kt index dd2f15604d..c31e163a31 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxBlockAdapter.kt @@ -82,9 +82,9 @@ class ToolBoxBlockAdapter(context: Context, private val mViewModel: ToolBoxViewM fun bindToolBoxBlock(toolBoxBlockEntity: ToolBoxBlockEntity) { val context = binding.root.context - binding.divider.setBackgroundColor(R.color.divider.toColor(context)) - binding.titleTv.setTextColor(R.color.text_title.toColor(context)) - binding.expandTv.setTextColor(R.color.text_subtitleDesc.toColor(context)) + binding.divider.setBackgroundColor(R.color.ui_divider.toColor(context)) + binding.titleTv.setTextColor(R.color.text_primary.toColor(context)) + binding.expandTv.setTextColor(R.color.text_tertiary.toColor(context)) binding.titleTv.text = toolBoxBlockEntity.categoryName binding.expandContainer.goneIf(toolBoxBlockEntity.toolboxList.size < 5) binding.expandContainer.setOnClickListener { 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 29d1b0ff1d..655042f64c 100644 --- a/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/toolbox/ToolBoxItemAdapter.kt @@ -95,9 +95,9 @@ class ToolBoxItemAdapter( private fun initToolBoxViewHolder(viewHolder: ToolBoxViewHolder, toolBoxEntity: ToolBoxEntity) { viewHolder.binding.run { - divider.setBackgroundColor(R.color.divider.toColor(mContext)) - toolboxItemTitle.setTextColor(R.color.text_title.toColor(mContext)) - toolboxItemDes.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + divider.setBackgroundColor(R.color.ui_divider.toColor(mContext)) + toolboxItemTitle.setTextColor(R.color.text_primary.toColor(mContext)) + toolboxItemDes.setTextColor(R.color.text_tertiary.toColor(mContext)) } viewHolder.binding.toolboxItemDes.text = toolBoxEntity.des diff --git a/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt index 11358ec192..15fc48f13d 100644 --- a/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/video/VideoItemViewHolder.kt @@ -12,8 +12,8 @@ class VideoItemViewHolder(var binding: VideoNewItemBinding) : BaseRecyclerViewHo fun bindVideoItem(entity: MyVideoEntity) { binding.run { root.setRootBackgroundDrawable(R.drawable.background_shape_white_radius_6) - videoTitle.setTextColor(R.color.text_title.toColor(root.context)) - userName.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) + videoTitle.setTextColor(R.color.text_primary.toColor(root.context)) + userName.setTextColor(R.color.text_tertiary.toColor(root.context)) ImageUtils.display(videoCover, entity.poster) videoLikeCount.text = entity.vote.toSimpleCount() videoCommentCount.text = entity.commentCount.toSimpleCount() @@ -21,7 +21,7 @@ class VideoItemViewHolder(var binding: VideoNewItemBinding) : BaseRecyclerViewHo videoTitle.text = entity.title ImageUtils.display(userIcon, entity.user.icon) userIcon.hierarchy.roundingParams = userIcon.hierarchy.roundingParams?.apply { - borderColor = R.color.background.toColor(userIcon.context) + borderColor = R.color.ui_background.toColor(userIcon.context) } userName.text = entity.user.name } diff --git a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt index c4a0f728b2..de3c090f52 100644 --- a/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/data/VideoDataAdapter.kt @@ -134,12 +134,12 @@ class VideoDataAdapter(context: Context) : ListAdapter(context) { xAxis.labelCount = datasX.size //不显示网格线 xAxis.setDrawGridLines(false) - xAxis.textColor = ContextCompat.getColor(mContext, R.color.text_subtitleDesc) + xAxis.textColor = ContextCompat.getColor(mContext, R.color.text_tertiary) xAxis.textSize = 10f //设置此属性必须要设置[lineChart.extraBottomOffset]，否则底部会被裁剪 xAxis.yOffset = 14f xAxis.axisLineWidth = 2f - xAxis.axisLineColor = ContextCompat.getColor(mContext, R.color.background) + xAxis.axisLineColor = ContextCompat.getColor(mContext, R.color.ui_background) xAxis.valueFormatter = object : ValueFormatter() { override fun getFormattedValue(value: Float): String { val date = datasX[(value % datasX.size).toInt()] @@ -156,7 +156,7 @@ class VideoDataAdapter(context: Context) : ListAdapter(context) { yAxis.setDrawAxisLine(false)//不显示左侧Y轴 yAxis.setDrawGridLines(true) - yAxis.gridColor = ContextCompat.getColor(mContext, R.color.background) + yAxis.gridColor = ContextCompat.getColor(mContext, R.color.ui_background) yAxis.gridLineWidth = 1f //设置Y轴坐标之间的最小间隔 val maxValue = datasY.maxOrNull() ?: 0 @@ -169,7 +169,7 @@ class VideoDataAdapter(context: Context) : ListAdapter(context) { //https://stackoverflow.com/questions/48060395/mpandroidchart-line-graph-line-gets-cut-inbetween yAxis.axisMinimum = -0.01f yAxis.axisMaximum = if (transformNum == 0) 2f else transformNum * 2f - yAxis.textColor = ContextCompat.getColor(mContext, R.color.text_subtitleDesc) + yAxis.textColor = ContextCompat.getColor(mContext, R.color.text_tertiary) yAxis.textSize = 11f yAxis.xOffset = 8f yAxis.valueFormatter = object : ValueFormatter() { 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 ca76969e60..5e024c1744 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 @@ -75,7 +75,7 @@ class VideoDataFragment : BaseFragment() { } private fun getItemDecoration(): RecyclerView.ItemDecoration { - return VerticalItemDecoration(requireContext(), 40F, false, R.color.background_white) + return VerticalItemDecoration(requireContext(), 40F, false, R.color.ui_surface) } private fun loadErrorControl() { 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 8dbf886768..e69f8a579a 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 @@ -105,7 +105,7 @@ class GameVideoActivity : ToolBarActivity() { 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)) + mBinding.tabContainer.setBackgroundColor(R.color.ui_surface.toColor(this)) for (i in 0 until mBinding.tabLayout.tabCount) { val tab = mBinding.tabLayout.getTabAt(i) if (tab != null) { diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt index b27b39bfbc..4b9b82d8df 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelAdapter.kt @@ -37,9 +37,9 @@ class VideoLabelAdapter( override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { if (holder is VideoLabelViewHolder) { holder.binding.run { - root.setRootBackgroundColor(R.color.background_white) - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - contentTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + root.setRootBackgroundColor(R.color.ui_surface) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + contentTv.setTextColor(R.color.text_tertiary.toColor(mContext)) } val activityLabelEntity = entityList[position] diff --git a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt index 6f69acbbef..111c84df76 100644 --- a/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/label/VideoLabelFragment.kt @@ -43,7 +43,7 @@ class VideoLabelFragment : ToolbarFragment() { val decoration = HorizontalDividerItemDecoration.Builder(requireContext()) .size(1f.dip2px()) .margin(20f.dip2px()) - .color(ContextCompat.getColor(requireContext(), R.color.background)).build() + .color(ContextCompat.getColor(requireContext(), R.color.ui_background)).build() addItemDecoration(decoration) adapter = mAdapter } diff --git a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt index 42169bd9d0..fe263d792c 100644 --- a/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/upload/view/UploadVideoActivity.kt @@ -96,7 +96,7 @@ class UploadVideoActivity : ToolBarActivity() { if (game != null) { mViewModel.gameEntity = SimpleGameEntity(game.id, game.name ?: "") mBinding.gameName.text = game.name - mBinding.gameName.setTextColor(resources.getColor(R.color.text_title)) + mBinding.gameName.setTextColor(resources.getColor(R.color.text_primary)) } } else if (requestCode == REQUEST_CODE_IMAGE_STORE && resultCode == Activity.RESULT_OK) { if (data != null) { @@ -231,7 +231,7 @@ class UploadVideoActivity : ToolBarActivity() { if (mViewModel.gameEntity != null) { mBinding.gameName.text = mViewModel.gameEntity?.name ?: "" - mBinding.gameName.setTextColor(resources.getColor(R.color.text_title)) + mBinding.gameName.setTextColor(resources.getColor(R.color.text_primary)) } } @@ -371,7 +371,7 @@ class UploadVideoActivity : ToolBarActivity() { val videoPatch = mViewModel.videoPatch if (videoPatch != null) { mBinding.gameName.text = videoPatch.gameName - mBinding.gameName.setTextColor(resources.getColor(R.color.text_subtitleDesc)) + mBinding.gameName.setTextColor(resources.getColor(R.color.text_tertiary)) mBinding.gameTitle.setText(videoPatch.title) mBinding.gameTitle.setSelection(mBinding.gameTitle.text.toString().length) mBinding.gameName.isEnabled = false @@ -406,7 +406,7 @@ class UploadVideoActivity : ToolBarActivity() { if (videoDraft.gameId.isNotEmpty()) { mViewModel.gameEntity = SimpleGameEntity(videoDraft.gameId, videoDraft.gameName) mBinding.gameName.text = videoDraft.gameName - mBinding.gameName.setTextColor(resources.getColor(R.color.text_title)) + mBinding.gameName.setTextColor(resources.getColor(R.color.text_primary)) } if (videoDraft.tagActivityId.isNotEmpty() && videoDraft.tagActivityName.isNotEmpty()) { mActivityLabelEntity = ActivityLabelEntity(videoDraft.tagActivityId, videoDraft.tagActivityName) @@ -678,8 +678,8 @@ class UploadVideoActivity : ToolBarActivity() { flexCell.gravity = Gravity.CENTER flexCell.text = videoTagEntity.name flexCell.tag = videoTagEntity.id - flexCell.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_subtitle, R.color.white)) - flexCell.background = DrawableView.getOvalSelectorStyle(R.color.text_f2f2f2, R.color.theme) + flexCell.setTextColor(DrawableView.getSelectorColorStyle(R.color.text_secondary, R.color.white)) + flexCell.background = DrawableView.getOvalSelectorStyle(R.color.text_f2f2f2, R.color.primary_theme) flexCell.setPadding(12F.dip2px(), 0, 12F.dip2px(), 0) flexCell.setOnClickListener { Util_System_Keyboard.hideSoftKeyboard(this, mBinding.gameTitle) @@ -694,7 +694,7 @@ class UploadVideoActivity : ToolBarActivity() { uploadProtocolText.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = resources.getColor(R.color.theme_font) + ds.color = resources.getColor(R.color.text_theme) ds.isUnderlineText = false } 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 262087e1d8..37a5d3286d 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 @@ -12,14 +12,14 @@ class VideoDraftActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setNavigationTitle("视频草稿") - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun isAutoResetViewBackgroundEnabled(): Boolean = true override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt index 464370bb73..48cf180994 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoManagerActivity.kt @@ -12,7 +12,6 @@ import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout import com.gh.common.util.* import com.gh.gamecenter.R import com.gh.gamecenter.common.constant.EntranceConsts -import com.gh.gamecenter.core.utils.EmptyCallback import com.gh.gamecenter.common.utils.PermissionHelper import com.gh.gamecenter.common.utils.updateStatusBarColor import com.gh.gamecenter.core.utils.MtaHelper @@ -58,7 +57,7 @@ class VideoManagerActivity : BaseActivity_TabLayout() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) setNavigationTitle("视频投稿") setToolbarMenu(R.menu.menu_text) mVideoLink = intent.getParcelableExtra(VideoLinkEntity::class.java.simpleName) @@ -111,7 +110,7 @@ class VideoManagerActivity : BaseActivity_TabLayout() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt index 9841ae781a..11ee1bd09f 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt @@ -75,7 +75,7 @@ class VideoVerifyAdapter( } } else if (entity.status == "pass") { val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.CHINA) - holder.binding.videoStatus.setTextColor(R.color.text_subtitleDesc.toColor()) + holder.binding.videoStatus.setTextColor(R.color.text_tertiary.toColor()) holder.binding.videoStatus.text = dateFormat.format(entity.time.upload * 1000) } else { VideoVerifyItemViewHolder.setVideoStatus(holder.binding.videoStatus, entity.status) @@ -169,8 +169,8 @@ class VideoVerifyAdapter( val hitText = item.findViewById(R.id.hint_text) hitText.text = text if (entity.status == "pending" && text == "删除") { - hitText.setBackgroundColor(R.color.background.toColor()) - hitText.setTextColor(R.color.text_body.toColor()) + hitText.setBackgroundColor(R.color.ui_background.toColor()) + hitText.setTextColor(R.color.text_instance.toColor()) } item.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/vote/VoteAdapter.kt b/app/src/main/java/com/gh/gamecenter/vote/VoteAdapter.kt index ab1f0e05f6..b4dbc99943 100644 --- a/app/src/main/java/com/gh/gamecenter/vote/VoteAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/vote/VoteAdapter.kt @@ -11,7 +11,6 @@ import android.widget.TextView import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.gh.common.exposure.IExposable -import com.gh.common.util.DialogUtils import com.gh.common.util.DirectUtils.directToLinkPage import com.gh.common.util.NewFlatLogUtils import com.gh.gamecenter.CleanApkActivity @@ -71,17 +70,17 @@ class VoteAdapter( holder.binding.root.setBackgroundColor( if (versionVoteEntity.isHighLight) R.color.comment_highlight.toColor( mContext - ) else R.color.background_white.toColor(mContext) + ) else R.color.ui_surface.toColor(mContext) ) if (versionVoteEntity.open) { val userData = versionVoteEntity.me if (userData != null && userData.isVersionRequested) { holder.binding.voteItemBtn.background = R.drawable.button_round_border_eeeeee.toDrawable(mContext) - holder.binding.voteItemBtn.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + holder.binding.voteItemBtn.setTextColor(R.color.text_tertiary.toColor(mContext)) holder.binding.voteItemBtn.setText(R.string.voted) } else { holder.binding.voteItemBtn.background = R.drawable.button_round_primary_light.toDrawable(mContext) - holder.binding.voteItemBtn.setTextColor(R.color.theme_font.toColor(mContext)) + holder.binding.voteItemBtn.setTextColor(R.color.text_theme.toColor(mContext)) holder.binding.voteItemBtn.setText(R.string.vote) } } else { @@ -113,12 +112,12 @@ class VoteAdapter( val uploadText = "去上传>" val allReplyText = "$replyText $uploadText" replyText = SpanBuilder(allReplyText) - .color(mContext, 0, 5, R.color.theme_font) + .color(mContext, 0, 5, R.color.text_theme) .click( mContext, replyText.length + 1, allReplyText.length, - R.color.theme_font, + R.color.text_theme, false ) { val isUserUploaded = versionVoteEntity.me?.requestsVersionApkUploaded ?: false @@ -136,7 +135,7 @@ class VoteAdapter( holder.binding.voteItemReply.movementMethod = CustomLinkMovementMethod.getInstance() } else { replyText = SpanBuilder(replyText) - .color(mContext, 0, 5, R.color.theme_font).build() + .color(mContext, 0, 5, R.color.text_theme).build() } holder.binding.voteItemReply.text = replyText holder.binding.voteItemReply.visibility = View.VISIBLE @@ -174,7 +173,7 @@ class VoteAdapter( }, cancelClickCallback = { NewFlatLogUtils.logGameDetailCancelForVersionVote(mGameId, mGameName, "暂不取消") }, uiModificationCallback = { - it.confirmTv.setTextColor(R.color.theme_red.toColor(mContext)) + it.confirmTv.setTextColor(R.color.secondary_red.toColor(mContext)) }, extraConfig = DialogHelper.Config(centerContent = true, centerTitle = true) ) } else { @@ -229,7 +228,7 @@ class VoteAdapter( viewHolder.loading.visibility = View.GONE viewHolder.hint.run { text = "添加选项" - setTextColor(R.color.theme_font.toColor(mContext)) + setTextColor(R.color.text_theme.toColor(mContext)) textSize = 14F setDrawableStart(R.drawable.ic_add_vote) compoundDrawablePadding = 4F.dip2px() diff --git a/app/src/main/java/com/gh/vspace/VDownloadManagerActivity.kt b/app/src/main/java/com/gh/vspace/VDownloadManagerActivity.kt index f712339beb..92979c77e5 100644 --- a/app/src/main/java/com/gh/vspace/VDownloadManagerActivity.kt +++ b/app/src/main/java/com/gh/vspace/VDownloadManagerActivity.kt @@ -14,7 +14,7 @@ class VDownloadManagerActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) if (savedInstanceState == null) { mFragment = VDownloadManagerWrapperFragment() mFragment?.arguments = intent.extras @@ -33,7 +33,7 @@ class VDownloadManagerActivity : ToolBarActivity() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt b/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt index 76e4ab1d02..7d2e5a3d13 100644 --- a/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt +++ b/app/src/main/java/com/gh/vspace/VDownloadManagerAdapter.kt @@ -329,8 +329,8 @@ class VDownloadManagerAdapter( } }, uiModificationCallback = { - it.cancelTv.setTextColor(R.color.theme_red.toColor(it.root.context)) - it.confirmTv.setTextColor(R.color.text_subtitle.toColor(it.root.context)) + it.cancelTv.setTextColor(R.color.secondary_red.toColor(it.root.context)) + it.confirmTv.setTextColor(R.color.text_secondary.toColor(it.root.context)) }, extraConfig = DialogHelper.Config(centerTitle = true) )?.setOnCancelListener { @@ -384,8 +384,8 @@ class VDownloadManagerAdapter( } }, uiModificationCallback = { - it.cancelTv.setTextColor(R.color.theme_red.toColor(it.root.context)) - it.confirmTv.setTextColor(R.color.text_subtitle.toColor(it.root.context)) + it.cancelTv.setTextColor(R.color.secondary_red.toColor(it.root.context)) + it.confirmTv.setTextColor(R.color.text_secondary.toColor(it.root.context)) }, extraConfig = DialogHelper.Config(centerTitle = true) ) @@ -410,9 +410,9 @@ class VDownloadManagerAdapter( fun updatePopupWindow() { mPopupBinding?.run { - root.setBackgroundColor(R.color.background_white.toColor(mContext)) - checkAllCb.setTextColor(R.color.text_title.toColor(mContext)) - selectNumTv.setTextColor(R.color.theme_font.toColor(mContext)) + root.setBackgroundColor(R.color.ui_surface.toColor(mContext)) + checkAllCb.setTextColor(R.color.text_primary.toColor(mContext)) + selectNumTv.setTextColor(R.color.text_theme.toColor(mContext)) checkAllCb.setDrawableStart(DrawableView.getCheckSelectorDrawable(mContext)) checkSelectItems() } @@ -426,7 +426,7 @@ class VDownloadManagerAdapter( mContext ) itemDelete.setTextColor( - if (selectItems.isEmpty()) R.color.text_subtitle.toColor(mContext) else R.color.white.toColor( + if (selectItems.isEmpty()) R.color.text_secondary.toColor(mContext) else R.color.white.toColor( mContext ) ) @@ -480,7 +480,7 @@ class VDownloadManagerAdapter( downloadEntity.speed * 1024 ) downloadDes.text = "$speedText(剩$remainTimeText)" - downloadDes.setTextColor(R.color.theme_font.toColor(mContext)) + downloadDes.setTextColor(R.color.text_theme.toColor(mContext)) backgroundType = DownloadButton.ButtonStyle.DOWNLOADING_NORMAL progress = (downloadEntity.percent * 10).toInt() setOnClickListener { @@ -492,7 +492,7 @@ class VDownloadManagerAdapter( backgroundType = DownloadButton.ButtonStyle.WAITING downloadDes.visibility = View.VISIBLE downloadDes.text = context.getString(R.string.waiting) - downloadDes.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + downloadDes.setTextColor(R.color.text_tertiary.toColor(mContext)) setOnClickListener { Utils.toast(mContext, "最多只能同时下载三个任务，请稍等"); } } DownloadStatus.pause, @@ -505,7 +505,7 @@ class VDownloadManagerAdapter( btnText = context.getString(R.string.resume) downloadDes.visibility = View.VISIBLE downloadDes.text = if (status == DownloadStatus.subscribe) "等待WIFI" else "已暂停" - downloadDes.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + downloadDes.setTextColor(R.color.text_tertiary.toColor(mContext)) setOnClickListener { DownloadManager.getInstance().resume(downloadEntity, true) } diff --git a/app/src/main/java/com/gh/vspace/VDownloadManagerFragment.kt b/app/src/main/java/com/gh/vspace/VDownloadManagerFragment.kt index cc90ebbf4e..cc55d184ab 100644 --- a/app/src/main/java/com/gh/vspace/VDownloadManagerFragment.kt +++ b/app/src/main/java/com/gh/vspace/VDownloadManagerFragment.kt @@ -71,7 +71,7 @@ class VDownloadManagerFragment : override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - mCachedView.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mCachedView.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mBinding.headerContainer.run { goneIf(mViewModel.type != VDownloadManagerViewModel.TYPE_DOWNLOADED) diff --git a/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt b/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt index b0c0322e1c..13ecc8031e 100644 --- a/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt +++ b/app/src/main/java/com/gh/vspace/VFeedbackDialogFragment.kt @@ -126,10 +126,10 @@ class VFeedbackDialogFragment : BaseDialogFragment() { binding.feedbackTagTv.width = (DisplayUtils.getScreenWidth() - 58F.dip2px()) / 2 binding.feedbackTagTv.text = feedbackTag.tagName if (feedbackTag.checked) { - binding.feedbackTagTv.setTextColor(R.color.theme_font.toColor(requireContext())) + binding.feedbackTagTv.setTextColor(R.color.text_theme.toColor(requireContext())) binding.feedbackTagTv.setBackgroundResource(R.drawable.bg_vfeedback_label_selected) } else { - binding.feedbackTagTv.setTextColor(R.color.text_subtitle.toColor(requireContext())) + binding.feedbackTagTv.setTextColor(R.color.text_secondary.toColor(requireContext())) binding.feedbackTagTv.setBackgroundResource(R.drawable.bg_vfeedback_label) } binding.root.setOnClickListener { diff --git a/app/src/main/java/com/gh/vspace/VHelper.kt b/app/src/main/java/com/gh/vspace/VHelper.kt index 550d47600e..5b071c4d0e 100644 --- a/app/src/main/java/com/gh/vspace/VHelper.kt +++ b/app/src/main/java/com/gh/vspace/VHelper.kt @@ -602,10 +602,10 @@ object VHelper { uiModificationCallback = { if (updateEntity.isAlertEveryTime()) { it.confirmTv.visibility = View.GONE - it.cancelTv.setTextColor(R.color.theme_font.toColor(context)) + it.cancelTv.setTextColor(R.color.text_theme.toColor(context)) } - it.confirmTv.setTextColor(R.color.text_subtitle.toColor(context)) + it.confirmTv.setTextColor(R.color.text_secondary.toColor(context)) } ) return diff --git a/app/src/main/java/com/gh/vspace/gapps/GAppsDownloadDialogFragment.kt b/app/src/main/java/com/gh/vspace/gapps/GAppsDownloadDialogFragment.kt index 4175eb64e8..d6562ea2fb 100644 --- a/app/src/main/java/com/gh/vspace/gapps/GAppsDownloadDialogFragment.kt +++ b/app/src/main/java/com/gh/vspace/gapps/GAppsDownloadDialogFragment.kt @@ -306,7 +306,7 @@ class GAppsDownloadDialogFragment : BaseBottomDialogFragment 3 ? ExtensionsKt.toDrawable(R.drawable.game_horizontal_rating) : null, null, null); binding.gameItemIncluded.gameRating.setPadding(0, 0, gameEntity.getCommentCount() > 3 ? DisplayUtils.dip2px(8) : 0, 0); binding.gameItemIncluded.gameRating.setText(gameEntity.getCommentCount() > 3 ? (gameEntity.getStar() == 10.0 ? "10" : String.valueOf(gameEntity.getStar())) : ""); - binding.gameItemIncluded.gameRating.setTextColor(gameEntity.getCommentCount() > 3 ? ExtensionsKt.toColor(R.color.theme_font) : ExtensionsKt.toColor(R.color.theme)); + binding.gameItemIncluded.gameRating.setTextColor(gameEntity.getCommentCount() > 3 ? ExtensionsKt.toColor(R.color.text_theme) : ExtensionsKt.toColor(R.color.primary_theme)); binding.gameItemIncluded.gameDes.setText(gameEntity.getDecoratedDes()); binding.gameItemIncluded.recommendStar.setRating(gameEntity.getRecommendStar()); GameItemViewHolder.initGameSubtitleAndAdLabel(gameEntity, binding.gameItemIncluded.gameSubtitleTv, binding.gameItemIncluded.gameNameContainer, binding.gameItemIncluded.gameName, false, null, false, null); diff --git a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java index 643bf828c6..59936be2c7 100644 --- a/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java +++ b/app/src/main/java/com/halo/assistant/fragment/myconcern/MyConcernAdapter.java @@ -107,14 +107,14 @@ class MyConcernAdapter extends BaseRecyclerAdapter { holder.binding.getRoot().setBackground(ContextCompat.getDrawable(mContext, R.drawable.reuse_listview_item_style)); holder.binding.concernItemName.setText(gameEntity.getName()); - holder.binding.concernItemName.setTextColor(ContextCompat.getColor(mContext, R.color.text_title)); + holder.binding.concernItemName.setTextColor(ContextCompat.getColor(mContext, R.color.text_primary)); if (gameEntity.isRelated()) { holder.binding.concernItemConcern.setText("关联关注"); - holder.binding.concernItemConcern.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); + holder.binding.concernItemConcern.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); holder.binding.concernItemConcern.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_round_border_eeeeee)); } else { holder.binding.concernItemConcern.setText(R.string.cancel_concern); - holder.binding.concernItemConcern.setTextColor(ContextCompat.getColor(mContext, R.color.theme_font)); + holder.binding.concernItemConcern.setTextColor(ContextCompat.getColor(mContext, R.color.text_theme)); holder.binding.concernItemConcern.setBackground(ContextCompat.getDrawable(mContext, R.drawable.button_border_blue_oval)); } holder.binding.concernItemConcern.setOnClickListener(v -> { 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 e94a0d1585..b18d6fdc72 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 @@ -84,7 +84,7 @@ public class MyConcernFragment extends ToolbarFragment implements OnRequestCallB mNoneData.setVisibility(View.VISIBLE); mConcernRv.setVisibility(View.GONE); mNoDataTv.setText(R.string.login_hint); - mNoDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.theme)); + mNoDataTv.setTextColor(ContextCompat.getColor(getContext(), R.color.primary_theme)); } else { mConcernRv.setVisibility(View.VISIBLE); } 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 6029cb9a25..c4c750996f 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 @@ -44,7 +44,7 @@ class RealNameInfoFragment : ToolbarFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - requireActivity().updateStatusBarColor(R.color.background_white, R.color.background_white) + requireActivity().updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mIsForcedToCertificate = arguments?.getBoolean(EntranceConsts.KEY_IS_FORCED_TO_CERTIFICATE) ?: false mHasBackdoor = @@ -134,7 +134,7 @@ class RealNameInfoFragment : ToolbarFragment() { requireContext(), bodyString.length - "前往了解更多信息>>".length, bodyString.length, - R.color.theme_font + R.color.text_theme ) { DirectUtils.directToWebView( requireContext(), @@ -159,7 +159,7 @@ class RealNameInfoFragment : ToolbarFragment() { manualHintString.length - "人工审核".length, manualHintString.length, isUnderlineText = true, - colorRes = R.color.theme_font + colorRes = R.color.text_theme ) { startActivity( ShellActivity.getIntent( @@ -377,11 +377,11 @@ class RealNameInfoFragment : ToolbarFragment() { override fun onDarkModeChanged() { super.onDarkModeChanged() - requireActivity().updateStatusBarColor(R.color.background_white, R.color.background_white) + requireActivity().updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mBinding.toolbar.run { - normalToolbar.setBackgroundColor(R.color.background_white.toColor(requireContext())) + normalToolbar.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) backBtn.setImageResource(R.drawable.ic_bar_back) - normalTitle.setTextColor(R.color.text_title.toColor(requireContext())) + normalTitle.setTextColor(R.color.text_primary.toColor(requireContext())) } } diff --git a/app/src/main/java/com/halo/assistant/fragment/user/VerifyPhoneFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/VerifyPhoneFragment.kt index 4908bbd255..dc04bb1435 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/VerifyPhoneFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/VerifyPhoneFragment.kt @@ -30,7 +30,7 @@ class VerifyPhoneFragment : ToolbarFragment() { } else { mBinding.captchaTv.run { text = "重新获取" - setTextColor(R.color.theme_font.toColor(requireContext())) + setTextColor(R.color.text_theme.toColor(requireContext())) isEnabled = true } } @@ -91,10 +91,10 @@ class VerifyPhoneFragment : ToolbarFragment() { val checkPhone = s.trim { it <= ' ' }.replace(" ".toRegex(), "") if (checkPhone.length < 11) { mBinding.captchaTv.isEnabled = false - mBinding.captchaTv.setTextColor(R.color.text_subtitleDesc.toColor(requireContext())) + mBinding.captchaTv.setTextColor(R.color.text_tertiary.toColor(requireContext())) } else { mBinding.captchaTv.isEnabled = true - mBinding.captchaTv.setTextColor(R.color.theme_font.toColor(requireContext())) + mBinding.captchaTv.setTextColor(R.color.text_theme.toColor(requireContext())) } } diff --git a/app/src/main/java/com/halo/assistant/fragment/user/auth/UserAuthAdapter.kt b/app/src/main/java/com/halo/assistant/fragment/user/auth/UserAuthAdapter.kt index 01af562c1c..3e29846000 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/auth/UserAuthAdapter.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/auth/UserAuthAdapter.kt @@ -32,13 +32,13 @@ class UserAuthAdapter(context: Context, private val mViewModel: UserAuthViewMode if (holder is UserAuthItemViewHolder) { val entity = mEntityList.safelyGetInRelease(position) holder.binding.run { - nameTv.setTextColor(R.color.text_title.toColor(mContext)) - applyingTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - expireTimeTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) - timeTv.setTextColor(R.color.text_title.toColor(mContext)) - divider.setBackgroundColor(R.color.divider.toColor(mContext)) + nameTv.setTextColor(R.color.text_primary.toColor(mContext)) + applyingTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + expireTimeTv.setTextColor(R.color.text_tertiary.toColor(mContext)) + timeTv.setTextColor(R.color.text_primary.toColor(mContext)) + divider.setBackgroundColor(R.color.ui_divider.toColor(mContext)) applyBtn.background = R.drawable.button_round_primary_light.toDrawable(mContext) - applyBtn.setTextColor(R.color.theme_font.toColor(mContext)) + applyBtn.setTextColor(R.color.text_theme.toColor(mContext)) ImageUtils.display(iconIv, entity?.auth?.icon) nameTv.text = entity?.auth?.text expireTimeTv.visibleIf(entity?.time != null) @@ -61,7 +61,7 @@ class UserAuthAdapter(context: Context, private val mViewModel: UserAuthViewMode if (holder is FooterViewHolder) { holder.initItemPadding() holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver) - holder.hint.setTextColor(R.color.text_body.toColor(mContext)) + holder.hint.setTextColor(R.color.text_instance.toColor(mContext)) val lp = holder.itemView.layoutParams as RecyclerView.LayoutParams lp.height = DisplayUtils.dip2px(48F) lp.width = ViewGroup.LayoutParams.MATCH_PARENT diff --git a/app/src/main/java/com/halo/assistant/fragment/user/auth/UserAuthFragment.kt b/app/src/main/java/com/halo/assistant/fragment/user/auth/UserAuthFragment.kt index 8f35176c8a..b197064a7c 100644 --- a/app/src/main/java/com/halo/assistant/fragment/user/auth/UserAuthFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/user/auth/UserAuthFragment.kt @@ -24,12 +24,12 @@ class UserAuthFragment: ListFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - mCachedView.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mCachedView.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) } override fun onDarkModeChanged() { super.onDarkModeChanged() - mCachedView.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mCachedView.setBackgroundColor(R.color.ui_surface.toColor(requireContext())) mAdapter.run { notifyItemRangeChanged(0, itemCount) } diff --git a/app/src/main/res/color/comment_send_btn_dark_selector.xml b/app/src/main/res/color/comment_send_btn_dark_selector.xml index 2419dad8d8..4de5af09c1 100644 --- a/app/src/main/res/color/comment_send_btn_dark_selector.xml +++ b/app/src/main/res/color/comment_send_btn_dark_selector.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/comment_send_btn_selector.xml b/app/src/main/res/color/comment_send_btn_selector.xml index 136d34c88b..353fefc0c3 100644 --- a/app/src/main/res/color/comment_send_btn_selector.xml +++ b/app/src/main/res/color/comment_send_btn_selector.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/community_home_text_tabbar_style.xml b/app/src/main/res/color/community_home_text_tabbar_style.xml index fdde2497c8..840c7dd82e 100644 --- a/app/src/main/res/color/community_home_text_tabbar_style.xml +++ b/app/src/main/res/color/community_home_text_tabbar_style.xml @@ -1,10 +1,10 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/color/forum_category_selector.xml b/app/src/main/res/color/forum_category_selector.xml index 948223d8e9..d16d791761 100644 --- a/app/src/main/res/color/forum_category_selector.xml +++ b/app/src/main/res/color/forum_category_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/interested_game_tag_text_selector.xml b/app/src/main/res/color/interested_game_tag_text_selector.xml index c838ad7d30..8792a04c4d 100644 --- a/app/src/main/res/color/interested_game_tag_text_selector.xml +++ b/app/src/main/res/color/interested_game_tag_text_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/libao_rg_button_selector.xml b/app/src/main/res/color/libao_rg_button_selector.xml index c838ad7d30..8792a04c4d 100644 --- a/app/src/main/res/color/libao_rg_button_selector.xml +++ b/app/src/main/res/color/libao_rg_button_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/poster_text_tabbar_style.xml b/app/src/main/res/color/poster_text_tabbar_style.xml index fd482d3d42..9171b661cc 100644 --- a/app/src/main/res/color/poster_text_tabbar_style.xml +++ b/app/src/main/res/color/poster_text_tabbar_style.xml @@ -1,10 +1,10 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/color/subject_tiled_tab_color_selector.xml b/app/src/main/res/color/subject_tiled_tab_color_selector.xml index 5b1565c99a..1e75137176 100644 --- a/app/src/main/res/color/subject_tiled_tab_color_selector.xml +++ b/app/src/main/res/color/subject_tiled_tab_color_selector.xml @@ -1,8 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/color/tab_selector.xml b/app/src/main/res/color/tab_selector.xml index 4bf1430034..c82df0de4e 100644 --- a/app/src/main/res/color/tab_selector.xml +++ b/app/src/main/res/color/tab_selector.xml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/text_search_default_rank_tabbar_style.xml b/app/src/main/res/color/text_search_default_rank_tabbar_style.xml index 89ae634dc6..0cb363c081 100644 --- a/app/src/main/res/color/text_search_default_rank_tabbar_style.xml +++ b/app/src/main/res/color/text_search_default_rank_tabbar_style.xml @@ -1,8 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/color/text_tabbar_video_style.xml b/app/src/main/res/color/text_tabbar_video_style.xml index e3d17130a1..b222775573 100644 --- a/app/src/main/res/color/text_tabbar_video_style.xml +++ b/app/src/main/res/color/text_tabbar_video_style.xml @@ -1,10 +1,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/theme_and_333.xml b/app/src/main/res/color/theme_and_333.xml index 204be65112..befe1e76c9 100644 --- a/app/src/main/res/color/theme_and_333.xml +++ b/app/src/main/res/color/theme_and_333.xml @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/color/top_community_category_text_selector.xml b/app/src/main/res/color/top_community_category_text_selector.xml index 063dfc7e72..21273a6e98 100644 --- a/app/src/main/res/color/top_community_category_text_selector.xml +++ b/app/src/main/res/color/top_community_category_text_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/video_upload_post_style.xml b/app/src/main/res/color/video_upload_post_style.xml index a303d8c886..aae58c8947 100644 --- a/app/src/main/res/color/video_upload_post_style.xml +++ b/app/src/main/res/color/video_upload_post_style.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/video_upload_source_check.xml b/app/src/main/res/color/video_upload_source_check.xml index 8bd80d553a..b30e46a55d 100644 --- a/app/src/main/res/color/video_upload_source_check.xml +++ b/app/src/main/res/color/video_upload_source_check.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/vote_selector.xml b/app/src/main/res/color/vote_selector.xml index 8492cdfa3a..cb4c65433b 100644 --- a/app/src/main/res/color/vote_selector.xml +++ b/app/src/main/res/color/vote_selector.xml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable-night/bg_forum_activity_card.xml b/app/src/main/res/drawable-night/bg_forum_activity_card.xml index e0bec164c0..c99e411128 100644 --- a/app/src/main/res/drawable-night/bg_forum_activity_card.xml +++ b/app/src/main/res/drawable-night/bg_forum_activity_card.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable-night/bg_personal_card.xml b/app/src/main/res/drawable-night/bg_personal_card.xml index 33c160a5d3..d06dddc64f 100644 --- a/app/src/main/res/drawable-night/bg_personal_card.xml +++ b/app/src/main/res/drawable-night/bg_personal_card.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable-night/download_dialog_version_note.xml b/app/src/main/res/drawable-night/download_dialog_version_note.xml index 07969eac72..b52633dd6c 100644 --- a/app/src/main/res/drawable-night/download_dialog_version_note.xml +++ b/app/src/main/res/drawable-night/download_dialog_version_note.xml @@ -4,7 +4,7 @@ + android:color="@color/ui_container_2" /> diff --git a/app/src/main/res/drawable-xxhdpi/bg_game_detail_seekbar.xml b/app/src/main/res/drawable-xxhdpi/bg_game_detail_seekbar.xml index d83a681478..31c9fd075e 100644 --- a/app/src/main/res/drawable-xxhdpi/bg_game_detail_seekbar.xml +++ b/app/src/main/res/drawable-xxhdpi/bg_game_detail_seekbar.xml @@ -19,7 +19,7 @@ - + diff --git a/app/src/main/res/drawable/amway_gradient_background.xml b/app/src/main/res/drawable/amway_gradient_background.xml index d66f1c944b..5fdc3233c4 100644 --- a/app/src/main/res/drawable/amway_gradient_background.xml +++ b/app/src/main/res/drawable/amway_gradient_background.xml @@ -5,6 +5,6 @@ + android:startColor="@color/ui_background" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/app_update_background.xml b/app/src/main/res/drawable/app_update_background.xml index ef4948613c..195bcfcb68 100644 --- a/app/src/main/res/drawable/app_update_background.xml +++ b/app/src/main/res/drawable/app_update_background.xml @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/app_updating_progress_anchor.xml b/app/src/main/res/drawable/app_updating_progress_anchor.xml index 7c214e2b59..4ce2e54883 100644 --- a/app/src/main/res/drawable/app_updating_progress_anchor.xml +++ b/app/src/main/res/drawable/app_updating_progress_anchor.xml @@ -4,7 +4,7 @@ + android:color="@color/primary_theme" /> diff --git a/app/src/main/res/drawable/app_updating_progress_filling.xml b/app/src/main/res/drawable/app_updating_progress_filling.xml index b28eb21ec0..826d059a6c 100644 --- a/app/src/main/res/drawable/app_updating_progress_filling.xml +++ b/app/src/main/res/drawable/app_updating_progress_filling.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:endColor="@color/ui_divider" + android:startColor="@color/ui_divider" /> @@ -17,8 +17,8 @@ + android:endColor="@color/ui_divider" + android:startColor="@color/ui_divider" /> diff --git a/app/src/main/res/drawable/bg_ad_label.xml b/app/src/main/res/drawable/bg_ad_label.xml index e507a6a208..8fad0540ec 100644 --- a/app/src/main/res/drawable/bg_ad_label.xml +++ b/app/src/main/res/drawable/bg_ad_label.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_add_kaifu.xml b/app/src/main/res/drawable/bg_add_kaifu.xml index 0170a909c1..d58001203e 100644 --- a/app/src/main/res/drawable/bg_add_kaifu.xml +++ b/app/src/main/res/drawable/bg_add_kaifu.xml @@ -2,10 +2,10 @@ - + + android:color="@color/text_secondary" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_add_kaifu_bottom_left.xml b/app/src/main/res/drawable/bg_add_kaifu_bottom_left.xml index d923589374..6cf1b69f0f 100644 --- a/app/src/main/res/drawable/bg_add_kaifu_bottom_left.xml +++ b/app/src/main/res/drawable/bg_add_kaifu_bottom_left.xml @@ -2,10 +2,10 @@ - + + android:color="@color/text_secondary" /> diff --git a/app/src/main/res/drawable/bg_add_kaifu_bottom_right.xml b/app/src/main/res/drawable/bg_add_kaifu_bottom_right.xml index 97c6c3384c..d0506967ac 100644 --- a/app/src/main/res/drawable/bg_add_kaifu_bottom_right.xml +++ b/app/src/main/res/drawable/bg_add_kaifu_bottom_right.xml @@ -2,10 +2,10 @@ - + + android:color="@color/text_secondary" /> diff --git a/app/src/main/res/drawable/bg_add_kaifu_top.xml b/app/src/main/res/drawable/bg_add_kaifu_top.xml index 2526c3295d..c356168506 100644 --- a/app/src/main/res/drawable/bg_add_kaifu_top.xml +++ b/app/src/main/res/drawable/bg_add_kaifu_top.xml @@ -1,7 +1,7 @@ - + + android:color="@color/text_secondary" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_add_kaifu_top_left.xml b/app/src/main/res/drawable/bg_add_kaifu_top_left.xml index 297b3ad4ad..b8af50b6a8 100644 --- a/app/src/main/res/drawable/bg_add_kaifu_top_left.xml +++ b/app/src/main/res/drawable/bg_add_kaifu_top_left.xml @@ -1,8 +1,8 @@ - + + android:color="@color/text_secondary" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_add_kaifu_top_right.xml b/app/src/main/res/drawable/bg_add_kaifu_top_right.xml index abf07a251b..3a8932de74 100644 --- a/app/src/main/res/drawable/bg_add_kaifu_top_right.xml +++ b/app/src/main/res/drawable/bg_add_kaifu_top_right.xml @@ -1,8 +1,8 @@ - + + android:color="@color/text_secondary" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_apply_moderator.xml b/app/src/main/res/drawable/bg_apply_moderator.xml index 2b13aaac63..088512f440 100644 --- a/app/src/main/res/drawable/bg_apply_moderator.xml +++ b/app/src/main/res/drawable/bg_apply_moderator.xml @@ -2,6 +2,6 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_blue_radius_20.xml b/app/src/main/res/drawable/bg_blue_radius_20.xml index 9c21ea8cfb..d8bf672ac7 100644 --- a/app/src/main/res/drawable/bg_blue_radius_20.xml +++ b/app/src/main/res/drawable/bg_blue_radius_20.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/bg_border_blue_radius_4.xml b/app/src/main/res/drawable/bg_border_blue_radius_4.xml index faefcf9cd0..fdbb123b2e 100644 --- a/app/src/main/res/drawable/bg_border_blue_radius_4.xml +++ b/app/src/main/res/drawable/bg_border_blue_radius_4.xml @@ -4,7 +4,7 @@ + android:color="@color/text_theme" /> diff --git a/app/src/main/res/drawable/bg_border_blue_radius_4_width_1.xml b/app/src/main/res/drawable/bg_border_blue_radius_4_width_1.xml index 2fa86119b9..3287dd84f4 100644 --- a/app/src/main/res/drawable/bg_border_blue_radius_4_width_1.xml +++ b/app/src/main/res/drawable/bg_border_blue_radius_4_width_1.xml @@ -4,7 +4,7 @@ + android:color="@color/text_theme" /> diff --git a/app/src/main/res/drawable/bg_circle_background.xml b/app/src/main/res/drawable/bg_circle_background.xml index 9f67abbd3c..a789c920b2 100644 --- a/app/src/main/res/drawable/bg_circle_background.xml +++ b/app/src/main/res/drawable/bg_circle_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_eeeeee_corner_7.xml b/app/src/main/res/drawable/bg_eeeeee_corner_7.xml index cfad873ada..61cdc434cb 100644 --- a/app/src/main/res/drawable/bg_eeeeee_corner_7.xml +++ b/app/src/main/res/drawable/bg_eeeeee_corner_7.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_f5f5f5_radius_20.xml b/app/src/main/res/drawable/bg_f5f5f5_radius_20.xml index 37bf5f7570..caefa07906 100644 --- a/app/src/main/res/drawable/bg_f5f5f5_radius_20.xml +++ b/app/src/main/res/drawable/bg_f5f5f5_radius_20.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_forum_activity_card.xml b/app/src/main/res/drawable/bg_forum_activity_card.xml index 212740e3df..fa55784e16 100644 --- a/app/src/main/res/drawable/bg_forum_activity_card.xml +++ b/app/src/main/res/drawable/bg_forum_activity_card.xml @@ -47,7 +47,7 @@ - + diff --git a/app/src/main/res/drawable/bg_forum_banner_selected.xml b/app/src/main/res/drawable/bg_forum_banner_selected.xml index 59e21bf351..17718dac09 100644 --- a/app/src/main/res/drawable/bg_forum_banner_selected.xml +++ b/app/src/main/res/drawable/bg_forum_banner_selected.xml @@ -6,6 +6,6 @@ + android:color="@color/resource_border" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_forum_banner_unselect.xml b/app/src/main/res/drawable/bg_forum_banner_unselect.xml index 157188e4a1..d08fa5acd0 100644 --- a/app/src/main/res/drawable/bg_forum_banner_unselect.xml +++ b/app/src/main/res/drawable/bg_forum_banner_unselect.xml @@ -5,6 +5,6 @@ + android:color="@color/resource_border" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_forum_home_search.xml b/app/src/main/res/drawable/bg_forum_home_search.xml index 44a07673e0..8b9b54f120 100644 --- a/app/src/main/res/drawable/bg_forum_home_search.xml +++ b/app/src/main/res/drawable/bg_forum_home_search.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> - + diff --git a/app/src/main/res/drawable/bg_forum_list_skeleton.xml b/app/src/main/res/drawable/bg_forum_list_skeleton.xml index e356249a5b..97cd6e964f 100644 --- a/app/src/main/res/drawable/bg_forum_list_skeleton.xml +++ b/app/src/main/res/drawable/bg_forum_list_skeleton.xml @@ -7,5 +7,5 @@ android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_forum_welfare_item.xml b/app/src/main/res/drawable/bg_forum_welfare_item.xml index f5a001ed3e..8b1e124efc 100644 --- a/app/src/main/res/drawable/bg_forum_welfare_item.xml +++ b/app/src/main/res/drawable/bg_forum_welfare_item.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_game_ad.xml b/app/src/main/res/drawable/bg_game_ad.xml index bcd93623cc..2d3901dcc7 100644 --- a/app/src/main/res/drawable/bg_game_ad.xml +++ b/app/src/main/res/drawable/bg_game_ad.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_game_big_event.xml b/app/src/main/res/drawable/bg_game_big_event.xml index 63f19918c5..ea5529d2ce 100644 --- a/app/src/main/res/drawable/bg_game_big_event.xml +++ b/app/src/main/res/drawable/bg_game_big_event.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/bg_game_collection_sfv_indicator.xml b/app/src/main/res/drawable/bg_game_collection_sfv_indicator.xml index 9ab1c3f4b7..80c7f82118 100644 --- a/app/src/main/res/drawable/bg_game_collection_sfv_indicator.xml +++ b/app/src/main/res/drawable/bg_game_collection_sfv_indicator.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_game_collection_tag_select.xml b/app/src/main/res/drawable/bg_game_collection_tag_select.xml index f1fb6e9697..c62e37190d 100644 --- a/app/src/main/res/drawable/bg_game_collection_tag_select.xml +++ b/app/src/main/res/drawable/bg_game_collection_tag_select.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_game_collection_tag_unselect.xml b/app/src/main/res/drawable/bg_game_collection_tag_unselect.xml index 0683c258fc..99c648f23b 100644 --- a/app/src/main/res/drawable/bg_game_collection_tag_unselect.xml +++ b/app/src/main/res/drawable/bg_game_collection_tag_unselect.xml @@ -2,6 +2,6 @@ + android:color="@color/primary_theme" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_game_collection_video_item.xml b/app/src/main/res/drawable/bg_game_collection_video_item.xml index e967783e65..ff531d11c3 100644 --- a/app/src/main/res/drawable/bg_game_collection_video_item.xml +++ b/app/src/main/res/drawable/bg_game_collection_video_item.xml @@ -3,7 +3,7 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_hint_red_radius_999.xml b/app/src/main/res/drawable/bg_hint_red_radius_999.xml index f9c6f807c0..5d96935f89 100644 --- a/app/src/main/res/drawable/bg_hint_red_radius_999.xml +++ b/app/src/main/res/drawable/bg_hint_red_radius_999.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_home_recent_vgame.xml b/app/src/main/res/drawable/bg_home_recent_vgame.xml index c5f798dd33..b305f0267a 100644 --- a/app/src/main/res/drawable/bg_home_recent_vgame.xml +++ b/app/src/main/res/drawable/bg_home_recent_vgame.xml @@ -3,7 +3,7 @@ - + diff --git a/app/src/main/res/drawable/bg_home_vgame_progress_active.xml b/app/src/main/res/drawable/bg_home_vgame_progress_active.xml index d8d45c3ef1..778fe9f341 100644 --- a/app/src/main/res/drawable/bg_home_vgame_progress_active.xml +++ b/app/src/main/res/drawable/bg_home_vgame_progress_active.xml @@ -12,7 +12,7 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_personal_card.xml b/app/src/main/res/drawable/bg_personal_card.xml index 6580282f61..caffadfc95 100644 --- a/app/src/main/res/drawable/bg_personal_card.xml +++ b/app/src/main/res/drawable/bg_personal_card.xml @@ -47,7 +47,7 @@ - + diff --git a/app/src/main/res/drawable/bg_personal_top_gradient.xml b/app/src/main/res/drawable/bg_personal_top_gradient.xml index ba21c8d92f..fc481734e2 100644 --- a/app/src/main/res/drawable/bg_personal_top_gradient.xml +++ b/app/src/main/res/drawable/bg_personal_top_gradient.xml @@ -4,7 +4,7 @@ + android:endColor="@color/ui_surface" + android:startColor="@color/ui_background" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_red_stroke_radius_999.xml b/app/src/main/res/drawable/bg_red_stroke_radius_999.xml index e4ace32cc7..ddca520107 100644 --- a/app/src/main/res/drawable/bg_red_stroke_radius_999.xml +++ b/app/src/main/res/drawable/bg_red_stroke_radius_999.xml @@ -2,7 +2,7 @@ - + - + diff --git a/app/src/main/res/drawable/bg_report_reason_top.xml b/app/src/main/res/drawable/bg_report_reason_top.xml index c6c6198eb1..b450454a7e 100644 --- a/app/src/main/res/drawable/bg_report_reason_top.xml +++ b/app/src/main/res/drawable/bg_report_reason_top.xml @@ -10,7 +10,7 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_search_default_rank.xml b/app/src/main/res/drawable/bg_search_default_rank.xml index d00e0267e4..c12c09b2c5 100644 --- a/app/src/main/res/drawable/bg_search_default_rank.xml +++ b/app/src/main/res/drawable/bg_search_default_rank.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/bg_selected_category.xml b/app/src/main/res/drawable/bg_selected_category.xml index 95dab6b904..fcb86bc980 100644 --- a/app/src/main/res/drawable/bg_selected_category.xml +++ b/app/src/main/res/drawable/bg_selected_category.xml @@ -8,6 +8,6 @@ + android:color="@color/text_theme" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_2496ff_alpha_10_radius_8.xml b/app/src/main/res/drawable/bg_shape_2496ff_alpha_10_radius_8.xml index 1c1b2c9c97..cfe4df48a3 100644 --- a/app/src/main/res/drawable/bg_shape_2496ff_alpha_10_radius_8.xml +++ b/app/src/main/res/drawable/bg_shape_2496ff_alpha_10_radius_8.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_3.xml b/app/src/main/res/drawable/bg_shape_f5_radius_3.xml index 138cee4c8f..1b61c8c686 100644 --- a/app/src/main/res/drawable/bg_shape_f5_radius_3.xml +++ b/app/src/main/res/drawable/bg_shape_f5_radius_3.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f5_radius_6.xml b/app/src/main/res/drawable/bg_shape_f5_radius_6.xml index 6e7fc9d0bd..a29f6c2a19 100644 --- a/app/src/main/res/drawable/bg_shape_f5_radius_6.xml +++ b/app/src/main/res/drawable/bg_shape_f5_radius_6.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f8_radius_12.xml b/app/src/main/res/drawable/bg_shape_f8_radius_12.xml index d83e7786b8..e55379ed75 100644 --- a/app/src/main/res/drawable/bg_shape_f8_radius_12.xml +++ b/app/src/main/res/drawable/bg_shape_f8_radius_12.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_f8_radius_6.xml b/app/src/main/res/drawable/bg_shape_f8_radius_6.xml index b7bd6cc341..edf3ff2dd8 100644 --- a/app/src/main/res/drawable/bg_shape_f8_radius_6.xml +++ b/app/src/main/res/drawable/bg_shape_f8_radius_6.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_space2_radius_4.xml b/app/src/main/res/drawable/bg_shape_space2_radius_4.xml index 4d7009e867..41dffbf728 100644 --- a/app/src/main/res/drawable/bg_shape_space2_radius_4.xml +++ b/app/src/main/res/drawable/bg_shape_space2_radius_4.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_space2_radius_999.xml b/app/src/main/res/drawable/bg_shape_space2_radius_999.xml index 6d5ba0aaa9..a322f650cb 100644 --- a/app/src/main/res/drawable/bg_shape_space2_radius_999.xml +++ b/app/src/main/res/drawable/bg_shape_space2_radius_999.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_space_radius_4.xml b/app/src/main/res/drawable/bg_shape_space_radius_4.xml index 38766b24a1..0996fb3e2d 100644 --- a/app/src/main/res/drawable/bg_shape_space_radius_4.xml +++ b/app/src/main/res/drawable/bg_shape_space_radius_4.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_space_radius_5.xml b/app/src/main/res/drawable/bg_shape_space_radius_5.xml index b1c7605728..5e7b69a97a 100644 --- a/app/src/main/res/drawable/bg_shape_space_radius_5.xml +++ b/app/src/main/res/drawable/bg_shape_space_radius_5.xml @@ -2,5 +2,5 @@ - + \ 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 f3020b4bab..270c2f0203 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 013c1d07a2..8e2ecea892 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 f5011d2552..e22dfc7cf6 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/bg_shape_white_radius_10_top_only.xml b/app/src/main/res/drawable/bg_shape_white_radius_10_top_only.xml index 997e966a89..27f7755019 100644 --- a/app/src/main/res/drawable/bg_shape_white_radius_10_top_only.xml +++ b/app/src/main/res/drawable/bg_shape_white_radius_10_top_only.xml @@ -6,5 +6,5 @@ android:topRightRadius="10dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_shape_white_radius_4.xml b/app/src/main/res/drawable/bg_shape_white_radius_4.xml index 4e6ce5c702..23bcabd07c 100644 --- a/app/src/main/res/drawable/bg_shape_white_radius_4.xml +++ b/app/src/main/res/drawable/bg_shape_white_radius_4.xml @@ -3,6 +3,6 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_child_radius_14.xml b/app/src/main/res/drawable/bg_skeleton_child_radius_14.xml index d65aad3032..a4e4c293b5 100644 --- a/app/src/main/res/drawable/bg_skeleton_child_radius_14.xml +++ b/app/src/main/res/drawable/bg_skeleton_child_radius_14.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_child_radius_4.xml b/app/src/main/res/drawable/bg_skeleton_child_radius_4.xml index 8cb9fb4362..8ed89959c9 100644 --- a/app/src/main/res/drawable/bg_skeleton_child_radius_4.xml +++ b/app/src/main/res/drawable/bg_skeleton_child_radius_4.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_child_radius_8.xml b/app/src/main/res/drawable/bg_skeleton_child_radius_8.xml index a3dc303052..034086898b 100644 --- a/app/src/main/res/drawable/bg_skeleton_child_radius_8.xml +++ b/app/src/main/res/drawable/bg_skeleton_child_radius_8.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_child_radius_999.xml b/app/src/main/res/drawable/bg_skeleton_child_radius_999.xml index e7771e311c..32cc4712ee 100644 --- a/app/src/main/res/drawable/bg_skeleton_child_radius_999.xml +++ b/app/src/main/res/drawable/bg_skeleton_child_radius_999.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_radius_10.xml b/app/src/main/res/drawable/bg_skeleton_radius_10.xml index 5b5fc802ef..a3b36ba9f8 100644 --- a/app/src/main/res/drawable/bg_skeleton_radius_10.xml +++ b/app/src/main/res/drawable/bg_skeleton_radius_10.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_radius_12.xml b/app/src/main/res/drawable/bg_skeleton_radius_12.xml index b0f83e524c..144dd4075f 100644 --- a/app/src/main/res/drawable/bg_skeleton_radius_12.xml +++ b/app/src/main/res/drawable/bg_skeleton_radius_12.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_radius_14.xml b/app/src/main/res/drawable/bg_skeleton_radius_14.xml index ac1e063ce6..b504134bb2 100644 --- a/app/src/main/res/drawable/bg_skeleton_radius_14.xml +++ b/app/src/main/res/drawable/bg_skeleton_radius_14.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_radius_16.xml b/app/src/main/res/drawable/bg_skeleton_radius_16.xml index e45c539de1..c24af75555 100644 --- a/app/src/main/res/drawable/bg_skeleton_radius_16.xml +++ b/app/src/main/res/drawable/bg_skeleton_radius_16.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_radius_20.xml b/app/src/main/res/drawable/bg_skeleton_radius_20.xml index 79cf4e8497..50a8d894d6 100644 --- a/app/src/main/res/drawable/bg_skeleton_radius_20.xml +++ b/app/src/main/res/drawable/bg_skeleton_radius_20.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_radius_4.xml b/app/src/main/res/drawable/bg_skeleton_radius_4.xml index 30152c5815..d513d6cdf4 100644 --- a/app/src/main/res/drawable/bg_skeleton_radius_4.xml +++ b/app/src/main/res/drawable/bg_skeleton_radius_4.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_radius_6.xml b/app/src/main/res/drawable/bg_skeleton_radius_6.xml index 30152c5815..d513d6cdf4 100644 --- a/app/src/main/res/drawable/bg_skeleton_radius_6.xml +++ b/app/src/main/res/drawable/bg_skeleton_radius_6.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_radius_8.xml b/app/src/main/res/drawable/bg_skeleton_radius_8.xml index fc9568f4ce..97ae7ebef0 100644 --- a/app/src/main/res/drawable/bg_skeleton_radius_8.xml +++ b/app/src/main/res/drawable/bg_skeleton_radius_8.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_skeleton_radius_999.xml b/app/src/main/res/drawable/bg_skeleton_radius_999.xml index 5a0d28ff9f..a6518a9c0f 100644 --- a/app/src/main/res/drawable/bg_skeleton_radius_999.xml +++ b/app/src/main/res/drawable/bg_skeleton_radius_999.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_f5_radius_999.xml b/app/src/main/res/drawable/bg_stroke_f5_radius_999.xml index 0bf2ada174..d7a483ab35 100644 --- a/app/src/main/res/drawable/bg_stroke_f5_radius_999.xml +++ b/app/src/main/res/drawable/bg_stroke_f5_radius_999.xml @@ -3,7 +3,7 @@ + android:color="@color/ui_background" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_sub_catalog_item.xml b/app/src/main/res/drawable/bg_sub_catalog_item.xml index 7aaab051c0..806b285214 100644 --- a/app/src/main/res/drawable/bg_sub_catalog_item.xml +++ b/app/src/main/res/drawable/bg_sub_catalog_item.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_tag_text.xml b/app/src/main/res/drawable/bg_tag_text.xml index 4c8bcdd729..55229093c5 100644 --- a/app/src/main/res/drawable/bg_tag_text.xml +++ b/app/src/main/res/drawable/bg_tag_text.xml @@ -6,7 +6,7 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_top_border.xml b/app/src/main/res/drawable/bg_top_border.xml index 2732629dfa..3b70055a60 100644 --- a/app/src/main/res/drawable/bg_top_border.xml +++ b/app/src/main/res/drawable/bg_top_border.xml @@ -2,10 +2,10 @@ - + + android:color="@color/ui_divider" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_top_community_category.xml b/app/src/main/res/drawable/bg_top_community_category.xml index ad78e648fc..15418bed08 100644 --- a/app/src/main/res/drawable/bg_top_community_category.xml +++ b/app/src/main/res/drawable/bg_top_community_category.xml @@ -5,6 +5,6 @@ + android:color="@color/ui_divider" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_top_community_category_selected.xml b/app/src/main/res/drawable/bg_top_community_category_selected.xml index 1c1b2c9c97..cfe4df48a3 100644 --- a/app/src/main/res/drawable/bg_top_community_category_selected.xml +++ b/app/src/main/res/drawable/bg_top_community_category_selected.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_verify_password.xml b/app/src/main/res/drawable/bg_verify_password.xml index 03a0f28e6d..fd09d5e7b4 100644 --- a/app/src/main/res/drawable/bg_verify_password.xml +++ b/app/src/main/res/drawable/bg_verify_password.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_verify_password_select.xml b/app/src/main/res/drawable/bg_verify_password_select.xml index 2a75243336..9de5c5f053 100644 --- a/app/src/main/res/drawable/bg_verify_password_select.xml +++ b/app/src/main/res/drawable/bg_verify_password_select.xml @@ -2,7 +2,7 @@ - + android:color="@color/primary_theme" /> + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_vfeedback_label.xml b/app/src/main/res/drawable/bg_vfeedback_label.xml index 7634b6c367..94f26b6244 100644 --- a/app/src/main/res/drawable/bg_vfeedback_label.xml +++ b/app/src/main/res/drawable/bg_vfeedback_label.xml @@ -2,7 +2,7 @@ + android:color="@color/ui_divider" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_vfeedback_label_selected.xml b/app/src/main/res/drawable/bg_vfeedback_label_selected.xml index e0442f404b..564a6f0451 100644 --- a/app/src/main/res/drawable/bg_vfeedback_label_selected.xml +++ b/app/src/main/res/drawable/bg_vfeedback_label_selected.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_white_radius_8.xml b/app/src/main/res/drawable/bg_white_radius_8.xml index 540e10500b..079267605d 100644 --- a/app/src/main/res/drawable/bg_white_radius_8.xml +++ b/app/src/main/res/drawable/bg_white_radius_8.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/border_dialog_white_bg_5.xml b/app/src/main/res/drawable/border_dialog_white_bg_5.xml index 9876aced25..85acba71ac 100644 --- a/app/src/main/res/drawable/border_dialog_white_bg_5.xml +++ b/app/src/main/res/drawable/border_dialog_white_bg_5.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/border_round_ccc.xml b/app/src/main/res/drawable/border_round_ccc.xml index 055745104c..9376aa2608 100644 --- a/app/src/main/res/drawable/border_round_ccc.xml +++ b/app/src/main/res/drawable/border_round_ccc.xml @@ -4,7 +4,7 @@ + android:color="@color/text_instance" /> diff --git a/app/src/main/res/drawable/border_round_ccc_999.xml b/app/src/main/res/drawable/border_round_ccc_999.xml index d21bcf872c..d5f54922fe 100644 --- a/app/src/main/res/drawable/border_round_ccc_999.xml +++ b/app/src/main/res/drawable/border_round_ccc_999.xml @@ -4,7 +4,7 @@ + android:color="@color/text_instance" /> diff --git a/app/src/main/res/drawable/border_round_eee_14.xml b/app/src/main/res/drawable/border_round_eee_14.xml index e577101aa4..8912eb46a9 100644 --- a/app/src/main/res/drawable/border_round_eee_14.xml +++ b/app/src/main/res/drawable/border_round_eee_14.xml @@ -4,7 +4,7 @@ + android:color="@color/ui_divider" /> diff --git a/app/src/main/res/drawable/border_round_eee_999.xml b/app/src/main/res/drawable/border_round_eee_999.xml index 8f7acd0e8b..0630d40677 100644 --- a/app/src/main/res/drawable/border_round_eee_999.xml +++ b/app/src/main/res/drawable/border_round_eee_999.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/border_round_stroke_0dot5_eee_999.xml b/app/src/main/res/drawable/border_round_stroke_0dot5_eee_999.xml index e68464ac33..9a1c564329 100644 --- a/app/src/main/res/drawable/border_round_stroke_0dot5_eee_999.xml +++ b/app/src/main/res/drawable/border_round_stroke_0dot5_eee_999.xml @@ -4,10 +4,10 @@ - + + android:color="@color/ui_divider" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/border_round_stroke_black_alpha_7.xml b/app/src/main/res/drawable/border_round_stroke_black_alpha_7.xml index 4a01689771..5a996f5baf 100644 --- a/app/src/main/res/drawable/border_round_stroke_black_alpha_7.xml +++ b/app/src/main/res/drawable/border_round_stroke_black_alpha_7.xml @@ -4,7 +4,7 @@ - + - + + android:color="@color/ui_divider" /> diff --git a/app/src/main/res/drawable/border_round_stroke_themefont_999.xml b/app/src/main/res/drawable/border_round_stroke_themefont_999.xml index c798183c4a..dd767a220a 100644 --- a/app/src/main/res/drawable/border_round_stroke_themefont_999.xml +++ b/app/src/main/res/drawable/border_round_stroke_themefont_999.xml @@ -2,10 +2,10 @@ - + + android:color="@color/text_theme" /> diff --git a/app/src/main/res/drawable/border_round_theme_14.xml b/app/src/main/res/drawable/border_round_theme_14.xml index 93a17caeaa..377548e88e 100644 --- a/app/src/main/res/drawable/border_round_theme_14.xml +++ b/app/src/main/res/drawable/border_round_theme_14.xml @@ -4,7 +4,7 @@ + android:color="@color/text_theme" /> diff --git a/app/src/main/res/drawable/border_round_theme_15.xml b/app/src/main/res/drawable/border_round_theme_15.xml index 154ae196a9..0b54e39e7f 100644 --- a/app/src/main/res/drawable/border_round_theme_15.xml +++ b/app/src/main/res/drawable/border_round_theme_15.xml @@ -4,7 +4,7 @@ + android:color="@color/text_theme" /> diff --git a/app/src/main/res/drawable/border_round_transparent_stroke_divider_radius_8.xml b/app/src/main/res/drawable/border_round_transparent_stroke_divider_radius_8.xml index f5fb61b71e..3a3c4f9995 100644 --- a/app/src/main/res/drawable/border_round_transparent_stroke_divider_radius_8.xml +++ b/app/src/main/res/drawable/border_round_transparent_stroke_divider_radius_8.xml @@ -8,6 +8,6 @@ + android:color="@color/ui_divider" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/button_border_blue_oval.xml b/app/src/main/res/drawable/button_border_blue_oval.xml index 4ad33379fb..e1046c989a 100644 --- a/app/src/main/res/drawable/button_border_blue_oval.xml +++ b/app/src/main/res/drawable/button_border_blue_oval.xml @@ -4,7 +4,7 @@ + android:color="@color/text_theme" /> diff --git a/app/src/main/res/drawable/button_normal_border.xml b/app/src/main/res/drawable/button_normal_border.xml index 7b39bd64cf..cdb5732cae 100644 --- a/app/src/main/res/drawable/button_normal_border.xml +++ b/app/src/main/res/drawable/button_normal_border.xml @@ -4,7 +4,7 @@ + android:color="@color/text_theme" /> diff --git a/app/src/main/res/drawable/button_round_2496ff_alpha_10.xml b/app/src/main/res/drawable/button_round_2496ff_alpha_10.xml index eac647bcc8..45fbb05dd7 100644 --- a/app/src/main/res/drawable/button_round_2496ff_alpha_10.xml +++ b/app/src/main/res/drawable/button_round_2496ff_alpha_10.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_round_2496ff_hollow.xml b/app/src/main/res/drawable/button_round_2496ff_hollow.xml index e6963f6387..2721502bab 100644 --- a/app/src/main/res/drawable/button_round_2496ff_hollow.xml +++ b/app/src/main/res/drawable/button_round_2496ff_hollow.xml @@ -4,7 +4,7 @@ + android:color="@color/primary_theme" /> diff --git a/app/src/main/res/drawable/comment_border_bg.xml b/app/src/main/res/drawable/comment_border_bg.xml index 7ca82a70e8..826033f1cb 100644 --- a/app/src/main/res/drawable/comment_border_bg.xml +++ b/app/src/main/res/drawable/comment_border_bg.xml @@ -4,7 +4,7 @@ + android:color="@color/text_theme" /> diff --git a/app/src/main/res/drawable/comment_send_button_available_dark.xml b/app/src/main/res/drawable/comment_send_button_available_dark.xml index 660f3485dc..6dd25c3cd6 100644 --- a/app/src/main/res/drawable/comment_send_button_available_dark.xml +++ b/app/src/main/res/drawable/comment_send_button_available_dark.xml @@ -4,7 +4,7 @@ diff --git a/app/src/main/res/drawable/community_comment_background.xml b/app/src/main/res/drawable/community_comment_background.xml index 8507af7c8d..c8011211d6 100644 --- a/app/src/main/res/drawable/community_comment_background.xml +++ b/app/src/main/res/drawable/community_comment_background.xml @@ -6,6 +6,6 @@ android:topLeftRadius="12dp" android:topRightRadius="10dp" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/community_comment_reply_background.xml b/app/src/main/res/drawable/community_comment_reply_background.xml index 98913953a8..cef0e6467d 100644 --- a/app/src/main/res/drawable/community_comment_reply_background.xml +++ b/app/src/main/res/drawable/community_comment_reply_background.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/community_edit_window_bg.xml b/app/src/main/res/drawable/community_edit_window_bg.xml index d46ff22e0c..b5825342c2 100644 --- a/app/src/main/res/drawable/community_edit_window_bg.xml +++ b/app/src/main/res/drawable/community_edit_window_bg.xml @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_app_updating_bg.xml b/app/src/main/res/drawable/dialog_app_updating_bg.xml index 4f879ebd7a..4a162e1e41 100644 --- a/app/src/main/res/drawable/dialog_app_updating_bg.xml +++ b/app/src/main/res/drawable/dialog_app_updating_bg.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/dialog_community_content_bg.xml b/app/src/main/res/drawable/dialog_community_content_bg.xml index 5145dfc577..f833bd8702 100644 --- a/app/src/main/res/drawable/dialog_community_content_bg.xml +++ b/app/src/main/res/drawable/dialog_community_content_bg.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_edit_history_scrollbar.xml b/app/src/main/res/drawable/dialog_edit_history_scrollbar.xml index e6ebaf16fe..f97a6b673e 100644 --- a/app/src/main/res/drawable/dialog_edit_history_scrollbar.xml +++ b/app/src/main/res/drawable/dialog_edit_history_scrollbar.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/divider_article_detail_comment.xml b/app/src/main/res/drawable/divider_article_detail_comment.xml index afcec90eec..a1e99f91cc 100644 --- a/app/src/main/res/drawable/divider_article_detail_comment.xml +++ b/app/src/main/res/drawable/divider_article_detail_comment.xml @@ -3,7 +3,7 @@ - + @@ -11,7 +11,7 @@ android:left="64dp" android:right="16dp"> - + diff --git a/app/src/main/res/drawable/divider_history_apks.xml b/app/src/main/res/drawable/divider_history_apks.xml index abd30850c8..5d634b7656 100644 --- a/app/src/main/res/drawable/divider_history_apks.xml +++ b/app/src/main/res/drawable/divider_history_apks.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file 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 e657b1334b..a934a8effe 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 @@ - + @@ -11,7 +11,7 @@ android:left="20dp" android:right="20dp"> - + diff --git a/app/src/main/res/drawable/divider_my_follow.xml b/app/src/main/res/drawable/divider_my_follow.xml index f421580cc5..5cc9d6d3a6 100644 --- a/app/src/main/res/drawable/divider_my_follow.xml +++ b/app/src/main/res/drawable/divider_my_follow.xml @@ -4,7 +4,7 @@ android:bottom="10dp" android:top="10dp"> - + diff --git a/app/src/main/res/drawable/divider_my_game.xml b/app/src/main/res/drawable/divider_my_game.xml index 0af7d0854c..ea21dd8c29 100644 --- a/app/src/main/res/drawable/divider_my_game.xml +++ b/app/src/main/res/drawable/divider_my_game.xml @@ -3,7 +3,7 @@ - + @@ -11,7 +11,7 @@ android:left="92dp" android:right="16dp"> - + diff --git a/app/src/main/res/drawable/download_dialog_background.xml b/app/src/main/res/drawable/download_dialog_background.xml index 434b7cee5e..6d4881a155 100644 --- a/app/src/main/res/drawable/download_dialog_background.xml +++ b/app/src/main/res/drawable/download_dialog_background.xml @@ -1,6 +1,6 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/download_dialog_version_note.xml b/app/src/main/res/drawable/download_dialog_version_note.xml index 855830a0c8..ffb45441b0 100644 --- a/app/src/main/res/drawable/download_dialog_version_note.xml +++ b/app/src/main/res/drawable/download_dialog_version_note.xml @@ -4,7 +4,7 @@ + android:color="@color/ui_divider" /> diff --git a/app/src/main/res/drawable/game_detail_amway_bg.xml b/app/src/main/res/drawable/game_detail_amway_bg.xml index 4758569dd9..4a67e1032a 100644 --- a/app/src/main/res/drawable/game_detail_amway_bg.xml +++ b/app/src/main/res/drawable/game_detail_amway_bg.xml @@ -4,6 +4,6 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/game_detail_btn_receive.xml b/app/src/main/res/drawable/game_detail_btn_receive.xml index 171366ea68..74935a6fab 100644 --- a/app/src/main/res/drawable/game_detail_btn_receive.xml +++ b/app/src/main/res/drawable/game_detail_btn_receive.xml @@ -4,7 +4,7 @@ diff --git a/app/src/main/res/drawable/game_detail_info_dividing_line.xml b/app/src/main/res/drawable/game_detail_info_dividing_line.xml index fcb537f2fb..0df2e3ab15 100644 --- a/app/src/main/res/drawable/game_detail_info_dividing_line.xml +++ b/app/src/main/res/drawable/game_detail_info_dividing_line.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/res/drawable/game_detail_more_dialog_background.xml b/app/src/main/res/drawable/game_detail_more_dialog_background.xml index 4270fbba27..a3a8e1f17e 100644 --- a/app/src/main/res/drawable/game_detail_more_dialog_background.xml +++ b/app/src/main/res/drawable/game_detail_more_dialog_background.xml @@ -1,6 +1,6 @@ - + - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/home_slide_card_gradient_mask.xml b/app/src/main/res/drawable/home_slide_card_gradient_mask.xml index f59439346b..fee0359deb 100644 --- a/app/src/main/res/drawable/home_slide_card_gradient_mask.xml +++ b/app/src/main/res/drawable/home_slide_card_gradient_mask.xml @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_archive.xml b/app/src/main/res/drawable/ic_archive.xml index 044eb467fb..5c53dcbd94 100644 --- a/app/src/main/res/drawable/ic_archive.xml +++ b/app/src/main/res/drawable/ic_archive.xml @@ -5,6 +5,6 @@ android:viewportHeight="14"> diff --git a/app/src/main/res/drawable/ic_article_detail_forum_jump.xml b/app/src/main/res/drawable/ic_article_detail_forum_jump.xml index 9237c7e5a3..a492c576c1 100644 --- a/app/src/main/res/drawable/ic_article_detail_forum_jump.xml +++ b/app/src/main/res/drawable/ic_article_detail_forum_jump.xml @@ -7,7 +7,7 @@ android:fillColor="#00000000" android:pathData="M1,2L5,6L1,10" android:strokeWidth="1" - android:strokeColor="@color/text_subtitleDesc" + android:strokeColor="@color/text_tertiary" android:strokeLineCap="round" android:strokeLineJoin="round" /> diff --git a/app/src/main/res/drawable/ic_choose_section_selected.xml b/app/src/main/res/drawable/ic_choose_section_selected.xml index 25649378cd..84348f5ab5 100644 --- a/app/src/main/res/drawable/ic_choose_section_selected.xml +++ b/app/src/main/res/drawable/ic_choose_section_selected.xml @@ -4,13 +4,13 @@ android:viewportWidth="16" android:viewportHeight="16"> diff --git a/app/src/main/res/drawable/ic_create_game_collection.xml b/app/src/main/res/drawable/ic_create_game_collection.xml index 504c0ad3de..d54251e657 100644 --- a/app/src/main/res/drawable/ic_create_game_collection.xml +++ b/app/src/main/res/drawable/ic_create_game_collection.xml @@ -7,15 +7,15 @@ diff --git a/app/src/main/res/drawable/ic_edit_arrow_right.xml b/app/src/main/res/drawable/ic_edit_arrow_right.xml index fc920ad0da..cea215b679 100644 --- a/app/src/main/res/drawable/ic_edit_arrow_right.xml +++ b/app/src/main/res/drawable/ic_edit_arrow_right.xml @@ -5,13 +5,13 @@ android:viewportHeight="8"> diff --git a/app/src/main/res/drawable/ic_gamedetail_concern.xml b/app/src/main/res/drawable/ic_gamedetail_concern.xml index aa5271d1fd..0a7aed3d22 100644 --- a/app/src/main/res/drawable/ic_gamedetail_concern.xml +++ b/app/src/main/res/drawable/ic_gamedetail_concern.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_gamedetail_concerned.xml b/app/src/main/res/drawable/ic_gamedetail_concerned.xml index 53dcce1370..9716bf8726 100644 --- a/app/src/main/res/drawable/ic_gamedetail_concerned.xml +++ b/app/src/main/res/drawable/ic_gamedetail_concerned.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_gamedetail_reserve.xml b/app/src/main/res/drawable/ic_gamedetail_reserve.xml index e538d31b1b..5310357c4f 100644 --- a/app/src/main/res/drawable/ic_gamedetail_reserve.xml +++ b/app/src/main/res/drawable/ic_gamedetail_reserve.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_gamedetail_reserved.xml b/app/src/main/res/drawable/ic_gamedetail_reserved.xml index bc0f5ce290..fab8f60699 100644 --- a/app/src/main/res/drawable/ic_gamedetail_reserved.xml +++ b/app/src/main/res/drawable/ic_gamedetail_reserved.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_gamedetail_simulator_manage.xml b/app/src/main/res/drawable/ic_gamedetail_simulator_manage.xml index 32b3c65c67..79410fbe8c 100644 --- a/app/src/main/res/drawable/ic_gamedetail_simulator_manage.xml +++ b/app/src/main/res/drawable/ic_gamedetail_simulator_manage.xml @@ -5,18 +5,18 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_gamedetail_switch_install.xml b/app/src/main/res/drawable/ic_gamedetail_switch_install.xml index d09d28ff0a..2cac2bfeec 100644 --- a/app/src/main/res/drawable/ic_gamedetail_switch_install.xml +++ b/app/src/main/res/drawable/ic_gamedetail_switch_install.xml @@ -5,6 +5,6 @@ android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_home_game_collection_slide_jump.xml b/app/src/main/res/drawable/ic_home_game_collection_slide_jump.xml index d1ce4bc456..4555bdee7d 100644 --- a/app/src/main/res/drawable/ic_home_game_collection_slide_jump.xml +++ b/app/src/main/res/drawable/ic_home_game_collection_slide_jump.xml @@ -8,6 +8,6 @@ android:pathData="M0.833,1.667L4.167,5L0.833,8.333" android:strokeLineJoin="round" android:fillColor="#00000000" - android:strokeColor="@color/text_subtitleDesc" + android:strokeColor="@color/text_tertiary" android:strokeLineCap="round" /> diff --git a/app/src/main/res/drawable/ic_jump.xml b/app/src/main/res/drawable/ic_jump.xml index dad1bb13cc..22fb202794 100644 --- a/app/src/main/res/drawable/ic_jump.xml +++ b/app/src/main/res/drawable/ic_jump.xml @@ -7,6 +7,6 @@ + android:fillColor="@color/text_instance" /> diff --git a/app/src/main/res/drawable/ic_my_follow_comment.xml b/app/src/main/res/drawable/ic_my_follow_comment.xml index 0dd47322a2..80de4a446b 100644 --- a/app/src/main/res/drawable/ic_my_follow_comment.xml +++ b/app/src/main/res/drawable/ic_my_follow_comment.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_my_follow_forum.xml b/app/src/main/res/drawable/ic_my_follow_forum.xml index 35bc892dd6..2a1919f6b5 100644 --- a/app/src/main/res/drawable/ic_my_follow_forum.xml +++ b/app/src/main/res/drawable/ic_my_follow_forum.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_my_follow_zone.xml b/app/src/main/res/drawable/ic_my_follow_zone.xml index 36897c61d9..3c19684cf8 100644 --- a/app/src/main/res/drawable/ic_my_follow_zone.xml +++ b/app/src/main/res/drawable/ic_my_follow_zone.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_children_policy.xml b/app/src/main/res/drawable/ic_personal_children_policy.xml index 47f47f8b67..f131f606b9 100644 --- a/app/src/main/res/drawable/ic_personal_children_policy.xml +++ b/app/src/main/res/drawable/ic_personal_children_policy.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_dark_mode.xml b/app/src/main/res/drawable/ic_personal_dark_mode.xml index 7d957e0f78..a8f670b606 100644 --- a/app/src/main/res/drawable/ic_personal_dark_mode.xml +++ b/app/src/main/res/drawable/ic_personal_dark_mode.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:fillColor="@color/text_primary" /> diff --git a/app/src/main/res/drawable/ic_personal_feedback.xml b/app/src/main/res/drawable/ic_personal_feedback.xml index 3f2e21f17e..813bb3bbd8 100644 --- a/app/src/main/res/drawable/ic_personal_feedback.xml +++ b/app/src/main/res/drawable/ic_personal_feedback.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_history.xml b/app/src/main/res/drawable/ic_personal_history.xml index 0f09c8fd48..d59571d50e 100644 --- a/app/src/main/res/drawable/ic_personal_history.xml +++ b/app/src/main/res/drawable/ic_personal_history.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_info_list.xml b/app/src/main/res/drawable/ic_personal_info_list.xml index ed271face2..168c535b4f 100644 --- a/app/src/main/res/drawable/ic_personal_info_list.xml +++ b/app/src/main/res/drawable/ic_personal_info_list.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_light_mode.xml b/app/src/main/res/drawable/ic_personal_light_mode.xml index 7c8d64867f..336122a9c3 100644 --- a/app/src/main/res/drawable/ic_personal_light_mode.xml +++ b/app/src/main/res/drawable/ic_personal_light_mode.xml @@ -7,30 +7,30 @@ android:pathData="M12,12m-5.5,0a5.5,5.5 0,1 1,11 0a5.5,5.5 0,1 1,-11 0" android:strokeWidth="2" android:fillColor="#00000000" - android:strokeColor="@color/text_title" + android:strokeColor="@color/text_primary" android:strokeLineCap="round" /> diff --git a/app/src/main/res/drawable/ic_personal_message.xml b/app/src/main/res/drawable/ic_personal_message.xml index cdf0b498d9..1f4b975416 100644 --- a/app/src/main/res/drawable/ic_personal_message.xml +++ b/app/src/main/res/drawable/ic_personal_message.xml @@ -8,10 +8,10 @@ android:strokeLineJoin="round" android:strokeWidth="2" android:fillColor="#00000000" - android:strokeColor="@color/text_title" + android:strokeColor="@color/text_primary" android:strokeLineCap="round" /> diff --git a/app/src/main/res/drawable/ic_personal_my_collection.xml b/app/src/main/res/drawable/ic_personal_my_collection.xml index 46d15b087c..0e4ba524ce 100644 --- a/app/src/main/res/drawable/ic_personal_my_collection.xml +++ b/app/src/main/res/drawable/ic_personal_my_collection.xml @@ -7,6 +7,6 @@ + android:fillColor="@color/text_primary" /> diff --git a/app/src/main/res/drawable/ic_personal_my_game.xml b/app/src/main/res/drawable/ic_personal_my_game.xml index e08d2bd11c..517b57d08b 100644 --- a/app/src/main/res/drawable/ic_personal_my_game.xml +++ b/app/src/main/res/drawable/ic_personal_my_game.xml @@ -6,7 +6,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_my_game_collection.xml b/app/src/main/res/drawable/ic_personal_my_game_collection.xml index 345f4f0ac4..b6ffb85e69 100644 --- a/app/src/main/res/drawable/ic_personal_my_game_collection.xml +++ b/app/src/main/res/drawable/ic_personal_my_game_collection.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_my_post.xml b/app/src/main/res/drawable/ic_personal_my_post.xml index 90d3e92335..f2d77ca3ff 100644 --- a/app/src/main/res/drawable/ic_personal_my_post.xml +++ b/app/src/main/res/drawable/ic_personal_my_post.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_permission.xml b/app/src/main/res/drawable/ic_personal_permission.xml index 8de487daa0..7d91e7964a 100644 --- a/app/src/main/res/drawable/ic_personal_permission.xml +++ b/app/src/main/res/drawable/ic_personal_permission.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_privacy_policy.xml b/app/src/main/res/drawable/ic_personal_privacy_policy.xml index e2dcff75cc..03beb1761a 100644 --- a/app/src/main/res/drawable/ic_personal_privacy_policy.xml +++ b/app/src/main/res/drawable/ic_personal_privacy_policy.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_sdk.xml b/app/src/main/res/drawable/ic_personal_sdk.xml index f933a5a4f8..c56dc1ffb2 100644 --- a/app/src/main/res/drawable/ic_personal_sdk.xml +++ b/app/src/main/res/drawable/ic_personal_sdk.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_setting.xml b/app/src/main/res/drawable/ic_personal_setting.xml index 61992c3f6d..6fddec7d65 100644 --- a/app/src/main/res/drawable/ic_personal_setting.xml +++ b/app/src/main/res/drawable/ic_personal_setting.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_share.xml b/app/src/main/res/drawable/ic_personal_share.xml index 1866e4c947..6e730d5815 100644 --- a/app/src/main/res/drawable/ic_personal_share.xml +++ b/app/src/main/res/drawable/ic_personal_share.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_personal_sign.xml b/app/src/main/res/drawable/ic_personal_sign.xml index 35f894810f..b35ad40061 100644 --- a/app/src/main/res/drawable/ic_personal_sign.xml +++ b/app/src/main/res/drawable/ic_personal_sign.xml @@ -4,7 +4,7 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_personal_user_protocol.xml b/app/src/main/res/drawable/ic_personal_user_protocol.xml index db6e9a4314..fe197a16ae 100644 --- a/app/src/main/res/drawable/ic_personal_user_protocol.xml +++ b/app/src/main/res/drawable/ic_personal_user_protocol.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_server_popup_up.xml b/app/src/main/res/drawable/ic_server_popup_up.xml index 80575f1879..5d72457b57 100644 --- a/app/src/main/res/drawable/ic_server_popup_up.xml +++ b/app/src/main/res/drawable/ic_server_popup_up.xml @@ -9,7 +9,7 @@ android:scaleY="-1"> diff --git a/app/src/main/res/drawable/ic_smooth_load_in_background.xml b/app/src/main/res/drawable/ic_smooth_load_in_background.xml index 83adbc0658..22defd93f9 100644 --- a/app/src/main/res/drawable/ic_smooth_load_in_background.xml +++ b/app/src/main/res/drawable/ic_smooth_load_in_background.xml @@ -9,13 +9,13 @@ android:pathData="M4,0.75L8,0.75A3.25,3.25 0,0 1,11.25 4L11.25,8A3.25,3.25 0,0 1,8 11.25L4,11.25A3.25,3.25 0,0 1,0.75 8L0.75,4A3.25,3.25 0,0 1,4 0.75z" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="@color/text_subtitle" /> + android:strokeColor="@color/text_secondary" /> diff --git a/app/src/main/res/drawable/ic_startup_ad_arrow.xml b/app/src/main/res/drawable/ic_startup_ad_arrow.xml index 0e4c17e4d9..db5ebe4509 100644 --- a/app/src/main/res/drawable/ic_startup_ad_arrow.xml +++ b/app/src/main/res/drawable/ic_startup_ad_arrow.xml @@ -11,7 +11,7 @@ android:strokeLineJoin="round" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#ffffff" + android:strokeColor="@color/text_aw_primary" android:strokeLineCap="round"/> diff --git a/app/src/main/res/drawable/ic_update_version_update_highlight.xml b/app/src/main/res/drawable/ic_update_version_update_highlight.xml index 62645aa846..d536fa157c 100644 --- a/app/src/main/res/drawable/ic_update_version_update_highlight.xml +++ b/app/src/main/res/drawable/ic_update_version_update_highlight.xml @@ -5,6 +5,6 @@ android:viewportHeight="6"> diff --git a/app/src/main/res/drawable/ic_user_game_collection.xml b/app/src/main/res/drawable/ic_user_game_collection.xml index dbf4157053..3b22d73594 100644 --- a/app/src/main/res/drawable/ic_user_game_collection.xml +++ b/app/src/main/res/drawable/ic_user_game_collection.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/drawable/ic_vgame_recent_hint.xml b/app/src/main/res/drawable/ic_vgame_recent_hint.xml index 5f41e53734..adef42976c 100644 --- a/app/src/main/res/drawable/ic_vgame_recent_hint.xml +++ b/app/src/main/res/drawable/ic_vgame_recent_hint.xml @@ -10,19 +10,19 @@ android:strokeLineJoin="round" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="@color/text_title" + android:strokeColor="@color/text_primary" android:strokeLineCap="round" /> + android:strokeColor="@color/text_primary" /> diff --git a/app/src/main/res/drawable/ic_vgame_update_hint.xml b/app/src/main/res/drawable/ic_vgame_update_hint.xml index b445242e09..51fec8776d 100644 --- a/app/src/main/res/drawable/ic_vgame_update_hint.xml +++ b/app/src/main/res/drawable/ic_vgame_update_hint.xml @@ -27,9 +27,9 @@ android:strokeWidth="1" android:pathData="M0.522,13.853L0.323,14.5H1H28H28.5V14V1V0.5H28H9.431C6.578,0.5 4.058,2.361 3.219,5.088L0.522,13.853Z" android:fillColor="#00000000" - android:strokeColor="@color/background_space" /> + android:strokeColor="@color/ui_container_1" /> + android:fillColor="@color/text_aw_primary" /> diff --git a/app/src/main/res/drawable/icon_arrow.xml b/app/src/main/res/drawable/icon_arrow.xml index 8666b94c14..3e4d86ce2d 100644 --- a/app/src/main/res/drawable/icon_arrow.xml +++ b/app/src/main/res/drawable/icon_arrow.xml @@ -10,7 +10,7 @@ android:strokeLineJoin="round" android:strokeWidth="1.5" android:fillColor="#00000000" - android:strokeColor="#ffffff" + android:strokeColor="@color/text_aw_primary" android:strokeLineCap="round" /> diff --git a/app/src/main/res/drawable/icon_clear.xml b/app/src/main/res/drawable/icon_clear.xml index 7ede768275..26629f9c6d 100644 --- a/app/src/main/res/drawable/icon_clear.xml +++ b/app/src/main/res/drawable/icon_clear.xml @@ -5,6 +5,6 @@ android:viewportHeight="14"> diff --git a/app/src/main/res/drawable/icon_heat.xml b/app/src/main/res/drawable/icon_heat.xml index 982a1202aa..d045b4f051 100644 --- a/app/src/main/res/drawable/icon_heat.xml +++ b/app/src/main/res/drawable/icon_heat.xml @@ -22,6 +22,6 @@ diff --git a/app/src/main/res/drawable/icon_moderator_more.xml b/app/src/main/res/drawable/icon_moderator_more.xml index 925a4148c1..732ad23b8e 100644 --- a/app/src/main/res/drawable/icon_moderator_more.xml +++ b/app/src/main/res/drawable/icon_moderator_more.xml @@ -7,14 +7,14 @@ + android:fillColor="@color/ui_background" /> + android:fillColor="@color/text_tertiary" /> diff --git a/app/src/main/res/drawable/icon_sheet_close.xml b/app/src/main/res/drawable/icon_sheet_close.xml index 82d0faa42f..663b9f970d 100644 --- a/app/src/main/res/drawable/icon_sheet_close.xml +++ b/app/src/main/res/drawable/icon_sheet_close.xml @@ -8,22 +8,22 @@ android:fillColor="#ffffff" android:pathData="M0,0h24v24h-24z" /> diff --git a/app/src/main/res/drawable/label_original.xml b/app/src/main/res/drawable/label_original.xml index abd0db27f1..4166e88acc 100644 --- a/app/src/main/res/drawable/label_original.xml +++ b/app/src/main/res/drawable/label_original.xml @@ -5,15 +5,15 @@ android:viewportHeight="16"> + android:strokeColor="@color/primary_theme" /> diff --git a/app/src/main/res/drawable/launcher_background.xml b/app/src/main/res/drawable/launcher_background.xml index a43faed447..318efd70bb 100644 --- a/app/src/main/res/drawable/launcher_background.xml +++ b/app/src/main/res/drawable/launcher_background.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable/login_btn_bg_enable.xml b/app/src/main/res/drawable/login_btn_bg_enable.xml index f8cb618310..52185d2fa2 100644 --- a/app/src/main/res/drawable/login_btn_bg_enable.xml +++ b/app/src/main/res/drawable/login_btn_bg_enable.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/oval_hint_accent_stroke_bg.xml b/app/src/main/res/drawable/oval_hint_accent_stroke_bg.xml index 30c6c0080c..ce7ed68b6f 100644 --- a/app/src/main/res/drawable/oval_hint_accent_stroke_bg.xml +++ b/app/src/main/res/drawable/oval_hint_accent_stroke_bg.xml @@ -6,6 +6,6 @@ + android:color="@color/ui_container_1" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_hint_red_bg.xml b/app/src/main/res/drawable/oval_hint_red_bg.xml index f926ac96ed..db7e1b060b 100644 --- a/app/src/main/res/drawable/oval_hint_red_bg.xml +++ b/app/src/main/res/drawable/oval_hint_red_bg.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_hint_red_stroke_bg.xml b/app/src/main/res/drawable/oval_hint_red_stroke_bg.xml index 315c70fea8..7d90e76781 100644 --- a/app/src/main/res/drawable/oval_hint_red_stroke_bg.xml +++ b/app/src/main/res/drawable/oval_hint_red_stroke_bg.xml @@ -2,7 +2,7 @@ - + + android:endColor="@color/primary_theme" + android:startColor="@color/primary_theme" /> diff --git a/app/src/main/res/drawable/progressbar_played_game_blue_style.xml b/app/src/main/res/drawable/progressbar_played_game_blue_style.xml index f68bfa3c16..8476ee4ab8 100644 --- a/app/src/main/res/drawable/progressbar_played_game_blue_style.xml +++ b/app/src/main/res/drawable/progressbar_played_game_blue_style.xml @@ -19,8 +19,8 @@ + android:endColor="@color/primary_theme" + android:startColor="@color/primary_theme" /> diff --git a/app/src/main/res/drawable/progressbar_video_detail.xml b/app/src/main/res/drawable/progressbar_video_detail.xml index 8d5a8eff6d..187a68a855 100644 --- a/app/src/main/res/drawable/progressbar_video_detail.xml +++ b/app/src/main/res/drawable/progressbar_video_detail.xml @@ -10,7 +10,7 @@ - + diff --git a/app/src/main/res/drawable/progressbar_xapk_detail_style.xml b/app/src/main/res/drawable/progressbar_xapk_detail_style.xml index 64af4abf80..0fdf575b9b 100644 --- a/app/src/main/res/drawable/progressbar_xapk_detail_style.xml +++ b/app/src/main/res/drawable/progressbar_xapk_detail_style.xml @@ -6,8 +6,8 @@ + android:endColor="@color/primary_theme" + android:startColor="@color/primary_theme" /> diff --git a/app/src/main/res/drawable/question_edit_popup_border.xml b/app/src/main/res/drawable/question_edit_popup_border.xml index 9af08ed8b7..42102a9ea2 100644 --- a/app/src/main/res/drawable/question_edit_popup_border.xml +++ b/app/src/main/res/drawable/question_edit_popup_border.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/round_grey_bg.xml b/app/src/main/res/drawable/round_grey_bg.xml index 0e06fb5750..f00123dad0 100644 --- a/app/src/main/res/drawable/round_grey_bg.xml +++ b/app/src/main/res/drawable/round_grey_bg.xml @@ -4,6 +4,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/scrollbar_vertical.xml b/app/src/main/res/drawable/scrollbar_vertical.xml index 369d0c0ce8..fa75bdb286 100644 --- a/app/src/main/res/drawable/scrollbar_vertical.xml +++ b/app/src/main/res/drawable/scrollbar_vertical.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable/selector_device_remind_indicator.xml b/app/src/main/res/drawable/selector_device_remind_indicator.xml index 4f0d197375..49b7a4619b 100644 --- a/app/src/main/res/drawable/selector_device_remind_indicator.xml +++ b/app/src/main/res/drawable/selector_device_remind_indicator.xml @@ -4,7 +4,7 @@ - + diff --git a/app/src/main/res/drawable/selector_f8f8f8.xml b/app/src/main/res/drawable/selector_f8f8f8.xml index 05f2751255..6fa95ef135 100644 --- a/app/src/main/res/drawable/selector_f8f8f8.xml +++ b/app/src/main/res/drawable/selector_f8f8f8.xml @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_default_avatar_selected.xml b/app/src/main/res/drawable/shape_default_avatar_selected.xml index 85b6001a12..7e015b370f 100644 --- a/app/src/main/res/drawable/shape_default_avatar_selected.xml +++ b/app/src/main/res/drawable/shape_default_avatar_selected.xml @@ -4,5 +4,5 @@ android:useLevel="false"> + android:color="@color/primary_theme" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/subject_tiled_tab_background.xml b/app/src/main/res/drawable/subject_tiled_tab_background.xml index f74f5456b5..c2c880b17a 100644 --- a/app/src/main/res/drawable/subject_tiled_tab_background.xml +++ b/app/src/main/res/drawable/subject_tiled_tab_background.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/subject_tiled_tab_select.xml b/app/src/main/res/drawable/subject_tiled_tab_select.xml index 2469ba47c3..fa709d8f7b 100644 --- a/app/src/main/res/drawable/subject_tiled_tab_select.xml +++ b/app/src/main/res/drawable/subject_tiled_tab_select.xml @@ -5,7 +5,7 @@ android:width="1dp" android:color="@color/text_dddddd" /> - + diff --git a/app/src/main/res/drawable/switchbuttom_back_color.xml b/app/src/main/res/drawable/switchbuttom_back_color.xml index cfe33078e3..ea514ba6da 100644 --- a/app/src/main/res/drawable/switchbuttom_back_color.xml +++ b/app/src/main/res/drawable/switchbuttom_back_color.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/textview_blue_dn.xml b/app/src/main/res/drawable/textview_blue_dn.xml index 997ff04459..e433d49c64 100644 --- a/app/src/main/res/drawable/textview_blue_dn.xml +++ b/app/src/main/res/drawable/textview_blue_dn.xml @@ -3,7 +3,7 @@ - + diff --git a/app/src/main/res/drawable/textview_blue_up.xml b/app/src/main/res/drawable/textview_blue_up.xml index 3d1f78b759..dc6973ae45 100644 --- a/app/src/main/res/drawable/textview_blue_up.xml +++ b/app/src/main/res/drawable/textview_blue_up.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/textview_concern_red_dn.xml b/app/src/main/res/drawable/textview_concern_red_dn.xml index b6074e6ef7..6adeac6e0c 100644 --- a/app/src/main/res/drawable/textview_concern_red_dn.xml +++ b/app/src/main/res/drawable/textview_concern_red_dn.xml @@ -3,7 +3,7 @@ - + diff --git a/app/src/main/res/drawable/textview_concern_red_up.xml b/app/src/main/res/drawable/textview_concern_red_up.xml index 9b30e869c6..07a5891e65 100644 --- a/app/src/main/res/drawable/textview_concern_red_up.xml +++ b/app/src/main/res/drawable/textview_concern_red_up.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/drawable/textview_concern_red_up_round.xml b/app/src/main/res/drawable/textview_concern_red_up_round.xml index 2732e1fec8..89f38c3d4d 100644 --- a/app/src/main/res/drawable/textview_concern_red_up_round.xml +++ b/app/src/main/res/drawable/textview_concern_red_up_round.xml @@ -5,7 +5,7 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/triangle_right_blue.xml b/app/src/main/res/drawable/triangle_right_blue.xml index a02867b6a3..1df1465e41 100644 --- a/app/src/main/res/drawable/triangle_right_blue.xml +++ b/app/src/main/res/drawable/triangle_right_blue.xml @@ -4,6 +4,6 @@ android:pivotX="0%" android:pivotY="0%"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/video_detail_seek_progress.xml b/app/src/main/res/drawable/video_detail_seek_progress.xml index 53e3dd7cee..136e5698c5 100644 --- a/app/src/main/res/drawable/video_detail_seek_progress.xml +++ b/app/src/main/res/drawable/video_detail_seek_progress.xml @@ -19,7 +19,7 @@ - + diff --git a/app/src/main/res/layout/activity_authorization.xml b/app/src/main/res/layout/activity_authorization.xml index 9e28c61ce2..514fc6150f 100644 --- a/app/src/main/res/layout/activity_authorization.xml +++ b/app/src/main/res/layout/activity_authorization.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -69,7 +69,7 @@ android:layout_marginTop="8dp" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" tools:text="@string/app_name" /> @@ -120,7 +120,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="该应用将访问您的公开资料，云存档数据" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="@id/container2" app:layout_constraintRight_toRightOf="@id/container2" diff --git a/app/src/main/res/layout/activity_cloud_archive_manager.xml b/app/src/main/res/layout/activity_cloud_archive_manager.xml index e68d45c72c..afb7a8406f 100644 --- a/app/src/main/res/layout/activity_cloud_archive_manager.xml +++ b/app/src/main/res/layout/activity_cloud_archive_manager.xml @@ -16,7 +16,7 @@ android:id="@+id/gameContainer" android:layout_width="match_parent" android:layout_height="96dp" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintTop_toBottomOf="@+id/reuseToolbar"> @@ -77,14 +77,14 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_alignParentTop="true" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> + app:indicatorColor="@color/text_theme" /> @@ -117,7 +117,7 @@ android:id="@+id/uploadContainer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" 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 333cd64e43..497974a4b6 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/background_white" + android:background="@color/ui_surface" android:focusable="true" android:focusableInTouchMode="true" android:orientation="vertical"> @@ -37,7 +37,7 @@ android:includeFontPadding="false" android:padding="10dp" android:text="取消" - android:textColor="@color/text_subtitle" /> + android:textColor="@color/text_secondary" /> @@ -88,7 +88,7 @@ android:gravity="center_vertical" android:maxLines="1" android:text="选择论坛" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" /> @@ -118,7 +118,7 @@ android:ellipsize="end" android:maxLines="1" android:text="选择子版块" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" /> @@ -152,7 +152,7 @@ android:layout_height="@dimen/cutting_line" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> + android:textColor="@color/text_instance" /> @@ -210,7 +210,7 @@ android:layout_marginRight="16dp" android:gravity="end" android:text="0" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -222,7 +222,7 @@ android:layout_height="0.5dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> 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 013cf9a008..754641b070 100644 --- a/app/src/main/res/layout/activity_editor_insert_game.xml +++ b/app/src/main/res/layout/activity_editor_insert_game.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background" + android:background="@color/ui_background" android:orientation="vertical"> @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:descendantFocusability="beforeDescendants" android:focusableInTouchMode="true" android:gravity="center_vertical" @@ -51,7 +51,7 @@ android:paddingLeft="12dp" android:paddingRight="12dp" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textColorHint="@color/text_C1BFC9" android:textCursorDrawable="@drawable/cursor_color" android:textSize="12sp" @@ -82,7 +82,7 @@ android:gravity="center" android:paddingLeft="16dp" android:text="@string/libao_search" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -106,7 +106,7 @@ android:id="@+id/default_list_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:visibility="gone"> @@ -124,7 +124,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/activity_game_collection_edit.xml b/app/src/main/res/layout/activity_game_collection_edit.xml index 8c30133b3f..9c71c06676 100644 --- a/app/src/main/res/layout/activity_game_collection_edit.xml +++ b/app/src/main/res/layout/activity_game_collection_edit.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical"> @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="点击上传图片" - android:textColor="@color/text_body" + android:textColor="@color/text_instance" android:textSize="@dimen/secondary_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -133,8 +133,8 @@ android:gravity="end" android:hint="请至少添加一个标签" android:includeFontPadding="false" - android:textColor="@color/text_body" - android:textColorHint="@color/text_subtitleDesc" + android:textColor="@color/text_instance" + android:textColorHint="@color/text_tertiary" android:textSize="@dimen/secondary_size" /> + android:background="@color/ui_divider" /> + android:textColor="@color/text_primary" /> + android:background="@color/ui_divider" /> + android:textColor="@color/text_primary" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_game_comment_logs.xml b/app/src/main/res/layout/activity_game_comment_logs.xml index fe83825612..e24f516dae 100644 --- a/app/src/main/res/layout/activity_game_comment_logs.xml +++ b/app/src/main/res/layout/activity_game_comment_logs.xml @@ -2,7 +2,7 @@ @@ -31,7 +31,7 @@ android:layout_width="35dp" android:layout_height="18dp" android:layout_marginRight="20dp" - android:background="@color/theme" + android:background="@color/primary_theme" android:gravity="center" android:text="新增" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_game_servers.xml b/app/src/main/res/layout/activity_game_servers.xml index 6b60ce0dab..e4cbfa98ca 100644 --- a/app/src/main/res/layout/activity_game_servers.xml +++ b/app/src/main/res/layout/activity_game_servers.xml @@ -77,7 +77,7 @@ style="@style/toolbar_title" android:layout_width="100dp" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:text="开服表" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> @@ -87,6 +87,6 @@ android:id="@+id/viewpager" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background" /> + android:background="@color/ui_background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_install_skeleton.xml b/app/src/main/res/layout/activity_install_skeleton.xml index fdb266b6fa..8924c31832 100644 --- a/app/src/main/res/layout/activity_install_skeleton.xml +++ b/app/src/main/res/layout/activity_install_skeleton.xml @@ -39,7 +39,7 @@ android:layout_height="60dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -56,7 +56,7 @@ android:layout_width="90dp" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:background="@color/background" + android:background="@color/ui_background" android:ellipsize="end" android:textSize="11sp" /> @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="@color/background" + android:background="@color/ui_background" android:singleLine="true" android:textSize="10sp" /> @@ -83,19 +83,19 @@ + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> @@ -104,7 +104,7 @@ android:id="@+id/download_btn" android:layout_width="60dp" android:layout_height="28.5dp" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -142,7 +142,7 @@ android:layout_height="60dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -158,7 +158,7 @@ android:layout_width="90dp" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:background="@color/background" + android:background="@color/ui_background" android:ellipsize="end" android:textSize="11sp" /> @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="@color/background" + android:background="@color/ui_background" android:singleLine="true" android:textSize="10sp" /> @@ -184,19 +184,19 @@ + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> @@ -204,7 +204,7 @@ + android:background="@color/ui_background" /> @@ -242,7 +242,7 @@ android:layout_height="60dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -258,7 +258,7 @@ android:layout_width="90dp" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:background="@color/background" + android:background="@color/ui_background" android:ellipsize="end" android:textSize="11sp" /> @@ -271,7 +271,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="@color/background" + android:background="@color/ui_background" android:singleLine="true" android:textSize="10sp" /> @@ -284,19 +284,19 @@ + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> @@ -304,7 +304,7 @@ + android:background="@color/ui_background" /> @@ -342,7 +342,7 @@ android:layout_height="60dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -358,7 +358,7 @@ android:layout_width="90dp" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:background="@color/background" + android:background="@color/ui_background" android:ellipsize="end" android:textSize="11sp" /> @@ -371,7 +371,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="@color/background" + android:background="@color/ui_background" android:singleLine="true" android:textSize="10sp" /> @@ -384,19 +384,19 @@ + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> @@ -404,7 +404,7 @@ + android:background="@color/ui_background" /> @@ -442,7 +442,7 @@ android:layout_height="60dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -458,7 +458,7 @@ android:layout_width="90dp" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:background="@color/background" + android:background="@color/ui_background" android:ellipsize="end" android:textSize="11sp" /> @@ -471,7 +471,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="@color/background" + android:background="@color/ui_background" android:singleLine="true" android:textSize="10sp" /> @@ -484,19 +484,19 @@ + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> @@ -504,7 +504,7 @@ + android:background="@color/ui_background" /> @@ -542,7 +542,7 @@ android:layout_height="60dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -558,7 +558,7 @@ android:layout_width="90dp" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:background="@color/background" + android:background="@color/ui_background" android:ellipsize="end" android:textSize="11sp" /> @@ -571,7 +571,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="@color/background" + android:background="@color/ui_background" android:singleLine="true" android:textSize="10sp" /> @@ -584,19 +584,19 @@ + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> @@ -604,7 +604,7 @@ + android:background="@color/ui_background" /> diff --git a/app/src/main/res/layout/activity_kaifu_add.xml b/app/src/main/res/layout/activity_kaifu_add.xml index 096eb21585..669afcde9e 100644 --- a/app/src/main/res/layout/activity_kaifu_add.xml +++ b/app/src/main/res/layout/activity_kaifu_add.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:background="@color/background"> + android:background="@color/ui_background"> @@ -13,7 +13,7 @@ android:layout_height="0dp" android:layout_marginTop="8dp" android:layout_weight="1" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -44,7 +44,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="1dp" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -37,7 +37,7 @@ android:layout_height="50dp" android:layout_marginRight="1dp" android:layout_weight="15" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:textColor="@color/title" @@ -50,7 +50,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="29" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:textColor="@color/title" @@ -62,7 +62,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:textColor="@color/title" @@ -75,7 +75,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="15dp" - android:background="@color/theme" + android:background="@color/primary_theme" android:orientation="horizontal" android:paddingLeft="1dp" android:paddingTop="1dp" @@ -87,7 +87,7 @@ android:layout_height="50dp" android:layout_marginRight="1dp" android:layout_weight="15" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:orientation="horizontal"> @@ -109,7 +109,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="29" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:hint="点击填写" android:singleLine="true" @@ -122,7 +122,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:background="@color/background_white" + android:background="@color/ui_surface" android:enabled="false" android:gravity="center" android:maxLength="4" @@ -137,7 +137,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="15dp" - android:background="@color/theme_red" + android:background="@color/secondary_red" android:orientation="horizontal" android:paddingLeft="1dp" android:paddingTop="1dp" @@ -149,7 +149,7 @@ android:layout_height="50dp" android:layout_marginRight="1dp" android:layout_weight="15" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:orientation="horizontal"> @@ -171,7 +171,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="29" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:textColor="@color/hint" @@ -183,7 +183,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:textColor="@color/hint" @@ -197,7 +197,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="1dp" - android:background="@color/background_white"> + android:background="@color/ui_surface"> + android:background="@color/ui_background"> diff --git a/app/src/main/res/layout/activity_libaodetail_skeleton.xml b/app/src/main/res/layout/activity_libaodetail_skeleton.xml index 31b4ef633e..a47f6028f1 100644 --- a/app/src/main/res/layout/activity_libaodetail_skeleton.xml +++ b/app/src/main/res/layout/activity_libaodetail_skeleton.xml @@ -3,13 +3,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:background="@color/background"> + android:background="@color/ui_background"> @@ -19,7 +19,7 @@ android:layout_height="60dp" android:layout_centerVertical="true" android:layout_marginRight="11dp" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -40,14 +40,14 @@ android:layout_height="wrap_content" android:layout_marginTop="6dp" android:layout_marginBottom="6dp" - android:background="@color/background" + android:background="@color/ui_background" android:singleLine="true" android:textSize="12sp" /> @@ -59,7 +59,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginLeft="10dp" - android:background="@color/background" + android:background="@color/ui_background" android:gravity="center" /> @@ -69,7 +69,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:paddingLeft="18dp" android:paddingTop="12dp" @@ -80,7 +80,7 @@ @@ -105,7 +105,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:paddingLeft="18dp" android:paddingTop="12dp" @@ -116,7 +116,7 @@ + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> @@ -155,7 +155,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:paddingLeft="18dp" android:paddingTop="12dp" @@ -166,7 +166,7 @@ + android:background="@color/ui_background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6f351491b5..fcbb00237d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -37,7 +37,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="10dp" android:text="战歌竞技场已首发上限！\n腾讯自走棋2.0大作，极速对决体验" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" android:visibility="gone" app:layout_constraintLeft_toLeftOf="parent" @@ -54,7 +54,7 @@ android:background="@drawable/border_round_theme_15" android:gravity="center" android:text="点击查看" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:visibility="gone" app:layout_constraintLeft_toLeftOf="parent" @@ -68,7 +68,7 @@ android:id="@+id/startAdContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background" + android:background="@color/ui_background" android:visibility="gone" tools:visibility="gone"> diff --git a/app/src/main/res/layout/activity_news_detail.xml b/app/src/main/res/layout/activity_news_detail.xml index 8e04d2162b..4eff4c3053 100644 --- a/app/src/main/res/layout/activity_news_detail.xml +++ b/app/src/main/res/layout/activity_news_detail.xml @@ -39,7 +39,7 @@ android:id="@+id/bottomContainer" android:layout_width="match_parent" android:layout_height="60dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="horizontal" android:paddingStart="5dp" android:paddingEnd="5dp" @@ -79,7 +79,7 @@ android:layout_toRightOf="@+id/comment_icon" android:paddingBottom="1dp" android:text="@string/news_detail_send_comment" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/activity_poster_edit.xml b/app/src/main/res/layout/activity_poster_edit.xml index 61047d1d48..6bc5a03602 100644 --- a/app/src/main/res/layout/activity_poster_edit.xml +++ b/app/src/main/res/layout/activity_poster_edit.xml @@ -53,7 +53,7 @@ android:paddingRight="12dp" android:paddingBottom="6dp" android:text="确定" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" app:layout_constraintBottom_toBottomOf="@id/normal_toolbar" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/normal_toolbar" /> @@ -97,7 +97,7 @@ diff --git a/app/src/main/res/layout/activity_questions_edit.xml b/app/src/main/res/layout/activity_questions_edit.xml index a957f83761..0f5cc495cc 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/background_white" + android:background="@color/ui_surface" android:focusable="true" android:focusableInTouchMode="true" android:orientation="vertical"> @@ -37,7 +37,7 @@ android:includeFontPadding="false" android:padding="10dp" android:text="取消" - android:textColor="@color/text_subtitle" /> + android:textColor="@color/text_secondary" /> @@ -101,7 +101,7 @@ android:gravity="center_vertical" android:maxLines="1" android:text="选择论坛" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" /> @@ -131,7 +131,7 @@ android:ellipsize="end" android:maxLines="1" android:text="选择子版块" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" /> @@ -166,7 +166,7 @@ + android:background="@color/ui_divider" /> @@ -187,7 +187,7 @@ android:paddingLeft="16dp" android:paddingTop="15dp" android:text="请详细描述你的问题" - android:textColor="@color/text_body" /> + android:textColor="@color/text_instance" /> + android:background="@color/ui_surface"> @@ -227,7 +227,7 @@ android:layout_marginRight="16dp" android:gravity="end" android:text="0" - android:textColor="@color/text_body" + android:textColor="@color/text_instance" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -239,7 +239,7 @@ android:layout_height="0.5dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_surface"> + android:background="@color/ui_background" /> @@ -105,7 +105,7 @@ android:rating="5" android:stepSize="1" app:mrb_progressBackgroundTint="@color/text_dddddd" - app:mrb_progressTint="@color/theme" + app:mrb_progressTint="@color/primary_theme" app:mrb_secondaryProgressTint="@color/text_dddddd" /> + android:background="@color/ui_background" /> + android:textColor="@color/text_theme" /> + android:background="@color/ui_surface" /> diff --git a/app/src/main/res/layout/activity_servers_calendar.xml b/app/src/main/res/layout/activity_servers_calendar.xml index d0c861a85f..75631e3a7d 100644 --- a/app/src/main/res/layout/activity_servers_calendar.xml +++ b/app/src/main/res/layout/activity_servers_calendar.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/background" + android:background="@color/ui_background" android:orientation="vertical"> @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@id/normal_toolbar_container" - android:background="@color/background_white" + android:background="@color/ui_surface" android:visibility="gone" tools:visibility="visible"> @@ -22,7 +22,7 @@ android:id="@+id/hint" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background" + android:background="@color/ui_background" android:drawableLeft="@drawable/servers_calendar_hint" android:drawablePadding="4dp" android:paddingLeft="20dp" @@ -30,7 +30,7 @@ android:paddingRight="20dp" android:paddingBottom="12dp" android:text="开服信息仅供参考，具体请以游戏内开服为准" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -40,7 +40,7 @@ android:id="@+id/divider" android:layout_width="1dp" android:layout_height="18dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintBottom_toBottomOf="@id/year" app:layout_constraintLeft_toRightOf="@id/year" app:layout_constraintTop_toTopOf="@id/year" /> @@ -52,7 +52,7 @@ android:gravity="center" android:paddingLeft="24dp" android:paddingRight="24dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/hint" @@ -64,7 +64,7 @@ android:layout_height="32dp" android:layout_marginLeft="24dp" android:gravity="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/year" app:layout_constraintLeft_toRightOf="@id/year" @@ -91,7 +91,7 @@ android:layout_height="32dp" android:layout_marginLeft="16dp" android:gravity="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/year" app:layout_constraintLeft_toRightOf="@id/cur_month" @@ -104,7 +104,7 @@ android:layout_height="1dp" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="@id/year" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> @@ -127,7 +127,7 @@ android:layout_height="1dp" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintBottom_toBottomOf="@id/recycler_view" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> @@ -141,7 +141,7 @@ android:lineSpacingExtra="4dp" android:paddingLeft="24dp" android:paddingRight="24dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/activity_share_gh.xml b/app/src/main/res/layout/activity_share_gh.xml index 433fcdb7c9..ec5a5eead0 100644 --- a/app/src/main/res/layout/activity_share_gh.xml +++ b/app/src/main/res/layout/activity_share_gh.xml @@ -2,7 +2,7 @@ @@ -16,7 +16,7 @@ android:id="@+id/content_ll" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center_horizontal" android:orientation="vertical"> @@ -33,14 +33,14 @@ android:layout_marginBottom="6dp" android:gravity="center_horizontal" android:text="光环助手官网" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> diff --git a/app/src/main/res/layout/activity_sharecard_pic.xml b/app/src/main/res/layout/activity_sharecard_pic.xml index af3abdfce6..985fc5bf1d 100644 --- a/app/src/main/res/layout/activity_sharecard_pic.xml +++ b/app/src/main/res/layout/activity_sharecard_pic.xml @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toRightOf="@+id/sharecard_game_icon" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/activity_toolbox_block.xml b/app/src/main/res/layout/activity_toolbox_block.xml index 7f133dd6e6..6da73c4f6c 100644 --- a/app/src/main/res/layout/activity_toolbox_block.xml +++ b/app/src/main/res/layout/activity_toolbox_block.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background" + android:background="@color/ui_background" android:orientation="vertical"> @@ -26,7 +26,7 @@ android:id="@+id/toolbox_appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background" + android:background="@color/ui_background" android:gravity="center" app:elevation="0dp" app:layout_behavior="com.gh.gamecenter.common.view.FixAppBarLayoutBehavior"> @@ -39,7 +39,7 @@ @@ -58,7 +58,7 @@ android:clickable="true" android:focusable="true" app:cardCornerRadius="8dp" - app:cardBackgroundColor="@color/background_white" + app:cardBackgroundColor="@color/ui_surface" app:cardElevation="12dp"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/activity_video_publish.xml b/app/src/main/res/layout/activity_video_publish.xml index 5cd1f33c23..c8b36086d8 100644 --- a/app/src/main/res/layout/activity_video_publish.xml +++ b/app/src/main/res/layout/activity_video_publish.xml @@ -41,7 +41,7 @@ android:includeFontPadding="false" android:padding="10dp" android:text="取消" - android:textColor="@color/text_subtitle" /> + android:textColor="@color/text_secondary" /> diff --git a/app/src/main/res/layout/activity_video_uplaod.xml b/app/src/main/res/layout/activity_video_uplaod.xml index b75efe403a..fda5d2c3ba 100644 --- a/app/src/main/res/layout/activity_video_uplaod.xml +++ b/app/src/main/res/layout/activity_video_uplaod.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -133,7 +133,7 @@ android:layout_height="0dp" android:gravity="center_vertical" android:text="请选择游戏～" - android:textColor="@color/text_body" + android:textColor="@color/text_instance" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/game_name_hint" app:layout_constraintLeft_toRightOf="@id/game_name_hint" @@ -146,7 +146,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/game_name_hint" /> @@ -159,7 +159,7 @@ android:paddingTop="16dp" android:paddingRight="16dp" android:paddingBottom="14dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="@id/game_title" tools:text="标题*" /> @@ -176,8 +176,8 @@ android:paddingTop="16dp" android:paddingRight="20dp" android:paddingBottom="24dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textSize="14sp" app:layout_constraintLeft_toRightOf="@id/game_title_hint" app:layout_constraintRight_toRightOf="parent" @@ -190,7 +190,7 @@ android:layout_marginRight="20dp" android:layout_marginBottom="14dp" android:text="0/100" - android:textColor="@color/text_body" + android:textColor="@color/text_instance" android:textSize="12dp" app:layout_constraintBottom_toBottomOf="@id/game_title" app:layout_constraintRight_toRightOf="@id/game_title" /> @@ -201,7 +201,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/game_title" /> @@ -213,7 +213,7 @@ android:gravity="center" android:paddingLeft="20dp" android:paddingRight="16dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/game_title_line" tools:text="分类*" /> @@ -242,7 +242,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/game_category" /> @@ -255,7 +255,7 @@ android:paddingLeft="20dp" android:paddingRight="16dp" android:text="标签" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="@id/game_category_hint" app:layout_constraintTop_toBottomOf="@id/game_category_line" /> @@ -347,7 +347,7 @@ android:id="@+id/game_tag_line" android:layout_width="0dp" android:layout_height="8dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/activityFlexbox" /> @@ -359,7 +359,7 @@ android:gravity="center" android:paddingLeft="20dp" android:paddingRight="16dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/game_tag_line" tools:text="视频来源*" /> @@ -404,7 +404,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/video_source" /> @@ -434,7 +434,7 @@ android:paddingLeft="20dp" android:paddingRight="16dp" android:text="添加水印" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -463,7 +463,7 @@ android:hint="请注明视频来源（例如转载自http://www.xx.com//vvv），标注清晰度将提高审核通过的概率哦" android:lineSpacingExtra="8dp" android:textColor="@color/video_upload_source_check" - android:textColorHint="@color/text_body" + android:textColorHint="@color/text_instance" android:textSize="14sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -486,7 +486,7 @@ android:id="@+id/watermark_line" android:layout_width="0dp" android:layout_height="8dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/videoSourceCl" /> @@ -509,7 +509,7 @@ android:layout_marginLeft="4dp" android:layout_marginBottom="2dp" android:text="@string/upload_protocol" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="@id/upload_confirm" app:layout_constraintLeft_toRightOf="@id/upload_confirm" @@ -528,7 +528,7 @@ android:drawablePadding="4dp" android:includeFontPadding="false" android:text="@string/video_upload_exposure_hint" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -546,7 +546,7 @@ diff --git a/app/src/main/res/layout/amway_comment_item.xml b/app/src/main/res/layout/amway_comment_item.xml index 609b53a013..efff05cfcc 100644 --- a/app/src/main/res/layout/amway_comment_item.xml +++ b/app/src/main/res/layout/amway_comment_item.xml @@ -67,7 +67,7 @@ android:paddingLeft="2dp" android:paddingRight="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:visibility="visible" @@ -88,7 +88,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/starIv" app:layout_constraintLeft_toRightOf="@id/starIv" @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="12dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@id/starIv" app:layout_constraintLeft_toRightOf="@id/ratingTv" @@ -197,7 +197,7 @@ app:layout_constraintBottom_toBottomOf="@id/sdv_user_badge" app:layout_constraintLeft_toRightOf="@id/sdv_user_badge" app:layout_constraintTop_toTopOf="@id/sdv_user_badge" - app:mrb_progressTint="@color/theme" /> + app:mrb_progressTint="@color/primary_theme" /> diff --git a/app/src/main/res/layout/answer_draft_item.xml b/app/src/main/res/layout/answer_draft_item.xml index 37397cfa3b..41fccfaff7 100644 --- a/app/src/main/res/layout/answer_draft_item.xml +++ b/app/src/main/res/layout/answer_draft_item.xml @@ -33,7 +33,7 @@ android:ellipsize="end" android:lineSpacingExtra="4dp" android:maxLines="3" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -63,7 +63,7 @@ android:paddingTop="6dp" android:paddingRight="10dp" android:paddingBottom="6dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -80,7 +80,7 @@ android:includeFontPadding="false" android:src="@drawable/article_draft_delete" android:text="删除" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/answer_draft_item_img" /> diff --git a/app/src/main/res/layout/app_update_hint_dialog.xml b/app/src/main/res/layout/app_update_hint_dialog.xml index 7aa5043ae6..57f3eb9b10 100644 --- a/app/src/main/res/layout/app_update_hint_dialog.xml +++ b/app/src/main/res/layout/app_update_hint_dialog.xml @@ -70,7 +70,7 @@ android:gravity="left" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" android:visibility="gone" app:layout_constraintLeft_toLeftOf="@id/head_background" @@ -103,7 +103,7 @@ android:layout_marginTop="8dp" android:layout_marginRight="24dp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="@id/head_background" app:layout_constraintRight_toRightOf="@id/head_background" @@ -116,7 +116,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:text="已在WiFi环境下完成下载" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" android:visibility="gone" app:layout_constraintLeft_toLeftOf="@id/desc" @@ -151,7 +151,7 @@ android:layout_marginBottom="13dp" android:padding="6dp" android:text="暂不更新" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirm" diff --git a/app/src/main/res/layout/app_updating_dialog.xml b/app/src/main/res/layout/app_updating_dialog.xml index c658c86d3e..a2a796357c 100644 --- a/app/src/main/res/layout/app_updating_dialog.xml +++ b/app/src/main/res/layout/app_updating_dialog.xml @@ -13,7 +13,7 @@ android:layout_marginTop="32dp" android:layout_marginBottom="10dp" android:text="@string/dialog_updating" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -78,7 +78,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="32dp" android:layout_weight="2" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/progress" @@ -90,7 +90,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintRight_toRightOf="@id/progress" app:layout_constraintTop_toBottomOf="@id/progress" diff --git a/app/src/main/res/layout/area_title_item.xml b/app/src/main/res/layout/area_title_item.xml index 55f5ed4c93..3ec492943f 100644 --- a/app/src/main/res/layout/area_title_item.xml +++ b/app/src/main/res/layout/area_title_item.xml @@ -3,7 +3,7 @@ android:id="@+id/area_title_item_name" android:layout_width="match_parent" android:layout_height="37dp" - android:background="@color/background" + android:background="@color/ui_background" android:gravity="center_vertical" android:paddingLeft="20dp" android:textColor="@color/black" diff --git a/app/src/main/res/layout/ask_answer_item.xml b/app/src/main/res/layout/ask_answer_item.xml index 52c5bbaed1..8c92f2a065 100644 --- a/app/src/main/res/layout/ask_answer_item.xml +++ b/app/src/main/res/layout/ask_answer_item.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" android:visibility="gone" @@ -68,7 +68,7 @@ android:ellipsize="end" android:maxLength="12" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/ask_answer_item_usericon_container" @@ -98,7 +98,7 @@ android:layout_marginLeft="4dp" android:gravity="center" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" android:visibility="visible" app:layout_constrainedWidth="true" @@ -118,7 +118,7 @@ android:ellipsize="end" android:maxLines="2" android:minLines="2" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@+id/ask_answer_item_img" app:layout_constraintStart_toStartOf="parent" @@ -167,7 +167,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/ask_answer_item_content" /> @@ -178,7 +178,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:layout_marginTop="10dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintLeft_toRightOf="@id/ask_answer_item_votecount" app:layout_constraintTop_toBottomOf="@id/ask_answer_item_content" /> @@ -191,7 +191,7 @@ android:gravity="right" android:maxEms="15" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -205,7 +205,7 @@ android:layout_marginLeft="10dp" android:singleLine="true" android:layout_marginTop="10dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/ask_subject_top_item.xml b/app/src/main/res/layout/ask_subject_top_item.xml index 9d8c4cfff6..d8915d985a 100644 --- a/app/src/main/res/layout/ask_subject_top_item.xml +++ b/app/src/main/res/layout/ask_subject_top_item.xml @@ -16,7 +16,7 @@ android:id="@+id/ask_subject_top_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:maxLines="2" android:paddingLeft="20dp" android:paddingTop="12dp" @@ -31,7 +31,7 @@ android:id="@+id/ask_subject_top_des" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:ellipsize="end" android:paddingLeft="20dp" android:paddingTop="9dp" @@ -45,7 +45,7 @@ android:id="@+id/ask_subject_top_tag" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background" + android:background="@color/ui_background" android:gravity="center_vertical" android:paddingLeft="20dp" android:paddingTop="10dp" diff --git a/app/src/main/res/layout/avatar_background_item.xml b/app/src/main/res/layout/avatar_background_item.xml index 2d626e9477..3bcf73682e 100644 --- a/app/src/main/res/layout/avatar_background_item.xml +++ b/app/src/main/res/layout/avatar_background_item.xml @@ -37,7 +37,7 @@ android:gravity="center" android:maxLines="1" android:text="边框名称" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/imageSdv" diff --git a/app/src/main/res/layout/avatar_item.xml b/app/src/main/res/layout/avatar_item.xml index 9bbf7903b6..33ec4934c7 100644 --- a/app/src/main/res/layout/avatar_item.xml +++ b/app/src/main/res/layout/avatar_item.xml @@ -31,7 +31,7 @@ android:ellipsize="end" android:gravity="center" android:maxLines="1" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/imageSdv" @@ -45,7 +45,7 @@ android:layout_marginTop="4dp" android:gravity="center" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/imageSdv" diff --git a/app/src/main/res/layout/big_image_recommend_item.xml b/app/src/main/res/layout/big_image_recommend_item.xml index b1694aa9bc..3995e5e44a 100644 --- a/app/src/main/res/layout/big_image_recommend_item.xml +++ b/app/src/main/res/layout/big_image_recommend_item.xml @@ -49,7 +49,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" app:layout_constrainedWidth="true" app:layout_constraintHorizontal_bias="0" @@ -71,7 +71,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" app:layout_constraintHorizontal_bias="0" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/catalog_header_item.xml b/app/src/main/res/layout/catalog_header_item.xml index 4a5f68f688..a53c0d9055 100644 --- a/app/src/main/res/layout/catalog_header_item.xml +++ b/app/src/main/res/layout/catalog_header_item.xml @@ -22,7 +22,7 @@ android:layout_weight="1" android:gravity="center_vertical" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" tools:text="人气手游风向标" /> @@ -33,7 +33,7 @@ android:layout_height="match_parent" android:gravity="center" android:text="全部 >" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/catalog_item.xml b/app/src/main/res/layout/catalog_item.xml index 5e832bdcf6..fe954cbb72 100644 --- a/app/src/main/res/layout/catalog_item.xml +++ b/app/src/main/res/layout/catalog_item.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" tools:text="精选" /> diff --git a/app/src/main/res/layout/catalog_subject_game_item.xml b/app/src/main/res/layout/catalog_subject_game_item.xml index 20e5d2f29a..40bae1d70c 100644 --- a/app/src/main/res/layout/catalog_subject_game_item.xml +++ b/app/src/main/res/layout/catalog_subject_game_item.xml @@ -24,7 +24,7 @@ android:lineSpacingExtra="4dp" android:marqueeRepeatLimit="marquee_forever" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" tools:text="超杀默示录" /> diff --git a/app/src/main/res/layout/category_directory_item.xml b/app/src/main/res/layout/category_directory_item.xml index 28b2c792b1..fdd6a6be2f 100644 --- a/app/src/main/res/layout/category_directory_item.xml +++ b/app/src/main/res/layout/category_directory_item.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" android:textSize="14sp" tools:text="玩法" /> diff --git a/app/src/main/res/layout/category_game_item.xml b/app/src/main/res/layout/category_game_item.xml index 3c96b831f0..74d344adab 100644 --- a/app/src/main/res/layout/category_game_item.xml +++ b/app/src/main/res/layout/category_game_item.xml @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" android:textStyle="bold" tools:text="地海争霸：巫妖王再怒" /> @@ -81,7 +81,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" /> @@ -104,7 +104,7 @@ android:layout_width="wrap_content" android:layout_height="14dp" android:layout_marginLeft="8dp" - android:background="@color/theme" + android:background="@color/primary_theme" android:gravity="center" android:maxLines="1" android:paddingStart="4dp" @@ -160,7 +160,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constraintLeft_toRightOf="@+id/game_rating" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/category_v2_item.xml b/app/src/main/res/layout/category_v2_item.xml index a623b56c00..dad6cfc5fe 100644 --- a/app/src/main/res/layout/category_v2_item.xml +++ b/app/src/main/res/layout/category_v2_item.xml @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" tools:text="精选" /> diff --git a/app/src/main/res/layout/cloud_archive_item.xml b/app/src/main/res/layout/cloud_archive_item.xml index 7daf0458ca..ba30a237bf 100644 --- a/app/src/main/res/layout/cloud_archive_item.xml +++ b/app/src/main/res/layout/cloud_archive_item.xml @@ -7,7 +7,7 @@ android:paddingTop="20dp" android:paddingEnd="16dp" android:paddingBottom="15dp" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -65,7 +65,7 @@ android:ellipsize="end" android:maxLength="12" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/user_icon_container" @@ -97,7 +97,7 @@ android:gravity="center" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -117,7 +117,7 @@ android:ellipsize="end" android:maxLines="2" android:minLines="2" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@+id/image" app:layout_constraintStart_toStartOf="parent" @@ -149,7 +149,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/content" /> @@ -162,7 +162,7 @@ android:gravity="right" android:maxEms="15" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/content" /> diff --git a/app/src/main/res/layout/comment_head_item.xml b/app/src/main/res/layout/comment_head_item.xml index 1f863c9f75..f28b80db58 100644 --- a/app/src/main/res/layout/comment_head_item.xml +++ b/app/src/main/res/layout/comment_head_item.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:paddingLeft="16dp" android:paddingRight="16dp"> diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml index e38c7fad53..acfa19d5d0 100644 --- a/app/src/main/res/layout/comment_item.xml +++ b/app/src/main/res/layout/comment_item.xml @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" @@ -110,7 +110,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -127,7 +127,7 @@ android:layout_height="13dp" android:layout_marginLeft="6dp" android:layout_marginTop="2dp" - android:background="@color/theme" + android:background="@color/primary_theme" android:gravity="center" android:text="置顶" android:textColor="@color/white" @@ -189,7 +189,7 @@ android:layout_toLeftOf="@id/command_container" android:includeFontPadding="false" android:lineSpacingExtra="3dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" tools:text="星際爭霸與星際爭霸2的職業選電競戰隊的經理美少女团体星際老男孩成員之一，還在杭州經營水產生意。" /> @@ -205,7 +205,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" tools:text="一个小时前" /> @@ -217,7 +217,7 @@ android:layout_marginLeft="8dp" android:layout_centerVertical="true" android:layout_toRightOf="@id/comment_time" - android:background="@color/text_body" /> + android:background="@color/text_instance" /> @@ -283,7 +283,7 @@ android:layout_below="@+id/comment_quote_author_tv" android:layout_marginTop="2dp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" tools:text="2006年12月30日，孙一峰与女友weiwei结婚，育有儿子孙宁和女儿孙焕佳。" /> diff --git a/app/src/main/res/layout/common_collection_image_text_item.xml b/app/src/main/res/layout/common_collection_image_text_item.xml index c2b52eba39..aac9e3f123 100644 --- a/app/src/main/res/layout/common_collection_image_text_item.xml +++ b/app/src/main/res/layout/common_collection_image_text_item.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -75,7 +75,7 @@ android:includeFontPadding="false" android:maxLength="12" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/timeContainer" @@ -106,7 +106,7 @@ android:layout_marginLeft="4dp" android:gravity="center" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -150,7 +150,7 @@ android:drawablePadding="2dp" android:textSize="11sp" tools:text="内容审核中" - tools:textColor="@color/text_subtitleDesc" /> + tools:textColor="@color/text_tertiary" /> @@ -169,7 +169,7 @@ android:layout_height="wrap_content" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" tools:text=" · 1分钟前" tools:visibility="visible" /> @@ -185,7 +185,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintTop_toBottomOf="@id/user_icon" @@ -206,7 +206,7 @@ android:paddingTop="10dp" android:paddingRight="12dp" android:paddingBottom="10dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" android:visibility="gone" @@ -224,7 +224,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="2" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@+id/questionTitle" tools:text="2012年在韓國出道，曾為韓國男子組合EXO成員及中國分隊EXO-M隊長。2014年解約回國後出演多部電影，開啟其演員生涯。2015年11月，發行首張中文單曲《Bad Girl》，開啟其個人歌手生涯。2016年11月，發行首張英文單曲《JULY》，正式開啟嘻哈音樂之路。" /> @@ -294,7 +294,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:includeFontPadding="false" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/popularAnswerUserIcon" app:layout_constraintStart_toEndOf="@+id/popularAnswerUserIcon" @@ -307,7 +307,7 @@ android:layout_marginLeft="5dp" android:includeFontPadding="false" android:text="回答了问题：" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/popularAnswerUserName" app:layout_constraintStart_toEndOf="@+id/popularAnswerUserName" @@ -321,7 +321,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -360,7 +360,7 @@ android:id="@+id/forumIcon" android:layout_width="24dp" android:layout_height="24dp" - app:gameIconBorderColor="@color/border" + app:gameIconBorderColor="@color/resource_border" app:gameIconBorderWidth="0.5dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -378,7 +378,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/community_article_draft_item.xml b/app/src/main/res/layout/community_article_draft_item.xml index 4e495dc4db..d21563a6e1 100644 --- a/app/src/main/res/layout/community_article_draft_item.xml +++ b/app/src/main/res/layout/community_article_draft_item.xml @@ -18,7 +18,7 @@ android:ellipsize="end" android:lineSpacingExtra="6dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -38,7 +38,7 @@ android:paddingTop="6dp" android:paddingRight="10dp" android:paddingBottom="6dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" @@ -54,7 +54,7 @@ android:includeFontPadding="false" android:src="@drawable/article_draft_delete" android:text="删除" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" /> diff --git a/app/src/main/res/layout/community_edit_window.xml b/app/src/main/res/layout/community_edit_window.xml index 93203a2147..f672cca63a 100644 --- a/app/src/main/res/layout/community_edit_window.xml +++ b/app/src/main/res/layout/community_edit_window.xml @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginTop="2dp" android:text="发帖子" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" /> @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:layout_marginTop="2dp" android:text="提问" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" /> @@ -89,7 +89,7 @@ android:layout_height="wrap_content" android:layout_marginTop="2dp" android:text="发视频" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/community_question_draft_item.xml b/app/src/main/res/layout/community_question_draft_item.xml index 082266f702..f451e68176 100644 --- a/app/src/main/res/layout/community_question_draft_item.xml +++ b/app/src/main/res/layout/community_question_draft_item.xml @@ -18,7 +18,7 @@ android:ellipsize="end" android:lineSpacingExtra="6dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -38,7 +38,7 @@ android:paddingTop="6dp" android:paddingRight="10dp" android:paddingBottom="6dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" @@ -54,7 +54,7 @@ android:includeFontPadding="false" android:src="@drawable/article_draft_delete" android:text="删除" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" /> diff --git a/app/src/main/res/layout/community_video_draft_item.xml b/app/src/main/res/layout/community_video_draft_item.xml index 957cab7415..6810bb9bf9 100644 --- a/app/src/main/res/layout/community_video_draft_item.xml +++ b/app/src/main/res/layout/community_video_draft_item.xml @@ -18,7 +18,7 @@ android:ellipsize="end" android:lineSpacingExtra="6dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -38,7 +38,7 @@ android:paddingTop="6dp" android:paddingRight="10dp" android:paddingBottom="6dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" @@ -54,7 +54,7 @@ android:includeFontPadding="false" android:src="@drawable/article_draft_delete" android:text="删除" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/article_draft_title" /> diff --git a/app/src/main/res/layout/detail_download_item.xml b/app/src/main/res/layout/detail_download_item.xml index 657de16bae..1cb70bbd92 100644 --- a/app/src/main/res/layout/detail_download_item.xml +++ b/app/src/main/res/layout/detail_download_item.xml @@ -135,7 +135,7 @@ @@ -169,7 +169,7 @@ android:includeFontPadding="false" android:paddingTop="4dp" android:text="畅玩 >" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="10sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="@+id/iv_vmode" @@ -204,7 +204,7 @@ android:includeFontPadding="false" android:paddingTop="4dp" android:text="关注" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="10sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="@+id/iv_concern" @@ -231,7 +231,7 @@ android:includeFontPadding="false" android:paddingTop="4dp" android:text="预约" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="10sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="@+id/iv_reserve" @@ -259,7 +259,7 @@ android:includeFontPadding="false" android:paddingTop="4dp" android:text="安装方式" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="10sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="@+id/iv_switch" diff --git a/app/src/main/res/layout/dialog_add_new_label.xml b/app/src/main/res/layout/dialog_add_new_label.xml index da62c3b759..60d9daaaa0 100644 --- a/app/src/main/res/layout/dialog_add_new_label.xml +++ b/app/src/main/res/layout/dialog_add_new_label.xml @@ -20,7 +20,7 @@ android:layout_marginRight="24dp" android:drawablePadding="4dp" android:gravity="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -40,8 +40,8 @@ android:lineSpacingExtra="7dp" android:paddingLeft="12dp" android:paddingRight="12dp" - android:textColor="@color/text_subtitle" - android:textColorHint="@color/text_body" + android:textColor="@color/text_secondary" + android:textColorHint="@color/text_instance" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -53,7 +53,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/content" /> @@ -65,7 +65,7 @@ android:gravity="center" android:paddingTop="18dp" android:paddingBottom="18dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:text="取消" app:layout_constraintLeft_toLeftOf="parent" @@ -76,7 +76,7 @@ android:id="@+id/middle_line" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirm" app:layout_constraintTop_toBottomOf="@id/line" /> @@ -88,7 +88,7 @@ android:gravity="center" android:paddingTop="18dp" android:paddingBottom="18dp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:text="确定" app:layout_constraintLeft_toRightOf="@id/cancel" diff --git a/app/src/main/res/layout/dialog_add_vote.xml b/app/src/main/res/layout/dialog_add_vote.xml index f527cd4016..58c4962b53 100644 --- a/app/src/main/res/layout/dialog_add_vote.xml +++ b/app/src/main/res/layout/dialog_add_vote.xml @@ -21,7 +21,7 @@ android:drawablePadding="4dp" android:text="添加选项" android:textAlignment="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -39,8 +39,8 @@ android:hint="请输入选项名称" android:lines="1" android:padding="12dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textSize="@dimen/primary_text_size" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -51,7 +51,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="23dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/contentEt" @@ -63,7 +63,7 @@ android:layout_height="50dp" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -74,7 +74,7 @@ android:id="@+id/centerDivider" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirmTv" app:layout_constraintTop_toBottomOf="@id/lineView" /> @@ -87,7 +87,7 @@ android:enabled="false" android:gravity="center" android:text="@string/menu_text_save" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@id/cancelTv" diff --git a/app/src/main/res/layout/dialog_address_confirmation.xml b/app/src/main/res/layout/dialog_address_confirmation.xml index 1112c794ce..95d207164b 100644 --- a/app/src/main/res/layout/dialog_address_confirmation.xml +++ b/app/src/main/res/layout/dialog_address_confirmation.xml @@ -29,7 +29,7 @@ android:layout_gravity="center" android:layout_marginTop="14dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" android:textStyle="bold" tools:text="光环助手" /> @@ -44,7 +44,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:padding="16dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" tools:text="http://static.wallbroken.com/p/7eb04605hc12e1346773583n.apk" /> @@ -55,7 +55,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:text="@string/oversea_hint" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" /> @@ -52,7 +52,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="取消" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/dialog_positive" @@ -61,7 +61,7 @@ @@ -74,7 +74,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="确定" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" app:layout_constraintLeft_toRightOf="@id/dialog_negative" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/dialog_apply_moderator.xml b/app/src/main/res/layout/dialog_apply_moderator.xml index 6baacef3aa..7132a3b371 100644 --- a/app/src/main/res/layout/dialog_apply_moderator.xml +++ b/app/src/main/res/layout/dialog_apply_moderator.xml @@ -25,7 +25,7 @@ android:includeFontPadding="false" android:text="提交申请成功" android:textAlignment="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -39,7 +39,7 @@ android:layout_marginTop="12dp" android:includeFontPadding="false" android:textAlignment="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_archive_loading.xml b/app/src/main/res/layout/dialog_archive_loading.xml index dc649d1ae6..21c1c06057 100644 --- a/app/src/main/res/layout/dialog_archive_loading.xml +++ b/app/src/main/res/layout/dialog_archive_loading.xml @@ -13,7 +13,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:text="存档下载中" /> @@ -23,7 +23,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" tools:text="68.0%" /> diff --git a/app/src/main/res/layout/dialog_bind_phone.xml b/app/src/main/res/layout/dialog_bind_phone.xml index cda69d170a..ad3df212d6 100644 --- a/app/src/main/res/layout/dialog_bind_phone.xml +++ b/app/src/main/res/layout/dialog_bind_phone.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:layout_centerHorizontal="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" android:textSize="16sp" android:text="如何绑定手机号" /> @@ -41,7 +41,7 @@ @@ -55,7 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="12dp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:text="设置" /> @@ -69,7 +69,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:text="账号与安全" /> @@ -80,7 +80,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="21dp" - android:background="@color/background" /> + android:background="@color/ui_background" /> diff --git a/app/src/main/res/layout/dialog_cancel_reservation.xml b/app/src/main/res/layout/dialog_cancel_reservation.xml index 306893eda6..23a59ecb7a 100644 --- a/app/src/main/res/layout/dialog_cancel_reservation.xml +++ b/app/src/main/res/layout/dialog_cancel_reservation.xml @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="取消预约" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" /> @@ -41,7 +41,7 @@ android:background="@drawable/bg_shape_space2_radius_999" android:gravity="center" android:text="暂不取消" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> @@ -33,7 +33,7 @@ android:background="@drawable/bg_choose_option_selector" android:gravity="center" android:text="从手机相册中选择" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -43,7 +43,7 @@ android:id="@+id/line2" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/localUploadTv" /> @@ -55,7 +55,7 @@ android:background="@drawable/bg_choose_option_selector" android:gravity="center" android:text="选择默认头像" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -65,7 +65,7 @@ android:id="@+id/line3" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/defaultTv" /> @@ -78,7 +78,7 @@ android:background="@drawable/bg_shape_space2_radius_999" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_choose_activity.xml b/app/src/main/res/layout/dialog_choose_activity.xml index e771b568bb..094858b7b6 100644 --- a/app/src/main/res/layout/dialog_choose_activity.xml +++ b/app/src/main/res/layout/dialog_choose_activity.xml @@ -20,7 +20,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="选择话题标签" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginRight="16dp" android:text="确定" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" app:layout_constraintBottom_toBottomOf="@+id/titleTv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/titleTv" /> diff --git a/app/src/main/res/layout/dialog_choose_default_avatar.xml b/app/src/main/res/layout/dialog_choose_default_avatar.xml index ab168ff67f..5dd8089e8c 100644 --- a/app/src/main/res/layout/dialog_choose_default_avatar.xml +++ b/app/src/main/res/layout/dialog_choose_default_avatar.xml @@ -11,7 +11,7 @@ android:layout_height="48dp" android:gravity="center" android:text="选择默认头像" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -59,7 +59,7 @@ android:background="@drawable/bg_shape_space2_radius_999" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/guideLine" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_choose_forum.xml b/app/src/main/res/layout/dialog_choose_forum.xml index f1001a5ef7..d26189fdf6 100644 --- a/app/src/main/res/layout/dialog_choose_forum.xml +++ b/app/src/main/res/layout/dialog_choose_forum.xml @@ -31,7 +31,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="选择论坛" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -62,8 +62,8 @@ android:hint="搜索想要的论坛" android:paddingLeft="14dp" android:paddingRight="12dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14dp" app:layout_constraintEnd_toEndOf="parent" @@ -74,7 +74,7 @@ android:id="@+id/tab_container" android:layout_width="match_parent" android:layout_height="@dimen/tab_layout_height" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/searchEt"> @@ -84,7 +84,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/default_tab_indicator_height" android:layout_alignParentBottom="true" - app:indicatorColor="@color/theme_font" /> + app:indicatorColor="@color/text_theme" /> diff --git a/app/src/main/res/layout/dialog_choose_game_collection_cover_type.xml b/app/src/main/res/layout/dialog_choose_game_collection_cover_type.xml index 96a97be535..928b1455b1 100644 --- a/app/src/main/res/layout/dialog_choose_game_collection_cover_type.xml +++ b/app/src/main/res/layout/dialog_choose_game_collection_cover_type.xml @@ -11,7 +11,7 @@ android:layout_height="48dp" android:gravity="center" android:text="选择图片上传方式" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -21,7 +21,7 @@ android:id="@+id/line1" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/titleTv" /> @@ -42,7 +42,7 @@ android:layout_marginTop="12dp" android:includeFontPadding="false" android:text="本地上传" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -58,7 +58,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="推荐" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="@dimen/tag_text_size" app:layout_constraintBottom_toBottomOf="@+id/localUploadTitleTv" app:layout_constraintStart_toEndOf="@+id/localUploadTitleTv" @@ -71,7 +71,7 @@ android:layout_marginTop="2dp" android:includeFontPadding="false" android:text="上传清晰美观的封面，有助于你的游戏单脱颖而出" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -83,7 +83,7 @@ android:id="@+id/line2" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/localUploadContainer" /> @@ -104,7 +104,7 @@ android:layout_marginTop="12dp" android:includeFontPadding="false" android:text="默认封面" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -118,7 +118,7 @@ android:layout_marginTop="2dp" android:includeFontPadding="false" android:text="光环提供的默认封面，解决你的选择困难症" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -130,7 +130,7 @@ android:id="@+id/line3" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/defaultUploadContainer" /> @@ -144,7 +144,7 @@ android:background="@drawable/bg_shape_f5_radius_999" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/secondary_title_text_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_choose_game_collection_default_cover.xml b/app/src/main/res/layout/dialog_choose_game_collection_default_cover.xml index a58204af70..1554ea17ed 100644 --- a/app/src/main/res/layout/dialog_choose_game_collection_default_cover.xml +++ b/app/src/main/res/layout/dialog_choose_game_collection_default_cover.xml @@ -12,7 +12,7 @@ android:gravity="center" android:text="选择默认封面" android:textStyle="bold" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -26,7 +26,7 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:text="换一批" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" app:layout_constraintBottom_toBottomOf="@+id/titleTv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/titleTv" /> @@ -59,7 +59,7 @@ android:background="@drawable/bg_shape_f5_radius_999" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/secondary_title_text_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_choose_section.xml b/app/src/main/res/layout/dialog_choose_section.xml index 336f407e0d..ac83513bbd 100644 --- a/app/src/main/res/layout/dialog_choose_section.xml +++ b/app/src/main/res/layout/dialog_choose_section.xml @@ -20,7 +20,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="选择版块" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -33,7 +33,7 @@ android:layout_height="24dp" android:layout_marginRight="16dp" app:srcCompat="@drawable/icon_sheet_close" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" app:layout_constraintBottom_toBottomOf="@+id/titleTv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/titleTv" /> diff --git a/app/src/main/res/layout/dialog_community.xml b/app/src/main/res/layout/dialog_community.xml index df31532040..c7ac2cfa66 100644 --- a/app/src/main/res/layout/dialog_community.xml +++ b/app/src/main/res/layout/dialog_community.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/background_white" + android:background="@color/ui_surface" android:orientation="vertical"> @@ -56,7 +56,7 @@ android:drawableLeft="@drawable/selector_device_remind" android:button="@null" android:drawablePadding="4dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" android:visibility="gone" android:layout_marginTop="8dp" @@ -71,7 +71,7 @@ android:gravity="center" android:textSize="14sp" android:layout_marginTop="16dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:enabled="false" android:background="@drawable/button_round_f5f5f5" /> diff --git a/app/src/main/res/layout/dialog_disallow_privacy_policy.xml b/app/src/main/res/layout/dialog_disallow_privacy_policy.xml index 497d92fabb..3f6dedff8d 100644 --- a/app/src/main/res/layout/dialog_disallow_privacy_policy.xml +++ b/app/src/main/res/layout/dialog_disallow_privacy_policy.xml @@ -55,7 +55,7 @@ android:layout_marginTop="24dp" android:lineSpacingExtra="4dp" android:text="我们将按法律法规要求，全力保护您的个人信息安全" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" /> + android:background="@color/ui_background" /> diff --git a/app/src/main/res/layout/dialog_download.xml b/app/src/main/res/layout/dialog_download.xml index a50518009f..2043617ef1 100644 --- a/app/src/main/res/layout/dialog_download.xml +++ b/app/src/main/res/layout/dialog_download.xml @@ -45,7 +45,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/back" @@ -64,7 +64,7 @@ android:paddingTop="6dp" android:paddingRight="12dp" android:paddingBottom="6dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/back" @@ -107,13 +107,13 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:text="其它版本" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="15dp" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/dialog_download_link.xml b/app/src/main/res/layout/dialog_download_link.xml index 11df4abdf6..b35b300e47 100644 --- a/app/src/main/res/layout/dialog_download_link.xml +++ b/app/src/main/res/layout/dialog_download_link.xml @@ -14,7 +14,7 @@ android:id="@+id/title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/dialog_download_traffic.xml b/app/src/main/res/layout/dialog_download_traffic.xml index 9fb1dbe910..ec8ff56b35 100644 --- a/app/src/main/res/layout/dialog_download_traffic.xml +++ b/app/src/main/res/layout/dialog_download_traffic.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="下载提示" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" /> @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="当前正在使用移动网络，是否允许使用流量下载？" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:lineSpacingExtra="8dp" android:includeFontPadding="false" android:textSize="@dimen/primary_text_size" /> @@ -37,7 +37,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="可在“我的光环-设置”打开或关闭流量提醒" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" /> diff --git a/app/src/main/res/layout/dialog_edit_archive.xml b/app/src/main/res/layout/dialog_edit_archive.xml index 67e48306c8..0c11ad2892 100644 --- a/app/src/main/res/layout/dialog_edit_archive.xml +++ b/app/src/main/res/layout/dialog_edit_archive.xml @@ -21,7 +21,7 @@ android:drawablePadding="4dp" android:text="编辑存档" android:textAlignment="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -35,7 +35,7 @@ android:layout_marginLeft="24dp" android:layout_marginTop="16dp" android:layout_marginRight="24dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/primary_text_size" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -65,8 +65,8 @@ android:inputType="text" android:maxLines="1" android:paddingStart="12dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textSize="@dimen/primary_text_size" app:layout_constraintEnd_toStartOf="@+id/clearIv" app:layout_constraintStart_toStartOf="@+id/contentBg" @@ -90,7 +90,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="23dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/contentEt" /> @@ -101,7 +101,7 @@ android:layout_height="50dp" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -112,7 +112,7 @@ android:id="@+id/centerDivider" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirmTv" app:layout_constraintTop_toBottomOf="@id/lineView" /> @@ -125,7 +125,7 @@ android:enabled="false" android:gravity="center" android:text="@string/confirm" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@id/cancelTv" diff --git a/app/src/main/res/layout/dialog_edit_history.xml b/app/src/main/res/layout/dialog_edit_history.xml index 48315eb8f1..05aed1c8ee 100644 --- a/app/src/main/res/layout/dialog_edit_history.xml +++ b/app/src/main/res/layout/dialog_edit_history.xml @@ -20,7 +20,7 @@ android:layout_marginRight="24dp" android:drawablePadding="4dp" android:text="更新时间" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -63,7 +63,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/scrollView" @@ -75,7 +75,7 @@ android:layout_height="50dp" android:gravity="center" android:text="关闭" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/dialog_game_add_shortcut_permission.xml b/app/src/main/res/layout/dialog_game_add_shortcut_permission.xml index 77ec48aa64..c6fc3c9d00 100644 --- a/app/src/main/res/layout/dialog_game_add_shortcut_permission.xml +++ b/app/src/main/res/layout/dialog_game_add_shortcut_permission.xml @@ -39,7 +39,7 @@ android:drawablePadding="4dp" android:gravity="center" android:text="添加桌面图标" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -66,7 +66,7 @@ android:layout_marginRight="24dp" android:lineSpacingExtra="4dp" android:text="需要设置权限才能添加到桌面。请前往安卓系统设置“权限-创建桌面快捷方式”，开启权限" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintTop_toBottomOf="@id/contentIv" /> @@ -98,7 +98,7 @@ android:gravity="center" android:lineSpacingExtra="8dp" android:text="无法正常设置，联系客服反馈" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/goSettingTv" /> diff --git a/app/src/main/res/layout/dialog_game_big_event.xml b/app/src/main/res/layout/dialog_game_big_event.xml index 53108a517e..33dc13f8f1 100644 --- a/app/src/main/res/layout/dialog_game_big_event.xml +++ b/app/src/main/res/layout/dialog_game_big_event.xml @@ -19,14 +19,14 @@ android:layout_width="88dp" android:layout_height="wrap_content" android:textSize="12sp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:text="更新时间" /> @@ -44,7 +44,7 @@ + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/dialog_game_collection_share.xml b/app/src/main/res/layout/dialog_game_collection_share.xml index 4f29e41bd8..052b7d8448 100644 --- a/app/src/main/res/layout/dialog_game_collection_share.xml +++ b/app/src/main/res/layout/dialog_game_collection_share.xml @@ -37,7 +37,7 @@ android:layout_gravity="center" android:layout_marginTop="16dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:text="分享" app:layout_constraintEnd_toEndOf="parent" @@ -49,7 +49,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/titleTv" /> diff --git a/app/src/main/res/layout/dialog_game_detail_more.xml b/app/src/main/res/layout/dialog_game_detail_more.xml index f6d6f3d6a7..265c945856 100644 --- a/app/src/main/res/layout/dialog_game_detail_more.xml +++ b/app/src/main/res/layout/dialog_game_detail_more.xml @@ -59,7 +59,7 @@ android:layout_weight="1" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="@+id/gameIconView" app:layout_constraintEnd_toEndOf="parent" @@ -73,7 +73,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="12dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_container" /> @@ -139,7 +139,7 @@ android:layout_width="match_parent" android:layout_height="0.5dp" android:layout_marginTop="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/share_container" /> diff --git a/app/src/main/res/layout/dialog_game_download_manager_menu.xml b/app/src/main/res/layout/dialog_game_download_manager_menu.xml index 4b62a84c72..2be9dcdd5f 100644 --- a/app/src/main/res/layout/dialog_game_download_manager_menu.xml +++ b/app/src/main/res/layout/dialog_game_download_manager_menu.xml @@ -11,13 +11,13 @@ android:layout_height="48dp" android:gravity="center" android:text="操作" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="14sp" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> + android:textColor="@color/text_secondary" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_game_off_service.xml b/app/src/main/res/layout/dialog_game_off_service.xml index fd60f732f7..3f5aeb8c18 100644 --- a/app/src/main/res/layout/dialog_game_off_service.xml +++ b/app/src/main/res/layout/dialog_game_off_service.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:lineSpacingExtra="8dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" tools:text="很抱歉，光环助手暂时不提供该游戏的下载" /> @@ -36,7 +36,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:lineSpacingExtra="8dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" tools:text="小助手自动为您找到以下外站下载地址（若外站下架，则链接可能会失效）\n小助手自动为您找到以下外站下载地址（若外站下架，则链接可能会失效）" /> @@ -45,14 +45,14 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="23dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/dialog_game_resource_policy.xml b/app/src/main/res/layout/dialog_game_resource_policy.xml index e7fedc89ed..e8c1084309 100644 --- a/app/src/main/res/layout/dialog_game_resource_policy.xml +++ b/app/src/main/res/layout/dialog_game_resource_policy.xml @@ -18,7 +18,7 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" tools:text="光环助手资源协议" /> @@ -41,7 +41,7 @@ android:layout_marginTop="20dp" android:layout_marginLeft="10dp" android:textSize="14sp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:gravity="center" android:background="@drawable/bg_shape_space2_radius_999" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/dialog_gapps_download.xml b/app/src/main/res/layout/dialog_gapps_download.xml index 5416027799..8fb37b4d42 100644 --- a/app/src/main/res/layout/dialog_gapps_download.xml +++ b/app/src/main/res/layout/dialog_gapps_download.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - app:cardBackgroundColor="@color/background_white" + app:cardBackgroundColor="@color/ui_surface" app:cardCornerRadius="12dp" app:cardElevation="0dp"> @@ -20,7 +20,7 @@ android:background="@drawable/vspace_dialog_top_background" android:gravity="center" android:text="安装谷歌框架说明" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/large_title_text_size" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -46,7 +46,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="1.8dp" android:textAlignment="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/primary_text_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -64,7 +64,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="1.8dp" android:textAlignment="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/primary_text_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -79,7 +79,7 @@ android:background="@drawable/bg_shape_f5_radius_999" android:gravity="center" android:text="暂不安装" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/primary_text_size" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/downloadButton" diff --git a/app/src/main/res/layout/dialog_input_url.xml b/app/src/main/res/layout/dialog_input_url.xml index e82d2025d6..86001e9e37 100644 --- a/app/src/main/res/layout/dialog_input_url.xml +++ b/app/src/main/res/layout/dialog_input_url.xml @@ -17,7 +17,7 @@ android:inputType="textUri" android:paddingLeft="16dp" android:paddingRight="10dp" - android:textColorHint="@color/text_body" + android:textColorHint="@color/text_instance" android:textSize="14sp" /> @@ -47,7 +47,7 @@ android:gravity="center" android:text="取消" android:textStyle="bold" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> @@ -33,7 +33,7 @@ android:id="@+id/line" android:layout_width="match_parent" android:layout_height="1px" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/titleTv" /> @@ -63,7 +63,7 @@ android:background="@drawable/bg_shape_space2_radius_999" android:gravity="center" android:text="清空" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/confirmBtn" diff --git a/app/src/main/res/layout/dialog_kaifu_remind.xml b/app/src/main/res/layout/dialog_kaifu_remind.xml index 502fabba1d..5a3c54655b 100644 --- a/app/src/main/res/layout/dialog_kaifu_remind.xml +++ b/app/src/main/res/layout/dialog_kaifu_remind.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:padding="16dp" android:text="温馨提示" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" /> @@ -38,7 +38,7 @@ android:layout_height="match_parent" android:lineSpacingExtra="4dp" android:padding="12dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" tools:text="混服：九游、官方、百度、当乐、OPPO等版本" /> @@ -47,7 +47,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/dialog_modify_nickname.xml b/app/src/main/res/layout/dialog_modify_nickname.xml index d8a29bff7d..4fe0dfd812 100644 --- a/app/src/main/res/layout/dialog_modify_nickname.xml +++ b/app/src/main/res/layout/dialog_modify_nickname.xml @@ -66,7 +66,7 @@ android:layout_width="0dp" android:layout_height="50dp" android:layout_weight="1" - android:background="@color/theme" + android:background="@color/primary_theme" android:gravity="center" android:text="@string/dialog_nickname_confirm" android:textColor="@color/white" diff --git a/app/src/main/res/layout/dialog_my_archive_option.xml b/app/src/main/res/layout/dialog_my_archive_option.xml index 9d85d3343f..6f90330bca 100644 --- a/app/src/main/res/layout/dialog_my_archive_option.xml +++ b/app/src/main/res/layout/dialog_my_archive_option.xml @@ -11,7 +11,7 @@ android:layout_height="48dp" android:gravity="center" android:text="更多选项" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -20,7 +20,7 @@ android:id="@+id/line1" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/titleTv" /> @@ -33,7 +33,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="删除" - android:textColor="@color/theme_red" + android:textColor="@color/secondary_red" android:textSize="@dimen/secondary_title_text_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -47,7 +47,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="编辑" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -61,7 +61,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="分享" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -75,7 +75,7 @@ android:background="@drawable/bg_shape_f5_radius_999" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/secondary_title_text_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_package_parse_error.xml b/app/src/main/res/layout/dialog_package_parse_error.xml index 22cc510cc9..d7695b68f7 100644 --- a/app/src/main/res/layout/dialog_package_parse_error.xml +++ b/app/src/main/res/layout/dialog_package_parse_error.xml @@ -15,7 +15,7 @@ android:layout_marginRight="24dp" android:drawablePadding="4dp" android:text="安装包解析错误" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -31,7 +31,7 @@ android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" android:text="检测到您本次下载的模拟器安装包发生错误，将无法正常安装使用。点击确定删除错误的安装包，然后请您再次尝试下载安装。" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -46,7 +46,7 @@ android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" android:text="您也可以点击提交反馈跟我们联系" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -58,7 +58,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/feedbackTv" /> @@ -71,7 +71,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="取消" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/confirm" @@ -81,7 +81,7 @@ android:id="@+id/middle_line" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirm" app:layout_constraintTop_toBottomOf="@id/line" /> @@ -94,7 +94,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="确定" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" app:layout_constraintLeft_toRightOf="@id/cancel" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/dialog_pass_regulation.xml b/app/src/main/res/layout/dialog_pass_regulation.xml index 67fea0ead9..38b6a2ead9 100644 --- a/app/src/main/res/layout/dialog_pass_regulation.xml +++ b/app/src/main/res/layout/dialog_pass_regulation.xml @@ -24,7 +24,7 @@ android:layout_marginTop="31dp" android:lineSpacingExtra="16dp" android:gravity="center_horizontal" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:text="@string/pass_regulation" /> diff --git a/app/src/main/res/layout/dialog_privacy_policy.xml b/app/src/main/res/layout/dialog_privacy_policy.xml index f0d6a14e1c..cdb4436d48 100644 --- a/app/src/main/res/layout/dialog_privacy_policy.xml +++ b/app/src/main/res/layout/dialog_privacy_policy.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardBackgroundColor="@color/background_white" + app:cardBackgroundColor="@color/ui_surface" app:cardCornerRadius="8dp" app:cardElevation="0dp"> @@ -38,7 +38,7 @@ android:layout_marginLeft="16dp" android:layout_marginTop="40dp" android:layout_marginRight="16dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="24sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="@id/head_background" @@ -54,7 +54,7 @@ android:layout_marginRight="16dp" android:includeFontPadding="false" android:lineSpacingExtra="8dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -94,7 +94,7 @@ android:layout_marginBottom="20dp" android:includeFontPadding="false" android:lineSpacingExtra="8dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" tools:text="这是啥" /> @@ -110,7 +110,7 @@ android:layout_marginBottom="20dp" android:includeFontPadding="false" android:lineSpacingExtra="8dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toTopOf="@id/allow_button" @@ -145,7 +145,7 @@ android:includeFontPadding="false" android:padding="4dp" android:text="暂不授权" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/dialog_privacy_protocol.xml b/app/src/main/res/layout/dialog_privacy_protocol.xml index 12086af979..23849f7d0b 100644 --- a/app/src/main/res/layout/dialog_privacy_protocol.xml +++ b/app/src/main/res/layout/dialog_privacy_protocol.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardBackgroundColor="@color/background_white" + app:cardBackgroundColor="@color/ui_surface" app:cardCornerRadius="8dp" app:cardElevation="0dp"> @@ -34,7 +34,7 @@ android:scrollbarThumbVertical="@drawable/webview_scrollbar_thumb_vertical" android:scrollbars="vertical" android:text="@string/dialog_privacy_policy_content" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" /> @@ -42,7 +42,7 @@ android:id="@+id/titleContainer" android:layout_width="match_parent" android:layout_height="64dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" @@ -63,7 +63,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:text="光环助手隐私政策" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" /> @@ -76,7 +76,7 @@ android:layout_marginRight="16dp" android:includeFontPadding="false" android:lineSpacingExtra="8dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintBottom_toTopOf="@id/line" app:layout_constraintLeft_toLeftOf="parent" @@ -89,7 +89,7 @@ android:layout_height="50dp" android:gravity="center" android:text="不同意" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/divider_line" @@ -102,7 +102,7 @@ android:layout_height="50dp" android:gravity="center" android:text="同意" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -114,7 +114,7 @@ android:id="@+id/divider_line" android:layout_width="1dp" android:layout_height="50dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/agreeTv" app:layout_constraintStart_toEndOf="@+id/refuseTv" @@ -125,7 +125,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="20dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintTop_toBottomOf="@+id/descTv" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_privacy_protocol_new.xml b/app/src/main/res/layout/dialog_privacy_protocol_new.xml index dc842b1e43..d1a4e2f0ed 100644 --- a/app/src/main/res/layout/dialog_privacy_protocol_new.xml +++ b/app/src/main/res/layout/dialog_privacy_protocol_new.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:cardBackgroundColor="@color/background_white" + app:cardBackgroundColor="@color/ui_surface" app:cardCornerRadius="8dp" app:cardElevation="0dp"> @@ -39,7 +39,7 @@ android:paddingTop="8dp" android:paddingEnd="12dp" android:paddingBottom="8dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/body_text_size" /> @@ -47,7 +47,7 @@ android:id="@+id/titleContainer" android:layout_width="match_parent" android:layout_height="64dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:orientation="horizontal" app:layout_constraintEnd_toEndOf="parent" @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:text="欢迎使用光环助手" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" /> @@ -72,7 +72,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="1.5dp" android:text="欢迎使用光环助手！为了更好的保障您的个人权益，在使用本产品前，请您审慎阅读以下“光环助手用户协议及隐私政策”：" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/primary_text_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -86,7 +86,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="1.5dp" android:text="如您同意以上内容，请点击“同意”，开始使用我们的产品和服务！" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/primary_text_size" app:layout_constraintBottom_toTopOf="@id/refuseTv" app:layout_constraintEnd_toEndOf="parent" @@ -100,7 +100,7 @@ android:background="@drawable/bg_shape_f5_radius_999" android:gravity="center" android:text="不同意" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/dialog_receive_badge.xml b/app/src/main/res/layout/dialog_receive_badge.xml index b15437b263..7c1981183a 100644 --- a/app/src/main/res/layout/dialog_receive_badge.xml +++ b/app/src/main/res/layout/dialog_receive_badge.xml @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" tools:text="当月累计评论30条" /> diff --git a/app/src/main/res/layout/dialog_regulation_test.xml b/app/src/main/res/layout/dialog_regulation_test.xml index 19b64bf6dd..8fc89743fa 100644 --- a/app/src/main/res/layout/dialog_regulation_test.xml +++ b/app/src/main/res/layout/dialog_regulation_test.xml @@ -19,7 +19,7 @@ android:drawableLeft="@drawable/ic_regulation_test_hint" android:drawablePadding="4dp" android:text="礼仪测试" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -34,7 +34,7 @@ android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" android:text="@string/regulation_hint" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -48,7 +48,7 @@ android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" android:text="@string/regulation_link" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="@id/content" app:layout_constraintRight_toRightOf="parent" @@ -59,7 +59,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/link" /> @@ -72,7 +72,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="跳过" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/confirm" @@ -81,7 +81,7 @@ @@ -94,7 +94,7 @@ android:paddingTop="18dp" android:paddingBottom="18dp" android:text="确定" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" app:layout_constraintLeft_toRightOf="@id/cancel" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/dialog_relieve_phone.xml b/app/src/main/res/layout/dialog_relieve_phone.xml index c757fe3bdc..9440440956 100644 --- a/app/src/main/res/layout/dialog_relieve_phone.xml +++ b/app/src/main/res/layout/dialog_relieve_phone.xml @@ -17,7 +17,7 @@ android:layout_marginLeft="24dp" android:layout_marginTop="24dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:text="解除关联" app:layout_constraintLeft_toLeftOf="parent" @@ -31,7 +31,7 @@ android:layout_marginRight="24dp" android:layout_marginTop="16dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:text="您未满足解除关联的条件，需完成以其中一项才可解绑哦~" app:layout_constrainedWidth="true" @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:text="完成实名认证" app:layout_constraintLeft_toRightOf="@+id/realNameIv" @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:text="绑定手机号" app:layout_constraintLeft_toRightOf="@+id/bindPhoneIv" @@ -116,7 +116,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="23dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintTop_toBottomOf="@+id/bindPhoneBtn" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" /> @@ -126,7 +126,7 @@ android:layout_width="match_parent" android:layout_height="50dp" android:gravity="center" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:text="以后再说" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/dialog_report_reason.xml b/app/src/main/res/layout/dialog_report_reason.xml index 5cd7fcfa2e..90e37aae55 100644 --- a/app/src/main/res/layout/dialog_report_reason.xml +++ b/app/src/main/res/layout/dialog_report_reason.xml @@ -136,8 +136,8 @@ android:lineSpacingExtra="4dp" android:hint="@string/report_reason_other_hint" android:textCursorDrawable="@drawable/cursor_color" - android:textColorHint="@color/text_body" - android:textColor="@color/text_subtitleDesc" + android:textColorHint="@color/text_instance" + android:textColor="@color/text_tertiary" android:textSize="14sp" /> @@ -155,7 +155,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="12dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/dialog_reserve.xml b/app/src/main/res/layout/dialog_reserve.xml index fcaad15230..d686dc2e83 100644 --- a/app/src/main/res/layout/dialog_reserve.xml +++ b/app/src/main/res/layout/dialog_reserve.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" /> @@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:text="查看全部 >" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/dialog_reserve_item.xml b/app/src/main/res/layout/dialog_reserve_item.xml index 5613bb9025..fd6998d1a9 100644 --- a/app/src/main/res/layout/dialog_reserve_item.xml +++ b/app/src/main/res/layout/dialog_reserve_item.xml @@ -24,7 +24,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/dialog_sertification.xml b/app/src/main/res/layout/dialog_sertification.xml index bcf2e94922..4b44cdf385 100644 --- a/app/src/main/res/layout/dialog_sertification.xml +++ b/app/src/main/res/layout/dialog_sertification.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="温馨提示" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" android:drawablePadding="4dp" @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="10dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:layout_marginLeft="24dp" android:layout_marginRight="24dp" @@ -47,7 +47,7 @@ android:layout_marginLeft="24dp" android:layout_marginRight="24dp" android:layout_marginTop="4dp" - android:textColor="@color/theme" /> + android:textColor="@color/primary_theme" /> + android:background="@color/ui_divider" /> + android:textColor="@color/text_primary" /> + android:background="@color/ui_divider" /> + android:textColor="@color/text_theme" /> diff --git a/app/src/main/res/layout/dialog_servers_calendear_detail.xml b/app/src/main/res/layout/dialog_servers_calendear_detail.xml index 07eb1bb979..36cf3c371f 100644 --- a/app/src/main/res/layout/dialog_servers_calendear_detail.xml +++ b/app/src/main/res/layout/dialog_servers_calendear_detail.xml @@ -23,7 +23,7 @@ android:paddingEnd="8dp" android:text="意见反馈" android:includeFontPadding="false" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -32,7 +32,7 @@ android:id="@+id/calendar_hint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" android:layout_marginTop="16dp" diff --git a/app/src/main/res/layout/dialog_servers_calendear_detail_item.xml b/app/src/main/res/layout/dialog_servers_calendear_detail_item.xml index 137c8fbe31..d97ab0a6de 100644 --- a/app/src/main/res/layout/dialog_servers_calendear_detail_item.xml +++ b/app/src/main/res/layout/dialog_servers_calendear_detail_item.xml @@ -17,7 +17,7 @@ android:layout_weight="1" android:layout_marginStart="16dp" android:text="时间" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/dialog_servers_calendear_detail_report.xml b/app/src/main/res/layout/dialog_servers_calendear_detail_report.xml index 2ab21a4099..388e7f9256 100644 --- a/app/src/main/res/layout/dialog_servers_calendear_detail_report.xml +++ b/app/src/main/res/layout/dialog_servers_calendear_detail_report.xml @@ -16,7 +16,7 @@ android:id="@+id/calendar_hint" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" android:layout_marginTop="16dp" diff --git a/app/src/main/res/layout/dialog_servers_calendear_detail_report_header.xml b/app/src/main/res/layout/dialog_servers_calendear_detail_report_header.xml index 44d9d60f95..8dbd6e55a0 100644 --- a/app/src/main/res/layout/dialog_servers_calendear_detail_report_header.xml +++ b/app/src/main/res/layout/dialog_servers_calendear_detail_report_header.xml @@ -25,7 +25,7 @@ android:layout_weight="1" android:layout_marginStart="8dp" android:text="时间" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/dialog_servers_calendear_detail_report_item.xml b/app/src/main/res/layout/dialog_servers_calendear_detail_report_item.xml index ac969658fb..8d7093241f 100644 --- a/app/src/main/res/layout/dialog_servers_calendear_detail_report_item.xml +++ b/app/src/main/res/layout/dialog_servers_calendear_detail_report_item.xml @@ -29,7 +29,7 @@ android:layout_weight="1" android:layout_marginStart="8dp" android:text="时间" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/dialog_share_archive.xml b/app/src/main/res/layout/dialog_share_archive.xml index 8192e9dff6..f2a0d32b03 100644 --- a/app/src/main/res/layout/dialog_share_archive.xml +++ b/app/src/main/res/layout/dialog_share_archive.xml @@ -21,7 +21,7 @@ android:drawablePadding="4dp" android:text="分享存档" android:textAlignment="center" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -51,8 +51,8 @@ android:inputType="text" android:maxLines="1" android:paddingStart="12dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textSize="@dimen/primary_text_size" app:layout_constraintEnd_toStartOf="@+id/clearTitleIv" app:layout_constraintStart_toStartOf="@+id/titleBg" @@ -94,8 +94,8 @@ android:inputType="text" android:maxLines="1" android:paddingStart="12dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textSize="@dimen/primary_text_size" app:layout_constraintEnd_toStartOf="@+id/clearDescIv" app:layout_constraintStart_toStartOf="@+id/descBg" @@ -119,7 +119,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="23dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/descEt" /> @@ -130,7 +130,7 @@ android:layout_height="50dp" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -141,7 +141,7 @@ android:id="@+id/centerDivider" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirmTv" app:layout_constraintTop_toBottomOf="@id/lineView" /> @@ -154,7 +154,7 @@ android:enabled="false" android:gravity="center" android:text="@string/share" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@id/cancelTv" diff --git a/app/src/main/res/layout/dialog_shortcut_permission.xml b/app/src/main/res/layout/dialog_shortcut_permission.xml index 4246562d54..445ca5b35b 100644 --- a/app/src/main/res/layout/dialog_shortcut_permission.xml +++ b/app/src/main/res/layout/dialog_shortcut_permission.xml @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="20dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:text="@string/dialog_shortcut_content1" /> @@ -28,7 +28,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" android:text="@string/dialog_shortcut_content2" /> @@ -50,7 +50,7 @@ android:paddingTop="16dp" android:paddingBottom="20dp" android:gravity="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="14sp" android:text="以后再说" /> diff --git a/app/src/main/res/layout/dialog_shortcut_permission_tips.xml b/app/src/main/res/layout/dialog_shortcut_permission_tips.xml index ccb416c02d..34e5d58992 100644 --- a/app/src/main/res/layout/dialog_shortcut_permission_tips.xml +++ b/app/src/main/res/layout/dialog_shortcut_permission_tips.xml @@ -18,7 +18,7 @@ android:background="@drawable/bg_title_gradient" android:gravity="center" android:text="@string/shortcut_title" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" /> @@ -29,7 +29,7 @@ android:lineSpacingExtra="4dp" android:paddingStart="24dp" android:paddingEnd="24dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:text="@string/shortcut_tips" /> @@ -50,7 +50,7 @@ android:background="@drawable/bg_f5f5f5_radius_20" android:gravity="center" android:text="@string/shortcut_cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/dialog_sign.xml b/app/src/main/res/layout/dialog_sign.xml index 9e82e59c69..0fb31afec7 100644 --- a/app/src/main/res/layout/dialog_sign.xml +++ b/app/src/main/res/layout/dialog_sign.xml @@ -8,7 +8,7 @@ android:layout_width="@dimen/default_dialog_width" android:layout_height="wrap_content" android:layout_gravity="center" - app:cardBackgroundColor="@color/background_white" + app:cardBackgroundColor="@color/ui_surface" app:cardCornerRadius="8dp"> @@ -40,7 +40,7 @@ android:layout_marginTop="12dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" /> @@ -80,7 +80,7 @@ android:id="@+id/centerDivider" android:layout_width="1dp" android:layout_height="match_parent" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/dialog_simulaor_game_guide.xml b/app/src/main/res/layout/dialog_simulaor_game_guide.xml index ed538b018a..20dba89376 100644 --- a/app/src/main/res/layout/dialog_simulaor_game_guide.xml +++ b/app/src/main/res/layout/dialog_simulaor_game_guide.xml @@ -10,7 +10,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="6dp" android:layout_marginRight="6dp" - app:cardBackgroundColor="@color/background_white" + app:cardBackgroundColor="@color/ui_surface" app:cardCornerRadius="12dp" app:cardElevation="0dp"> diff --git a/app/src/main/res/layout/dialog_stop_service_explanation.xml b/app/src/main/res/layout/dialog_stop_service_explanation.xml index edb508524e..acc48a4a6d 100644 --- a/app/src/main/res/layout/dialog_stop_service_explanation.xml +++ b/app/src/main/res/layout/dialog_stop_service_explanation.xml @@ -22,7 +22,7 @@ android:paddingRight="24dp" android:paddingBottom="14dp" android:text="停服保护状态说明" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" /> @@ -44,7 +44,7 @@ android:paddingTop="20dp" android:paddingRight="12dp" android:paddingBottom="20dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" tools:text="混服：九游、官方、百度、当乐、OPPO等版本" /> @@ -53,7 +53,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="24dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/dialog_strategy_item.xml b/app/src/main/res/layout/dialog_strategy_item.xml index 3031bcec41..b8254c8340 100644 --- a/app/src/main/res/layout/dialog_strategy_item.xml +++ b/app/src/main/res/layout/dialog_strategy_item.xml @@ -12,7 +12,7 @@ android:paddingBottom="12dp" android:paddingTop="12dp" android:text="@string/string_description" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="16sp" /> + android:background="@color/ui_surface"> + android:background="@color/ui_surface" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_top_community_category.xml b/app/src/main/res/layout/dialog_top_community_category.xml index 57938f5f6e..77c7d701d1 100644 --- a/app/src/main/res/layout/dialog_top_community_category.xml +++ b/app/src/main/res/layout/dialog_top_community_category.xml @@ -15,7 +15,7 @@ android:layout_marginTop="24dp" android:textStyle="bold" android:text="@string/article_detail_top_category_dialog_title" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" /> @@ -101,7 +101,7 @@ android:layout_height="50dp" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -112,7 +112,7 @@ android:id="@+id/centerDivider" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirmTv" app:layout_constraintTop_toBottomOf="@id/lineView" /> @@ -125,7 +125,7 @@ android:enabled="false" android:gravity="center" android:text="@string/confirm" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@id/cancelTv" diff --git a/app/src/main/res/layout/dialog_upload_schedule.xml b/app/src/main/res/layout/dialog_upload_schedule.xml index d4143cf6c5..1dd20cf8c1 100644 --- a/app/src/main/res/layout/dialog_upload_schedule.xml +++ b/app/src/main/res/layout/dialog_upload_schedule.xml @@ -27,7 +27,7 @@ android:layout_gravity="center_horizontal" android:layout_marginTop="12dp" android:text="游戏正在上传中" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/dialog_verified_confirm.xml b/app/src/main/res/layout/dialog_verified_confirm.xml index 8912afb82f..929c7585fe 100644 --- a/app/src/main/res/layout/dialog_verified_confirm.xml +++ b/app/src/main/res/layout/dialog_verified_confirm.xml @@ -11,7 +11,7 @@ android:paddingLeft="16dp" android:paddingTop="24dp" android:text="实名认证确认" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" /> @@ -23,14 +23,14 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:text="身份认证信息保存之后不可修改，确认提交？" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/dialog_vgame_feedback.xml b/app/src/main/res/layout/dialog_vgame_feedback.xml index 53f5ada781..19b2cc31de 100644 --- a/app/src/main/res/layout/dialog_vgame_feedback.xml +++ b/app/src/main/res/layout/dialog_vgame_feedback.xml @@ -10,7 +10,7 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardBackgroundColor="@color/background_white" + app:cardBackgroundColor="@color/ui_surface" app:cardCornerRadius="12dp" app:cardElevation="0dp" app:layout_constraintTop_toTopOf="parent"> @@ -45,7 +45,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/secondary_title_text_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -74,7 +74,7 @@ android:layout_marginStart="24dp" android:layout_marginEnd="24dp" android:text="本次游戏时间较短，是遇到什么问题了吗？ " - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" /> @@ -110,7 +110,7 @@ android:paddingTop="10dp" android:paddingEnd="16dp" android:paddingBottom="10dp" - android:textColorHint="@color/text_body" + android:textColorHint="@color/text_instance" android:textSize="14sp" /> @@ -143,7 +143,7 @@ android:layout_width="match_parent" android:layout_height="6dp" android:layout_alignParentBottom="true" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintBottom_toBottomOf="@id/container" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_video_upload_draft.xml b/app/src/main/res/layout/dialog_video_upload_draft.xml index 86463fa98f..f1c9cc57c6 100644 --- a/app/src/main/res/layout/dialog_video_upload_draft.xml +++ b/app/src/main/res/layout/dialog_video_upload_draft.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="提示" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="17sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@+id/hint_icon" @@ -33,7 +33,7 @@ android:layout_height="wrap_content" android:layout_marginTop="25dp" android:text="确定要保存视频草稿吗？" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="15sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -45,7 +45,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:lineSpacingExtra="8dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/title" @@ -62,7 +62,7 @@ android:paddingRight="31dp" android:paddingBottom="13dp" android:text="确定保存" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@id/negative" app:layout_constraintTop_toBottomOf="@id/content" /> diff --git a/app/src/main/res/layout/dialog_view_badge.xml b/app/src/main/res/layout/dialog_view_badge.xml index 228aecf726..be196cc8a1 100644 --- a/app/src/main/res/layout/dialog_view_badge.xml +++ b/app/src/main/res/layout/dialog_view_badge.xml @@ -38,7 +38,7 @@ android:layout_marginRight="16dp" android:includeFontPadding="false" android:lines="1" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" tools:text="当月累计评论30条当月累计评论30条" /> diff --git a/app/src/main/res/layout/dialog_vspace.xml b/app/src/main/res/layout/dialog_vspace.xml index c4372bdbb1..b7fab5c879 100644 --- a/app/src/main/res/layout/dialog_vspace.xml +++ b/app/src/main/res/layout/dialog_vspace.xml @@ -35,7 +35,7 @@ android:gravity="center_horizontal" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -142,7 +142,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:text="《畅玩助手服务组件隐私协议》" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_vspace_32.xml b/app/src/main/res/layout/dialog_vspace_32.xml index 8cdddfcd35..35329d6d19 100644 --- a/app/src/main/res/layout/dialog_vspace_32.xml +++ b/app/src/main/res/layout/dialog_vspace_32.xml @@ -35,7 +35,7 @@ android:gravity="center_horizontal" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -64,7 +64,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="64位组件" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="16sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -78,7 +78,7 @@ android:drawablePadding="2dp" android:gravity="center" android:text="已安装" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="@dimen/secondary_size" app:drawableStartCompat="@drawable/ic_completed" app:layout_constraintBottom_toBottomOf="parent" @@ -99,7 +99,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="32位组件" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -126,7 +126,7 @@ android:layout_marginTop="24dp" android:layout_marginBottom="40dp" android:text="《畅玩助手服务组件隐私协议》" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_vspace_update_32.xml b/app/src/main/res/layout/dialog_vspace_update_32.xml index eeee511ef1..ba4e017841 100644 --- a/app/src/main/res/layout/dialog_vspace_update_32.xml +++ b/app/src/main/res/layout/dialog_vspace_update_32.xml @@ -21,7 +21,7 @@ android:drawablePadding="4dp" android:gravity="center" android:text="服务工具更新提示" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -36,7 +36,7 @@ android:layout_marginTop="12dp" android:layout_marginRight="24dp" android:lineSpacingExtra="7dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -70,7 +70,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="64位组件" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="16sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -84,7 +84,7 @@ android:drawablePadding="2dp" android:gravity="center" android:text="已更新" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="@dimen/secondary_size" app:drawableStartCompat="@drawable/ic_completed" app:layout_constraintBottom_toBottomOf="parent" @@ -105,7 +105,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="32位组件" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/dialog_wechat_reserve_success.xml b/app/src/main/res/layout/dialog_wechat_reserve_success.xml index 215bbecf30..6e3d13b622 100644 --- a/app/src/main/res/layout/dialog_wechat_reserve_success.xml +++ b/app/src/main/res/layout/dialog_wechat_reserve_success.xml @@ -43,7 +43,7 @@ android:layout_marginRight="24dp" android:lineSpacingExtra="4dp" android:text="游戏上线时，您将在消息中心收到通知。为了避免错过通知，建议您开启微信公众号提醒" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/cardView" /> diff --git a/app/src/main/res/layout/discovery_game_item.xml b/app/src/main/res/layout/discovery_game_item.xml index 15582a3780..41240b4016 100644 --- a/app/src/main/res/layout/discovery_game_item.xml +++ b/app/src/main/res/layout/discovery_game_item.xml @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/body_text_size" android:textStyle="bold" tools:text="地海争霸：巫妖王再怒" /> @@ -84,7 +84,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" @@ -107,7 +107,7 @@ android:layout_width="wrap_content" android:layout_height="14dp" android:layout_marginStart="8dp" - android:background="@color/theme" + android:background="@color/primary_theme" android:gravity="center" android:maxLines="1" android:paddingStart="4dp" @@ -175,7 +175,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/tag_text_size" app:layout_constraintLeft_toRightOf="@+id/game_rating" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/download_dialog_installed_item.xml b/app/src/main/res/layout/download_dialog_installed_item.xml index 0928a40bde..08c1c886ea 100644 --- a/app/src/main/res/layout/download_dialog_installed_item.xml +++ b/app/src/main/res/layout/download_dialog_installed_item.xml @@ -49,7 +49,7 @@ android:layout_marginLeft="12dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" app:layout_constraintBottom_toTopOf="@id/remark" app:layout_constraintLeft_toRightOf="@id/icon" @@ -66,7 +66,7 @@ android:layout_marginTop="2dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constraintBottom_toTopOf="@id/status" app:layout_constraintLeft_toRightOf="@id/icon" @@ -82,7 +82,7 @@ android:layout_marginTop="2dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@id/icon" app:layout_constraintLeft_toRightOf="@id/icon" @@ -114,7 +114,7 @@ android:layout_marginRight="12dp" android:drawableLeft="@drawable/download_dialog_status_launch" android:drawablePadding="4dp" - android:textColor="@color/theme" + android:textColor="@color/primary_theme" android:textSize="12sp" android:visibility="gone" /> @@ -128,7 +128,7 @@ android:drawablePadding="4dp" android:includeFontPadding="false" android:text="查看合集" - android:textColor="@color/text_body" + android:textColor="@color/text_instance" android:textSize="12sp" android:visibility="visible" app:drawableRightCompat="@drawable/download_dialog_status_collection_gray" /> diff --git a/app/src/main/res/layout/download_dialog_item.xml b/app/src/main/res/layout/download_dialog_item.xml index 38bd201966..1d9f722bb6 100644 --- a/app/src/main/res/layout/download_dialog_item.xml +++ b/app/src/main/res/layout/download_dialog_item.xml @@ -54,7 +54,7 @@ android:layout_marginLeft="8dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" app:layout_constraintBottom_toTopOf="@id/remark" app:layout_constraintLeft_toRightOf="@id/icon" @@ -71,7 +71,7 @@ android:layout_marginTop="2dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constraintBottom_toTopOf="@id/status" app:layout_constraintLeft_toRightOf="@id/icon" @@ -88,7 +88,7 @@ android:drawablePadding="2dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@id/icon" app:layout_constraintLeft_toRightOf="@id/icon" diff --git a/app/src/main/res/layout/download_dialog_link_item.xml b/app/src/main/res/layout/download_dialog_link_item.xml index 0c07809f3d..56c20b6ea1 100644 --- a/app/src/main/res/layout/download_dialog_link_item.xml +++ b/app/src/main/res/layout/download_dialog_link_item.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:gravity="center" android:singleLine="true" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -29,7 +29,7 @@ android:layout_marginLeft="8dp" android:gravity="center" android:singleLine="true" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/download_dialog_platform_request_item.xml b/app/src/main/res/layout/download_dialog_platform_request_item.xml index 3ebdf93579..82fbe8ad3a 100644 --- a/app/src/main/res/layout/download_dialog_platform_request_item.xml +++ b/app/src/main/res/layout/download_dialog_platform_request_item.xml @@ -16,7 +16,7 @@ android:paddingTop="12dp" android:paddingBottom="12dp" android:text="没有我的版本？求版本 >" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/download_dialog_section_item.xml b/app/src/main/res/layout/download_dialog_section_item.xml index 5452952761..487e684ffa 100644 --- a/app/src/main/res/layout/download_dialog_section_item.xml +++ b/app/src/main/res/layout/download_dialog_section_item.xml @@ -13,7 +13,7 @@ android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="15sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -26,7 +26,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="点击卡片下载或查看合集" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/download_simulator_dialog.xml b/app/src/main/res/layout/download_simulator_dialog.xml index edbaa177a0..62c582b445 100644 --- a/app/src/main/res/layout/download_simulator_dialog.xml +++ b/app/src/main/res/layout/download_simulator_dialog.xml @@ -78,7 +78,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="24dp" android:layout_weight="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/progress" @@ -90,7 +90,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintRight_toRightOf="@id/progress" app:layout_constraintTop_toBottomOf="@id/progress" diff --git a/app/src/main/res/layout/downloadmanager.xml b/app/src/main/res/layout/downloadmanager.xml index b7754dc859..a6bf520b08 100644 --- a/app/src/main/res/layout/downloadmanager.xml +++ b/app/src/main/res/layout/downloadmanager.xml @@ -9,7 +9,7 @@ android:id="@+id/downloadmanager_rv_show" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" /> + android:background="@color/ui_surface" /> + android:background="@color/ui_surface"> @@ -51,14 +51,14 @@ android:id="@+id/downloadmanager_head_container" android:layout_width="match_parent" android:layout_height="48dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:visibility="gone"> + android:background="@color/ui_background" /> diff --git a/app/src/main/res/layout/downloadmanager_item_head.xml b/app/src/main/res/layout/downloadmanager_item_head.xml index 9ab48deb8c..b8cca2c272 100644 --- a/app/src/main/res/layout/downloadmanager_item_head.xml +++ b/app/src/main/res/layout/downloadmanager_item_head.xml @@ -2,14 +2,14 @@ + android:background="@color/ui_background" /> diff --git a/app/src/main/res/layout/editor_insert_container.xml b/app/src/main/res/layout/editor_insert_container.xml index de56e32cdc..6a49b5455a 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/background_white" + android:background="@color/ui_surface" android:gravity="center_vertical" android:orientation="horizontal"> @@ -79,7 +79,7 @@ + android:background="@color/ui_divider" /> @@ -301,7 +301,7 @@ android:layout_marginTop="8dp" android:gravity="center" android:text="引用帖子" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="11sp" /> @@ -328,7 +328,7 @@ android:layout_marginTop="8dp" android:gravity="center" android:text="引用视频帖" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="11sp" /> @@ -355,7 +355,7 @@ android:layout_marginTop="8dp" android:gravity="center" android:text="引用游戏" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="11sp" /> @@ -384,7 +384,7 @@ android:layout_marginTop="8dp" android:gravity="center" android:text="引用游戏单" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="11sp" /> diff --git a/app/src/main/res/layout/editor_insert_default_item.xml b/app/src/main/res/layout/editor_insert_default_item.xml index f90b4bad7b..2e98d32202 100644 --- a/app/src/main/res/layout/editor_insert_default_item.xml +++ b/app/src/main/res/layout/editor_insert_default_item.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@id/type" @@ -40,7 +40,7 @@ android:layout_marginLeft="12dp" android:layout_marginTop="4dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/game_icon" app:layout_constraintLeft_toRightOf="@id/game_icon" @@ -52,7 +52,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/fm_downloadmanager_item.xml b/app/src/main/res/layout/fm_downloadmanager_item.xml index 33b35771b8..3467dee545 100644 --- a/app/src/main/res/layout/fm_downloadmanager_item.xml +++ b/app/src/main/res/layout/fm_downloadmanager_item.xml @@ -38,7 +38,7 @@ android:includeFontPadding="false" android:marqueeRepeatLimit="marquee_forever" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" /> @@ -51,7 +51,7 @@ android:layout_marginTop="8dp" android:drawablePadding="2dp" android:includeFontPadding="false" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="@dimen/little_secondary_size" tools:text="2.41MB/s(剩37秒)" /> diff --git a/app/src/main/res/layout/fm_search_history_item.xml b/app/src/main/res/layout/fm_search_history_item.xml index ecd4812119..d086e9b81e 100644 --- a/app/src/main/res/layout/fm_search_history_item.xml +++ b/app/src/main/res/layout/fm_search_history_item.xml @@ -13,7 +13,7 @@ android:layout_height="1px" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> @@ -43,7 +43,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" diff --git a/app/src/main/res/layout/followers_or_fans_item.xml b/app/src/main/res/layout/followers_or_fans_item.xml index 99874c5e3b..5c0eb6f7ea 100644 --- a/app/src/main/res/layout/followers_or_fans_item.xml +++ b/app/src/main/res/layout/followers_or_fans_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/background_white" + android:background="@color/ui_surface" android:paddingLeft="5dp" android:paddingRight="16dp"> @@ -24,7 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginRight="11dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="11sp" tools:text="1回答" /> @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/answer_count" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="11sp" tools:text="1赞同" /> @@ -46,7 +46,7 @@ android:layout_marginTop="5dp" android:layout_marginRight="19dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/user_icon" @@ -63,7 +63,7 @@ android:layout_marginLeft="8dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintBottom_toTopOf="@+id/user_introduce" app:layout_constraintLeft_toRightOf="@+id/user_icon" @@ -89,7 +89,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginLeft="68dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/forum_activity_item.xml b/app/src/main/res/layout/forum_activity_item.xml index e72226b1c1..392cc0955d 100644 --- a/app/src/main/res/layout/forum_activity_item.xml +++ b/app/src/main/res/layout/forum_activity_item.xml @@ -33,7 +33,7 @@ android:layout_marginRight="16dp" android:includeFontPadding="false" android:lineSpacingExtra="2dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" @@ -80,7 +80,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="12dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" android:text="2021.04.30" app:layout_constraintBottom_toBottomOf="@+id/statusContainer" @@ -103,7 +103,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" android:text="2022.04.30" app:layout_constraintBottom_toBottomOf="@+id/timeIv" diff --git a/app/src/main/res/layout/forum_article_ask_list_skeleton.xml b/app/src/main/res/layout/forum_article_ask_list_skeleton.xml index 7cae16bdc4..cdc57b023a 100644 --- a/app/src/main/res/layout/forum_article_ask_list_skeleton.xml +++ b/app/src/main/res/layout/forum_article_ask_list_skeleton.xml @@ -2,7 +2,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:background="@color/ui_background"> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/forum_record_item.xml b/app/src/main/res/layout/forum_record_item.xml index a9c6a16f27..9baea2de88 100644 --- a/app/src/main/res/layout/forum_record_item.xml +++ b/app/src/main/res/layout/forum_record_item.xml @@ -45,7 +45,7 @@ android:ellipsize="end" android:lines="1" android:gravity="center" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="11sp" app:layout_constrainedWidth="true" app:layout_constraintLeft_toRightOf="@+id/unreadHint" diff --git a/app/src/main/res/layout/forum_search_content_list.xml b/app/src/main/res/layout/forum_search_content_list.xml index dda3d86540..1c577f0ec1 100644 --- a/app/src/main/res/layout/forum_search_content_list.xml +++ b/app/src/main/res/layout/forum_search_content_list.xml @@ -14,7 +14,7 @@ android:id="@+id/normalContainer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:paddingLeft="20dp" android:paddingTop="16dp" @@ -32,7 +32,7 @@ android:ellipsize="end" android:lineSpacingExtra="6dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" app:layout_constraintEnd_toStartOf="@+id/image" app:layout_constraintStart_toStartOf="parent" @@ -47,7 +47,7 @@ android:layout_marginRight="16dp" android:ellipsize="end" android:maxLines="2" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@+id/image" app:layout_constraintStart_toStartOf="parent" @@ -103,7 +103,7 @@ android:id="@+id/countTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" /> 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 595fda27c4..9018622eee 100644 --- a/app/src/main/res/layout/forum_top_link_item.xml +++ b/app/src/main/res/layout/forum_top_link_item.xml @@ -27,7 +27,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/forum_welfare_item.xml b/app/src/main/res/layout/forum_welfare_item.xml index 7fcb76360a..d670a8a4ce 100644 --- a/app/src/main/res/layout/forum_welfare_item.xml +++ b/app/src/main/res/layout/forum_welfare_item.xml @@ -16,7 +16,7 @@ android:gravity="center" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" android:textSize="14sp" app:layout_constraintVertical_chainStyle="packed" diff --git a/app/src/main/res/layout/fragment_add_user_played_game.xml b/app/src/main/res/layout/fragment_add_user_played_game.xml index c1074460fc..787a9e0467 100644 --- a/app/src/main/res/layout/fragment_add_user_played_game.xml +++ b/app/src/main/res/layout/fragment_add_user_played_game.xml @@ -8,7 +8,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> @@ -15,7 +15,7 @@ android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:fitsSystemWindows="true" app:elevation="0dp" app:layout_behavior="com.gh.gamecenter.common.view.FixAppBarLayoutBehavior"> @@ -25,7 +25,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - app:contentScrim="@color/background_white" + app:contentScrim="@color/ui_surface" app:layout_scrollFlags="scroll|exitUntilCollapsed" app:scrimAnimationDuration="200"> diff --git a/app/src/main/res/layout/fragment_amway_al.xml b/app/src/main/res/layout/fragment_amway_al.xml index 34f74779c2..9a491ccdf5 100644 --- a/app/src/main/res/layout/fragment_amway_al.xml +++ b/app/src/main/res/layout/fragment_amway_al.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/layout/fragment_amway_search_default.xml b/app/src/main/res/layout/fragment_amway_search_default.xml index c68381a873..cc0c877902 100644 --- a/app/src/main/res/layout/fragment_amway_search_default.xml +++ b/app/src/main/res/layout/fragment_amway_search_default.xml @@ -13,7 +13,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:background="@color/background" + android:background="@color/ui_background" android:gravity="center" android:orientation="vertical" android:visibility="gone" diff --git a/app/src/main/res/layout/fragment_amway_success.xml b/app/src/main/res/layout/fragment_amway_success.xml index 86ed5bd0bd..170e4ea786 100644 --- a/app/src/main/res/layout/fragment_amway_success.xml +++ b/app/src/main/res/layout/fragment_amway_success.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -98,7 +98,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="《光环助手评论规则》" - android:textColor="@color/theme_font" /> + android:textColor="@color/text_theme" /> diff --git a/app/src/main/res/layout/fragment_answer_comment_conversation.xml b/app/src/main/res/layout/fragment_answer_comment_conversation.xml index 6569e4b9d3..b032a68598 100644 --- a/app/src/main/res/layout/fragment_answer_comment_conversation.xml +++ b/app/src/main/res/layout/fragment_answer_comment_conversation.xml @@ -19,20 +19,20 @@ android:layout_width="match_parent" android:layout_height="40dp" android:layout_marginTop="8dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:drawableLeft="@drawable/article_link" android:drawablePadding="12dp" android:gravity="center_vertical" android:paddingLeft="20dp" android:singleLine="true" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="13dp" android:visibility="gone" tools:visibility="visible" /> + android:background="@color/ui_background"> @@ -116,7 +116,7 @@ android:layout_marginRight="7dp" android:drawableRight="@drawable/answer_detail_more_answer_icon" android:drawablePadding="8dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" tools:text="查看全部66个回答" /> @@ -151,7 +151,7 @@ android:layout_height="wrap_content" android:layout_marginRight="16dp" android:maxLength="12" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintBottom_toTopOf="@+id/sdv_user_badge" app:layout_constraintLeft_toRightOf="@id/user_icon_iv" @@ -177,7 +177,7 @@ android:layout_marginRight="16dp" android:gravity="center_vertical" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@id/sdv_user_badge" app:layout_constraintLeft_toRightOf="@id/sdv_user_badge" @@ -192,7 +192,7 @@ android:layout_height="wrap_content" android:layout_marginRight="5dp" android:text="喜欢就关注吧→" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/follow_tv" @@ -209,7 +209,7 @@ android:gravity="center" android:paddingLeft="12dp" android:paddingRight="12dp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:textStyle="bold" android:visibility="gone" diff --git a/app/src/main/res/layout/fragment_answer_detail_skeleton.xml b/app/src/main/res/layout/fragment_answer_detail_skeleton.xml index 7db4a53910..b6605bd183 100644 --- a/app/src/main/res/layout/fragment_answer_detail_skeleton.xml +++ b/app/src/main/res/layout/fragment_answer_detail_skeleton.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/background"> + android:background="@color/ui_background"> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> @@ -114,7 +114,7 @@ + android:background="@color/ui_background" /> @@ -135,7 +135,7 @@ android:id="@+id/answer_detail_line2" android:layout_width="match_parent" android:layout_height="2dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintTop_toBottomOf="@id/answer_detail_title_rl" /> @@ -222,7 +222,7 @@ android:layout_width="match_parent" android:layout_height="50dp" android:layout_alignParentBottom="true" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -289,7 +289,7 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="26dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -299,7 +299,7 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="32dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/iv_comment" app:layout_constraintTop_toTopOf="parent" /> @@ -309,7 +309,7 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_marginRight="32dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/iv_collect" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_answer_edit.xml b/app/src/main/res/layout/fragment_answer_edit.xml index 312ed4187a..2a1777cdc2 100644 --- a/app/src/main/res/layout/fragment_answer_edit.xml +++ b/app/src/main/res/layout/fragment_answer_edit.xml @@ -22,7 +22,7 @@ android:paddingTop="20dp" android:paddingRight="10dp" android:paddingBottom="12dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" tools:text="快递公司全面复工:三通一达等均已全网恢复正常运营" /> @@ -56,7 +56,7 @@ android:layout_marginBottom="8dp" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" tools:text="国家邮政局召开部分快递企业专题电话会议。国家邮政局局党组书记、局长马军胜主持召开专题电话会议，向中通、圆通、申通、韵达、百世" /> @@ -172,7 +172,7 @@ android:layout_height="0.5dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/fragment_apply_moderator.xml b/app/src/main/res/layout/fragment_apply_moderator.xml index dc30164cb9..cb9a79edb8 100644 --- a/app/src/main/res/layout/fragment_apply_moderator.xml +++ b/app/src/main/res/layout/fragment_apply_moderator.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/background_white"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_article_detail.xml b/app/src/main/res/layout/fragment_article_detail.xml index 4a96bce1c3..9991bfbfb5 100644 --- a/app/src/main/res/layout/fragment_article_detail.xml +++ b/app/src/main/res/layout/fragment_article_detail.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/background_white" + android:background="@color/ui_surface" android:descendantFocusability="blocksDescendants"> + android:background="@color/ui_surface"> @@ -69,7 +69,7 @@ android:includeFontPadding="false" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/forumIv" app:layout_constraintTop_toTopOf="@+id/forumIv" /> @@ -82,7 +82,7 @@ android:drawablePadding="4dp" android:includeFontPadding="false" android:text="去论坛" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/tag_text_size" app:drawableEndCompat="@drawable/ic_article_detail_forum_jump" app:layout_constraintBottom_toBottomOf="@+id/forumIv" diff --git a/app/src/main/res/layout/fragment_article_detail_comment_skeleton.xml b/app/src/main/res/layout/fragment_article_detail_comment_skeleton.xml index 190ce61414..ec20697ffd 100644 --- a/app/src/main/res/layout/fragment_article_detail_comment_skeleton.xml +++ b/app/src/main/res/layout/fragment_article_detail_comment_skeleton.xml @@ -8,7 +8,7 @@ + android:background="@color/ui_divider" /> + android:background="@color/ui_background"> @@ -27,7 +27,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fitsSystemWindows="true" - app:contentScrim="@color/background" + app:contentScrim="@color/ui_background" app:layout_scrollFlags="scroll|exitUntilCollapsed" app:scrimAnimationDuration="0" app:scrimVisibleHeightTrigger="120dp" @@ -156,7 +156,7 @@ android:layout_width="match_parent" android:layout_height="60dp" android:layout_alignParentBottom="true" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center"> + android:textColor="@color/text_instance" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_avatar_list.xml b/app/src/main/res/layout/fragment_avatar_list.xml index b30e45004c..70f91a4ec6 100644 --- a/app/src/main/res/layout/fragment_avatar_list.xml +++ b/app/src/main/res/layout/fragment_avatar_list.xml @@ -2,7 +2,7 @@ + android:background="@color/ui_background"> + android:background="@color/ui_surface"> + tools:background="@color/text_secondary" /> @@ -70,7 +70,7 @@ android:paddingLeft="12dp" android:background="@drawable/bg_shape_f5_radius_4" android:textSize="14sp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:gravity="center_vertical" tools:text="168****8888" app:layout_constraintTop_toBottomOf="@+id/relieveTitle" @@ -91,7 +91,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" tools:text="2021-09-23" /> @@ -102,7 +102,7 @@ android:layout_centerVertical="true" android:layout_alignParentRight="true" android:textSize="14sp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" tools:text="168****8888" /> @@ -112,7 +112,7 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:textSize="12sp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" tools:text="根据国家政策规定，需进行社区交流身份认证。" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/historyContainer" /> @@ -123,7 +123,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:textSize="12sp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" tools:text="点击了解更多>>" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/noticeTv" /> diff --git a/app/src/main/res/layout/fragment_catalog.xml b/app/src/main/res/layout/fragment_catalog.xml index 90e869231c..b18b16bae5 100644 --- a/app/src/main/res/layout/fragment_catalog.xml +++ b/app/src/main/res/layout/fragment_catalog.xml @@ -2,13 +2,13 @@ + android:background="@color/ui_surface"> + android:background="@color/ui_divider" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_surface"> + android:background="@color/ui_divider" /> + android:background="@color/ui_background" /> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_category_list.xml b/app/src/main/res/layout/fragment_category_list.xml index cac7fab599..acf576c614 100644 --- a/app/src/main/res/layout/fragment_category_list.xml +++ b/app/src/main/res/layout/fragment_category_list.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/background_white"> + android:background="@color/ui_surface"> @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:text="已收录0款游戏" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> + android:textColor="@color/text_theme" /> + android:textColor="@color/text_instance" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_cloud_archive.xml b/app/src/main/res/layout/fragment_cloud_archive.xml index 721d08c0cb..e56f883dd9 100644 --- a/app/src/main/res/layout/fragment_cloud_archive.xml +++ b/app/src/main/res/layout/fragment_cloud_archive.xml @@ -5,15 +5,15 @@ android:layout_height="match_parent" android:focusable="true" android:focusableInTouchMode="true" - android:background="@color/background_white"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_comment_detail.xml b/app/src/main/res/layout/fragment_comment_detail.xml index 0a6cb48c01..0152d0597f 100644 --- a/app/src/main/res/layout/fragment_comment_detail.xml +++ b/app/src/main/res/layout/fragment_comment_detail.xml @@ -16,7 +16,7 @@ android:gravity="center_vertical" android:paddingLeft="20dp" android:singleLine="true" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="13dp" android:visibility="gone" /> diff --git a/app/src/main/res/layout/fragment_community_home.xml b/app/src/main/res/layout/fragment_community_home.xml index ece0c50fde..9295953a82 100644 --- a/app/src/main/res/layout/fragment_community_home.xml +++ b/app/src/main/res/layout/fragment_community_home.xml @@ -4,7 +4,7 @@ android:id="@+id/communityHomeContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background"> + android:background="@color/ui_background"> + app:tint="@color/text_primary" /> diff --git a/app/src/main/res/layout/fragment_concern.xml b/app/src/main/res/layout/fragment_concern.xml index ed9f7159ca..4d179d4073 100644 --- a/app/src/main/res/layout/fragment_concern.xml +++ b/app/src/main/res/layout/fragment_concern.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:background="@color/background"> + android:background="@color/ui_background"> + android:background="@color/ui_surface" /> @@ -61,7 +61,7 @@ android:id="@+id/concern_rv_recommend" android:layout_width="match_parent" android:layout_height="300dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:overScrollMode="never" android:visibility="gone" /> diff --git a/app/src/main/res/layout/fragment_delivery_info.xml b/app/src/main/res/layout/fragment_delivery_info.xml index d11a596ac2..dda76016ef 100644 --- a/app/src/main/res/layout/fragment_delivery_info.xml +++ b/app/src/main/res/layout/fragment_delivery_info.xml @@ -2,21 +2,21 @@ + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_desc.xml b/app/src/main/res/layout/fragment_desc.xml index 3ff9fdc7b2..239729f330 100644 --- a/app/src/main/res/layout/fragment_desc.xml +++ b/app/src/main/res/layout/fragment_desc.xml @@ -8,7 +8,7 @@ android:id="@+id/recyclerview" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background" + android:background="@color/ui_background" android:overScrollMode="never" /> diff --git a/app/src/main/res/layout/fragment_forum.xml b/app/src/main/res/layout/fragment_forum.xml index ee8a321585..b02be79984 100644 --- a/app/src/main/res/layout/fragment_forum.xml +++ b/app/src/main/res/layout/fragment_forum.xml @@ -133,7 +133,7 @@ android:layout_marginLeft="16dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" android:textSize="16sp" android:text="关注论坛" @@ -172,7 +172,7 @@ android:layout_marginTop="24dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/followForumRv" /> @@ -191,7 +191,7 @@ android:layout_marginLeft="16dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" android:textSize="16sp" android:text="热门论坛" @@ -230,7 +230,7 @@ android:layout_marginTop="24dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/hotForumRv" /> @@ -250,7 +250,7 @@ android:layout_marginLeft="16dp" android:paddingTop="16dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" android:textSize="16sp" android:text="综合论坛" @@ -288,7 +288,7 @@ android:layout_marginTop="14dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/officialForumRv" /> @@ -308,7 +308,7 @@ android:layout_marginLeft="16dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" android:textSize="16sp" android:text="其他福利" @@ -332,7 +332,7 @@ android:layout_height="130dp" android:paddingBottom="54dp" android:gravity="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" android:text="没有更多内容了~" /> diff --git a/app/src/main/res/layout/fragment_forum_content_search_list.xml b/app/src/main/res/layout/fragment_forum_content_search_list.xml index b63ebb53f5..71bf0ae575 100644 --- a/app/src/main/res/layout/fragment_forum_content_search_list.xml +++ b/app/src/main/res/layout/fragment_forum_content_search_list.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background"> + android:background="@color/ui_background"> @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fitsSystemWindows="true" - app:contentScrim="@color/background_white" + app:contentScrim="@color/ui_surface" app:layout_scrollFlags="scroll|exitUntilCollapsed" app:scrimAnimationDuration="0" app:scrimVisibleHeightTrigger="80dp" @@ -292,7 +292,7 @@ android:id="@+id/dividerLine" android:layout_width="match_parent" android:layout_height="8dp" - android:background="@color/background_space" /> + android:background="@color/ui_container_1" /> @@ -351,7 +351,7 @@ android:id="@+id/tab_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_forum_detail_skeleton.xml b/app/src/main/res/layout/fragment_forum_detail_skeleton.xml index 791a7a0704..8f06156a6f 100644 --- a/app/src/main/res/layout/fragment_forum_detail_skeleton.xml +++ b/app/src/main/res/layout/fragment_forum_detail_skeleton.xml @@ -11,7 +11,7 @@ @@ -81,7 +81,7 @@ + android:background="@color/ui_divider" /> @@ -163,7 +163,7 @@ + android:background="@color/ui_divider" /> + android:background="@color/ui_surface" /> diff --git a/app/src/main/res/layout/fragment_game_collection_detail.xml b/app/src/main/res/layout/fragment_game_collection_detail.xml index e6f1cf6d9a..41148e3ff6 100644 --- a/app/src/main/res/layout/fragment_game_collection_detail.xml +++ b/app/src/main/res/layout/fragment_game_collection_detail.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:fitsSystemWindows="true" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" app:elevation="0dp" app:layout_behavior="com.gh.gamecenter.common.view.FixAppBarLayoutBehavior"> @@ -51,7 +51,7 @@ android:layout_width="match_parent" android:layout_height="44dp" android:scrollbars="none" - android:background="@color/background_white" + android:background="@color/ui_surface" android:nestedScrollingEnabled="false"> + android:background="@color/ui_surface"> @@ -100,7 +100,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1px" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> @@ -196,7 +196,7 @@ android:id="@+id/list_rv" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:overScrollMode="never" app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" /> diff --git a/app/src/main/res/layout/fragment_game_collection_detail_skeleton.xml b/app/src/main/res/layout/fragment_game_collection_detail_skeleton.xml index 05fc6ebef6..580884f2bb 100644 --- a/app/src/main/res/layout/fragment_game_collection_detail_skeleton.xml +++ b/app/src/main/res/layout/fragment_game_collection_detail_skeleton.xml @@ -12,7 +12,7 @@ diff --git a/app/src/main/res/layout/fragment_game_collection_hot_list_wrapper.xml b/app/src/main/res/layout/fragment_game_collection_hot_list_wrapper.xml index de7f6b6815..d66463a132 100644 --- a/app/src/main/res/layout/fragment_game_collection_hot_list_wrapper.xml +++ b/app/src/main/res/layout/fragment_game_collection_hot_list_wrapper.xml @@ -9,7 +9,7 @@ android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background" + android:background="@color/ui_background" android:fitsSystemWindows="true" app:elevation="0dp" app:layout_behavior="com.gh.gamecenter.common.view.FixAppBarLayoutBehavior"> @@ -19,7 +19,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - app:contentScrim="@color/background" + app:contentScrim="@color/ui_background" app:layout_scrollFlags="scroll|exitUntilCollapsed" app:scrimAnimationDuration="0"> diff --git a/app/src/main/res/layout/fragment_game_collection_square.xml b/app/src/main/res/layout/fragment_game_collection_square.xml index 31eb06ac0a..c5bbe356c6 100644 --- a/app/src/main/res/layout/fragment_game_collection_square.xml +++ b/app/src/main/res/layout/fragment_game_collection_square.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/list_refresh" - android:background="@color/background_white" + android:background="@color/ui_surface" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -16,7 +16,7 @@ android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:fitsSystemWindows="true" app:elevation="0dp" app:layout_behavior="com.gh.gamecenter.common.view.FixAppBarLayoutBehavior"> @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - app:contentScrim="@color/background_white" + app:contentScrim="@color/ui_surface" app:layout_scrollFlags="scroll|exitUntilCollapsed" app:scrimAnimationDuration="0"> @@ -55,7 +55,7 @@ style="@style/Base_ToolbarStyle" android:layout_width="match_parent" android:layout_height="@dimen/appbar_height" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_collapseMode="pin" app:navigationIcon="@drawable/ic_bar_back" /> @@ -69,7 +69,7 @@ android:id="@+id/statusBar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" /> + android:background="@color/ui_surface" /> diff --git a/app/src/main/res/layout/fragment_game_collection_square_skeleton.xml b/app/src/main/res/layout/fragment_game_collection_square_skeleton.xml index fd4e32ecf6..06f786e209 100644 --- a/app/src/main/res/layout/fragment_game_collection_square_skeleton.xml +++ b/app/src/main/res/layout/fragment_game_collection_square_skeleton.xml @@ -9,7 +9,7 @@ @@ -45,7 +45,7 @@ diff --git a/app/src/main/res/layout/fragment_game_collection_tag_select.xml b/app/src/main/res/layout/fragment_game_collection_tag_select.xml index 9100a5adf8..adb386d774 100644 --- a/app/src/main/res/layout/fragment_game_collection_tag_select.xml +++ b/app/src/main/res/layout/fragment_game_collection_tag_select.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_game_server_test_v2.xml b/app/src/main/res/layout/fragment_game_server_test_v2.xml index b365e95f2f..ad6c6b3099 100644 --- a/app/src/main/res/layout/fragment_game_server_test_v2.xml +++ b/app/src/main/res/layout/fragment_game_server_test_v2.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/background_white"> + android:background="@color/ui_surface"> + android:background="@color/ui_background"> + android:background="@color/ui_background"> @@ -36,7 +36,7 @@ android:id="@+id/background_block" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintBottom_toBottomOf="@id/server_time" app:layout_constraintLeft_toRightOf="@id/server_time" app:layout_constraintRight_toLeftOf="@+id/server_status" @@ -46,7 +46,7 @@ android:id="@+id/server_status" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:drawableRight="@drawable/server_popup_button_style" android:drawablePadding="8dp" android:includeFontPadding="false" @@ -55,7 +55,7 @@ android:paddingRight="16dp" android:paddingBottom="10dp" android:text="测试状态" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_game_servers_publish.xml b/app/src/main/res/layout/fragment_game_servers_publish.xml index 48a2be9916..d3c006a054 100644 --- a/app/src/main/res/layout/fragment_game_servers_publish.xml +++ b/app/src/main/res/layout/fragment_game_servers_publish.xml @@ -12,7 +12,7 @@ android:id="@+id/server_time" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:drawableRight="@drawable/server_popup_button_style" android:drawablePadding="8dp" android:includeFontPadding="false" @@ -21,7 +21,7 @@ android:paddingRight="50dp" android:paddingBottom="10dp" android:text="开服时间" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -30,7 +30,7 @@ android:id="@+id/background_block" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintBottom_toBottomOf="@id/server_time" app:layout_constraintLeft_toRightOf="@id/server_time" app:layout_constraintRight_toLeftOf="@+id/server_status" @@ -40,7 +40,7 @@ android:id="@+id/server_status" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:drawableRight="@drawable/server_popup_button_style" android:drawablePadding="8dp" android:includeFontPadding="false" @@ -49,7 +49,7 @@ android:paddingRight="16dp" android:paddingBottom="10dp" android:text="测试状态" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -58,7 +58,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1px" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/server_time" /> @@ -77,7 +77,7 @@ android:id="@+id/layout_fragment_content" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/fragment_game_updatable.xml b/app/src/main/res/layout/fragment_game_updatable.xml index d029e01901..664405312f 100644 --- a/app/src/main/res/layout/fragment_game_updatable.xml +++ b/app/src/main/res/layout/fragment_game_updatable.xml @@ -7,7 +7,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:clipToPadding="false" android:paddingBottom="20dp" /> diff --git a/app/src/main/res/layout/fragment_game_upload.xml b/app/src/main/res/layout/fragment_game_upload.xml index 100a0e4343..48d4327509 100644 --- a/app/src/main/res/layout/fragment_game_upload.xml +++ b/app/src/main/res/layout/fragment_game_upload.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical"> @@ -73,8 +73,8 @@ android:layout_marginLeft="4dp" android:gravity="center" android:hint="点我选择" - android:textColor="@color/text_subtitle" - android:textColorHint="@color/theme_font" + android:textColor="@color/text_secondary" + android:textColorHint="@color/text_theme" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -84,7 +84,7 @@ style="@style/line_horizontal" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> @@ -161,8 +161,8 @@ android:paddingTop="10dp" android:paddingRight="10dp" android:paddingBottom="10dp" - android:textColor="@color/text_subtitle" - android:textColorHint="@color/text_body" + android:textColor="@color/text_secondary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -171,7 +171,7 @@ style="@style/line_horizontal" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -244,7 +244,7 @@ + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> @@ -600,8 +600,8 @@ android:paddingTop="10dp" android:paddingRight="10dp" android:paddingBottom="10dp" - android:textColor="@color/text_subtitle" - android:textColorHint="@color/text_body" + android:textColor="@color/text_secondary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -609,7 +609,7 @@ + android:background="@color/ui_background" /> @@ -630,7 +630,7 @@ android:id="@+id/suggest_post_ll" android:layout_width="match_parent" android:layout_height="60dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="horizontal" android:padding="10dp"> diff --git a/app/src/main/res/layout/fragment_gamedetail.xml b/app/src/main/res/layout/fragment_gamedetail.xml index 99ff7a6e2f..cf8254cc3c 100644 --- a/app/src/main/res/layout/fragment_gamedetail.xml +++ b/app/src/main/res/layout/fragment_gamedetail.xml @@ -2,7 +2,7 @@ + android:background="@color/ui_background"> @@ -63,7 +63,7 @@ + android:background="@color/ui_divider" /> @@ -11,14 +11,14 @@ android:layout_width="match_parent" android:layout_height="10dp" android:layout_marginTop="30dp" - android:background="@color/background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_halo_personal.xml b/app/src/main/res/layout/fragment_halo_personal.xml index 9255d18566..6e553f5f8f 100644 --- a/app/src/main/res/layout/fragment_halo_personal.xml +++ b/app/src/main/res/layout/fragment_halo_personal.xml @@ -5,7 +5,7 @@ android:id="@+id/list_refresh" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background" + android:background="@color/ui_background" android:fitsSystemWindows="false"> + android:background="@color/ui_surface" /> @@ -73,7 +73,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="解锁更多精彩内容" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" /> @@ -264,7 +264,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="我的发布" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/little_secondary_size" app:drawableTopCompat="@drawable/ic_personal_my_post" /> @@ -277,7 +277,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="我的游戏单" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/little_secondary_size" app:drawableTopCompat="@drawable/ic_personal_my_game_collection" /> @@ -290,7 +290,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="浏览记录" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/little_secondary_size" app:drawableTopCompat="@drawable/ic_personal_history" /> @@ -303,7 +303,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="我的收藏" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/little_secondary_size" app:drawableTopCompat="@drawable/ic_personal_my_collection" /> @@ -377,7 +377,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:text="更多功能" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/primary_text_size" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_history_apk_list.xml b/app/src/main/res/layout/fragment_history_apk_list.xml index 8d0792d98e..8d7e63f4dd 100644 --- a/app/src/main/res/layout/fragment_history_apk_list.xml +++ b/app/src/main/res/layout/fragment_history_apk_list.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/background_white" + android:background="@color/ui_surface" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index ad8f2870a0..58fcf7a017 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -32,7 +32,7 @@ android:id="@+id/contentContainer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white"> + android:background="@color/ui_surface"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_home_game_wrapper.xml b/app/src/main/res/layout/fragment_home_game_wrapper.xml index b4b24bd651..9e965e9656 100644 --- a/app/src/main/res/layout/fragment_home_game_wrapper.xml +++ b/app/src/main/res/layout/fragment_home_game_wrapper.xml @@ -8,7 +8,7 @@ android:id="@+id/toolbarContainer" android:layout_width="0dp" android:layout_height="56dp" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/app/src/main/res/layout/fragment_home_toolbar_wrapper.xml b/app/src/main/res/layout/fragment_home_toolbar_wrapper.xml index 657ab82e09..e9ae83fb77 100644 --- a/app/src/main/res/layout/fragment_home_toolbar_wrapper.xml +++ b/app/src/main/res/layout/fragment_home_toolbar_wrapper.xml @@ -10,7 +10,7 @@ android:id="@+id/statusBar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" /> + android:background="@color/ui_surface" /> diff --git a/app/src/main/res/layout/fragment_invite.xml b/app/src/main/res/layout/fragment_invite.xml index a98d942746..51262bfe93 100644 --- a/app/src/main/res/layout/fragment_invite.xml +++ b/app/src/main/res/layout/fragment_invite.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background" + android:background="@color/ui_background" android:orientation="vertical"> @@ -37,7 +37,7 @@ android:paddingLeft="12dp" android:paddingRight="12dp" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textColorHint="@color/text_C1BFC9" android:textCursorDrawable="@drawable/cursor_color" android:textSize="12sp" @@ -66,7 +66,7 @@ android:gravity="center" android:paddingLeft="16dp" android:text="@string/libao_search" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/fragment_libao1.xml b/app/src/main/res/layout/fragment_libao1.xml index 9acddc301a..5f42988791 100644 --- a/app/src/main/res/layout/fragment_libao1.xml +++ b/app/src/main/res/layout/fragment_libao1.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_libao2.xml b/app/src/main/res/layout/fragment_libao2.xml index e7a3819bca..a4852a6e48 100644 --- a/app/src/main/res/layout/fragment_libao2.xml +++ b/app/src/main/res/layout/fragment_libao2.xml @@ -2,7 +2,7 @@ + android:background="@color/ui_surface"> + android:background="@color/ui_surface"> + android:background="@color/ui_background"> @@ -41,7 +41,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view2" app:layout_constraintTop_toTopOf="parent" /> @@ -51,7 +51,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view2" app:layout_constraintTop_toTopOf="parent" /> @@ -61,7 +61,7 @@ android:layout_marginTop="44dp" android:layout_marginEnd="28dp" android:layout_marginRight="28dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -70,7 +70,7 @@ + android:background="@color/ui_background" /> @@ -106,7 +106,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view3" app:layout_constraintTop_toTopOf="parent" /> @@ -116,7 +116,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view3" app:layout_constraintTop_toTopOf="parent" /> @@ -126,7 +126,7 @@ android:layout_marginTop="44dp" android:layout_marginEnd="28dp" android:layout_marginRight="28dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -135,7 +135,7 @@ + android:background="@color/ui_background" /> @@ -171,7 +171,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view4" app:layout_constraintTop_toTopOf="parent" /> @@ -181,7 +181,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view4" app:layout_constraintTop_toTopOf="parent" /> @@ -191,7 +191,7 @@ android:layout_marginTop="44dp" android:layout_marginEnd="28dp" android:layout_marginRight="28dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -200,7 +200,7 @@ + android:background="@color/ui_background" /> @@ -236,7 +236,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view5" app:layout_constraintTop_toTopOf="parent" /> @@ -246,7 +246,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view5" app:layout_constraintTop_toTopOf="parent" /> @@ -256,7 +256,7 @@ android:layout_marginTop="44dp" android:layout_marginEnd="28dp" android:layout_marginRight="28dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -265,7 +265,7 @@ + android:background="@color/ui_background" /> @@ -301,7 +301,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view6" app:layout_constraintTop_toTopOf="parent" /> @@ -311,7 +311,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view6" app:layout_constraintTop_toTopOf="parent" /> @@ -321,7 +321,7 @@ android:layout_marginTop="44dp" android:layout_marginEnd="28dp" android:layout_marginRight="28dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -330,7 +330,7 @@ + android:background="@color/ui_background" /> @@ -366,7 +366,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view7" app:layout_constraintTop_toTopOf="parent" /> @@ -376,7 +376,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view7" app:layout_constraintTop_toTopOf="parent" /> @@ -386,7 +386,7 @@ android:layout_marginTop="44dp" android:layout_marginEnd="28dp" android:layout_marginRight="28dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -395,7 +395,7 @@ + android:background="@color/ui_background" /> @@ -431,7 +431,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view8" app:layout_constraintTop_toTopOf="parent" /> @@ -441,7 +441,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view8" app:layout_constraintTop_toTopOf="parent" /> @@ -451,7 +451,7 @@ android:layout_marginTop="44dp" android:layout_marginEnd="28dp" android:layout_marginRight="28dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -460,6 +460,6 @@ + android:background="@color/ui_background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_libao_wrapper.xml b/app/src/main/res/layout/fragment_libao_wrapper.xml index 506c4054e4..10ec0146c6 100644 --- a/app/src/main/res/layout/fragment_libao_wrapper.xml +++ b/app/src/main/res/layout/fragment_libao_wrapper.xml @@ -17,14 +17,14 @@ android:id="@+id/fragment_tab_rl" android:layout_width="match_parent" android:layout_height="@dimen/tab_layout_height" - android:background="@color/background_white"> + android:background="@color/ui_surface"> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/fragment_list_article_detail_comment.xml b/app/src/main/res/layout/fragment_list_article_detail_comment.xml index 7625131574..1f2436b5f8 100644 --- a/app/src/main/res/layout/fragment_list_article_detail_comment.xml +++ b/app/src/main/res/layout/fragment_list_article_detail_comment.xml @@ -2,7 +2,7 @@ + android:background="@color/ui_background"> + android:background="@color/ui_surface"> + android:textColor="@color/text_tertiary" /> diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index ce2d87daae..a33a8c29e3 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -42,7 +42,7 @@ android:layout_marginStart="8dp" android:drawablePadding="4dp" android:text="@string/realname_error_hint" - android:textColor="@color/theme_yellow" + android:textColor="@color/secondary_yellow" android:textSize="@dimen/secondary_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/realNameErrorHintIv" @@ -74,7 +74,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/main_bottom_tab_height" android:layout_alignParentBottom="true" - android:background="@color/background_white" + android:background="@color/ui_surface" android:clickable="true" android:gravity="center_vertical" android:orientation="horizontal"> diff --git a/app/src/main/res/layout/fragment_main_home.xml b/app/src/main/res/layout/fragment_main_home.xml index 446f587f1c..fed0efc63b 100644 --- a/app/src/main/res/layout/fragment_main_home.xml +++ b/app/src/main/res/layout/fragment_main_home.xml @@ -14,7 +14,7 @@ android:id="@+id/game_list" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:clipChildren="false" android:clipToPadding="false" /> diff --git a/app/src/main/res/layout/fragment_main_home_wrapper.xml b/app/src/main/res/layout/fragment_main_home_wrapper.xml index 3fecfbc596..c1be90eb88 100644 --- a/app/src/main/res/layout/fragment_main_home_wrapper.xml +++ b/app/src/main/res/layout/fragment_main_home_wrapper.xml @@ -5,7 +5,7 @@ android:id="@+id/wrapperLl" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:paddingBottom="@dimen/main_bottom_tab_height"> @@ -108,7 +108,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" @@ -169,7 +169,7 @@ android:id="@+id/headerBackground" android:layout_width="0dp" android:layout_height="0dp" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -280,7 +280,7 @@ android:id="@+id/toolbarBackground" android:layout_width="match_parent" android:layout_height="@dimen/appbar_height" - android:background="@color/background_white"> + android:background="@color/ui_surface"> + android:background="@color/ui_surface"> @@ -73,8 +73,8 @@ android:hint="请输入本人身份证\护照\通行证号码" android:padding="8dp" android:singleLine="true" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@id/idCardTv" /> @@ -108,7 +108,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="证件照仅用于身份证认证审核" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/imageIv" /> @@ -139,7 +139,7 @@ android:id="@+id/successContainer" android:layout_width="match_parent" android:layout_height="0dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center_horizontal" android:orientation="vertical" android:paddingTop="48dp" @@ -159,7 +159,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="已提交人工审核，将在1-3个工作日完成审核" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" /> @@ -169,7 +169,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:text="联系客服" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_message_detail.xml b/app/src/main/res/layout/fragment_message_detail.xml index 54b2880834..04df8d4e05 100644 --- a/app/src/main/res/layout/fragment_message_detail.xml +++ b/app/src/main/res/layout/fragment_message_detail.xml @@ -2,7 +2,7 @@ + android:background="@color/ui_background"> + android:background="@color/ui_background"> + android:background="@color/ui_surface"> + android:background="@color/ui_background"> + android:background="@color/ui_surface"> @@ -91,7 +91,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:text="《游戏单管理规范》" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_no_padding_tablayout_viewpager.xml b/app/src/main/res/layout/fragment_no_padding_tablayout_viewpager.xml index 1086fe34d1..7abc621c4b 100644 --- a/app/src/main/res/layout/fragment_no_padding_tablayout_viewpager.xml +++ b/app/src/main/res/layout/fragment_no_padding_tablayout_viewpager.xml @@ -9,7 +9,7 @@ android:id="@+id/fragment_tab_container" android:layout_width="match_parent" android:layout_height="@dimen/tab_layout_height" - android:background="@color/background_white"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_package_skip.xml b/app/src/main/res/layout/fragment_package_skip.xml index 11aa1e53c1..502b5cf816 100644 --- a/app/src/main/res/layout/fragment_package_skip.xml +++ b/app/src/main/res/layout/fragment_package_skip.xml @@ -41,7 +41,7 @@ android:layout_marginLeft="4dp" android:includeFontPadding="false" android:text="光环助手" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="为您找到" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_password_setting.xml b/app/src/main/res/layout/fragment_password_setting.xml index fc60bf57e5..25cac7b05f 100644 --- a/app/src/main/res/layout/fragment_password_setting.xml +++ b/app/src/main/res/layout/fragment_password_setting.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/background_white"> + android:background="@color/ui_surface"> @@ -80,7 +80,7 @@ android:layout_marginTop="24dp" android:singleLine="true" android:text="找回密码" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_qgame.xml b/app/src/main/res/layout/fragment_qgame.xml index 5ed4863be6..d1f9130e1f 100644 --- a/app/src/main/res/layout/fragment_qgame.xml +++ b/app/src/main/res/layout/fragment_qgame.xml @@ -14,7 +14,7 @@ android:id="@+id/game_list" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:clipToPadding="false" /> diff --git a/app/src/main/res/layout/fragment_real_name.xml b/app/src/main/res/layout/fragment_real_name.xml index 4d81c437a6..9fb3228f49 100644 --- a/app/src/main/res/layout/fragment_real_name.xml +++ b/app/src/main/res/layout/fragment_real_name.xml @@ -17,7 +17,7 @@ android:id="@+id/infoContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingStart="20dp" android:paddingTop="16dp" android:paddingEnd="20dp" @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -43,7 +43,7 @@ android:layout_marginTop="12dp" android:includeFontPadding="false" android:lineSpacingExtra="3dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -103,8 +103,8 @@ android:hint="请输入真实姓名" android:padding="8dp" android:singleLine="true" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@id/nameTv" /> @@ -131,8 +131,8 @@ android:hint="请输入本人真实身份证号码" android:padding="8dp" android:singleLine="true" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@id/idCardTv" /> @@ -159,7 +159,7 @@ android:layout_marginTop="12dp" android:includeFontPadding="false" android:lineSpacingExtra="3dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -185,7 +185,7 @@ android:background="@drawable/button_round_f5f5f5" android:gravity="center" android:text="补充完善实名信息（仅限一次）" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -199,7 +199,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="24dp" android:text="联系客服" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_region.xml b/app/src/main/res/layout/fragment_region.xml index 672eb1e9a5..a0477e6059 100644 --- a/app/src/main/res/layout/fragment_region.xml +++ b/app/src/main/res/layout/fragment_region.xml @@ -12,7 +12,7 @@ android:id="@+id/region_rv_title" android:layout_width="match_parent" android:layout_height="37dp" - android:background="@color/background" + android:background="@color/ui_background" android:gravity="center_vertical" android:paddingLeft="20dp" android:textColor="@color/black" diff --git a/app/src/main/res/layout/fragment_search_default.xml b/app/src/main/res/layout/fragment_search_default.xml index 3920330f36..d62cc0b376 100644 --- a/app/src/main/res/layout/fragment_search_default.xml +++ b/app/src/main/res/layout/fragment_search_default.xml @@ -4,7 +4,7 @@ android:id="@+id/rootContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:overScrollMode="never" android:scrollbars="none"> @@ -22,7 +22,7 @@ android:id="@+id/history_flex_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintTop_toBottomOf="@+id/historyHeadContainer"> + android:background="@color/ui_divider" /> + android:textColor="@color/text_instance" /> + android:background="@color/ui_surface" /> @@ -97,7 +97,7 @@ android:paddingTop="16dp" android:paddingLeft="4dp" android:paddingRight="4dp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:text="@string/seek_function" /> diff --git a/app/src/main/res/layout/fragment_simulator_game.xml b/app/src/main/res/layout/fragment_simulator_game.xml index a718ebd791..c220dda7d4 100644 --- a/app/src/main/res/layout/fragment_simulator_game.xml +++ b/app/src/main/res/layout/fragment_simulator_game.xml @@ -14,7 +14,7 @@ android:id="@+id/fragment_tab_container" android:layout_width="match_parent" android:layout_height="@dimen/tab_layout_height" - android:background="@color/background_white"> + android:background="@color/ui_surface"> + android:background="@color/ui_background"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_subject_rows.xml b/app/src/main/res/layout/fragment_subject_rows.xml index e4f614ea00..26d5932fb4 100644 --- a/app/src/main/res/layout/fragment_subject_rows.xml +++ b/app/src/main/res/layout/fragment_subject_rows.xml @@ -8,7 +8,7 @@ android:id="@+id/rows_labels_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" /> @@ -30,11 +30,11 @@ android:id="@+id/subject_tab" android:layout_width="match_parent" android:layout_height="match_parent" - app:tabIndicatorColor="@color/theme" + app:tabIndicatorColor="@color/primary_theme" app:tabMode="scrollable" app:tabIndicatorHeight="0dp" app:tabRippleColor="@color/transparent" - app:tabSelectedTextColor="@color/theme" + app:tabSelectedTextColor="@color/primary_theme" app:tabIndicator="@null" app:tabTextAppearance="@style/TabLayoutTextAppearance" /> diff --git a/app/src/main/res/layout/fragment_subject_tiled.xml b/app/src/main/res/layout/fragment_subject_tiled.xml index c90474b180..9ecd11825e 100644 --- a/app/src/main/res/layout/fragment_subject_tiled.xml +++ b/app/src/main/res/layout/fragment_subject_tiled.xml @@ -9,7 +9,7 @@ android:id="@+id/subject_appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" app:layout_behavior="com.gh.gamecenter.common.view.FixAppBarLayoutBehavior"> diff --git a/app/src/main/res/layout/fragment_switch_install_method.xml b/app/src/main/res/layout/fragment_switch_install_method.xml index 25938e7fe9..deda51674b 100644 --- a/app/src/main/res/layout/fragment_switch_install_method.xml +++ b/app/src/main/res/layout/fragment_switch_install_method.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background"> + android:background="@color/ui_background"> @@ -34,7 +34,7 @@ android:layout_below="@id/config_container" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_user_game.xml b/app/src/main/res/layout/fragment_user_game.xml index a3226a90f5..2c34450d60 100644 --- a/app/src/main/res/layout/fragment_user_game.xml +++ b/app/src/main/res/layout/fragment_user_game.xml @@ -2,7 +2,7 @@ + android:background="@color/ui_background"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/fragment_user_publish.xml b/app/src/main/res/layout/fragment_user_publish.xml index d3209ebbe2..b57f4b88de 100644 --- a/app/src/main/res/layout/fragment_user_publish.xml +++ b/app/src/main/res/layout/fragment_user_publish.xml @@ -13,7 +13,7 @@ android:id="@+id/list_rv" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:overScrollMode="never" /> @@ -33,7 +33,7 @@ android:id="@+id/typeScrollView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:scrollbars="none"> + android:textColor="@color/text_theme" /> + android:textColor="@color/text_primary" /> + android:textColor="@color/text_primary" /> + android:textColor="@color/text_primary" /> + android:textColor="@color/text_primary" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_userinfo.xml b/app/src/main/res/layout/fragment_userinfo.xml index ae82b27921..81afd97743 100644 --- a/app/src/main/res/layout/fragment_userinfo.xml +++ b/app/src/main/res/layout/fragment_userinfo.xml @@ -3,14 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background" + android:background="@color/ui_background" android:orientation="vertical"> @@ -115,7 +115,7 @@ android:paddingTop="15dp" android:paddingBottom="15dp" android:text="账号安全指南" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_userinfo_edit.xml b/app/src/main/res/layout/fragment_userinfo_edit.xml index 7abbee991e..decdc5f662 100644 --- a/app/src/main/res/layout/fragment_userinfo_edit.xml +++ b/app/src/main/res/layout/fragment_userinfo_edit.xml @@ -117,7 +117,7 @@ android:id="@+id/userinfo_edit_id_card" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:visibility="gone"> @@ -149,12 +149,12 @@ android:gravity="center_vertical" android:paddingLeft="20dp" android:text="真实姓名" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> @@ -169,7 +169,7 @@ android:paddingRight="8dp" android:singleLine="true" android:textColor="@color/title" - android:textColorHint="@color/text_body" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -181,12 +181,12 @@ android:gravity="center_vertical" android:paddingLeft="20dp" android:text="身份证号" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> @@ -201,7 +201,7 @@ android:paddingRight="8dp" android:singleLine="true" android:textColor="@color/title" - android:textColorHint="@color/text_body" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> @@ -223,7 +223,7 @@ android:lineSpacingExtra="4dp" android:paddingLeft="18dp" android:paddingRight="18dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" tools:text="@string/userinfo_edit_id_card_explain" /> diff --git a/app/src/main/res/layout/fragment_vdownload_manager.xml b/app/src/main/res/layout/fragment_vdownload_manager.xml index c02846fefb..14c47da762 100644 --- a/app/src/main/res/layout/fragment_vdownload_manager.xml +++ b/app/src/main/res/layout/fragment_vdownload_manager.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white"> + android:background="@color/ui_surface"> + android:background="@color/ui_surface"> @@ -50,7 +50,7 @@ diff --git a/app/src/main/res/layout/fragment_verify_phone.xml b/app/src/main/res/layout/fragment_verify_phone.xml index 3848f9ae18..c97b4d1571 100644 --- a/app/src/main/res/layout/fragment_verify_phone.xml +++ b/app/src/main/res/layout/fragment_verify_phone.xml @@ -5,7 +5,7 @@ android:paddingLeft="40dp" android:paddingRight="40dp" android:orientation="vertical" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -94,8 +94,8 @@ android:maxLength="8" android:paddingTop="10dp" android:paddingBottom="10dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="16sp" /> @@ -108,7 +108,7 @@ android:layout_marginRight="24dp" android:gravity="center" android:text="@string/login_get_captcha" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="14sp" /> + android:background="@color/ui_surface" /> @@ -29,7 +29,7 @@ android:layout_centerVertical="true" android:includeFontPadding="false" android:text="全部评论" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" /> + android:textColor="@color/text_tertiary" /> @@ -72,7 +72,7 @@ android:id="@+id/list_rv" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background" + android:background="@color/ui_background" android:paddingBottom="56dp" /> diff --git a/app/src/main/res/layout/fragment_video_data.xml b/app/src/main/res/layout/fragment_video_data.xml index ac906148d5..4aa6ca4d1f 100644 --- a/app/src/main/res/layout/fragment_video_data.xml +++ b/app/src/main/res/layout/fragment_video_data.xml @@ -7,7 +7,7 @@ + android:background="@color/ui_surface"> @@ -152,7 +152,7 @@ android:layout_height="0.5dp" android:layout_marginTop="24dp" android:layout_marginBottom="7dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/fragment_video_publish.xml b/app/src/main/res/layout/fragment_video_publish.xml index 0c86837b1b..c8b26ebcb2 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/background_white"> + android:background="@color/ui_surface"> @@ -88,7 +88,7 @@ android:ellipsize="end" android:maxLines="1" android:text="选择子版块" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" /> + app:placeholderImage="@color/ui_background" /> @@ -273,8 +273,8 @@ android:hint="描述下视频内容~" android:maxLength="200" android:minHeight="60dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -299,7 +299,7 @@ android:drawablePadding="12dp" android:includeFontPadding="false" android:text="添加话题标签" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> @@ -327,7 +327,7 @@ android:drawablePadding="12dp" android:includeFontPadding="false" android:text="内容来源" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -349,7 +349,7 @@ android:drawablePadding="4dp" android:gravity="center" android:text="原创" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> + android:textColor="@color/text_primary" /> @@ -373,8 +373,8 @@ android:gravity="center_vertical" android:hint="注明内容来源网址(如http://www.xx.com//vvv)" android:padding="12dp" - android:textColor="@color/text_subtitle" - android:textColorHint="@color/text_body" + android:textColor="@color/text_secondary" + android:textColorHint="@color/text_instance" android:textSize="12sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_vote.xml b/app/src/main/res/layout/fragment_vote.xml index 262955e979..ba1a57dcda 100644 --- a/app/src/main/res/layout/fragment_vote.xml +++ b/app/src/main/res/layout/fragment_vote.xml @@ -29,9 +29,9 @@ android:layout_height="50dp" android:layout_marginTop="8dp" android:layout_marginBottom="8dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="15sp" android:visibility="gone" tools:text="点击下载万能加速器" diff --git a/app/src/main/res/layout/fragment_vspace_loading.xml b/app/src/main/res/layout/fragment_vspace_loading.xml index 02eb863536..63dc570bf8 100644 --- a/app/src/main/res/layout/fragment_vspace_loading.xml +++ b/app/src/main/res/layout/fragment_vspace_loading.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/background_white"> + android:background="@color/ui_surface"> @@ -72,7 +72,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.26" - tools:background="@color/background" /> + tools:background="@color/ui_background" /> diff --git a/app/src/main/res/layout/fragment_web_warning.xml b/app/src/main/res/layout/fragment_web_warning.xml index 15d2feeb27..13d6a689d9 100644 --- a/app/src/main/res/layout/fragment_web_warning.xml +++ b/app/src/main/res/layout/fragment_web_warning.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical"> + android:background="@color/ui_surface" /> + android:background="@color/ui_background" /> @@ -36,7 +36,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="35dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view2" app:layout_constraintTop_toTopOf="parent" /> @@ -46,7 +46,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view2" app:layout_constraintTop_toTopOf="parent" /> @@ -57,7 +57,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/view2" app:layout_constraintTop_toTopOf="parent" /> @@ -67,7 +67,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="@+id/view9" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/view10" @@ -78,7 +78,7 @@ + android:background="@color/ui_background" /> @@ -104,7 +104,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="35dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewq" app:layout_constraintTop_toTopOf="parent" /> @@ -114,7 +114,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewq" app:layout_constraintTop_toTopOf="parent" /> @@ -125,7 +125,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewq" app:layout_constraintTop_toTopOf="parent" /> @@ -135,7 +135,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="@+id/viewqw" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/viewqe" @@ -146,7 +146,7 @@ + android:background="@color/ui_background" /> @@ -172,7 +172,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="35dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/vieww" app:layout_constraintTop_toTopOf="parent" /> @@ -182,7 +182,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/vieww" app:layout_constraintTop_toTopOf="parent" /> @@ -193,7 +193,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/vieww" app:layout_constraintTop_toTopOf="parent" /> @@ -203,7 +203,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="@+id/viewwe" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/viewwr" @@ -214,7 +214,7 @@ + android:background="@color/ui_background" /> @@ -240,7 +240,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="35dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewe" app:layout_constraintTop_toTopOf="parent" /> @@ -250,7 +250,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewe" app:layout_constraintTop_toTopOf="parent" /> @@ -261,7 +261,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewe" app:layout_constraintTop_toTopOf="parent" /> @@ -271,7 +271,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="@+id/viewer" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/viewet" @@ -282,7 +282,7 @@ + android:background="@color/ui_background" /> @@ -308,7 +308,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="35dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewr" app:layout_constraintTop_toTopOf="parent" /> @@ -318,7 +318,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewr" app:layout_constraintTop_toTopOf="parent" /> @@ -329,7 +329,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewr" app:layout_constraintTop_toTopOf="parent" /> @@ -339,7 +339,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="@+id/viewrt" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/viewry" @@ -350,7 +350,7 @@ + android:background="@color/ui_background" /> @@ -376,7 +376,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="35dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewt" app:layout_constraintTop_toTopOf="parent" /> @@ -386,7 +386,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewt" app:layout_constraintTop_toTopOf="parent" /> @@ -397,7 +397,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewt" app:layout_constraintTop_toTopOf="parent" /> @@ -407,7 +407,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="@+id/viewty" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/viewtu" @@ -418,7 +418,7 @@ + android:background="@color/ui_background" /> @@ -444,7 +444,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="35dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewy" app:layout_constraintTop_toTopOf="parent" /> @@ -454,7 +454,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="55dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewy" app:layout_constraintTop_toTopOf="parent" /> @@ -465,7 +465,7 @@ android:layout_marginStart="15dp" android:layout_marginLeft="15dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintStart_toEndOf="@+id/viewy" app:layout_constraintTop_toTopOf="parent" /> @@ -475,7 +475,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:layout_marginTop="75dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="@+id/viewyu" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/viewyy" diff --git a/app/src/main/res/layout/gallery_video_item.xml b/app/src/main/res/layout/gallery_video_item.xml index 3367fbf61a..6405ab6141 100644 --- a/app/src/main/res/layout/gallery_video_item.xml +++ b/app/src/main/res/layout/gallery_video_item.xml @@ -60,7 +60,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:lineSpacingExtra="4dp" android:maxLines="2" diff --git a/app/src/main/res/layout/game_attach_item.xml b/app/src/main/res/layout/game_attach_item.xml index d9e3e0457f..b6c7b4335d 100644 --- a/app/src/main/res/layout/game_attach_item.xml +++ b/app/src/main/res/layout/game_attach_item.xml @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" tools:text="轩辕剑龙舞云山" /> @@ -58,7 +58,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:visibility="visible" @@ -89,7 +89,7 @@ android:drawableLeft="@drawable/home_game_rating" android:drawablePadding="4dp" android:includeFontPadding="false" - android:textColor="@color/theme" + android:textColor="@color/primary_theme" android:textSize="18sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/game_icon_container" diff --git a/app/src/main/res/layout/game_collection_detail_divider_item.xml b/app/src/main/res/layout/game_collection_detail_divider_item.xml index 4f3a0dcff4..3a5796bca9 100644 --- a/app/src/main/res/layout/game_collection_detail_divider_item.xml +++ b/app/src/main/res/layout/game_collection_detail_divider_item.xml @@ -2,4 +2,4 @@ + android:background="@color/ui_background" /> diff --git a/app/src/main/res/layout/game_collection_detail_none_game_item.xml b/app/src/main/res/layout/game_collection_detail_none_game_item.xml index 2762f540bd..908441e6c2 100644 --- a/app/src/main/res/layout/game_collection_detail_none_game_item.xml +++ b/app/src/main/res/layout/game_collection_detail_none_game_item.xml @@ -5,7 +5,7 @@ android:layout_height="374dp" android:gravity="center" android:orientation="vertical" - android:background="@color/background_white"> + android:background="@color/ui_surface"> \ No newline at end of file diff --git a/app/src/main/res/layout/game_collection_detail_video_item.xml b/app/src/main/res/layout/game_collection_detail_video_item.xml index 74a5be8bcf..1c7fa42d6c 100644 --- a/app/src/main/res/layout/game_collection_detail_video_item.xml +++ b/app/src/main/res/layout/game_collection_detail_video_item.xml @@ -38,7 +38,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="2dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="20sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -73,7 +73,7 @@ android:drawablePadding="4dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:drawableEndCompat="@drawable/ic_game_collection_jump_dark" app:drawableStartCompat="@drawable/ic_game_collection_des_gray" @@ -130,7 +130,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -141,7 +141,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/tag_text_size" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" @@ -154,7 +154,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/tag_text_size" android:visibility="gone" android:layout_marginStart="8dp" @@ -176,7 +176,7 @@ android:background="@drawable/button_round_2496ff_alpha_8" android:gravity="center" android:text="关注" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/userIcon" diff --git a/app/src/main/res/layout/game_collection_game_item.xml b/app/src/main/res/layout/game_collection_game_item.xml index 5be3b7738b..2c456a5f89 100644 --- a/app/src/main/res/layout/game_collection_game_item.xml +++ b/app/src/main/res/layout/game_collection_game_item.xml @@ -28,7 +28,7 @@ android:ellipsize="end" android:maxLines="3" android:background="@drawable/bg_shape_space_radius_8" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" tools:text="跑跑卡丁车的手游版作为一部致敬经典的作品，在人物和地图上都有基本还原端游，但是手感有些区别" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/game_collection_hot_list_tab_item.xml b/app/src/main/res/layout/game_collection_hot_list_tab_item.xml index a35f65d320..adb1ab7571 100644 --- a/app/src/main/res/layout/game_collection_hot_list_tab_item.xml +++ b/app/src/main/res/layout/game_collection_hot_list_tab_item.xml @@ -15,6 +15,6 @@ android:singleLine="true" android:textSize="@dimen/secondary_size" tools:text="#玩家创作榜" - tools:textColor="@color/theme_font" /> + tools:textColor="@color/text_theme" /> \ No newline at end of file diff --git a/app/src/main/res/layout/game_collection_selected_tag_item.xml b/app/src/main/res/layout/game_collection_selected_tag_item.xml index af90b676f4..bf5b6076e8 100644 --- a/app/src/main/res/layout/game_collection_selected_tag_item.xml +++ b/app/src/main/res/layout/game_collection_selected_tag_item.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:text="选择3个标签，让小伙伴们精准了解游戏单 ～" - android:textColor="@color/text_body" + android:textColor="@color/text_instance" android:textSize="@dimen/primary_text_size" app:layout_constraintBottom_toBottomOf="@+id/selectedTagFlexbox" /> diff --git a/app/src/main/res/layout/game_collection_square_amway_item.xml b/app/src/main/res/layout/game_collection_square_amway_item.xml index d30cb829e2..e62956d197 100644 --- a/app/src/main/res/layout/game_collection_square_amway_item.xml +++ b/app/src/main/res/layout/game_collection_square_amway_item.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#2496FF"> + android:background="@color/primary_theme"> diff --git a/app/src/main/res/layout/game_comment_log_item.xml b/app/src/main/res/layout/game_comment_log_item.xml index b74dbba7cb..c873e26e64 100644 --- a/app/src/main/res/layout/game_comment_log_item.xml +++ b/app/src/main/res/layout/game_comment_log_item.xml @@ -6,7 +6,7 @@ android:id="@+id/comment_item" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingLeft="20dp" android:paddingRight="20dp" android:paddingBottom="12dp"> @@ -65,7 +65,7 @@ app:layout_constraintBottom_toBottomOf="@+id/user_icon_container" app:layout_constraintLeft_toRightOf="@+id/user_icon_container" app:layout_constraintTop_toBottomOf="@+id/user_name" - app:mrb_progressTint="@color/theme" /> + app:mrb_progressTint="@color/primary_theme" /> diff --git a/app/src/main/res/layout/game_detail_info.xml b/app/src/main/res/layout/game_detail_info.xml index bbeafbf8a4..a6a9b41045 100644 --- a/app/src/main/res/layout/game_detail_info.xml +++ b/app/src/main/res/layout/game_detail_info.xml @@ -2,7 +2,7 @@ @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="详细信息" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -59,7 +59,7 @@ android:layout_marginTop="16dp" android:layout_marginBottom="2dp" android:text="个人信息及用途等说明可在隐私政策中查看" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/game_double_card_item.xml b/app/src/main/res/layout/game_double_card_item.xml index 01c845a332..c542b09867 100644 --- a/app/src/main/res/layout/game_double_card_item.xml +++ b/app/src/main/res/layout/game_double_card_item.xml @@ -50,7 +50,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" tools:text="火炬之光：无限" /> @@ -63,7 +63,7 @@ android:paddingLeft="2dp" android:paddingRight="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" @@ -80,7 +80,7 @@ android:singleLine="true" android:includeFontPadding="false" android:ellipsize="end" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" tools:text="无体力无PVP，爽快战斗纯正打宝，即刻预约" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/game_gallery_item.xml b/app/src/main/res/layout/game_gallery_item.xml index 278a67dcd5..59f5df614c 100644 --- a/app/src/main/res/layout/game_gallery_item.xml +++ b/app/src/main/res/layout/game_gallery_item.xml @@ -32,7 +32,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="8dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/game_gallery_list.xml b/app/src/main/res/layout/game_gallery_list.xml index 140ca45e3b..73d52f68da 100644 --- a/app/src/main/res/layout/game_gallery_list.xml +++ b/app/src/main/res/layout/game_gallery_list.xml @@ -15,7 +15,7 @@ android:layout_marginLeft="@dimen/game_detail_item_horizontal_padding" android:includeFontPadding="false" android:text="视频" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -29,7 +29,7 @@ android:drawableRight="@drawable/ic_right_arrow_darker" android:drawablePadding="2dp" android:text="更多" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/titleTv" diff --git a/app/src/main/res/layout/game_head_item.xml b/app/src/main/res/layout/game_head_item.xml index f5e0b6ed3d..7169b88d25 100644 --- a/app/src/main/res/layout/game_head_item.xml +++ b/app/src/main/res/layout/game_head_item.xml @@ -29,7 +29,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" app:layout_constrainedWidth="true" @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="center" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/game_image_item.xml b/app/src/main/res/layout/game_image_item.xml index 945dd8b142..e48780738e 100644 --- a/app/src/main/res/layout/game_image_item.xml +++ b/app/src/main/res/layout/game_image_item.xml @@ -68,7 +68,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@id/game_image_icon" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingLeft="20dp" android:paddingTop="13dp" android:paddingBottom="13dp" diff --git a/app/src/main/res/layout/game_latest_service_list.xml b/app/src/main/res/layout/game_latest_service_list.xml index 95f2c8ee7a..72c97ce92a 100644 --- a/app/src/main/res/layout/game_latest_service_list.xml +++ b/app/src/main/res/layout/game_latest_service_list.xml @@ -5,7 +5,7 @@ android:id="@+id/containerWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background" + android:background="@color/ui_background" android:paddingLeft="@dimen/game_detail_item_horizontal_padding" android:paddingRight="@dimen/game_detail_item_horizontal_padding"> @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="最新开服" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -41,7 +41,7 @@ android:drawableRight="@drawable/ic_right_arrow_darker" android:drawablePadding="2dp" android:text="更多" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/titleTv" app:layout_constraintEnd_toEndOf="parent" @@ -75,7 +75,7 @@ android:drawableLeft="@drawable/servers_calendar_hint" android:drawablePadding="4dp" android:text="请以游戏内实际开服为准" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/game_permission_dialog.xml b/app/src/main/res/layout/game_permission_dialog.xml index 522ffbe883..f87ee22c90 100644 --- a/app/src/main/res/layout/game_permission_dialog.xml +++ b/app/src/main/res/layout/game_permission_dialog.xml @@ -8,7 +8,7 @@ @@ -36,7 +36,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -54,7 +54,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -71,7 +71,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -104,7 +104,7 @@ android:layout_marginLeft="12dp" android:layout_toRightOf="@id/privacyIv" android:text="隐私政策" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> @@ -132,7 +132,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="9dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/text" /> @@ -153,7 +153,7 @@ android:id="@+id/line2" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/permissionsRv" /> @@ -164,7 +164,7 @@ android:layout_height="51dp" android:gravity="center" android:text="确定" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/game_permission_item.xml b/app/src/main/res/layout/game_permission_item.xml index 91ac4f003f..90654e64c6 100644 --- a/app/src/main/res/layout/game_permission_item.xml +++ b/app/src/main/res/layout/game_permission_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/background_white" + android:background="@color/ui_surface" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingBottom="16dp"> @@ -23,7 +23,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="8dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/hintIv" diff --git a/app/src/main/res/layout/game_pluggable_item.xml b/app/src/main/res/layout/game_pluggable_item.xml index 4c83f8ed41..222ae6a068 100644 --- a/app/src/main/res/layout/game_pluggable_item.xml +++ b/app/src/main/res/layout/game_pluggable_item.xml @@ -19,7 +19,7 @@ android:layout_marginBottom="8dp" android:padding="4dp" android:text="不再提醒" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> diff --git a/app/src/main/res/layout/game_plugin_item.xml b/app/src/main/res/layout/game_plugin_item.xml index 75d12db6dd..f51d741842 100644 --- a/app/src/main/res/layout/game_plugin_item.xml +++ b/app/src/main/res/layout/game_plugin_item.xml @@ -32,7 +32,7 @@ android:includeFontPadding="false" android:paddingTop="12dp" android:paddingBottom="8dp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:textStyle="bold" tools:text="你有100个游戏可以升级插件版" /> @@ -71,7 +71,7 @@ android:drawablePadding="4dp" android:includeFontPadding="false" android:text="展开" - android:textColor="@color/theme" + android:textColor="@color/primary_theme" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/game_test_item.xml b/app/src/main/res/layout/game_test_item.xml index ae98df3b45..c130aface4 100644 --- a/app/src/main/res/layout/game_test_item.xml +++ b/app/src/main/res/layout/game_test_item.xml @@ -46,7 +46,7 @@ android:includeFontPadding="false" android:lineSpacingMultiplier="0.9" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" tools:text="who let dog out" /> @@ -62,7 +62,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" @@ -188,7 +188,7 @@ android:id="@+id/extend_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:visibility="gone"> diff --git a/app/src/main/res/layout/game_update_content.xml b/app/src/main/res/layout/game_update_content.xml index b31630c373..d28b34f7a3 100644 --- a/app/src/main/res/layout/game_update_content.xml +++ b/app/src/main/res/layout/game_update_content.xml @@ -5,7 +5,7 @@ android:id="@+id/containerWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background" + android:background="@color/ui_background" android:paddingLeft="@dimen/game_detail_item_horizontal_padding" android:paddingRight="@dimen/game_detail_item_horizontal_padding"> @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="更新内容" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -28,7 +28,7 @@ android:layout_marginTop="7dp" android:lineSpacingExtra="4dp" android:maxLines="4" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" app:endText="... " app:expandText="全部" @@ -45,7 +45,7 @@ android:layout_marginTop="6dp" android:includeFontPadding="false" android:text="历史版本 >" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="13sp" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/gamedetail_body.xml b/app/src/main/res/layout/gamedetail_body.xml index e02c16752a..04fa12ddb2 100644 --- a/app/src/main/res/layout/gamedetail_body.xml +++ b/app/src/main/res/layout/gamedetail_body.xml @@ -11,7 +11,7 @@ android:id="@+id/gamedetail_appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:fitsSystemWindows="true" android:gravity="center" app:layout_behavior="com.gh.gamecenter.common.view.FixAppBarLayoutBehavior" @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - app:contentScrim="@color/background_white" + app:contentScrim="@color/ui_surface" app:layout_scrollFlags="scroll|exitUntilCollapsed" app:scrimAnimationDuration="0" app:scrimVisibleHeightTrigger="105dp" @@ -127,7 +127,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="2dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" tools:text="地海争霸2" /> @@ -163,7 +163,7 @@ android:paddingStart="6dp" android:paddingTop="0.5dp" android:text="登陆游戏后需进行实名认证" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="@dimen/tag_text_size" android:includeFontPadding="false" android:visibility="gone" @@ -217,7 +217,7 @@ android:includeFontPadding="false" android:maxLines="1" android:padding="4dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" android:visibility="gone" tools:text="游戏大事件游戏大事件" @@ -237,7 +237,7 @@ android:id="@+id/toolbarGapView" android:layout_width="match_parent" android:layout_height="8dp" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -74,7 +74,7 @@ android:layout_weight="0.8" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -94,7 +94,7 @@ android:layout_marginLeft="8dp" android:layout_marginRight="8dp" android:maxLines="1" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/linkHintIv" @@ -119,7 +119,7 @@ android:layout_marginRight="2dp" android:maxWidth="74dp" android:maxLines="1" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toLeftOf="@id/linkHintArrowIv" @@ -177,7 +177,7 @@ android:lineSpacingExtra="4dp" android:paddingLeft="12dp" android:paddingRight="12dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" android:visibility="gone" app:endText="... " diff --git a/app/src/main/res/layout/gamedetail_item_custom_column_item.xml b/app/src/main/res/layout/gamedetail_item_custom_column_item.xml index 779a368114..cab0eaaaa5 100644 --- a/app/src/main/res/layout/gamedetail_item_custom_column_item.xml +++ b/app/src/main/res/layout/gamedetail_item_custom_column_item.xml @@ -14,7 +14,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="4" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" tools:text="sample" /> diff --git a/app/src/main/res/layout/gamedetail_item_game_collection.xml b/app/src/main/res/layout/gamedetail_item_game_collection.xml index 08688f8ff2..6f91f2455c 100644 --- a/app/src/main/res/layout/gamedetail_item_game_collection.xml +++ b/app/src/main/res/layout/gamedetail_item_game_collection.xml @@ -47,7 +47,7 @@ android:maxLines="1" android:paddingStart="12dp" android:paddingEnd="12dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/body_text_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -62,7 +62,7 @@ android:layout_height="32dp" android:layout_marginStart="12dp" android:visibility="gone" - app:gameIconBorderColor="@color/background_white" + app:gameIconBorderColor="@color/ui_surface" app:gameIconBorderWidth="1dp" app:gameIconCornerRadius="8dp" app:gameIconRemoveCrevice="true" @@ -77,7 +77,7 @@ android:layout_height="32dp" android:layout_marginStart="4dp" android:visibility="gone" - app:gameIconBorderColor="@color/background_white" + app:gameIconBorderColor="@color/ui_surface" app:gameIconBorderWidth="1dp" app:gameIconCornerRadius="8dp" app:gameIconRemoveCrevice="true" @@ -92,7 +92,7 @@ android:layout_height="32dp" android:layout_marginStart="4dp" android:visibility="gone" - app:gameIconBorderColor="@color/background_white" + app:gameIconBorderColor="@color/ui_surface" app:gameIconBorderWidth="1dp" app:gameIconCornerRadius="8dp" app:gameIconRemoveCrevice="true" diff --git a/app/src/main/res/layout/gamedetail_item_image.xml b/app/src/main/res/layout/gamedetail_item_image.xml index 9d0ec6ed55..f3efaffe85 100644 --- a/app/src/main/res/layout/gamedetail_item_image.xml +++ b/app/src/main/res/layout/gamedetail_item_image.xml @@ -5,7 +5,7 @@ android:id="@+id/containerWrapper" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background" + android:background="@color/ui_background" android:orientation="vertical" android:paddingStart="@dimen/game_detail_item_horizontal_padding" android:paddingEnd="@dimen/game_detail_item_horizontal_padding"> @@ -18,7 +18,7 @@ android:gravity="center_vertical" android:includeFontPadding="false" android:paddingBottom="11dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" tools:text="大图" /> diff --git a/app/src/main/res/layout/gamedetail_item_news.xml b/app/src/main/res/layout/gamedetail_item_news.xml index 2f82c73f59..227b1cd973 100644 --- a/app/src/main/res/layout/gamedetail_item_news.xml +++ b/app/src/main/res/layout/gamedetail_item_news.xml @@ -2,7 +2,7 @@ @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/news_all" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="13sp" /> @@ -62,7 +62,7 @@ android:paddingLeft="2dp" android:paddingRight="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" @@ -84,7 +84,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="6dp" android:includeFontPadding="false" - android:textColor="@color/theme" + android:textColor="@color/primary_theme" android:textSize="12sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/amway_score_icon" @@ -129,7 +129,7 @@ android:lineSpacingMultiplier="1.3" android:maxLines="3" android:minLines="3" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -169,7 +169,7 @@ android:layout_marginLeft="4dp" android:maxWidth="96dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/user_icon_container" app:layout_constraintLeft_toRightOf="@id/user_icon_container" @@ -192,7 +192,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:text="评分：" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/user_icon_container" app:layout_constraintLeft_toRightOf="@id/sdv_user_badge" @@ -210,7 +210,7 @@ app:layout_constraintBottom_toBottomOf="@+id/user_icon_container" app:layout_constraintLeft_toRightOf="@id/rating_name" app:layout_constraintTop_toTopOf="@id/user_icon_container" - app:mrb_progressTint="@color/theme" /> + app:mrb_progressTint="@color/primary_theme" /> @@ -223,7 +223,7 @@ android:background="@drawable/home_amway_selector" android:gravity="center" android:text="全部" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@id/amway_background" diff --git a/app/src/main/res/layout/home_discover_card_item.xml b/app/src/main/res/layout/home_discover_card_item.xml index b6ddf9dd8b..a068c4fa37 100644 --- a/app/src/main/res/layout/home_discover_card_item.xml +++ b/app/src/main/res/layout/home_discover_card_item.xml @@ -36,7 +36,7 @@ android:layout_marginEnd="16dp" android:drawableEnd="@drawable/ic_home_head_arrow" android:drawablePadding="4dp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:text="全部" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/home_divider_item.xml b/app/src/main/res/layout/home_divider_item.xml index 85fe2f115d..df2e619bd3 100644 --- a/app/src/main/res/layout/home_divider_item.xml +++ b/app/src/main/res/layout/home_divider_item.xml @@ -11,7 +11,7 @@ android:layout_height="0.5dp" android:layout_marginLeft="@dimen/home_item_padding" android:layout_marginRight="@dimen/home_item_padding" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/home_game_collection_card_item.xml b/app/src/main/res/layout/home_game_collection_card_item.xml index ba3a102ca2..2a44f93a82 100644 --- a/app/src/main/res/layout/home_game_collection_card_item.xml +++ b/app/src/main/res/layout/home_game_collection_card_item.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:alpha="0" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/home_game_collection_refresh_item.xml b/app/src/main/res/layout/home_game_collection_refresh_item.xml index f347f692da..4d7469ea8d 100644 --- a/app/src/main/res/layout/home_game_collection_refresh_item.xml +++ b/app/src/main/res/layout/home_game_collection_refresh_item.xml @@ -29,7 +29,7 @@ android:layout_marginEnd="16dp" android:layout_marginRight="16dp" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/primary_title_text_size" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/refreshLottie" @@ -46,7 +46,7 @@ android:layout_marginRight="4dp" android:gravity="center" android:text="全部" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="@dimen/secondary_size" app:layout_constraintBottom_toBottomOf="@+id/arrowIv" app:layout_constraintEnd_toStartOf="@+id/arrowIv" @@ -63,7 +63,7 @@ app:layout_constraintBottom_toBottomOf="@+id/titleTv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@+id/titleTv" - app:tint="@color/theme_font" /> + app:tint="@color/text_theme" /> @@ -68,7 +68,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" @@ -109,7 +109,7 @@ android:drawablePadding="4dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/theme" + android:textColor="@color/primary_theme" android:textSize="12sp" android:textStyle="bold" tools:text="9.3" /> @@ -171,7 +171,7 @@ android:drawablePadding="4dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/theme" + android:textColor="@color/primary_theme" android:textSize="18sp" android:textStyle="bold" android:visibility="gone" @@ -215,7 +215,7 @@ android:orientation="horizontal" android:paddingTop="12dp" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/home_slide_card_item.xml b/app/src/main/res/layout/home_slide_card_item.xml index 5cd70d4d48..46f0a04fb0 100644 --- a/app/src/main/res/layout/home_slide_card_item.xml +++ b/app/src/main/res/layout/home_slide_card_item.xml @@ -18,7 +18,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:alpha="0.8" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -80,7 +80,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" tools:text="板块标题" /> @@ -89,7 +89,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/little_secondary_size" tools:text="副标题" /> @@ -168,7 +168,7 @@ android:gravity="center" android:paddingLeft="4dp" android:paddingRight="4dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/tag_text_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/home_sub_slide_list_item.xml b/app/src/main/res/layout/home_sub_slide_list_item.xml index d4d2a1dcfa..83a5e6a883 100644 --- a/app/src/main/res/layout/home_sub_slide_list_item.xml +++ b/app/src/main/res/layout/home_sub_slide_list_item.xml @@ -71,7 +71,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" diff --git a/app/src/main/res/layout/home_unknown_item.xml b/app/src/main/res/layout/home_unknown_item.xml index 3580022e54..beff76acd3 100644 --- a/app/src/main/res/layout/home_unknown_item.xml +++ b/app/src/main/res/layout/home_unknown_item.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:descendantFocusability="blocksDescendants"> \ No newline at end of file diff --git a/app/src/main/res/layout/imprint_content_item.xml b/app/src/main/res/layout/imprint_content_item.xml index 4ca3ce127e..da707fd16b 100644 --- a/app/src/main/res/layout/imprint_content_item.xml +++ b/app/src/main/res/layout/imprint_content_item.xml @@ -14,7 +14,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="4" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:text="平台" @@ -27,7 +27,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="4" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:text="版本" @@ -39,7 +39,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="5" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:text="上架时间" diff --git a/app/src/main/res/layout/interested_game_type_item.xml b/app/src/main/res/layout/interested_game_type_item.xml index 880d0ded63..c3145a1a57 100644 --- a/app/src/main/res/layout/interested_game_type_item.xml +++ b/app/src/main/res/layout/interested_game_type_item.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" android:textSize="16sp" tools:text="玩法" diff --git a/app/src/main/res/layout/item_article_detail_comment.xml b/app/src/main/res/layout/item_article_detail_comment.xml index 1290158267..ddc4efdac4 100644 --- a/app/src/main/res/layout/item_article_detail_comment.xml +++ b/app/src/main/res/layout/item_article_detail_comment.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/background_white"> + android:background="@color/ui_surface"> + app:mrb_progressTint="@color/primary_theme" /> @@ -336,7 +336,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="3dp" android:maxLines="2" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" tools:text="2006年12月30日，孙一峰与女友weiwei结婚，育有儿子孙宁和女儿孙焕佳。" /> @@ -349,7 +349,7 @@ android:drawablePadding="5dp" android:includeFontPadding="false" android:text="查看更多回复" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" /> @@ -369,7 +369,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_marginBottom="20dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -382,7 +382,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_marginBottom="20dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -404,7 +404,7 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:text="查看原文" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -421,7 +421,7 @@ android:gravity="center" android:maxLines="1" android:paddingRight="8dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -439,7 +439,7 @@ android:layout_height="wrap_content" android:layout_marginRight="8dp" android:gravity="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -454,7 +454,7 @@ android:drawableLeft="@drawable/comment_vote_unselect" android:drawablePadding="4dp" android:gravity="center_vertical" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="@id/timeTv" app:layout_constraintEnd_toEndOf="parent" @@ -469,7 +469,7 @@ android:drawableLeft="@drawable/ic_article_detail_comment_list" android:drawablePadding="4dp" android:gravity="center_vertical" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="@id/timeTv" app:layout_constraintEnd_toStartOf="@id/likeCountTv" @@ -481,7 +481,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginRight="20dp" - android:textColor="@color/theme_red" + android:textColor="@color/secondary_red" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -494,7 +494,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="8dp" - android:background="@color/background" + android:background="@color/ui_background" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -506,7 +506,7 @@ android:layout_height="0.5dp" android:layout_marginLeft="64dp" android:layout_marginRight="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_article_detail_comment_empty.xml b/app/src/main/res/layout/item_article_detail_comment_empty.xml index 46a5e486af..b62c21ec30 100644 --- a/app/src/main/res/layout/item_article_detail_comment_empty.xml +++ b/app/src/main/res/layout/item_article_detail_comment_empty.xml @@ -3,7 +3,7 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="288dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:orientation="vertical"> @@ -20,7 +20,7 @@ android:layout_marginTop="24dp" android:gravity="center" android:text="@string/article_detail_empty_comment" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" /> + android:background="@color/ui_background"> + android:background="@color/ui_surface"> @@ -59,7 +59,7 @@ android:id="@+id/dividerLine" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" android:visibility="gone" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> @@ -220,7 +220,7 @@ android:paddingRight="16dp" android:paddingTop="4dp" android:paddingBottom="4dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="22sp" android:textStyle="bold" tools:text="这是一个很长很长很长很长很长很长很长很长很长很长的标题" /> @@ -286,7 +286,7 @@ android:ellipsize="end" android:gravity="center_vertical" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" tools:text="元气骑士" app:drawableRightCompat="@drawable/ic_article_edit_choose_forum_arrow_gray" @@ -300,7 +300,7 @@ android:layout_marginEnd="8dp" android:drawablePadding="4dp" android:includeFontPadding="false" - android:textColor="@color/theme" + android:textColor="@color/primary_theme" android:textSize="12sp" android:visibility="gone" app:drawableStartCompat="@drawable/icon_section" diff --git a/app/src/main/res/layout/item_article_detail_related_content.xml b/app/src/main/res/layout/item_article_detail_related_content.xml index ed41c2c10c..31399d194e 100644 --- a/app/src/main/res/layout/item_article_detail_related_content.xml +++ b/app/src/main/res/layout/item_article_detail_related_content.xml @@ -27,7 +27,7 @@ android:maxLines="1" android:ellipsize="end" tools:text="坎特伯雷公主与骑士唤醒冠军省略很多字" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:includeFontPadding="false" app:layout_constraintEnd_toEndOf="parent" @@ -42,7 +42,7 @@ android:maxLines="1" android:ellipsize="end" tools:text="突击检查！看看你们手机里都有哪些有意思的游戏梗图与表情包，分享到评论区中与大家说说你的想法，我们将随机抽取8名小伙伴送出" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="11sp" android:includeFontPadding="false" app:layout_constraintEnd_toEndOf="parent" @@ -58,7 +58,7 @@ android:layout_marginBottom="4dp" android:maxLines="1" tools:text="点赞 5 · 评论 8" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" android:includeFontPadding="false" app:layout_constraintTop_toBottomOf="@id/subtitle" diff --git a/app/src/main/res/layout/item_blank_divider.xml b/app/src/main/res/layout/item_blank_divider.xml index 548e54d991..e7d2f4be7c 100644 --- a/app/src/main/res/layout/item_blank_divider.xml +++ b/app/src/main/res/layout/item_blank_divider.xml @@ -3,6 +3,6 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/background_white"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml index 952f9b4fb2..0f094f5638 100644 --- a/app/src/main/res/layout/item_category.xml +++ b/app/src/main/res/layout/item_category.xml @@ -10,7 +10,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="8dp" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -35,7 +35,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" app:layout_constraintStart_toEndOf="@+id/gameIcon" app:layout_constraintTop_toTopOf="@+id/gameIcon" @@ -49,7 +49,7 @@ android:layout_marginTop="6dp" android:includeFontPadding="false" android:text="选择推荐指数：" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/tag_text_size" app:layout_constraintStart_toEndOf="@+id/gameIcon" app:layout_constraintTop_toBottomOf="@+id/gameNameTv" /> @@ -67,7 +67,7 @@ app:layout_constraintBottom_toBottomOf="@+id/gameIcon" app:layout_constraintStart_toEndOf="@+id/gameIcon" app:mrb_progressBackgroundTint="@color/text_dddddd" - app:mrb_progressTint="@color/theme" + app:mrb_progressTint="@color/primary_theme" app:mrb_secondaryProgressTint="@color/text_dddddd" /> diff --git a/app/src/main/res/layout/item_choose_section_dialog.xml b/app/src/main/res/layout/item_choose_section_dialog.xml index 9b8e68f372..f5f7b8d27a 100644 --- a/app/src/main/res/layout/item_choose_section_dialog.xml +++ b/app/src/main/res/layout/item_choose_section_dialog.xml @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:layout_marginStart="16dp" android:layout_marginLeft="16dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/item_comment_edit_image.xml b/app/src/main/res/layout/item_comment_edit_image.xml index 21f0c83c82..6c668122f3 100644 --- a/app/src/main/res/layout/item_comment_edit_image.xml +++ b/app/src/main/res/layout/item_comment_edit_image.xml @@ -14,7 +14,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:roundedCornerRadius="4dp" - app:roundingBorderColor="@color/border" + app:roundingBorderColor="@color/resource_border" app:roundingBorderWidth="0.5dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_device_remind_banner.xml b/app/src/main/res/layout/item_device_remind_banner.xml index 08821a0c09..10539bd0b0 100644 --- a/app/src/main/res/layout/item_device_remind_banner.xml +++ b/app/src/main/res/layout/item_device_remind_banner.xml @@ -5,5 +5,5 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:placeholderImageScaleType="fitXY" - app:roundingBorderColor="@color/background" + app:roundingBorderColor="@color/ui_background" app:roundingBorderWidth="1dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_filter_size.xml b/app/src/main/res/layout/item_filter_size.xml index 79295d7ea9..9e430ad44f 100644 --- a/app/src/main/res/layout/item_filter_size.xml +++ b/app/src/main/res/layout/item_filter_size.xml @@ -3,7 +3,7 @@ android:id="@+id/config_controller" android:layout_width="100dp" android:layout_height="40dp" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -77,7 +77,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:text="专区" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" /> @@ -103,7 +103,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:text="论坛" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/item_forum_article_head.xml b/app/src/main/res/layout/item_forum_article_head.xml index 12bfcd9a85..7879c08a9c 100644 --- a/app/src/main/res/layout/item_forum_article_head.xml +++ b/app/src/main/res/layout/item_forum_article_head.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingTop="12dp"> \ No newline at end of file diff --git a/app/src/main/res/layout/item_forum_video.xml b/app/src/main/res/layout/item_forum_video.xml index 020d75f497..3c6ec4c601 100644 --- a/app/src/main/res/layout/item_forum_video.xml +++ b/app/src/main/res/layout/item_forum_video.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" @@ -55,7 +55,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/video_poster" app:layout_constraintTop_toTopOf="@+id/video_poster" /> @@ -67,7 +67,7 @@ android:layout_marginLeft="12dp" android:layout_marginTop="4dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/video_poster" @@ -80,7 +80,7 @@ android:layout_marginLeft="12dp" android:layout_marginBottom="2dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="@+id/video_poster" app:layout_constraintStart_toEndOf="@+id/video_poster" /> diff --git a/app/src/main/res/layout/item_game_collection_filter.xml b/app/src/main/res/layout/item_game_collection_filter.xml index 761d48f21d..e581642e5a 100644 --- a/app/src/main/res/layout/item_game_collection_filter.xml +++ b/app/src/main/res/layout/item_game_collection_filter.xml @@ -26,7 +26,7 @@ android:ellipsize="end" android:lines="1" android:text="全部标签" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="@dimen/secondary_size" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_collection_hot_list.xml b/app/src/main/res/layout/item_game_collection_hot_list.xml index 2d9b796760..4e4e1c60ad 100644 --- a/app/src/main/res/layout/item_game_collection_hot_list.xml +++ b/app/src/main/res/layout/item_game_collection_hot_list.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - app:cardBackgroundColor="@color/background_white" + app:cardBackgroundColor="@color/ui_surface" app:cardCornerRadius="8dp" app:cardElevation="0dp"> @@ -85,7 +85,7 @@ android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:gravity="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/little_secondary_size" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/coverImage" @@ -101,7 +101,7 @@ android:ellipsize="end" android:lineSpacingExtra="2dp" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/coverImage" @@ -115,7 +115,7 @@ android:layout_marginStart="12dp" android:layout_marginTop="-8dp" android:visibility="gone" - app:gameIconBorderColor="@color/background_white" + app:gameIconBorderColor="@color/ui_surface" app:gameIconBorderWidth="1dp" app:gameIconCornerRadius="8dp" app:gameIconRemoveCrevice="true" @@ -130,7 +130,7 @@ android:layout_height="32dp" android:layout_marginStart="4dp" android:visibility="gone" - app:gameIconBorderColor="@color/background_white" + app:gameIconBorderColor="@color/ui_surface" app:gameIconBorderWidth="1dp" app:gameIconCornerRadius="8dp" app:gameIconRemoveCrevice="true" @@ -145,7 +145,7 @@ android:layout_height="32dp" android:layout_marginStart="4dp" android:visibility="gone" - app:gameIconBorderColor="@color/background_white" + app:gameIconBorderColor="@color/ui_surface" app:gameIconBorderWidth="1dp" app:gameIconCornerRadius="8dp" app:gameIconRemoveCrevice="true" @@ -182,7 +182,7 @@ android:layout_marginRight="12dp" android:ellipsize="end" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/userIconCv" diff --git a/app/src/main/res/layout/item_game_collection_player_creation.xml b/app/src/main/res/layout/item_game_collection_player_creation.xml index 4788dfc14f..2efc748544 100644 --- a/app/src/main/res/layout/item_game_collection_player_creation.xml +++ b/app/src/main/res/layout/item_game_collection_player_creation.xml @@ -6,7 +6,7 @@ android:layout_height="108dp" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - app:cardBackgroundColor="@color/background_white" + app:cardBackgroundColor="@color/ui_surface" app:cardCornerRadius="8dp" app:cardElevation="0dp"> @@ -33,7 +33,7 @@ android:layout_marginLeft="12dp" android:layout_marginTop="22dp" android:gravity="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_title_text_size" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" @@ -48,7 +48,7 @@ android:layout_marginLeft="33dp" app:avatar_width="44dp" app:badge_width="14.3dp" - app:border_color="@color/border" + app:border_color="@color/resource_border" app:border_width="1px" app:layout_constraintBottom_toTopOf="@+id/gameCollectionCv" app:layout_constraintStart_toStartOf="parent" @@ -65,7 +65,7 @@ android:layout_marginEnd="4dp" android:layout_marginRight="4dp" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/userFansAndVoteCountTv" app:layout_constraintEnd_toStartOf="@+id/badgeIv" @@ -88,7 +88,7 @@ app:layout_constraintHorizontal_bias="0" app:layout_constraintStart_toEndOf="@+id/userNameTv" app:layout_constraintTop_toTopOf="@+id/userNameTv" - tools:background="@color/background" + tools:background="@color/ui_background" tools:visibility="visible" /> @@ -215,7 +215,7 @@ android:layout_marginEnd="8dp" android:layout_marginRight="8dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/secondary_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/moreIv" diff --git a/app/src/main/res/layout/item_game_collection_player_creation_header.xml b/app/src/main/res/layout/item_game_collection_player_creation_header.xml index 14963f0617..31fc8cc139 100644 --- a/app/src/main/res/layout/item_game_collection_player_creation_header.xml +++ b/app/src/main/res/layout/item_game_collection_player_creation_header.xml @@ -15,7 +15,7 @@ android:id="@+id/tipsTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" tools:text="上榜原因：最近一周积极创建游戏单的用户" /> @@ -25,5 +25,5 @@ android:layout_height="12dp" android:layout_marginStart="4dp" android:src="@drawable/ic_ignore_rating_tips" - app:tint="@color/text_subtitleDesc" /> + app:tint="@color/text_tertiary" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_detail_big_event.xml b/app/src/main/res/layout/item_game_detail_big_event.xml index 581110ff2d..ea8fb58f74 100644 --- a/app/src/main/res/layout/item_game_detail_big_event.xml +++ b/app/src/main/res/layout/item_game_detail_big_event.xml @@ -12,7 +12,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:textSize="12sp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:text="2020-01-01" tools:text="2020-01-01" /> @@ -25,7 +25,7 @@ app:layout_constraintTop_toTopOf="@+id/timeTv" android:textSize="14sp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:text="预下载已开启，将于1月8日上午10点正式上线.预下载已开启，将于1月8日上午10点正式上线" tools:text="预下载已开启，将于1月8日上午10点正式上线" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_detail_comment_more.xml b/app/src/main/res/layout/item_game_detail_comment_more.xml index d2b1c1ab0a..7837daef32 100644 --- a/app/src/main/res/layout/item_game_detail_comment_more.xml +++ b/app/src/main/res/layout/item_game_detail_comment_more.xml @@ -16,6 +16,6 @@ android:text="查看全部评价" android:drawablePadding="5dp" android:textSize="12sp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:drawableRight="@drawable/ic_game_detail_arrow_right" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_detail_game_tag.xml b/app/src/main/res/layout/item_game_detail_game_tag.xml index 4701fb9aa2..85759ae22c 100644 --- a/app/src/main/res/layout/item_game_detail_game_tag.xml +++ b/app/src/main/res/layout/item_game_detail_game_tag.xml @@ -15,7 +15,7 @@ android:layout_weight="1" android:layout_height="wrap_content" android:text="全局加速" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/item_game_detail_rating_comment.xml b/app/src/main/res/layout/item_game_detail_rating_comment.xml index 9b288a8bd1..40dc1f7324 100644 --- a/app/src/main/res/layout/item_game_detail_rating_comment.xml +++ b/app/src/main/res/layout/item_game_detail_rating_comment.xml @@ -6,7 +6,7 @@ android:id="@+id/comment_item" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingLeft="16dp" android:paddingBottom="14dp"> @@ -25,7 +25,7 @@ android:layout_width="32dp" android:layout_height="32dp" app:roundAsCircle="true" - app:roundingBorderColor="@color/divider" + app:roundingBorderColor="@color/ui_divider" app:roundingBorderWidth="1dp" /> + app:mrb_progressTint="@color/primary_theme" /> @@ -47,7 +47,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" diff --git a/app/src/main/res/layout/item_game_info.xml b/app/src/main/res/layout/item_game_info.xml index cf7a5c5291..fdc65ca8bb 100644 --- a/app/src/main/res/layout/item_game_info.xml +++ b/app/src/main/res/layout/item_game_info.xml @@ -17,7 +17,7 @@ android:gravity="end" android:singleLine="true" android:text="0.0M" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="8dp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="13sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/infoTv" @@ -43,7 +43,7 @@ android:id="@+id/action2Tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="13sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/infoTv" @@ -56,7 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="游戏大小" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -66,6 +66,6 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/item_game_libao.xml b/app/src/main/res/layout/item_game_libao.xml index 4a0cc56b7f..863f877dbc 100644 --- a/app/src/main/res/layout/item_game_libao.xml +++ b/app/src/main/res/layout/item_game_libao.xml @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:drawableLeft="@drawable/ic_game_detail_libao" android:drawablePadding="4dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -54,7 +54,7 @@ android:layout_marginLeft="8dp" android:gravity="start" android:text="剩余0%" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/libaoSchedulePb" @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="礼包码：-" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -93,7 +93,7 @@ android:layout_height="wrap_content" android:layout_marginTop="10dp" android:layout_marginRight="20dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintEnd_toStartOf="@+id/receiveTv" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_game_raiders.xml b/app/src/main/res/layout/item_game_raiders.xml index f0814195ed..6599a7375e 100644 --- a/app/src/main/res/layout/item_game_raiders.xml +++ b/app/src/main/res/layout/item_game_raiders.xml @@ -17,7 +17,7 @@ android:ellipsize="end" android:lineSpacingExtra="4dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -32,7 +32,7 @@ android:ellipsize="end" android:lineSpacingExtra="4dp" android:maxLines="4" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -45,7 +45,7 @@ android:layout_height="0.5dp" android:layout_marginTop="14dp" android:layout_marginBottom="8dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toTopOf="@+id/timeTv" app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -54,7 +54,7 @@ android:id="@+id/timeTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_game_raiders_fixed_top.xml b/app/src/main/res/layout/item_game_raiders_fixed_top.xml index af04379670..e225e6fc9d 100644 --- a/app/src/main/res/layout/item_game_raiders_fixed_top.xml +++ b/app/src/main/res/layout/item_game_raiders_fixed_top.xml @@ -28,7 +28,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="3dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -42,7 +42,7 @@ android:layout_marginLeft="12dp" android:layout_marginBottom="10dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/item_game_save_list.xml b/app/src/main/res/layout/item_game_save_list.xml index a769fa4e3b..08210cfbd1 100644 --- a/app/src/main/res/layout/item_game_save_list.xml +++ b/app/src/main/res/layout/item_game_save_list.xml @@ -30,7 +30,7 @@ android:layout_marginEnd="12dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" app:layout_constrainedWidth="true" diff --git a/app/src/main/res/layout/item_game_server_test_big_image.xml b/app/src/main/res/layout/item_game_server_test_big_image.xml index a3f971aee6..af8c64dc5a 100644 --- a/app/src/main/res/layout/item_game_server_test_big_image.xml +++ b/app/src/main/res/layout/item_game_server_test_big_image.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/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:paddingStart="16dp" android:paddingTop="12dp" @@ -31,7 +31,7 @@ android:layout_marginStart="8dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" app:layout_constraintStart_toEndOf="@+id/statusTv" app:layout_constraintTop_toTopOf="parent" @@ -101,7 +101,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" tools:text="轩辕剑龙舞云山" /> @@ -116,7 +116,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" @@ -130,7 +130,7 @@ android:layout_marginStart="8dp" android:layout_marginBottom="1dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/little_secondary_size" app:layout_constraintBottom_toBottomOf="@+id/game_icon" app:layout_constraintStart_toEndOf="@+id/game_icon" diff --git a/app/src/main/res/layout/item_game_server_test_time.xml b/app/src/main/res/layout/item_game_server_test_time.xml index 301e256349..3666aaf4ef 100644 --- a/app/src/main/res/layout/item_game_server_test_time.xml +++ b/app/src/main/res/layout/item_game_server_test_time.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="40dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:clickable="true" android:focusable="true" android:paddingStart="16dp" @@ -16,7 +16,7 @@ android:layout_height="wrap_content" android:drawablePadding="4dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/primary_text_size" app:drawableStartCompat="@drawable/ic_game_server_test_date" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/item_game_upload_label.xml b/app/src/main/res/layout/item_game_upload_label.xml index 29c62ba8eb..0f8c1a2a86 100644 --- a/app/src/main/res/layout/item_game_upload_label.xml +++ b/app/src/main/res/layout/item_game_upload_label.xml @@ -17,7 +17,7 @@ android:paddingTop="4dp" android:paddingRight="5dp" android:paddingBottom="4dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="10sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_halo_personal_func.xml b/app/src/main/res/layout/item_halo_personal_func.xml index 6b3356c91b..880fa62374 100644 --- a/app/src/main/res/layout/item_halo_personal_func.xml +++ b/app/src/main/res/layout/item_halo_personal_func.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:maxLength="12" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="11sp" app:layout_constraintEnd_toEndOf="@+id/iv_addon_icon" app:layout_constraintStart_toStartOf="@+id/iv_addon_icon" diff --git a/app/src/main/res/layout/item_history_apk.xml b/app/src/main/res/layout/item_history_apk.xml index eb3d8b2f04..bf4a880df4 100644 --- a/app/src/main/res/layout/item_history_apk.xml +++ b/app/src/main/res/layout/item_history_apk.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/background_white" + android:background="@color/ui_surface" android:paddingLeft="20dp" android:paddingTop="16dp" android:paddingRight="20dp" @@ -23,7 +23,7 @@ android:id="@+id/versionTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/downloadBtn" app:layout_constraintLeft_toLeftOf="parent" @@ -35,7 +35,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="8dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/downloadBtn" app:layout_constraintLeft_toRightOf="@id/versionTv" @@ -50,7 +50,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="3" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:endText="... " app:expandText="展开" diff --git a/app/src/main/res/layout/item_home_game_collection_big_slide_card.xml b/app/src/main/res/layout/item_home_game_collection_big_slide_card.xml index fbb4edb009..3847ed735f 100644 --- a/app/src/main/res/layout/item_home_game_collection_big_slide_card.xml +++ b/app/src/main/res/layout/item_home_game_collection_big_slide_card.xml @@ -126,7 +126,7 @@ android:id="@+id/divider" android:layout_width="0dp" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toTopOf="@+id/moreTv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -137,7 +137,7 @@ android:layout_height="40dp" android:drawablePadding="4dp" android:gravity="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" app:drawableEndCompat="@drawable/ic_home_game_collection_slide_jump" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/item_home_game_collection_big_slide_card_game.xml b/app/src/main/res/layout/item_home_game_collection_big_slide_card_game.xml index 7c61793066..cf726b8e58 100644 --- a/app/src/main/res/layout/item_home_game_collection_big_slide_card_game.xml +++ b/app/src/main/res/layout/item_home_game_collection_big_slide_card_game.xml @@ -11,7 +11,7 @@ android:layout_height="40dp" android:layout_marginStart="12dp" android:layout_marginLeft="12dp" - app:gameIconBorderColor="@color/border" + app:gameIconBorderColor="@color/resource_border" app:gameIconBorderWidth="0.5dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -27,7 +27,7 @@ android:layout_marginRight="12dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/gameDesTv" app:layout_constraintEnd_toStartOf="@+id/downloadBtn" @@ -47,7 +47,7 @@ android:layout_marginRight="12dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/little_secondary_size" app:layout_constraintBottom_toBottomOf="@+id/gameIconIv" app:layout_constraintEnd_toStartOf="@+id/downloadBtn" diff --git a/app/src/main/res/layout/item_home_game_collection_small_slide_card.xml b/app/src/main/res/layout/item_home_game_collection_small_slide_card.xml index defaba8081..f09842cf62 100644 --- a/app/src/main/res/layout/item_home_game_collection_small_slide_card.xml +++ b/app/src/main/res/layout/item_home_game_collection_small_slide_card.xml @@ -53,7 +53,7 @@ android:ellipsize="end" android:lineSpacingExtra="2dp" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -68,7 +68,7 @@ android:layout_marginStart="12dp" android:layout_marginBottom="-8dp" android:visibility="gone" - app:gameIconBorderColor="@color/background_white" + app:gameIconBorderColor="@color/ui_surface" app:gameIconBorderWidth="1dp" app:gameIconCornerRadius="8dp" app:gameIconRemoveCrevice="true" @@ -83,7 +83,7 @@ android:layout_height="32dp" android:layout_marginStart="4dp" android:visibility="gone" - app:gameIconBorderColor="@color/background_white" + app:gameIconBorderColor="@color/ui_surface" app:gameIconBorderWidth="1dp" app:gameIconCornerRadius="8dp" app:gameIconRemoveCrevice="true" @@ -98,7 +98,7 @@ android:layout_height="32dp" android:layout_marginStart="4dp" android:visibility="gone" - app:gameIconBorderColor="@color/background_white" + app:gameIconBorderColor="@color/ui_surface" app:gameIconBorderWidth="1dp" app:gameIconCornerRadius="8dp" app:gameIconRemoveCrevice="true" @@ -135,7 +135,7 @@ android:layout_marginRight="12dp" android:ellipsize="end" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/secondary_size" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@+id/userIconCv" diff --git a/app/src/main/res/layout/item_home_game_test_v2_item.xml b/app/src/main/res/layout/item_home_game_test_v2_item.xml index 512ce97ca6..030c582e4c 100644 --- a/app/src/main/res/layout/item_home_game_test_v2_item.xml +++ b/app/src/main/res/layout/item_home_game_test_v2_item.xml @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" tools:text="地海争霸：巫妖王再怒" /> @@ -81,7 +81,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" /> @@ -104,7 +104,7 @@ android:layout_width="wrap_content" android:layout_height="14dp" android:layout_marginLeft="8dp" - android:background="@color/theme" + android:background="@color/primary_theme" android:gravity="center" android:maxLines="1" android:paddingStart="4dp" @@ -161,7 +161,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="11sp" app:layout_constraintLeft_toRightOf="@+id/game_rating" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/item_home_game_test_v2_recommend_label.xml b/app/src/main/res/layout/item_home_game_test_v2_recommend_label.xml index c9d2702289..908beed062 100644 --- a/app/src/main/res/layout/item_home_game_test_v2_recommend_label.xml +++ b/app/src/main/res/layout/item_home_game_test_v2_recommend_label.xml @@ -12,7 +12,7 @@ android:paddingLeft="12dp" android:drawablePadding="8dp" android:paddingRight="12dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:layout_height="36dp"> \ No newline at end of file diff --git a/app/src/main/res/layout/item_home_horizontal_slide_video.xml b/app/src/main/res/layout/item_home_horizontal_slide_video.xml index 921fd52a6d..08b01c7674 100644 --- a/app/src/main/res/layout/item_home_horizontal_slide_video.xml +++ b/app/src/main/res/layout/item_home_horizontal_slide_video.xml @@ -6,7 +6,7 @@ android:layout_height="wrap_content" android:paddingTop="15dp" android:paddingBottom="17dp" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -80,7 +80,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" diff --git a/app/src/main/res/layout/item_home_recent_vgame.xml b/app/src/main/res/layout/item_home_recent_vgame.xml index 8faa7b68ef..be16f22a22 100644 --- a/app/src/main/res/layout/item_home_recent_vgame.xml +++ b/app/src/main/res/layout/item_home_recent_vgame.xml @@ -28,7 +28,7 @@ android:layout_marginStart="4dp" android:includeFontPadding="false" android:text="最近在玩" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/primary_text_size" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@id/hintIv" @@ -44,7 +44,7 @@ android:includeFontPadding="false" android:text="更多" android:visibility="gone" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="@dimen/secondary_size" app:drawableEndCompat="@drawable/ic_home_head_arrow" app:layout_constraintEnd_toEndOf="parent" @@ -83,7 +83,7 @@ android:layout_width="1dp" android:layout_height="16dp" android:layout_marginEnd="11.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="@id/recyclerViewContainer" app:layout_constraintEnd_toStartOf="@id/vspaceIv" app:layout_constraintTop_toTopOf="@id/recyclerViewContainer" /> diff --git a/app/src/main/res/layout/item_home_recommend_list_item.xml b/app/src/main/res/layout/item_home_recommend_list_item.xml index 530166e7ae..c8c6dd77b8 100644 --- a/app/src/main/res/layout/item_home_recommend_list_item.xml +++ b/app/src/main/res/layout/item_home_recommend_list_item.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="11sp" tools:text="分类" /> diff --git a/app/src/main/res/layout/item_moderator_task.xml b/app/src/main/res/layout/item_moderator_task.xml index 8425366e7a..5c02841d1d 100644 --- a/app/src/main/res/layout/item_moderator_task.xml +++ b/app/src/main/res/layout/item_moderator_task.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" tools:text="通过礼仪考试" /> @@ -44,7 +44,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" tools:text="活跃度=发帖数量+回帖数量+回复数量≥20" /> diff --git a/app/src/main/res/layout/item_my_archive.xml b/app/src/main/res/layout/item_my_archive.xml index 590242c9ff..a36b6ed917 100644 --- a/app/src/main/res/layout/item_my_archive.xml +++ b/app/src/main/res/layout/item_my_archive.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="102dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingStart="16dp" android:paddingLeft="16dp" android:paddingTop="16dp" @@ -21,7 +21,7 @@ android:layout_marginRight="58dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/optionsIv" @@ -36,7 +36,7 @@ android:layout_marginTop="8dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/little_secondary_size" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/titleTv" @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/little_secondary_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_my_game_rating.xml b/app/src/main/res/layout/item_my_game_rating.xml index 1bf6bec8e3..da1c54342e 100644 --- a/app/src/main/res/layout/item_my_game_rating.xml +++ b/app/src/main/res/layout/item_my_game_rating.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:paddingLeft="20dp" android:paddingTop="16dp" @@ -15,7 +15,7 @@ android:id="@+id/game_info" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -99,14 +99,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -123,7 +123,7 @@ app:layout_constraintBottom_toBottomOf="@+id/tv_rating" app:layout_constraintStart_toEndOf="@+id/tv_rating" app:layout_constraintTop_toTopOf="@+id/tv_rating" - app:mrb_progressTint="@color/theme" /> + app:mrb_progressTint="@color/primary_theme" /> + android:background="@color/ui_surface"> @@ -59,7 +59,7 @@ android:paddingLeft="12dp" android:paddingRight="12dp" android:text="解谜" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/secondary_size" /> diff --git a/app/src/main/res/layout/item_recommend_interest_footer.xml b/app/src/main/res/layout/item_recommend_interest_footer.xml index 8b074b29c2..f1ef31ddbe 100644 --- a/app/src/main/res/layout/item_recommend_interest_footer.xml +++ b/app/src/main/res/layout/item_recommend_interest_footer.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:padding="16dp"> @@ -91,7 +91,7 @@ android:layout_marginTop="16dp" android:layout_marginEnd="16dp" android:layout_marginRight="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_test_server_text.xml b/app/src/main/res/layout/item_test_server_text.xml index d69c05d8c2..4f6f75718b 100644 --- a/app/src/main/res/layout/item_test_server_text.xml +++ b/app/src/main/res/layout/item_test_server_text.xml @@ -2,14 +2,14 @@ + android:background="@color/ui_surface"> \ No newline at end of file diff --git a/app/src/main/res/layout/item_toolbox.xml b/app/src/main/res/layout/item_toolbox.xml index 44d40f93e7..8864c7af2d 100644 --- a/app/src/main/res/layout/item_toolbox.xml +++ b/app/src/main/res/layout/item_toolbox.xml @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:lines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" /> @@ -51,7 +51,7 @@ android:ellipsize="end" android:lines="1" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" /> @@ -63,6 +63,6 @@ android:layout_height="1dp" android:layout_marginStart="78dp" android:layout_marginEnd="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" android:visibility="gone" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_updatable_game.xml b/app/src/main/res/layout/item_updatable_game.xml index bc87c3a500..a5e8207002 100644 --- a/app/src/main/res/layout/item_updatable_game.xml +++ b/app/src/main/res/layout/item_updatable_game.xml @@ -56,7 +56,7 @@ android:includeFontPadding="false" android:marqueeRepeatLimit="marquee_forever" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" tools:text="跑跑卡丁车" /> @@ -68,7 +68,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" tools:text="当前：V2.0.0" /> @@ -78,7 +78,7 @@ android:layout_height="wrap_content" android:layout_marginTop="5dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" tools:text="最新：V2.2.6 | 67.9M" /> diff --git a/app/src/main/res/layout/item_updatable_game_header.xml b/app/src/main/res/layout/item_updatable_game_header.xml index 9e7bb562b5..01f9345b10 100644 --- a/app/src/main/res/layout/item_updatable_game_header.xml +++ b/app/src/main/res/layout/item_updatable_game_header.xml @@ -14,7 +14,7 @@ android:layout_height="wrap_content" android:drawablePadding="3dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_updatable_other_game_hint.xml b/app/src/main/res/layout/item_updatable_other_game_hint.xml index ca2c9a3d19..b6a763ea4f 100644 --- a/app/src/main/res/layout/item_updatable_other_game_hint.xml +++ b/app/src/main/res/layout/item_updatable_other_game_hint.xml @@ -15,7 +15,7 @@ android:drawableEnd="@drawable/ic_arrow_down_blue" android:drawablePadding="3dp" android:text="游戏的其它版本可更新" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/item_user_auth.xml b/app/src/main/res/layout/item_user_auth.xml index 88b04934cb..45eb705ed6 100644 --- a/app/src/main/res/layout/item_user_auth.xml +++ b/app/src/main/res/layout/item_user_auth.xml @@ -25,7 +25,7 @@ android:layout_marginEnd="88dp" android:layout_marginRight="88dp" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintBottom_toTopOf="@+id/expireTimeTv" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/iconIv" @@ -40,7 +40,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:text="有效期：" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" app:layout_constraintBottom_toBottomOf="@+id/iconIv" app:layout_constraintStart_toEndOf="@+id/iconIv" @@ -52,7 +52,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="88dp" android:layout_marginRight="88dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_size" app:layout_constraintBottom_toBottomOf="@+id/expireTimeTv" app:layout_constraintEnd_toEndOf="parent" @@ -68,7 +68,7 @@ android:background="@drawable/button_round_primary_light" android:gravity="center" android:text="佩戴" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -81,7 +81,7 @@ android:layout_marginBottom="16dp" android:gravity="center" android:text="佩戴中" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -93,7 +93,7 @@ android:id="@+id/divider" android:layout_width="0dp" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/item_user_comment_history.xml b/app/src/main/res/layout/item_user_comment_history.xml index f05c071348..480bafb0eb 100644 --- a/app/src/main/res/layout/item_user_comment_history.xml +++ b/app/src/main/res/layout/item_user_comment_history.xml @@ -13,7 +13,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> + app:mrb_progressTint="@color/primary_theme" /> diff --git a/app/src/main/res/layout/item_vgame_download_manager.xml b/app/src/main/res/layout/item_vgame_download_manager.xml index c9bb69a011..9eb8031a0c 100644 --- a/app/src/main/res/layout/item_vgame_download_manager.xml +++ b/app/src/main/res/layout/item_vgame_download_manager.xml @@ -42,7 +42,7 @@ android:layout_marginEnd="12dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" app:layout_constrainedWidth="true" @@ -61,7 +61,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/little_secondary_size" app:layout_constraintBottom_toBottomOf="@id/iconIv" app:layout_constraintEnd_toEndOf="@id/nameTv" diff --git a/app/src/main/res/layout/item_video_data_chart.xml b/app/src/main/res/layout/item_video_data_chart.xml index 0b4dcb11d9..0b41b6eafa 100644 --- a/app/src/main/res/layout/item_video_data_chart.xml +++ b/app/src/main/res/layout/item_video_data_chart.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="粉丝量" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -24,7 +24,7 @@ android:layout_marginLeft="2dp" android:includeFontPadding="false" android:text="（显示近7天数据）" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/chartTitleTv" app:layout_constraintStart_toEndOf="@+id/chartTitleTv" diff --git a/app/src/main/res/layout/item_video_data_overview.xml b/app/src/main/res/layout/item_video_data_overview.xml index 37a1b06693..5e5ab504da 100644 --- a/app/src/main/res/layout/item_video_data_overview.xml +++ b/app/src/main/res/layout/item_video_data_overview.xml @@ -34,7 +34,7 @@ android:layout_marginLeft="16dp" android:layout_marginTop="14dp" android:text="数据总览" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -55,7 +55,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" tools:text="0" /> @@ -68,7 +68,7 @@ android:layout_marginTop="2dp" android:drawablePadding="2dp" android:text="0" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" /> @@ -96,7 +96,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" tools:text="0" /> @@ -109,7 +109,7 @@ android:layout_marginTop="2dp" android:drawablePadding="2dp" android:text="0" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" /> @@ -137,7 +137,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" tools:text="0" /> @@ -150,7 +150,7 @@ android:layout_marginTop="2dp" android:drawablePadding="2dp" android:text="0" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" /> @@ -180,7 +180,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" tools:text="0" /> @@ -193,7 +193,7 @@ android:layout_marginTop="2dp" android:drawablePadding="2dp" android:text="0" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" /> @@ -222,7 +222,7 @@ android:layout_height="wrap_content" android:gravity="center_horizontal" android:text="@{NumberUtils.transSimpleLetterCount(entity.share)}" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" tools:text="0" /> @@ -235,7 +235,7 @@ android:layout_marginTop="2dp" android:drawablePadding="2dp" android:text="0" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" /> @@ -263,7 +263,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="18sp" android:textStyle="bold" tools:text="0" /> @@ -276,7 +276,7 @@ android:layout_marginTop="2dp" android:drawablePadding="2dp" android:text="0" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" /> diff --git a/app/src/main/res/layout/item_video_desc_top.xml b/app/src/main/res/layout/item_video_desc_top.xml index f0228bf196..92df345370 100644 --- a/app/src/main/res/layout/item_video_desc_top.xml +++ b/app/src/main/res/layout/item_video_desc_top.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/background_white" + android:background="@color/ui_surface" android:paddingLeft="8dp" android:paddingTop="16dp" android:paddingRight="16dp"> @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintStart_toEndOf="@+id/userAvatar" app:layout_constraintTop_toTopOf="@+id/userAvatar" @@ -43,7 +43,7 @@ app:layout_constraintBottom_toBottomOf="@+id/userNameTv" app:layout_constraintStart_toEndOf="@+id/userNameTv" app:layout_constraintTop_toTopOf="@id/userNameTv" - tools:background="@color/background" + tools:background="@color/ui_background" tools:visibility="visible" /> @@ -86,7 +86,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:lineSpacingExtra="4dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/expandMoreIv" @@ -101,7 +101,7 @@ android:layout_marginTop="12dp" android:includeFontPadding="false" android:lineSpacingExtra="7dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -134,7 +134,7 @@ android:layout_marginStart="8dp" android:drawablePadding="4dp" android:includeFontPadding="false" - android:textColor="@color/theme" + android:textColor="@color/primary_theme" android:textSize="@dimen/secondary_size" android:visibility="gone" app:drawableStartCompat="@drawable/icon_section" @@ -239,7 +239,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" /> @@ -248,7 +248,7 @@ android:layout_height="1dp" android:layout_marginTop="20dp" android:layout_marginBottom="4dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/kaifu_add_item_title.xml b/app/src/main/res/layout/kaifu_add_item_title.xml index d48da0baf3..3c941e6159 100644 --- a/app/src/main/res/layout/kaifu_add_item_title.xml +++ b/app/src/main/res/layout/kaifu_add_item_title.xml @@ -13,7 +13,7 @@ android:layout_height="30dp" android:layout_marginRight="1dp" android:layout_weight="15" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:text="时间" @@ -25,7 +25,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="29" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:text="名字" @@ -36,7 +36,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:maxLines="2" android:text="备注" diff --git a/app/src/main/res/layout/kaifu_item_time.xml b/app/src/main/res/layout/kaifu_item_time.xml index 0c68243930..bf4c48fee2 100644 --- a/app/src/main/res/layout/kaifu_item_time.xml +++ b/app/src/main/res/layout/kaifu_item_time.xml @@ -3,7 +3,7 @@ android:id="@+id/kaifu_item_time" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical"> diff --git a/app/src/main/res/layout/kaifu_new_add_item_title.xml b/app/src/main/res/layout/kaifu_new_add_item_title.xml index 635a915b43..dcc1a9f2c8 100644 --- a/app/src/main/res/layout/kaifu_new_add_item_title.xml +++ b/app/src/main/res/layout/kaifu_new_add_item_title.xml @@ -12,7 +12,7 @@ android:gravity="center" android:maxLines="2" android:text="时间" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/layout_add_kaifu_popup_item.xml b/app/src/main/res/layout/layout_add_kaifu_popup_item.xml index fba0b0b123..9125f855d0 100644 --- a/app/src/main/res/layout/layout_add_kaifu_popup_item.xml +++ b/app/src/main/res/layout/layout_add_kaifu_popup_item.xml @@ -12,7 +12,7 @@ android:gravity="center" android:orientation="vertical" android:text="修改" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -27,7 +27,7 @@ android:layout_marginLeft="14dp" android:layout_marginEnd="14dp" android:layout_marginRight="14dp" - android:background="@color/background" + android:background="@color/ui_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/layout_article_detail_comment_list.xml b/app/src/main/res/layout/layout_article_detail_comment_list.xml index 6a407c4a4d..6b212d7d8a 100644 --- a/app/src/main/res/layout/layout_article_detail_comment_list.xml +++ b/app/src/main/res/layout/layout_article_detail_comment_list.xml @@ -2,7 +2,7 @@ + android:background="@color/ui_background"> diff --git a/app/src/main/res/layout/layout_dialog_panel_titlebar.xml b/app/src/main/res/layout/layout_dialog_panel_titlebar.xml index 409686d6c6..854073c365 100644 --- a/app/src/main/res/layout/layout_dialog_panel_titlebar.xml +++ b/app/src/main/res/layout/layout_dialog_panel_titlebar.xml @@ -14,7 +14,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" tools:text="35条评论" /> diff --git a/app/src/main/res/layout/layout_filter.xml b/app/src/main/res/layout/layout_filter.xml index 973239d205..61812ab2a7 100644 --- a/app/src/main/res/layout/layout_filter.xml +++ b/app/src/main/res/layout/layout_filter.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="40dp" - android:background="@color/background_white"> + android:background="@color/ui_surface"> diff --git a/app/src/main/res/layout/layout_game_collection_auth_tag.xml b/app/src/main/res/layout/layout_game_collection_auth_tag.xml index b1ee27dd6f..14a0861f8a 100644 --- a/app/src/main/res/layout/layout_game_collection_auth_tag.xml +++ b/app/src/main/res/layout/layout_game_collection_auth_tag.xml @@ -13,7 +13,7 @@ android:gravity="center" android:background="@drawable/bg_game_collection_auth_tag" android:includeFontPadding="false" - android:textColor="@color/theme" + android:textColor="@color/primary_theme" android:textSize="10sp" android:text="作者点评" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_game_collection_filter_guide.xml b/app/src/main/res/layout/layout_game_collection_filter_guide.xml index 9503686d6f..9cfc21b326 100644 --- a/app/src/main/res/layout/layout_game_collection_filter_guide.xml +++ b/app/src/main/res/layout/layout_game_collection_filter_guide.xml @@ -33,7 +33,7 @@ android:ellipsize="end" android:lines="1" android:text="全部标签" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="@dimen/secondary_size" /> diff --git a/app/src/main/res/layout/layout_menu_article_publish.xml b/app/src/main/res/layout/layout_menu_article_publish.xml index c46df88bad..01da14f079 100644 --- a/app/src/main/res/layout/layout_menu_article_publish.xml +++ b/app/src/main/res/layout/layout_menu_article_publish.xml @@ -11,7 +11,7 @@ android:gravity="center" android:paddingRight="20dp" android:text="发文章" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="13sp" /> diff --git a/app/src/main/res/layout/layout_menu_cloud_save_manager.xml b/app/src/main/res/layout/layout_menu_cloud_save_manager.xml index f5325e8a56..9ab01bdcd1 100644 --- a/app/src/main/res/layout/layout_menu_cloud_save_manager.xml +++ b/app/src/main/res/layout/layout_menu_cloud_save_manager.xml @@ -11,7 +11,7 @@ android:layout_marginEnd="16dp" android:includeFontPadding="false" android:text="使用帮助" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/primary_text_size" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/layout_menu_download_manager.xml b/app/src/main/res/layout/layout_menu_download_manager.xml index 20a70e2b9f..bce2f48394 100644 --- a/app/src/main/res/layout/layout_menu_download_manager.xml +++ b/app/src/main/res/layout/layout_menu_download_manager.xml @@ -22,7 +22,7 @@ android:layout_marginEnd="16dp" android:includeFontPadding="false" android:text="畅玩管理" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/primary_text_size" app:layout_constraintBottom_toBottomOf="@id/iconIv" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/layout_menu_game_comment.xml b/app/src/main/res/layout/layout_menu_game_comment.xml index a8cc32dd95..97ef9345df 100644 --- a/app/src/main/res/layout/layout_menu_game_comment.xml +++ b/app/src/main/res/layout/layout_menu_game_comment.xml @@ -11,7 +11,7 @@ android:gravity="center" android:paddingRight="20dp" android:text="提交" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="13sp" /> diff --git a/app/src/main/res/layout/layout_menu_manage.xml b/app/src/main/res/layout/layout_menu_manage.xml index 89028051e6..3dbbde2177 100644 --- a/app/src/main/res/layout/layout_menu_manage.xml +++ b/app/src/main/res/layout/layout_menu_manage.xml @@ -10,6 +10,6 @@ android:gravity="center_vertical|end" android:paddingRight="16dp" android:text="编辑" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/layout_menu_my_ask_draft.xml b/app/src/main/res/layout/layout_menu_my_ask_draft.xml index 1e91a0a603..2b6fe7d677 100644 --- a/app/src/main/res/layout/layout_menu_my_ask_draft.xml +++ b/app/src/main/res/layout/layout_menu_my_ask_draft.xml @@ -14,7 +14,7 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:text="草稿" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/layout_menu_my_post.xml b/app/src/main/res/layout/layout_menu_my_post.xml index 3817ae975f..2eb0236264 100644 --- a/app/src/main/res/layout/layout_menu_my_post.xml +++ b/app/src/main/res/layout/layout_menu_my_post.xml @@ -18,7 +18,7 @@ android:background="@drawable/bg_my_post_draft" android:gravity="center" android:text="草稿箱" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/layout_menu_post.xml b/app/src/main/res/layout/layout_menu_post.xml index 65d6f561e3..3d9ae5d122 100644 --- a/app/src/main/res/layout/layout_menu_post.xml +++ b/app/src/main/res/layout/layout_menu_post.xml @@ -11,7 +11,7 @@ android:gravity="center" android:paddingRight="24dp" android:text="提交" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/layout_menu_question_and_answer.xml b/app/src/main/res/layout/layout_menu_question_and_answer.xml index 931cbd0806..1e1a85ffa3 100644 --- a/app/src/main/res/layout/layout_menu_question_and_answer.xml +++ b/app/src/main/res/layout/layout_menu_question_and_answer.xml @@ -9,7 +9,7 @@ android:layout_height="22dp" android:layout_centerInParent="true" android:gravity="center" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" android:paddingLeft="10dp" android:paddingRight="10dp" diff --git a/app/src/main/res/layout/layout_menu_reset.xml b/app/src/main/res/layout/layout_menu_reset.xml index c1ff426563..5e834504b2 100644 --- a/app/src/main/res/layout/layout_menu_reset.xml +++ b/app/src/main/res/layout/layout_menu_reset.xml @@ -12,7 +12,7 @@ android:textStyle="bold" android:paddingRight="24dp" android:text="重置" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/layout_menu_save.xml b/app/src/main/res/layout/layout_menu_save.xml index 99b21fe478..315677ad33 100644 --- a/app/src/main/res/layout/layout_menu_save.xml +++ b/app/src/main/res/layout/layout_menu_save.xml @@ -11,7 +11,7 @@ android:gravity="center" android:paddingRight="16dp" android:text="保存" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/layout_menu_simulator_uninstall.xml b/app/src/main/res/layout/layout_menu_simulator_uninstall.xml index ccdb624c51..f771879b1d 100644 --- a/app/src/main/res/layout/layout_menu_simulator_uninstall.xml +++ b/app/src/main/res/layout/layout_menu_simulator_uninstall.xml @@ -17,7 +17,7 @@ android:id="@+id/unInstallTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:text="管理" /> @@ -26,7 +26,7 @@ android:id="@+id/completeTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:text="完成" /> diff --git a/app/src/main/res/layout/layout_menu_text.xml b/app/src/main/res/layout/layout_menu_text.xml index e568636e5b..1b162ae0e4 100644 --- a/app/src/main/res/layout/layout_menu_text.xml +++ b/app/src/main/res/layout/layout_menu_text.xml @@ -10,7 +10,7 @@ android:layout_centerInParent="true" android:gravity="center" android:paddingRight="20dp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/layout_multi_input_item.xml b/app/src/main/res/layout/layout_multi_input_item.xml index 4c2cf68b76..c183cc886d 100644 --- a/app/src/main/res/layout/layout_multi_input_item.xml +++ b/app/src/main/res/layout/layout_multi_input_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/background_white" + android:background="@color/ui_surface" android:paddingStart="20dp" android:paddingTop="16dp" android:paddingEnd="20dp" @@ -19,8 +19,8 @@ android:gravity="start" android:hint="@string/introduce_hint" android:minLines="2" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="@dimen/primary_text_size" app:layout_constraintBottom_toTopOf="@+id/countTv" @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0/30" - android:textColor="@color/text_body" + android:textColor="@color/text_instance" android:textSize="@dimen/secondary_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/layout_personal_other_item.xml b/app/src/main/res/layout/layout_personal_other_item.xml index fabef96a7f..f01ed31fcb 100644 --- a/app/src/main/res/layout/layout_personal_other_item.xml +++ b/app/src/main/res/layout/layout_personal_other_item.xml @@ -40,7 +40,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/primary_text_size" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -66,7 +66,7 @@ android:layout_marginTop="8dp" android:includeFontPadding="false" android:lineHeight="16dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" android:visibility="gone" tools:visibility="gone" /> @@ -96,7 +96,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/primary_text_size" android:visibility="visible" app:drawableEndCompat="@drawable/ic_jump" @@ -131,7 +131,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/setting_cache_size_def" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/primary_text_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/layout_popup_discovery_dislike.xml b/app/src/main/res/layout/layout_popup_discovery_dislike.xml index 371e858680..ee34a73b2d 100644 --- a/app/src/main/res/layout/layout_popup_discovery_dislike.xml +++ b/app/src/main/res/layout/layout_popup_discovery_dislike.xml @@ -35,7 +35,7 @@ android:drawableStart="@drawable/ic_discovery_popup_dislike" android:drawablePadding="4dp" android:text="不喜欢的原因：" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/layout_popup_option_item.xml b/app/src/main/res/layout/layout_popup_option_item.xml index 3dab72715d..df2536a96d 100644 --- a/app/src/main/res/layout/layout_popup_option_item.xml +++ b/app/src/main/res/layout/layout_popup_option_item.xml @@ -9,5 +9,5 @@ android:gravity="center" android:orientation="vertical" android:text="修改" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_qgame_search_bar.xml b/app/src/main/res/layout/layout_qgame_search_bar.xml index e3f1bca528..57f5096d45 100644 --- a/app/src/main/res/layout/layout_qgame_search_bar.xml +++ b/app/src/main/res/layout/layout_qgame_search_bar.xml @@ -2,7 +2,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingLeft="16dp" android:paddingTop="12dp" android:paddingRight="16dp" @@ -31,8 +31,8 @@ android:paddingRight="40dp" android:singleLine="true" android:gravity="center_vertical" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/search_background" @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:text="搜索" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/search_background" app:layout_constraintLeft_toRightOf="@id/search_background" diff --git a/app/src/main/res/layout/layout_search_bar.xml b/app/src/main/res/layout/layout_search_bar.xml index 2cbde64a1c..b87778a7cf 100644 --- a/app/src/main/res/layout/layout_search_bar.xml +++ b/app/src/main/res/layout/layout_search_bar.xml @@ -2,7 +2,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:focusableInTouchMode="true" android:paddingLeft="16dp" android:paddingTop="12dp" @@ -31,8 +31,8 @@ android:paddingEnd="40dp" android:paddingRight="40dp" android:singleLine="true" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/search_background" @@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:text="搜索" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@id/search_background" app:layout_constraintLeft_toRightOf="@id/search_background" diff --git a/app/src/main/res/layout/layout_search_game_content_tag.xml b/app/src/main/res/layout/layout_search_game_content_tag.xml index a532c8bf9b..2474f619fb 100644 --- a/app/src/main/res/layout/layout_search_game_content_tag.xml +++ b/app/src/main/res/layout/layout_search_game_content_tag.xml @@ -20,7 +20,7 @@ android:layout_marginLeft="2dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" tools:text="礼包礼包礼包礼包" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_selected_category.xml b/app/src/main/res/layout/layout_selected_category.xml index a347872ccd..277260bbbe 100644 --- a/app/src/main/res/layout/layout_selected_category.xml +++ b/app/src/main/res/layout/layout_selected_category.xml @@ -14,7 +14,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" tools:text="竞技" /> diff --git a/app/src/main/res/layout/layout_setting_des_item.xml b/app/src/main/res/layout/layout_setting_des_item.xml index 81b769b7e9..1ab293d6a0 100644 --- a/app/src/main/res/layout/layout_setting_des_item.xml +++ b/app/src/main/res/layout/layout_setting_des_item.xml @@ -9,6 +9,6 @@ android:paddingTop="12dp" android:paddingEnd="20dp" android:paddingBottom="12dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" tools:text="描述文案描述文案描述文案描述文案描述文案描述文案描述文案描述文案描述文案描述文案描述文案描述文案描述文案描述文案描述文案" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_setting_item.xml b/app/src/main/res/layout/layout_setting_item.xml index d4ad27a904..a55150c7a5 100644 --- a/app/src/main/res/layout/layout_setting_item.xml +++ b/app/src/main/res/layout/layout_setting_item.xml @@ -29,7 +29,7 @@ android:id="@+id/titleTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/primary_text_size" android:includeFontPadding="false" app:layout_constraintStart_toStartOf="parent" @@ -55,7 +55,7 @@ android:layout_marginTop="8dp" android:includeFontPadding="false" android:lineHeight="16dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" android:visibility="gone" /> @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/primary_text_size" android:visibility="gone" app:drawableEndCompat="@drawable/icon_more" @@ -101,7 +101,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/setting_cache_size_def" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/primary_text_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/layout_single_input_item.xml b/app/src/main/res/layout/layout_single_input_item.xml index b341029988..db084427f2 100644 --- a/app/src/main/res/layout/layout_single_input_item.xml +++ b/app/src/main/res/layout/layout_single_input_item.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="50dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingStart="20dp" android:paddingEnd="20dp"> @@ -17,8 +17,8 @@ android:background="@null" android:hint="@string/nickname_hint" android:singleLine="true" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="@dimen/primary_text_size" app:layout_constraintBottom_toBottomOf="parent" @@ -33,7 +33,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0/12" - android:textColor="@color/text_body" + android:textColor="@color/text_instance" android:textSize="@dimen/secondary_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/layout_subject_head.xml b/app/src/main/res/layout/layout_subject_head.xml index 869a520751..6bb0c366e1 100644 --- a/app/src/main/res/layout/layout_subject_head.xml +++ b/app/src/main/res/layout/layout_subject_head.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constrainedWidth="true" diff --git a/app/src/main/res/layout/layout_video_detail_surface.xml b/app/src/main/res/layout/layout_video_detail_surface.xml index c0aaf3e7c6..6d05da51b7 100644 --- a/app/src/main/res/layout/layout_video_detail_surface.xml +++ b/app/src/main/res/layout/layout_video_detail_surface.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="视频加载失败" - android:textColor="@color/divider" + android:textColor="@color/ui_divider" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/libao_code_item.xml b/app/src/main/res/layout/libao_code_item.xml index 4eabfd130f..8bca0ebda2 100644 --- a/app/src/main/res/layout/libao_code_item.xml +++ b/app/src/main/res/layout/libao_code_item.xml @@ -8,7 +8,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:text="@string/string_description" /> + android:textColor="@color/text_theme" /> \ No newline at end of file diff --git a/app/src/main/res/layout/libao_item.xml b/app/src/main/res/layout/libao_item.xml index e859f5df9e..43c1a90b44 100644 --- a/app/src/main/res/layout/libao_item.xml +++ b/app/src/main/res/layout/libao_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/background_white" + android:background="@color/ui_surface" android:gravity="center_vertical" android:orientation="horizontal" android:paddingLeft="18dp" @@ -31,7 +31,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" /> @@ -62,7 +62,7 @@ android:paddingLeft="2dp" android:paddingRight="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" @@ -75,7 +75,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="11sp" /> diff --git a/app/src/main/res/layout/libaodetail_item_content.xml b/app/src/main/res/layout/libaodetail_item_content.xml index 221a2ac007..49510deb2a 100644 --- a/app/src/main/res/layout/libaodetail_item_content.xml +++ b/app/src/main/res/layout/libaodetail_item_content.xml @@ -10,7 +10,7 @@ android:id="@+id/libaodetail_content_ll" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:padding="16dp" android:visibility="gone" @@ -20,7 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/libaodetail_content" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" /> @@ -43,7 +43,7 @@ android:id="@+id/libaodetail_time_ll" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:padding="16dp" android:visibility="gone" @@ -53,7 +53,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/libaodetail_rule" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" /> @@ -72,7 +72,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:lineSpacingExtra="6dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" /> @@ -95,7 +95,7 @@ android:id="@+id/libaodetail_des_ll" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical" android:padding="16dp" android:visibility="gone" @@ -105,7 +105,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/libaodetail_des" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" /> @@ -115,7 +115,7 @@ android:layout_height="wrap_content" android:layout_marginTop="12dp" android:lineSpacingExtra="6dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/libaodetail_item_top.xml b/app/src/main/res/layout/libaodetail_item_top.xml index 0aa64079ac..21b6e2b81e 100644 --- a/app/src/main/res/layout/libaodetail_item_top.xml +++ b/app/src/main/res/layout/libaodetail_item_top.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/background_white" + android:background="@color/ui_surface" android:gravity="center_vertical" android:orientation="horizontal" android:paddingLeft="18dp" @@ -65,7 +65,7 @@ android:paddingLeft="2dp" android:paddingRight="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题" @@ -113,7 +113,7 @@ android:layout_below="@+id/libaodetail_ll" android:layout_marginTop="12dp" android:layout_marginBottom="10dp" - android:background="@color/divider" + android:background="@color/ui_divider" android:visibility="gone" /> @@ -50,7 +50,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:includeFontPadding="false" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" tools:text="@string/app_name" /> diff --git a/app/src/main/res/layout/new_comment_item.xml b/app/src/main/res/layout/new_comment_item.xml index 18970041db..3e3a2c1a73 100644 --- a/app/src/main/res/layout/new_comment_item.xml +++ b/app/src/main/res/layout/new_comment_item.xml @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" @@ -101,7 +101,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -118,7 +118,7 @@ android:layout_height="13dp" android:layout_marginLeft="6dp" android:layout_marginTop="2dp" - android:background="@color/theme" + android:background="@color/primary_theme" android:gravity="center" android:text="置顶" android:textColor="#fff" @@ -155,7 +155,7 @@ android:layout_toLeftOf="@id/comment_more" android:includeFontPadding="false" android:lineSpacingExtra="6dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" tools:text="星際爭霸與星際爭霸2的職業選電競戰隊的經理美少女团体星際老男孩成員之一，還在杭州經營水產生意。" /> @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" tools:text="一个小时前" /> @@ -187,7 +187,7 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:text="回复" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" /> @@ -226,7 +226,7 @@ android:layout_height="0.5dp" android:layout_marginRight="6dp" android:layout_alignParentBottom="true" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> @@ -248,7 +248,7 @@ android:id="@+id/comment_quote_author_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" tools:text="孙宁" /> @@ -268,7 +268,7 @@ android:layout_below="@+id/comment_quote_author_tv" android:layout_marginTop="2dp" android:lineSpacingExtra="4dp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" tools:text="2006年12月30日，孙一峰与女友weiwei结婚，育有儿子孙宁和女儿孙焕佳。" /> diff --git a/app/src/main/res/layout/news_detail_comment.xml b/app/src/main/res/layout/news_detail_comment.xml index 761c1d5964..679e1059b6 100644 --- a/app/src/main/res/layout/news_detail_comment.xml +++ b/app/src/main/res/layout/news_detail_comment.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/layout/news_detail_skeleton.xml b/app/src/main/res/layout/news_detail_skeleton.xml index 471e7540e6..69f520b120 100644 --- a/app/src/main/res/layout/news_detail_skeleton.xml +++ b/app/src/main/res/layout/news_detail_skeleton.xml @@ -4,61 +4,61 @@ android:layout_height="match_parent" android:paddingLeft="30dp" android:paddingRight="30dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical"> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_background" /> \ No newline at end of file diff --git a/app/src/main/res/layout/newsdetail_item_comment.xml b/app/src/main/res/layout/newsdetail_item_comment.xml index 175e71f32c..b58d9c28d9 100644 --- a/app/src/main/res/layout/newsdetail_item_comment.xml +++ b/app/src/main/res/layout/newsdetail_item_comment.xml @@ -14,6 +14,6 @@ android:background="@drawable/comment_border_bg" android:gravity="center" android:text="管理我的关注" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="16sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/newsdetail_item_content.xml b/app/src/main/res/layout/newsdetail_item_content.xml index 5dfcd4a44b..86c3ee026d 100644 --- a/app/src/main/res/layout/newsdetail_item_content.xml +++ b/app/src/main/res/layout/newsdetail_item_content.xml @@ -2,7 +2,7 @@ + app:mrb_progressTint="@color/primary_theme" /> diff --git a/app/src/main/res/layout/personality_background_fragment.xml b/app/src/main/res/layout/personality_background_fragment.xml index 726a4b8e64..2224382ed8 100644 --- a/app/src/main/res/layout/personality_background_fragment.xml +++ b/app/src/main/res/layout/personality_background_fragment.xml @@ -3,13 +3,13 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:text="自定义背景" android:layout_marginTop="12dp" - android:textColor="@color/text_body" + android:textColor="@color/text_instance" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/piece_article_detail_comment_filter.xml b/app/src/main/res/layout/piece_article_detail_comment_filter.xml index d29e7fbf4b..5721f92da5 100644 --- a/app/src/main/res/layout/piece_article_detail_comment_filter.xml +++ b/app/src/main/res/layout/piece_article_detail_comment_filter.xml @@ -5,7 +5,7 @@ android:id="@+id/filterView" android:layout_width="match_parent" android:layout_height="48dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:clickable="false" tools:showIn="@layout/fragment_article_detail"> @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="16dp" android:text="全部评论" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="6dp" android:text="0" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toRightOf="@id/commentHintTv" @@ -85,15 +85,15 @@ app:layout_constraintTop_toTopOf="parent" app:sfv_itemHeight="24dp" app:sfv_itemWidth="36dp" - app:sfv_textCheckedColor="@color/text_subtitle" - app:sfv_textDefaultColor="@color/text_subtitleDesc" + app:sfv_textCheckedColor="@color/text_secondary" + app:sfv_textDefaultColor="@color/text_tertiary" app:sfv_textSize="10" /> 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 e2c3131a75..4ff9d9ba6e 100644 --- a/app/src/main/res/layout/piece_article_input_container.xml +++ b/app/src/main/res/layout/piece_article_input_container.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="56dp" android:layout_alignParentBottom="true" - android:background="@color/background_white" + android:background="@color/ui_surface" android:clickable="true" android:focusable="true" tools:showIn="@layout/fragment_article_detail"> @@ -15,7 +15,7 @@ android:id="@+id/divider" android:layout_width="match_parent" android:layout_height="1px" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -32,7 +32,7 @@ android:maxLines="1" android:paddingLeft="16dp" android:paddingRight="16dp" - android:textColor="@color/text_body" + android:textColor="@color/text_instance" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -59,7 +59,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:text="分享" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/bottomShareIv" @@ -92,7 +92,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:text="赞同" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/bottomLikeIv" @@ -118,7 +118,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:text="收藏" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/bottomStarIv" @@ -145,7 +145,7 @@ android:layout_marginTop="2dp" android:gravity="center" android:text="评论" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/bottomCommentIv" diff --git a/app/src/main/res/layout/piece_comment_typing_container.xml b/app/src/main/res/layout/piece_comment_typing_container.xml index 482fcce6c8..5218c36a60 100644 --- a/app/src/main/res/layout/piece_comment_typing_container.xml +++ b/app/src/main/res/layout/piece_comment_typing_container.xml @@ -37,7 +37,7 @@ android:id="@+id/imageContainer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:divider="@color/background_white" + android:divider="@color/ui_surface" android:orientation="horizontal" /> @@ -47,7 +47,7 @@ android:layout_height="0.5dp" android:layout_marginTop="12dp" android:layout_marginBottom="11dp" - android:background="@color/divider" + android:background="@color/ui_divider" android:visibility="gone" /> diff --git a/app/src/main/res/layout/piece_comment_typing_container_dark.xml b/app/src/main/res/layout/piece_comment_typing_container_dark.xml index 3ff862b47f..6696da4d4e 100644 --- a/app/src/main/res/layout/piece_comment_typing_container_dark.xml +++ b/app/src/main/res/layout/piece_comment_typing_container_dark.xml @@ -45,7 +45,7 @@ android:hint="说点什么吧" android:lineSpacingExtra="4dp" android:textColor="@color/white" - android:textColorHint="@color/text_subtitle" + android:textColorHint="@color/text_secondary" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/piece_community_vote_and_comment.xml b/app/src/main/res/layout/piece_community_vote_and_comment.xml index 0a85bfccaf..eab2af848a 100644 --- a/app/src/main/res/layout/piece_community_vote_and_comment.xml +++ b/app/src/main/res/layout/piece_community_vote_and_comment.xml @@ -5,7 +5,7 @@ android:id="@+id/include_vote_and_comment" android:layout_width="match_parent" android:layout_height="64dp" - android:background="@color/background_white"> + android:background="@color/ui_surface"> + android:background="@color/ui_surface"> + android:background="@color/ui_divider" /> \ No newline at end of file diff --git a/app/src/main/res/layout/popup_accelerate_notification.xml b/app/src/main/res/layout/popup_accelerate_notification.xml index de47cc7f6c..a16f983bf2 100644 --- a/app/src/main/res/layout/popup_accelerate_notification.xml +++ b/app/src/main/res/layout/popup_accelerate_notification.xml @@ -19,7 +19,7 @@ android:layout_marginStart="20dp" android:layout_marginLeft="20dp" android:layout_marginTop="6dp" - app:gameIconBorderColor="@color/background_white" + app:gameIconBorderColor="@color/ui_surface" app:gameIconBorderWidth="1dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -33,7 +33,7 @@ android:layout_marginEnd="20dp" android:layout_marginRight="20dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/gameIconView" app:layout_constraintEnd_toEndOf="parent" @@ -47,10 +47,10 @@ android:layout_marginTop="6dp" android:drawablePadding="4dp" android:text="加速版上线了，点击查看消息" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="@dimen/secondary_size" app:drawableEndCompat="@drawable/ic_jump_universal" - app:drawableTint="@color/theme_font" + app:drawableTint="@color/text_theme" app:layout_constraintStart_toStartOf="@+id/gameIconView" app:layout_constraintTop_toBottomOf="@+id/gameIconView" /> diff --git a/app/src/main/res/layout/popup_filter_game_type.xml b/app/src/main/res/layout/popup_filter_game_type.xml index 3d12878edf..0a664ad927 100644 --- a/app/src/main/res/layout/popup_filter_game_type.xml +++ b/app/src/main/res/layout/popup_filter_game_type.xml @@ -10,7 +10,7 @@ android:id="@+id/flexbox" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingStart="16dp" android:paddingTop="8dp" android:paddingEnd="16dp" @@ -23,7 +23,7 @@ @@ -44,14 +44,14 @@ android:layout_marginStart="4dp" android:includeFontPadding="false" android:text="记住我的选择" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/secondary_size" /> @@ -17,7 +17,7 @@ android:button="@null" android:drawablePadding="6dp" android:text="全选" - android:textColor="@color/text_title" /> + android:textColor="@color/text_primary" /> diff --git a/app/src/main/res/layout/popup_server_category.xml b/app/src/main/res/layout/popup_server_category.xml index f359d320c9..7d87b9f03a 100644 --- a/app/src/main/res/layout/popup_server_category.xml +++ b/app/src/main/res/layout/popup_server_category.xml @@ -15,7 +15,7 @@ android:id="@+id/action_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="horizontal" android:paddingLeft="20dp" android:paddingTop="16dp" @@ -32,7 +32,7 @@ android:layout_weight="1" android:gravity="center" android:text="重置" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/popup_server_time.xml b/app/src/main/res/layout/popup_server_time.xml index 3e5ea863f2..4ecb99ec01 100644 --- a/app/src/main/res/layout/popup_server_time.xml +++ b/app/src/main/res/layout/popup_server_time.xml @@ -8,7 +8,7 @@ @@ -54,7 +54,7 @@ android:id="@+id/line" android:layout_width="1dp" android:layout_height="match_parent" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> @@ -59,7 +59,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="10sp" android:text="完成" /> diff --git a/app/src/main/res/layout/popup_simulator_uninstall.xml b/app/src/main/res/layout/popup_simulator_uninstall.xml index 827ec334c6..7a088e27a1 100644 --- a/app/src/main/res/layout/popup_simulator_uninstall.xml +++ b/app/src/main/res/layout/popup_simulator_uninstall.xml @@ -14,7 +14,7 @@ android:id="@+id/unInstallBtn" android:layout_width="match_parent" android:layout_height="54dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="horizontal" android:gravity="center"> @@ -28,7 +28,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:text="卸载模拟器" /> diff --git a/app/src/main/res/layout/popup_test_time.xml b/app/src/main/res/layout/popup_test_time.xml index dbb1b39823..addff38c89 100644 --- a/app/src/main/res/layout/popup_test_time.xml +++ b/app/src/main/res/layout/popup_test_time.xml @@ -8,7 +8,7 @@ @@ -72,7 +72,7 @@ android:id="@+id/line" android:layout_width="1dp" android:layout_height="match_parent" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/popup_user_home_more.xml b/app/src/main/res/layout/popup_user_home_more.xml index 1fd4d7d4ed..a63343985c 100644 --- a/app/src/main/res/layout/popup_user_home_more.xml +++ b/app/src/main/res/layout/popup_user_home_more.xml @@ -12,7 +12,7 @@ android:layout_height="44dp" android:layout_marginTop="11dp" android:gravity="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="14sp" android:text="分享" /> @@ -21,7 +21,7 @@ android:layout_width="match_parent" android:layout_height="44dp" android:gravity="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="14sp" android:text="举报" /> diff --git a/app/src/main/res/layout/privacy_item.xml b/app/src/main/res/layout/privacy_item.xml index 76b13e58c3..243f20d277 100644 --- a/app/src/main/res/layout/privacy_item.xml +++ b/app/src/main/res/layout/privacy_item.xml @@ -21,7 +21,7 @@ android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@id/icon" @@ -37,7 +37,7 @@ android:layout_marginRight="12dp" android:includeFontPadding="false" android:lineSpacingExtra="6dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintLeft_toRightOf="@id/icon" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/question_edit_title_search_item.xml b/app/src/main/res/layout/question_edit_title_search_item.xml index f677149674..03c4a132aa 100644 --- a/app/src/main/res/layout/question_edit_title_search_item.xml +++ b/app/src/main/res/layout/question_edit_title_search_item.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -34,7 +34,7 @@ android:drawableLeft="@drawable/ic_add_label_blue" android:drawablePadding="4dp" android:text="新标签" - android:textColor="@color/theme_font" /> + android:textColor="@color/text_theme" /> \ No newline at end of file diff --git a/app/src/main/res/layout/questionsdetail_item.xml b/app/src/main/res/layout/questionsdetail_item.xml index 79ca6bf99c..ade6ecd027 100644 --- a/app/src/main/res/layout/questionsdetail_item.xml +++ b/app/src/main/res/layout/questionsdetail_item.xml @@ -53,7 +53,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" tools:text="1人关注" /> @@ -76,7 +76,7 @@ android:layout_width="0dp" android:layout_height="50dp" android:layout_weight="1" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/questionsdetail_line_center" app:layout_constraintTop_toTopOf="@+id/questionsdetail_line_center"> @@ -92,7 +92,7 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:text="关注问题" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:textStyle="bold" /> @@ -112,7 +112,7 @@ android:layout_width="0dp" android:layout_height="50dp" android:layout_weight="1" - android:background="@color/background_white" + android:background="@color/ui_surface" app:layout_constraintLeft_toRightOf="@id/questionsdetail_line_center" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/questionsdetail_line_center"> @@ -125,7 +125,7 @@ android:drawablePadding="8dp" android:gravity="center" android:text="@string/question_detail_invite" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:textStyle="bold" /> @@ -137,7 +137,7 @@ android:id="@+id/questiondetail_related_question_container" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/background" + android:background="@color/ui_background" android:paddingTop="8dp" android:visibility="gone" tools:visibility="visible"> @@ -145,7 +145,7 @@ @@ -216,7 +216,7 @@ + android:background="@color/ui_divider" /> \ No newline at end of file diff --git a/app/src/main/res/layout/questionsinvite_item.xml b/app/src/main/res/layout/questionsinvite_item.xml index e0a2c7d2c2..89241d0b75 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/background_white" + android:background="@color/ui_surface" android:paddingLeft="20dp" android:paddingTop="15dp" android:paddingRight="20dp" @@ -39,7 +39,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:includeFontPadding="false" android:textStyle="bold" @@ -77,7 +77,7 @@ android:layout_marginRight="8dp" android:singleLine="true" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" tools:text="资深回答者" /> @@ -87,7 +87,7 @@ android:layout_height="wrap_content" android:layout_marginRight="8dp" android:layout_toRightOf="@id/questionsinvite_item_answercount" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:includeFontPadding="false" android:textSize="11sp" tools:text="34赞" /> @@ -97,7 +97,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_toRightOf="@id/questionsinvite_item_des" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:includeFontPadding="false" android:textSize="11sp" tools:text="34回答" /> diff --git a/app/src/main/res/layout/rank_collection_item.xml b/app/src/main/res/layout/rank_collection_item.xml index a2a77a43b0..c1c9554969 100644 --- a/app/src/main/res/layout/rank_collection_item.xml +++ b/app/src/main/res/layout/rank_collection_item.xml @@ -21,7 +21,7 @@ android:paddingBottom="8dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textStyle="bold" android:textSize="16sp" tools:text="热门榜" /> @@ -35,7 +35,7 @@ android:paddingBottom="8dp" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:text=" >" /> diff --git a/app/src/main/res/layout/rank_game_item.xml b/app/src/main/res/layout/rank_game_item.xml index 9fe844fa77..324037ddfb 100644 --- a/app/src/main/res/layout/rank_game_item.xml +++ b/app/src/main/res/layout/rank_game_item.xml @@ -60,7 +60,7 @@ android:layout_marginRight="8dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" android:textStyle="bold" tools:text="地海争霸：巫妖王再怒" /> diff --git a/app/src/main/res/layout/rating_comment_item.xml b/app/src/main/res/layout/rating_comment_item.xml index 4091357817..eb6a1aa767 100644 --- a/app/src/main/res/layout/rating_comment_item.xml +++ b/app/src/main/res/layout/rating_comment_item.xml @@ -5,7 +5,7 @@ android:id="@+id/comment_item" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -40,7 +40,7 @@ android:ellipsize="end" android:maxLines="1" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" android:textStyle="bold" app:layout_constrainedWidth="true" @@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -115,7 +115,7 @@ android:id="@+id/authTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/tag_text_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:gravity="center" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/tag_text_size" app:layout_constraintBottom_toBottomOf="@+id/authTv" app:layout_constraintStart_toEndOf="@+id/authTv" @@ -142,7 +142,7 @@ android:id="@+id/ipRegionTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/tag_text_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/time" @@ -176,7 +176,7 @@ android:numStars="5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/user_icon" - app:mrb_progressTint="@color/theme" /> + app:mrb_progressTint="@color/primary_theme" /> @@ -312,7 +312,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="2" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -339,7 +339,7 @@ android:drawableEnd="@drawable/ic_comment_more_arrow" android:drawablePadding="4dp" android:text="查看更多回复" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="13sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/reply_content" /> diff --git a/app/src/main/res/layout/rating_item.xml b/app/src/main/res/layout/rating_item.xml index 5fee717dfe..95804795b3 100644 --- a/app/src/main/res/layout/rating_item.xml +++ b/app/src/main/res/layout/rating_item.xml @@ -18,7 +18,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="还没有收集到足够的评价，无法给出公正的评分" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="14sp" android:visibility="gone" /> @@ -77,7 +77,7 @@ android:minWidth="8dp" android:minHeight="8dp" android:rating="5" - app:mrb_progressTint="@color/theme" /> + app:mrb_progressTint="@color/primary_theme" /> + app:mrb_progressTint="@color/primary_theme" /> + app:mrb_progressTint="@color/primary_theme" /> + app:mrb_progressTint="@color/primary_theme" /> + app:mrb_progressTint="@color/primary_theme" /> @@ -298,7 +298,7 @@ android:layout_marginRight="16dp" android:includeFontPadding="false" android:text="停服保护状态下，评价将不计入总分" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="13sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -314,7 +314,7 @@ android:layout_marginBottom="14dp" android:includeFontPadding="false" android:text="什么是停服保护" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/stopServerTopIcon" @@ -347,7 +347,7 @@ android:includeFontPadding="false" android:paddingStart="16dp" android:text="小编评价" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" android:textStyle="bold" /> @@ -356,7 +356,7 @@ android:layout_height="1px" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> @@ -389,7 +389,7 @@ android:layout_height="1px" android:layout_marginStart="16dp" android:layout_marginEnd="16dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> @@ -426,7 +426,7 @@ android:drawablePadding="4dp" android:gravity="center" android:text="筛选" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/rating_reply_head_item.xml b/app/src/main/res/layout/rating_reply_head_item.xml index 25a6e548a4..46b53767de 100644 --- a/app/src/main/res/layout/rating_reply_head_item.xml +++ b/app/src/main/res/layout/rating_reply_head_item.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center_vertical" android:orientation="horizontal" android:paddingTop="@dimen/game_detail_item_horizontal_padding" @@ -50,7 +50,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:lineSpacingMultiplier="1.2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" /> @@ -75,7 +75,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="7dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="11sp" /> @@ -123,7 +123,7 @@ android:layout_width="match_parent" android:layout_height="1px" android:layout_marginTop="@dimen/game_detail_item_horizontal_padding" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/gameIconContainer" diff --git a/app/src/main/res/layout/search_default_rank_item.xml b/app/src/main/res/layout/search_default_rank_item.xml index 29216a739c..09e3437b66 100644 --- a/app/src/main/res/layout/search_default_rank_item.xml +++ b/app/src/main/res/layout/search_default_rank_item.xml @@ -42,7 +42,7 @@ android:ellipsize="end" android:maxLines="1" android:textSize="14sp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/labelIv" diff --git a/app/src/main/res/layout/search_game_index_item.xml b/app/src/main/res/layout/search_game_index_item.xml index 82e71d468e..819ae4c880 100644 --- a/app/src/main/res/layout/search_game_index_item.xml +++ b/app/src/main/res/layout/search_game_index_item.xml @@ -11,7 +11,7 @@ android:layout_height="1px" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" android:visibility="gone" /> \ No newline at end of file diff --git a/app/src/main/res/layout/search_subject_item.xml b/app/src/main/res/layout/search_subject_item.xml index ba7f31a688..c0a57579f0 100644 --- a/app/src/main/res/layout/search_subject_item.xml +++ b/app/src/main/res/layout/search_subject_item.xml @@ -11,7 +11,7 @@ android:layout_height="1px" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/divider" + android:background="@color/ui_divider" android:visibility="gone" /> diff --git a/app/src/main/res/layout/simulator_header_view.xml b/app/src/main/res/layout/simulator_header_view.xml index 352a9897bc..cf99c4fb86 100644 --- a/app/src/main/res/layout/simulator_header_view.xml +++ b/app/src/main/res/layout/simulator_header_view.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="40dp" - android:background="@color/background_space"> + android:background="@color/ui_container_1"> @@ -51,5 +51,5 @@ android:layout_height="1dp" android:layout_marginLeft="16dp" android:layout_marginRight="16dp" - android:background="@color/divider" /> + android:background="@color/ui_divider" /> \ No newline at end of file diff --git a/app/src/main/res/layout/stairs_comment_item.xml b/app/src/main/res/layout/stairs_comment_item.xml index 851602ad2e..7baabc6a16 100644 --- a/app/src/main/res/layout/stairs_comment_item.xml +++ b/app/src/main/res/layout/stairs_comment_item.xml @@ -41,7 +41,7 @@ android:id="@+id/comment_user_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="13sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="parent" @@ -120,7 +120,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="12sp" tools:text="20" /> @@ -150,7 +150,7 @@ android:layout_below="@+id/comment_content" android:layout_marginTop="8dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" tools:text="1小时前" /> @@ -182,7 +182,7 @@ + android:background="@color/text_secondary" /> diff --git a/app/src/main/res/layout/sub_category_item.xml b/app/src/main/res/layout/sub_category_item.xml index eabe57d019..12edf950c8 100644 --- a/app/src/main/res/layout/sub_category_item.xml +++ b/app/src/main/res/layout/sub_category_item.xml @@ -13,7 +13,7 @@ android:layout_centerHorizontal="true" android:gravity="center" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" tools:text="最多五个字啊啊啊" /> diff --git a/app/src/main/res/layout/toolbar_shadow.xml b/app/src/main/res/layout/toolbar_shadow.xml index d62cabb0e4..ec73b5c7f6 100644 --- a/app/src/main/res/layout/toolbar_shadow.xml +++ b/app/src/main/res/layout/toolbar_shadow.xml @@ -19,7 +19,7 @@ android:id="@+id/statusBarView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" /> + android:background="@color/ui_surface" /> diff --git a/app/src/main/res/layout/toolbox_block_item.xml b/app/src/main/res/layout/toolbox_block_item.xml index 6ce3f89138..e1dea91df0 100644 --- a/app/src/main/res/layout/toolbox_block_item.xml +++ b/app/src/main/res/layout/toolbox_block_item.xml @@ -13,7 +13,7 @@ android:paddingEnd="18dp" android:paddingBottom="8dp" android:text="标签分类" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/primary_title_text_size" android:textStyle="bold" /> @@ -37,7 +37,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="展开全部" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" /> + android:background="@color/ui_divider" /> \ No newline at end of file diff --git a/app/src/main/res/layout/toolbox_item.xml b/app/src/main/res/layout/toolbox_item.xml index 1c356586cc..0a7b17fdfa 100644 --- a/app/src/main/res/layout/toolbox_item.xml +++ b/app/src/main/res/layout/toolbox_item.xml @@ -3,7 +3,7 @@ xmlns:fresco="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/background_white" + android:background="@color/ui_surface" android:paddingBottom="16dp" android:paddingLeft="18dp" android:paddingRight="18dp" @@ -28,7 +28,7 @@ android:id="@+id/toolbox_item_title" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" /> @@ -39,7 +39,7 @@ android:layout_below="@+id/toolbox_item_title" android:layout_marginTop="6dp" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/user_search_list_item.xml b/app/src/main/res/layout/user_search_list_item.xml index 4e255303ea..355b24a661 100644 --- a/app/src/main/res/layout/user_search_list_item.xml +++ b/app/src/main/res/layout/user_search_list_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/background_white" + android:background="@color/ui_surface" android:paddingLeft="20dp" android:paddingTop="16dp" android:paddingRight="20dp"> @@ -37,7 +37,7 @@ android:ellipsize="end" android:maxLength="12" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@+id/userSignatureTv" app:layout_constraintEnd_toStartOf="@+id/user_badge_icon" @@ -66,7 +66,7 @@ android:layout_marginLeft="4dp" android:gravity="center" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constrainedWidth="true" app:layout_constraintBottom_toBottomOf="@id/user_badge_icon" @@ -83,7 +83,7 @@ android:layout_marginLeft="12dp" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toTopOf="@+id/userFansCountTv" app:layout_constraintEnd_toStartOf="@+id/attentionTv" @@ -95,7 +95,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginLeft="12dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/userAvatar" app:layout_constraintStart_toEndOf="@+id/userAvatar" @@ -116,7 +116,7 @@ diff --git a/app/src/main/res/layout/video_albums_item.xml b/app/src/main/res/layout/video_albums_item.xml index edc4d56102..96230ed8a6 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/ui_surface"> + android:background="@color/ui_divider" /> diff --git a/app/src/main/res/layout/video_label_item.xml b/app/src/main/res/layout/video_label_item.xml index e9eb49bd78..e6bbe9a75c 100644 --- a/app/src/main/res/layout/video_label_item.xml +++ b/app/src/main/res/layout/video_label_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/background_white" + android:background="@color/ui_surface" android:paddingLeft="16dp" android:paddingTop="20dp" android:paddingRight="16dp" @@ -20,7 +20,7 @@ android:ellipsize="end" android:lineSpacingExtra="8dp" android:maxLines="1" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="16sp" app:layout_constraintEnd_toStartOf="@+id/selectedIv" app:layout_constraintStart_toStartOf="parent" @@ -35,7 +35,7 @@ android:layout_marginRight="16dp" android:lineSpacingExtra="8dp" android:text="@{entity.desc}" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" app:layout_constraintEnd_toStartOf="@+id/selectedIv" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/video_new_item.xml b/app/src/main/res/layout/video_new_item.xml index bc515728d6..90bc11cc1f 100644 --- a/app/src/main/res/layout/video_new_item.xml +++ b/app/src/main/res/layout/video_new_item.xml @@ -106,7 +106,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="4dp" android:maxLines="2" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="13sp" app:layout_constraintBottom_toTopOf="@+id/user_info" app:layout_constraintEnd_toEndOf="parent" @@ -135,7 +135,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:roundingBorderColor="@color/background" + app:roundingBorderColor="@color/ui_background" app:roundingBorderWidth="1dp" /> @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="游戏时长统计" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/vote_item.xml b/app/src/main/res/layout/vote_item.xml index 859ef9f9b0..81fdfd4fc1 100644 --- a/app/src/main/res/layout/vote_item.xml +++ b/app/src/main/res/layout/vote_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/background_white" + android:background="@color/ui_surface" android:orientation="vertical"> + android:background="@color/ui_divider" /> \ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 47b69736f0..bd721ba258 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,7 +1,7 @@ - @color/background_space_2 + @color/ui_container_2 @color/transparent #343434 diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 2c88ff88f8..5ca9142262 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -3,17 +3,17 @@ @@ -170,7 +170,7 @@ wrap_content 8dp false - @color/text_subtitle + @color/text_secondary 11sp @@ -192,7 +192,7 @@ @@ -210,7 +210,7 @@ @drawable/ic_filter_arrow_down 5dp center_vertical - @color/text_subtitle + @color/text_secondary bold 12sp @@ -236,7 +236,7 @@ 12dp 12dp @drawable/button_round_f5f5f5 - @color/text_title + @color/text_primary 12sp @@ -255,12 +255,12 @@ \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a5a94dc8a9..e4ed01b872 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,8 +1,8 @@ - @color/background_white - @color/divider - @color/background_space + @color/ui_surface + @color/ui_divider + @color/ui_container_1 \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 390fae27cd..e01bc59d33 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,17 +3,17 @@ @@ -161,7 +161,7 @@ wrap_content 8dp false - @color/text_subtitle + @color/text_secondary 11sp @@ -183,7 +183,7 @@ @@ -201,7 +201,7 @@ @drawable/ic_filter_arrow_down 5dp center_vertical - @color/text_subtitle + @color/text_secondary bold 12sp @@ -227,7 +227,7 @@ 12dp 12dp @drawable/button_round_f5f5f5 - @color/text_title + @color/text_primary 12sp @@ -246,13 +246,13 @@ @@ -110,6 +110,6 @@ \ No newline at end of file diff --git a/module_common/src/main/res/values/colors.xml b/module_common/src/main/res/values/colors.xml index 1416cb76a6..8f7e3a23ea 100644 --- a/module_common/src/main/res/values/colors.xml +++ b/module_common/src/main/res/values/colors.xml @@ -1,70 +1,88 @@ - #2496FF + + #2496FF + + #1A2496FF + + + + #FF4147 + + #06CEA8 + + #FFA142 + + + + #1383EB + + #333333 + + #666666 + + #999999 + + #B3B3B3 + + #FFFFFF + + #CCFFFFFF + + #99FFFFFF + + #CCCCCC + + + + #F5F5F5 + + #FFFFFF + + #F8F8F8 + + #F5F5F5 + + #EEEEEE + + #0A2496FF + + #EEEEEE + + #E1E1E1 + + #F5F5F5 + + + + #1A000000 + + #EEEEEE + + #66000000 + + #33000000 + + #332496FF #CC2496FF - #1A2496FF #1F2496FF #142496FF - - #FFA142 - - #FF4147 - - #06CEA8 - - #1383EB + #991383EB - - #333333 - #666666 - #999999 - #CCCCCC - #B3B3B3 - @color/white @color/black - - @color/white - - @color/white_alpha_80 - - @color/white_alpha_60 - - - #F5F5F5 - - @color/bg_F8F8F8 - @color/background - - #FFFFFF #CCFFFFFF #00F5F5F5 - - #EEEEEE - - #1A000000 - - #66000000 - - #33000000 - - #0A2496FF - #1A2496FF + @color/primary_theme #0D000000 - @color/theme + @color/primary_theme @color/text_4BC7FF #0D000000 @@ -83,15 +101,11 @@ #0D000000 - #E1E1E1 #d1e5f7 - - #F5F5F5 - @color/theme #06D0A8 #FFB13C @color/c7c7c7 @@ -223,7 +237,6 @@ #8CA0B8 #F5F5F5 #08000000 - @color/text_subtitle #aaaaaa diff --git a/module_common/src/main/res/values/style.xml b/module_common/src/main/res/values/style.xml index 5e55cae67c..0f285a01a6 100644 --- a/module_common/src/main/res/values/style.xml +++ b/module_common/src/main/res/values/style.xml @@ -42,7 +42,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/adapter/MyConcernRecommendAdapter.java b/module_core_feature/src/main/java/com/gh/gamecenter/feature/adapter/MyConcernRecommendAdapter.java index ec3d325529..6ddc803f63 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/adapter/MyConcernRecommendAdapter.java +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/adapter/MyConcernRecommendAdapter.java @@ -204,7 +204,7 @@ public class MyConcernRecommendAdapter extends BaseRecyclerAdapter 3) R.color.theme_font.toColor(root.context) else R.color.theme.toColor( + if (entity.commentCount > 3) R.color.text_theme.toColor(root.context) else R.color.primary_theme.toColor( root.context ) ) @@ -85,7 +85,7 @@ class GameItemViewHolder(var binding: GameItemBinding) : BaseRecyclerViewHolder< if (gameEntity.isUseDefaultServerStyle()) { serverTypeTv.background = R.drawable.server_label_default_bg.toDrawable(gameNameTv.context) - serverTypeTv.setTextColor(R.color.text_server_label.toColor(gameNameTv.context)) + serverTypeTv.setTextColor(R.color.text_secondary.toColor(gameNameTv.context)) } else { serverTypeTv.background = DrawableView.getServerDrawable(serverLabel.color) serverTypeTv.setTextColor(R.color.white.toColor(gameNameTv.context)) @@ -139,7 +139,7 @@ class GameItemViewHolder(var binding: GameItemBinding) : BaseRecyclerViewHolder< gameSubtitleTv.apply { visibility = View.VISIBLE text = "预下载" - setTextColor(R.color.text_subtitle.toColor(context)) + setTextColor(R.color.text_secondary.toColor(context)) background = R.drawable.bg_advance_download_game_subtitle.toDrawable(context) } } diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/game/SelectGameAdapter.java b/module_core_feature/src/main/java/com/gh/gamecenter/feature/game/SelectGameAdapter.java index c65a437244..f4651e9f17 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/game/SelectGameAdapter.java +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/game/SelectGameAdapter.java @@ -139,7 +139,7 @@ public class SelectGameAdapter extends BaseRecyclerAdapter holder.binding.gameIcon.getIconIv().setImageBitmap(installGameEntity.getGameBm()); holder.binding.gameIcon.getIconDecoratorIv().setVisibility(View.GONE); holder.binding.gameName.setText(installGameEntity.getGameName()); - holder.binding.gameName.setTextColor(ContextCompat.getColor(mContext, R.color.text_title)); + holder.binding.gameName.setTextColor(ContextCompat.getColor(mContext, R.color.text_primary)); holder.binding.getRoot().setOnClickListener(v -> listener.loadDone(installGameEntity)); } diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/game/SuggestSelectGameAdapter.kt b/module_core_feature/src/main/java/com/gh/gamecenter/feature/game/SuggestSelectGameAdapter.kt index d90e5a08b4..95d327e7b9 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/game/SuggestSelectGameAdapter.kt +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/game/SuggestSelectGameAdapter.kt @@ -45,7 +45,7 @@ class SuggestSelectGameAdapter( holder.binding.gameIcon.getIconIv().setImageBitmap(installGameEntity.gameBm) holder.binding.gameIcon.getIconDecoratorIv().visibility = View.GONE holder.binding.gameName.text = installGameEntity.gameName - holder.binding.gameName.setTextColor(R.color.text_title.toColor(mContext)) + holder.binding.gameName.setTextColor(R.color.text_primary.toColor(mContext)) holder.binding.root.setOnClickListener { mClickAction(installGameEntity) diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/utils/PlatformUtils.java b/module_core_feature/src/main/java/com/gh/gamecenter/feature/utils/PlatformUtils.java index 180f9a9b42..589787ccba 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/utils/PlatformUtils.java +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/utils/PlatformUtils.java @@ -177,7 +177,7 @@ public class PlatformUtils { return color; } - int themeColor = ContextCompat.getColor(HaloApp.getInstance(), R.color.theme); + int themeColor = ContextCompat.getColor(HaloApp.getInstance(), R.color.primary_theme); return String.format("#%06X", 0xFFFFFF & themeColor); } diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/view/DownloadButton.kt b/module_core_feature/src/main/java/com/gh/gamecenter/feature/view/DownloadButton.kt index 0e9aab3ec5..88360cdbbb 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/view/DownloadButton.kt +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/view/DownloadButton.kt @@ -90,7 +90,7 @@ class DownloadButton @JvmOverloads constructor( override fun onDraw(canvas: Canvas?) { super.onDraw(canvas) if (mText.isEmpty()) return - mPaint.color = if (mPaintColor == 0) R.color.theme_font.toColor(context) else mPaintColor // 初始化颜色 + mPaint.color = if (mPaintColor == 0) R.color.text_theme.toColor(context) else mPaintColor // 初始化颜色 mPaint.textSize = mTextSize.toFloat() mFakeTextPaint.textSize = mTextSize.toFloat() mFakeTextPaint.style = Paint.Style.FILL_AND_STROKE @@ -192,7 +192,7 @@ class DownloadButton @JvmOverloads constructor( progressDrawable = null background = R.drawable.button_round_gray_light.toDrawable(context) progress = 0 - mDefaultColor = R.color.text_subtitleDesc.toColor(context) + mDefaultColor = R.color.text_tertiary.toColor(context) } ButtonStyle.PLUGIN, ButtonStyle.INSTALL_PLUGIN -> { @@ -210,22 +210,22 @@ class DownloadButton @JvmOverloads constructor( context ) else R.drawable.detail_downloading_normal_style.toDrawable(context) mDefaultColor = - if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.color.white.toColor(context) else R.color.theme_font.toColor( + if (mDownloadStyle == DOWNLOAD_IMAGE_STYLE) R.color.white.toColor(context) else R.color.text_theme.toColor( context ) } else { background = R.drawable.game_item_btn_downloading_style.toDrawable(context) - mDefaultColor = R.color.theme_font.toColor(context) + mDefaultColor = R.color.text_theme.toColor(context) mPressedColor = R.color.white.toColor(context) } } ButtonStyle.DOWNLOADING_PLUGIN -> { if (showProgress) { progressDrawable = R.drawable.detail_downloading_normal_style.toDrawable(context) - mDefaultColor = R.color.theme_font.toColor(context) + mDefaultColor = R.color.text_theme.toColor(context) } else { background = R.drawable.game_item_btn_downloading_style.toDrawable(context) - mDefaultColor = R.color.theme_font.toColor(context) + mDefaultColor = R.color.text_theme.toColor(context) mPressedColor = R.color.white.toColor(context) } } @@ -233,13 +233,13 @@ class DownloadButton @JvmOverloads constructor( progressDrawable = null background = R.drawable.button_round_border_eeeeee.toDrawable(context) progress = 0 - mDefaultColor = R.color.text_subtitleDesc.toColor(context) + mDefaultColor = R.color.text_tertiary.toColor(context) } ButtonStyle.PAUSE -> { progressDrawable = null background = R.drawable.button_normal_round_border.toDrawable(context) progress = 0 - mDefaultColor = R.color.theme_font.toColor(context) + mDefaultColor = R.color.text_theme.toColor(context) } } mPaintColor = mDefaultColor diff --git a/module_core_feature/src/main/res/drawable/bg_advance_download_game_subtitle.xml b/module_core_feature/src/main/res/drawable/bg_advance_download_game_subtitle.xml index eefffad1af..5afbe13202 100644 --- a/module_core_feature/src/main/res/drawable/bg_advance_download_game_subtitle.xml +++ b/module_core_feature/src/main/res/drawable/bg_advance_download_game_subtitle.xml @@ -2,7 +2,7 @@ + android:color="@color/ui_divider" /> - + \ No newline at end of file diff --git a/module_core_feature/src/main/res/drawable/bg_shape_f5_radius_4.xml b/module_core_feature/src/main/res/drawable/bg_shape_f5_radius_4.xml index 3105dba6e3..7bab5bb310 100644 --- a/module_core_feature/src/main/res/drawable/bg_shape_f5_radius_4.xml +++ b/module_core_feature/src/main/res/drawable/bg_shape_f5_radius_4.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/module_core_feature/src/main/res/drawable/button_normal_round_border.xml b/module_core_feature/src/main/res/drawable/button_normal_round_border.xml index 84f8a498be..888bb315f6 100644 --- a/module_core_feature/src/main/res/drawable/button_normal_round_border.xml +++ b/module_core_feature/src/main/res/drawable/button_normal_round_border.xml @@ -4,7 +4,7 @@ + android:color="@color/text_theme" /> diff --git a/module_core_feature/src/main/res/drawable/button_round_border_eeeeee.xml b/module_core_feature/src/main/res/drawable/button_round_border_eeeeee.xml index 8338773318..9d300f30ee 100644 --- a/module_core_feature/src/main/res/drawable/button_round_border_eeeeee.xml +++ b/module_core_feature/src/main/res/drawable/button_round_border_eeeeee.xml @@ -2,7 +2,7 @@ + android:color="@color/ui_divider" /> \ No newline at end of file diff --git a/module_core_feature/src/main/res/drawable/detail_downloading_normal_style.xml b/module_core_feature/src/main/res/drawable/detail_downloading_normal_style.xml index efe49c4e2b..85dff313b8 100644 --- a/module_core_feature/src/main/res/drawable/detail_downloading_normal_style.xml +++ b/module_core_feature/src/main/res/drawable/detail_downloading_normal_style.xml @@ -5,7 +5,7 @@ + android:color="@color/primary_theme" /> @@ -19,8 +19,8 @@ + android:endColor="@color/primary_theme" + android:startColor="@color/primary_theme" /> diff --git a/module_core_feature/src/main/res/drawable/game_item_btn_download_dn.xml b/module_core_feature/src/main/res/drawable/game_item_btn_download_dn.xml index 35f5e6d9df..077e83af67 100644 --- a/module_core_feature/src/main/res/drawable/game_item_btn_download_dn.xml +++ b/module_core_feature/src/main/res/drawable/game_item_btn_download_dn.xml @@ -3,7 +3,7 @@ - + diff --git a/module_core_feature/src/main/res/layout/concern_item.xml b/module_core_feature/src/main/res/layout/concern_item.xml index a035906198..6f9dbec5f5 100644 --- a/module_core_feature/src/main/res/layout/concern_item.xml +++ b/module_core_feature/src/main/res/layout/concern_item.xml @@ -30,7 +30,7 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" /> diff --git a/module_core_feature/src/main/res/layout/dialog_manual_input.xml b/module_core_feature/src/main/res/layout/dialog_manual_input.xml index 84c07cb0f5..b147fd8434 100644 --- a/module_core_feature/src/main/res/layout/dialog_manual_input.xml +++ b/module_core_feature/src/main/res/layout/dialog_manual_input.xml @@ -20,7 +20,7 @@ android:drawablePadding="4dp" android:gravity="center" android:text="手动填写" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -38,8 +38,8 @@ android:hint="输入游戏名称" android:lines="1" android:padding="12dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textSize="@dimen/primary_text_size" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -50,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginTop="23dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@id/contentEt" @@ -62,7 +62,7 @@ android:layout_height="50dp" android:gravity="center" android:text="@string/cancel" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -73,7 +73,7 @@ android:id="@+id/centerDivider" android:layout_width="1dp" android:layout_height="0dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="@id/confirmTv" app:layout_constraintTop_toBottomOf="@id/lineView" /> @@ -86,7 +86,7 @@ android:enabled="false" android:gravity="center" android:text="@string/confirm" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:textStyle="bold" app:layout_constraintLeft_toRightOf="@id/cancelTv" diff --git a/module_core_feature/src/main/res/layout/dialog_select_game.xml b/module_core_feature/src/main/res/layout/dialog_select_game.xml index b6d759a147..f2000c4305 100644 --- a/module_core_feature/src/main/res/layout/dialog_select_game.xml +++ b/module_core_feature/src/main/res/layout/dialog_select_game.xml @@ -11,7 +11,7 @@ android:layout_height="48dp" android:gravity="center" android:text="请选择游戏" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -31,7 +31,7 @@ android:id="@+id/line" android:layout_width="match_parent" android:layout_height="0.5dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/titleTv" /> @@ -69,7 +69,7 @@ android:background="@drawable/bg_shape_f5_radius_999" android:gravity="center" android:text="手动填写" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/module_core_feature/src/main/res/layout/dialog_select_game_item.xml b/module_core_feature/src/main/res/layout/dialog_select_game_item.xml index 6f6680b45e..418f927e91 100644 --- a/module_core_feature/src/main/res/layout/dialog_select_game_item.xml +++ b/module_core_feature/src/main/res/layout/dialog_select_game_item.xml @@ -17,7 +17,7 @@ android:layout_marginTop="8dp" android:maxLines="1" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" /> \ No newline at end of file diff --git a/module_core_feature/src/main/res/layout/game_item.xml b/module_core_feature/src/main/res/layout/game_item.xml index 244dd894e0..4d3090ced6 100644 --- a/module_core_feature/src/main/res/layout/game_item.xml +++ b/module_core_feature/src/main/res/layout/game_item.xml @@ -66,7 +66,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" android:textStyle="bold" tools:text="地海争霸：巫妖王再怒" /> @@ -81,7 +81,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:visibility="visible" @@ -104,7 +104,7 @@ android:layout_width="wrap_content" android:layout_height="14dp" android:layout_marginLeft="4dp" - android:background="@color/theme" + android:background="@color/primary_theme" android:gravity="center" android:includeFontPadding="false" android:maxLines="1" @@ -162,7 +162,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constraintLeft_toRightOf="@+id/game_rating" app:layout_constraintRight_toRightOf="@+id/gameDesSpace" @@ -213,7 +213,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="推荐指数：" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@+id/gameDesSpace" app:layout_constraintLeft_toLeftOf="@+id/gameDesSpace" @@ -232,7 +232,7 @@ app:layout_constraintBottom_toBottomOf="@+id/recommendStarPref" app:layout_constraintLeft_toRightOf="@+id/recommendStarPref" app:layout_constraintTop_toTopOf="@+id/recommendStarPref" - app:mrb_progressTint="@color/theme" + app:mrb_progressTint="@color/primary_theme" tools:rating="3" /> @@ -162,7 +162,7 @@ android:id="@+id/news_digest_commentnum" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" /> diff --git a/module_feedback/src/main/res/drawable/qa_feedback_rg_button_checked.xml b/module_feedback/src/main/res/drawable/qa_feedback_rg_button_checked.xml index bce6f2c049..6cdc96e47d 100644 --- a/module_feedback/src/main/res/drawable/qa_feedback_rg_button_checked.xml +++ b/module_feedback/src/main/res/drawable/qa_feedback_rg_button_checked.xml @@ -6,7 +6,7 @@ + android:color="@color/primary_theme" /> \ No newline at end of file diff --git a/module_login/src/main/java/com/gh/gamecenter/login/utils/DialogHelper.kt b/module_login/src/main/java/com/gh/gamecenter/login/utils/DialogHelper.kt index c7b6c5b8c3..fd16a2e7ed 100644 --- a/module_login/src/main/java/com/gh/gamecenter/login/utils/DialogHelper.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/DialogHelper.kt @@ -39,9 +39,9 @@ object DialogHelper { uiModificationCallback = { binding -> binding.run { rootContainer.background = R.drawable.background_shape_white_radius_8.toDrawable(context) - titleTv.setTextColor(R.color.text_title.toColor(context)) - contentTv.setTextColor(R.color.text_subtitle.toColor(context)) - cancelTv.setTextColor(R.color.text_title.toColor(context)) + titleTv.setTextColor(R.color.text_primary.toColor(context)) + contentTv.setTextColor(R.color.text_secondary.toColor(context)) + cancelTv.setTextColor(R.color.text_primary.toColor(context)) cancelTv.background = R.drawable.bg_shape_background_space_2_radius_999.toDrawable(context) confirmTv.setTextColor(R.color.text_aw_primary.toColor(context)) confirmTv.background = R.drawable.button_blue_oval.toDrawable(context) diff --git a/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt b/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt index cdc5804e75..0dc7e57b02 100644 --- a/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt +++ b/module_login/src/main/java/com/gh/gamecenter/login/utils/QuickLoginHelper.kt @@ -197,7 +197,7 @@ object QuickLoginHelper { .setNavTextSize(18) //服务条款标题字体大小 // 手机号码 .setNumberSize(28, true) //手机号码字体大小 - .setNumberColor(R.color.text_title.toColor(context)) //手机号码字体颜色 + .setNumberColor(R.color.text_primary.toColor(context)) //手机号码字体颜色 .setNumFieldOffsetY(440) //号码栏Y偏移量 // 登录按钮 .setLogBtnImgPath("download_button_normal_style") //登录按钮背景 @@ -218,7 +218,7 @@ object QuickLoginHelper { mLoggingDialog = Dialog(oauthContext, R.style.DialogWindowTransparent).apply { val binding = SetWaitDialogBinding.inflate(LayoutInflater.from(oauthContext)).apply { root.background = R.drawable.background_shape_white_radius_8.toDrawable(context) - setWaitMessage.setTextColor(R.color.text_title.toColor(context)) + setWaitMessage.setTextColor(R.color.text_primary.toColor(context)) setWaitMessage.text = R.string.logging.toResString() } requestWindowFeature(Window.FEATURE_NO_TITLE) @@ -255,8 +255,8 @@ object QuickLoginHelper { ) //隐私条款的协议文本，自定义条款，自定义条款链接(支持四份条款) .setPrivacyText( 12, - R.color.text_subtitleDesc.toColor(context), - R.color.text_subtitle.toColor(context), + R.color.text_tertiary.toColor(context), + R.color.text_secondary.toColor(context), true, false ) //条款文本设置 @@ -344,7 +344,7 @@ object QuickLoginHelper { NewFlatLogUtils.logFastLoginRelatedShow("fast_login_show") (root.parent as? ViewGroup)?.run { - setBackgroundColor(R.color.background_white.toColor(context)) + setBackgroundColor(R.color.ui_surface.toColor(context)) val phoneNumTv = (getChildAt(1) as? ViewGroup)?.getChildAt(0) as? TextView phoneNumTv?.run { diff --git a/module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java index 202e85de4d..8df8a967fe 100644 --- a/module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java +++ b/module_login/src/main/java/com/gh/gamecenter/login/view/LoginFragment.java @@ -101,7 +101,7 @@ public class LoginFragment mBinding.loginCaptcha.setText(arg1 + "s"); } else { mBinding.loginCaptcha.setText("重新获取"); - mBinding.loginCaptcha.setTextColor(ExtensionsKt.toColor(R.color.theme_font)); + mBinding.loginCaptcha.setTextColor(ExtensionsKt.toColor(R.color.text_theme)); mBinding.loginCaptcha.setEnabled(true); } } @@ -203,7 +203,7 @@ public class LoginFragment @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); - ds.setColor(getResources().getColor(R.color.text_subtitle)); + ds.setColor(getResources().getColor(R.color.text_secondary)); ds.setUnderlineText(true); } @@ -223,7 +223,7 @@ public class LoginFragment @Override public void updateDrawState(@NonNull TextPaint ds) { super.updateDrawState(ds); - ds.setColor(getResources().getColor(R.color.text_subtitle)); + ds.setColor(getResources().getColor(R.color.text_secondary)); ds.setUnderlineText(true); } @@ -501,7 +501,7 @@ public class LoginFragment protected void onDarkModeChanged() { super.onDarkModeChanged(); if (mIsFromQuickLogin) { - mBinding.normalToolbarContainer.normalToolbar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); + mBinding.normalToolbarContainer.normalToolbar.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); mBinding.normalToolbarContainer.backBtn.setImageDrawable(AppCompatResources.getDrawable(requireContext(), R.drawable.ic_bar_back)); } setCheckIvSrc(); diff --git a/module_login/src/main/res/drawable/bg_login_edit.xml b/module_login/src/main/res/drawable/bg_login_edit.xml index e9a7307185..6781657d4d 100644 --- a/module_login/src/main/res/drawable/bg_login_edit.xml +++ b/module_login/src/main/res/drawable/bg_login_edit.xml @@ -2,7 +2,7 @@ - + diff --git a/module_login/src/main/res/drawable/bg_quick_login_third_party.xml b/module_login/src/main/res/drawable/bg_quick_login_third_party.xml index e356b06850..33e0947e23 100644 --- a/module_login/src/main/res/drawable/bg_quick_login_third_party.xml +++ b/module_login/src/main/res/drawable/bg_quick_login_third_party.xml @@ -2,9 +2,9 @@ - + + android:color="@color/ui_divider" /> \ No newline at end of file diff --git a/module_login/src/main/res/drawable/ic_login_close.xml b/module_login/src/main/res/drawable/ic_login_close.xml index b0f73ec6d2..89aa7e8a7f 100644 --- a/module_login/src/main/res/drawable/ic_login_close.xml +++ b/module_login/src/main/res/drawable/ic_login_close.xml @@ -10,7 +10,7 @@ android:strokeLineJoin="round" android:strokeWidth="2" android:fillColor="#00000000" - android:strokeColor="#333333" + android:strokeColor="@color/text_primary" android:strokeLineCap="round" /> diff --git a/module_login/src/main/res/layout/fragment_login.xml b/module_login/src/main/res/layout/fragment_login.xml index 1d30d2661d..6300fe9444 100644 --- a/module_login/src/main/res/layout/fragment_login.xml +++ b/module_login/src/main/res/layout/fragment_login.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:consumeWindowInsets="true" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -47,7 +47,7 @@ android:layout_marginTop="8dp" android:layout_marginLeft="40dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" android:text="未注册手机登录后将自动创建账号" /> @@ -68,7 +68,7 @@ android:layout_centerVertical="true" android:layout_marginLeft="20dp" android:text="@string/login_phone_prefix" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="16sp" /> + android:background="@color/ui_divider" /> @@ -121,8 +121,8 @@ android:maxLength="8" android:paddingTop="10dp" android:paddingBottom="10dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="16sp" /> @@ -135,7 +135,7 @@ android:layout_marginRight="24dp" android:gravity="center" android:text="@string/login_get_captcha" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" /> + android:background="@color/ui_divider" /> @@ -205,7 +205,7 @@ android:layout_marginTop="16dp" android:layout_below="@+id/login_phone_btn" android:layout_centerHorizontal="true" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:text="一键登录 >" /> diff --git a/module_login/src/main/res/layout/layout_quick_login.xml b/module_login/src/main/res/layout/layout_quick_login.xml index c7bf89d746..492bc4307a 100644 --- a/module_login/src/main/res/layout/layout_quick_login.xml +++ b/module_login/src/main/res/layout/layout_quick_login.xml @@ -31,7 +31,7 @@ android:layout_marginTop="422dp" android:includeFontPadding="false" android:text="本机号码" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" /> diff --git a/module_login/src/main/res/layout/layout_quick_login_navigation.xml b/module_login/src/main/res/layout/layout_quick_login_navigation.xml index a9c6bac287..091e8a185b 100644 --- a/module_login/src/main/res/layout/layout_quick_login_navigation.xml +++ b/module_login/src/main/res/layout/layout_quick_login_navigation.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="@dimen/appbar_height" - android:background="@color/background_white"> + android:background="@color/ui_surface"> { private void initKeFuViewHolder(KeFuViewHolder viewHolder, final MessageKeFuEntity keFuEntity) { viewHolder.binding.messageKaifuItem.setBackground(ContextCompat.getDrawable(mContext, R.drawable.reuse_listview_item_style)); - viewHolder.binding.messageKefuSuggestion.setBackgroundColor(ContextCompat.getColor(mContext, R.color.background)); + viewHolder.binding.messageKefuSuggestion.setBackgroundColor(ContextCompat.getColor(mContext, R.color.ui_background)); viewHolder.binding.messageKefuSuggestion.setTextColor(ContextCompat.getColor(mContext, R.color.title)); viewHolder.binding.messageKefuName.setTextColor(ContextCompat.getColor(mContext, R.color.text_black)); viewHolder.binding.messageKefuContent.setTextColor(ContextCompat.getColor(mContext, R.color.title)); viewHolder.binding.messageKefuTime.setTextColor(ContextCompat.getColor(mContext, R.color.hint)); - viewHolder.binding.copyTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitle)); + viewHolder.binding.copyTv.setTextColor(ContextCompat.getColor(mContext, R.color.text_secondary)); boolean shouldShouldUserId = keFuEntity.getShowUserId() != null && keFuEntity.getShowUserId(); @@ -302,7 +302,7 @@ public class KeFuFragmentAdapter extends ListAdapter { private TextView getLinkChildView(KeFuViewHolder viewHolder, String text) { TextView textView = new TextView(mContext); - textView.setTextColor(mContext.getResources().getColor(R.color.theme_font)); + textView.setTextColor(mContext.getResources().getColor(R.color.text_theme)); textView.setTextSize(12F); textView.setText(text); LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageActivity.kt b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageActivity.kt index ecabb6866d..6a0dd9d69b 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageActivity.kt +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageActivity.kt @@ -20,12 +20,12 @@ class MessageActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageAdapter.kt b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageAdapter.kt index db65cf7a1f..a179675741 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageAdapter.kt +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageAdapter.kt @@ -74,19 +74,19 @@ class MessageAdapter( topViewHolder.mBinding.messageInviteName.setTextColor( ContextCompat.getColor( mContext, - R.color.text_title + R.color.text_primary ) ) topViewHolder.mBinding.messageVoteName.setTextColor( ContextCompat.getColor( mContext, - R.color.text_title + R.color.text_primary ) ) topViewHolder.mBinding.messageServiceName.setTextColor( ContextCompat.getColor( mContext, - R.color.text_title + R.color.text_primary ) ) topViewHolder.mBinding.messageVote.background = ContextCompat.getDrawable( diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageInviteActivity.kt b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageInviteActivity.kt index f38d8a3ee0..e942caad2b 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageInviteActivity.kt +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageInviteActivity.kt @@ -11,12 +11,12 @@ import com.gh.gamecenter.message.R class MessageInviteActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageKeFuActivity.kt b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageKeFuActivity.kt index 76f0fb0253..4e07234122 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageKeFuActivity.kt +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageKeFuActivity.kt @@ -15,12 +15,12 @@ class MessageKeFuActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageVoteActivity.kt b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageVoteActivity.kt index d3237a6b6d..ac71987826 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageVoteActivity.kt +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageVoteActivity.kt @@ -11,12 +11,12 @@ import com.gh.gamecenter.message.R class MessageVoteActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageWrapperActivity.kt b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageWrapperActivity.kt index ba45f51add..ef567cbc75 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/MessageWrapperActivity.kt +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/MessageWrapperActivity.kt @@ -67,7 +67,7 @@ class MessageWrapperActivity : BaseActivity_TabLayout() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) mViewModel = viewModelProviderFromParent() mBinding = ActivityMessageWrapperBinding.bind(mContentView) @@ -148,7 +148,7 @@ class MessageWrapperActivity : BaseActivity_TabLayout() { val ovalHint = tabView?.findViewById(R.id.ovalHint) tabTitle?.typeface = if (isChecked) Typeface.DEFAULT_BOLD else Typeface.DEFAULT - tabTitle?.setTextColor(if (isChecked) R.color.text_title.toColor(this) else R.color.text_subtitle.toColor(this)) + tabTitle?.setTextColor(if (isChecked) R.color.text_primary.toColor(this) else R.color.text_secondary.toColor(this)) hintTv?.background = R.drawable.message_unread_hint.toDrawable(this) ovalHint?.background = R.drawable.oval_message_hint_bg.toDrawable(this) @@ -164,7 +164,7 @@ class MessageWrapperActivity : BaseActivity_TabLayout() { override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernAdapter.java b/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernAdapter.java index d1536e4214..9b6eb627b3 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernAdapter.java +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernAdapter.java @@ -356,8 +356,8 @@ class ConcernAdapter extends BaseRecyclerAdapter { viewHolder.binding.newsDigestTime.setTextColor(ContextCompat.getColor(mContext, R.color.hint)); viewHolder.binding.newsDigestContent.setTextColor(ContextCompat.getColor(mContext, R.color.text_3a3a3a)); viewHolder.binding.newsDigestLibaoHint.setTextColor(ContextCompat.getColor(mContext, R.color.hint)); - viewHolder.binding.newsDigestReadNum.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); - viewHolder.binding.newsDigestCommentnum.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); + viewHolder.binding.newsDigestReadNum.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); + viewHolder.binding.newsDigestCommentnum.setTextColor(ContextCompat.getColor(mContext, R.color.text_tertiary)); final ConcernEntity concernEntity = concernList.get(position); viewHolder.setClickData(concernEntity); diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernFragment.java b/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernFragment.java index 27ac448305..defe1f3e02 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernFragment.java +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernFragment.java @@ -115,7 +115,7 @@ public class ConcernFragment extends ToolbarFragment implements SwipeRefreshLayo public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mBinding.news1SrlRefresh.setColorSchemeResources(R.color.theme); + mBinding.news1SrlRefresh.setColorSchemeResources(R.color.primary_theme); mBinding.news1SrlRefresh.setOnRefreshListener(this); mBinding.news1RvList.setHasFixedSize(true); @@ -238,14 +238,14 @@ public class ConcernFragment extends ToolbarFragment implements SwipeRefreshLayo mBinding.reuseNoneData.reuseResetLoadTv.setVisibility(View.GONE); mBinding.reuseNoneData.reuseNoneDataDescTv.setVisibility(View.GONE); mBinding.reuseNoneData.reuseNoneDataTv.setText(getString(R.string.login_hint)); - mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(getResources().getColor(R.color.theme_font)); + mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(getResources().getColor(R.color.text_theme)); } else { mBinding.reuseNoneData.reuseNoneDataIv.setVisibility(View.VISIBLE); mBinding.reuseNoneData.reuseResetLoadTv.setVisibility(View.GONE); mBinding.reuseNoneData.reuseNoneDataDescTv.setVisibility(View.VISIBLE); mBinding.reuseNoneData.reuseNoneDataDescTv.setText(getString(R.string.my_game_dynamics_no_data_desc)); mBinding.reuseNoneData.reuseNoneDataTv.setText(getString(R.string.my_game_dynamics_no_data)); - mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(getResources().getColor(R.color.text_title)); + mBinding.reuseNoneData.reuseNoneDataTv.setTextColor(getResources().getColor(R.color.text_primary)); } ((ToolBarActivity) requireActivity()).clearMenu(); @@ -396,7 +396,7 @@ public class ConcernFragment extends ToolbarFragment implements SwipeRefreshLayo mBinding.reuseNoneData.reuseNoneDataDescTv.setVisibility(View.GONE); mBinding.reuseNoneData.reuseResetLoadTv.setVisibility(View.VISIBLE); mBinding.reuseNoneData.reuseResetLoadTv.setText("点击刷新"); - mBinding.reuseNoneData.reuseResetLoadTv.setTextColor(getResources().getColor(R.color.background_white)); + mBinding.reuseNoneData.reuseResetLoadTv.setTextColor(getResources().getColor(R.color.ui_surface)); mBinding.reuseNoneData.reuseResetLoadTv.setOnClickListener(v -> { refresh(); mBinding.reuseNoneData.reuseResetLoadTv.setOnClickListener(null); @@ -523,7 +523,7 @@ public class ConcernFragment extends ToolbarFragment implements SwipeRefreshLayo mConcernRecommendAdapter.notifyItemRangeChanged(0, mConcernRecommendAdapter.getItemCount()); mBinding.news1RvList.removeItemDecoration(mItemDecoration); mBinding.news1RvList.addItemDecoration(getItemDecoration()); - mBinding.getRoot().setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); - mBinding.divider.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.divider)); + mBinding.getRoot().setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_surface)); + mBinding.divider.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.ui_divider)); } } diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernInfoActivity.java b/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernInfoActivity.java index 7d7791d091..1e046645d5 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernInfoActivity.java +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/concern/ConcernInfoActivity.java @@ -18,7 +18,7 @@ public class ConcernInfoActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } public static Intent getIntent(Context context, String entrance) { @@ -30,6 +30,6 @@ public class ConcernInfoActivity extends ToolBarActivity { @Override protected void onDarkModeChanged() { super.onDarkModeChanged(); - ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + ExtensionsKt.updateStatusBarColor(this, R.color.ui_surface, R.color.ui_surface); } } diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageItemViewHolder.java b/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageItemViewHolder.java index 9a3aacb336..8e9e1d3dc5 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageItemViewHolder.java +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageItemViewHolder.java @@ -83,12 +83,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder public void setMessageItem(MessageEntity messageEntity, Context context, String entrance) { mBinding.messageItem.setBackground(ContextCompat.getDrawable(mBinding.getRoot().getContext(), R.drawable.reuse_listview_item_style)); mBinding.messageOriginal.setBackground(ContextCompat.getDrawable(mBinding.getRoot().getContext(), R.drawable.bg_shape_space_radius_8)); - mBinding.messageUserName.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_title)); - mBinding.messageUserMore.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.theme_font)); - mBinding.messageCommand.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_title)); - mBinding.messageTime.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_subtitleDesc)); - mBinding.messageContent.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_subtitle)); - mBinding.messageOriginalTitle.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_subtitleDesc)); + mBinding.messageUserName.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_primary)); + mBinding.messageUserMore.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_theme)); + mBinding.messageCommand.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_primary)); + mBinding.messageTime.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_tertiary)); + mBinding.messageContent.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_secondary)); + mBinding.messageOriginalTitle.setTextColor(ContextCompat.getColor(mBinding.getRoot().getContext(), R.color.text_tertiary)); setClickData(messageEntity); if (messageEntity.getUserEntity().getAuth() != null) { @@ -388,12 +388,12 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder Pattern p = Pattern.compile(LABEL_REGEX); Matcher m = p.matcher(comment); if (m.find()) { - SpannableStringBuilder contents = TextHelper.getCommentLabelSpannableStringBuilder(comment, R.color.text_subtitleDesc); + SpannableStringBuilder contents = TextHelper.getCommentLabelSpannableStringBuilder(comment, R.color.text_tertiary); ExtensionsKt.setTextWithHighlightedTextWrappedInsideWrapper( mBinding.messageOriginalTitle, contents, Constants.DEFAULT_TEXT_WRAPPER, - R.color.text_subtitleDesc, + R.color.text_tertiary, false, null ); @@ -402,7 +402,7 @@ public class MessageItemViewHolder extends BaseRecyclerViewHolder mBinding.messageOriginalTitle, comment, Constants.DEFAULT_TEXT_WRAPPER, - R.color.text_subtitleDesc, + R.color.text_tertiary, false, null ); diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageListActivity.kt b/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageListActivity.kt index 4f272d6a4a..1e52ebc29d 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageListActivity.kt +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageListActivity.kt @@ -15,12 +15,12 @@ class MessageListActivity : ToolBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } override fun onDarkModeChanged() { super.onDarkModeChanged() - updateStatusBarColor(R.color.background_white, R.color.background_white) + updateStatusBarColor(R.color.ui_surface, R.color.ui_surface) } companion object { diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageListAdapter.kt b/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageListAdapter.kt index 2713a75710..f78da48f07 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageListAdapter.kt +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/message/MessageListAdapter.kt @@ -105,12 +105,12 @@ class MessageListAdapter( if (holder is KeFuViewHolder) { holder.binding.run { messageKaifuItem.background = R.drawable.reuse_listview_item_style.toDrawable(mContext) - messageKefuSuggestion.setBackgroundColor(R.color.background.toColor(mContext)) + messageKefuSuggestion.setBackgroundColor(R.color.ui_background.toColor(mContext)) messageKefuSuggestion.setTextColor(R.color.title.toColor(mContext)) messageKefuName.setTextColor(R.color.text_black.toColor(mContext)) messageKefuContent.setTextColor(R.color.title.toColor(mContext)) messageKefuTime.setTextColor(R.color.hint.toColor(mContext)) - copyTv.setTextColor(R.color.text_subtitle.toColor(mContext)) + copyTv.setTextColor(R.color.text_secondary.toColor(mContext)) } if (it.privateMessage != null) { initKeFuViewHolder(holder, it.privateMessage!!) @@ -398,7 +398,7 @@ class MessageListAdapter( private fun getLinkChildView(viewHolder: KeFuViewHolder, text: String): TextView { val textView = TextView(mContext) - textView.setTextColor(R.color.theme_font.toColor(mContext)) + textView.setTextColor(R.color.text_theme.toColor(mContext)) textView.textSize = 12F textView.text = text val params = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/message/SortedMessageListAdapter.kt b/module_message/src/main/java/com/gh/gamecenter/message/view/message/SortedMessageListAdapter.kt index 201314298c..b535f55f86 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/message/SortedMessageListAdapter.kt +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/message/SortedMessageListAdapter.kt @@ -65,9 +65,9 @@ class SortedMessageListAdapter( if (entity.setting.top) R.drawable.sorted_message_top_item_style.toDrawable(mContext) else R.drawable.reuse_listview_item_style.toDrawable( mContext ) - divider.setBackgroundColor(R.color.divider.toColor(mContext)) - titleTv.setTextColor(R.color.text_title.toColor(mContext)) - contentTv.setTextColor(R.color.text_subtitleDesc.toColor(mContext)) + divider.setBackgroundColor(R.color.ui_divider.toColor(mContext)) + titleTv.setTextColor(R.color.text_primary.toColor(mContext)) + contentTv.setTextColor(R.color.text_tertiary.toColor(mContext)) timeTv.setTextColor(R.color.text_neutral.toColor(mContext)) hintTv.background = R.drawable.message_unread_hint.toDrawable(mContext) ovalHint.background = R.drawable.oval_message_hint_bg.toDrawable(mContext) diff --git a/module_message/src/main/java/com/gh/gamecenter/message/view/message/SortedMessageListFragment.kt b/module_message/src/main/java/com/gh/gamecenter/message/view/message/SortedMessageListFragment.kt index 5eaad5b128..bfbec4aa0c 100644 --- a/module_message/src/main/java/com/gh/gamecenter/message/view/message/SortedMessageListFragment.kt +++ b/module_message/src/main/java/com/gh/gamecenter/message/view/message/SortedMessageListFragment.kt @@ -36,7 +36,7 @@ class SortedMessageListFragment : ListFragment diff --git a/module_message/src/main/res/drawable/shape_message_unread_hint.xml b/module_message/src/main/res/drawable/shape_message_unread_hint.xml index 0b59aa8717..05ecc20cdd 100644 --- a/module_message/src/main/res/drawable/shape_message_unread_hint.xml +++ b/module_message/src/main/res/drawable/shape_message_unread_hint.xml @@ -2,7 +2,7 @@ - + - + \ No newline at end of file diff --git a/module_message/src/main/res/layout/activity_message_wrapper.xml b/module_message/src/main/res/layout/activity_message_wrapper.xml index f15f9ef993..552a06709e 100644 --- a/module_message/src/main/res/layout/activity_message_wrapper.xml +++ b/module_message/src/main/res/layout/activity_message_wrapper.xml @@ -25,7 +25,7 @@ android:layout_width="0dp" android:layout_height="@dimen/default_tab_indicator_height" android:layout_marginBottom="5dp" - app:indicatorColor="@color/theme" + app:indicatorColor="@color/primary_theme" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/module_message/src/main/res/layout/dialog_ask_follow_more.xml b/module_message/src/main/res/layout/dialog_ask_follow_more.xml index 4874b4a8a0..707a7e6633 100644 --- a/module_message/src/main/res/layout/dialog_ask_follow_more.xml +++ b/module_message/src/main/res/layout/dialog_ask_follow_more.xml @@ -10,7 +10,7 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_marginBottom="20dp" - android:background="@color/background_white" + android:background="@color/ui_surface" android:gravity="center" android:orientation="vertical" android:paddingBottom="10dp"> @@ -22,7 +22,7 @@ android:gravity="center_vertical" android:paddingLeft="20dp" android:paddingRight="20dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="15sp" tools:text="已赞同回答" /> @@ -31,7 +31,7 @@ android:layout_height="1dp" android:layout_marginLeft="20dp" android:layout_marginRight="20dp" - android:background="@color/background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> + android:background="@color/ui_divider" /> + android:textColor="@color/text_secondary" /> \ No newline at end of file diff --git a/module_message/src/main/res/layout/fragment_info_concern.xml b/module_message/src/main/res/layout/fragment_info_concern.xml index e15c2e08d5..0993d29b9c 100644 --- a/module_message/src/main/res/layout/fragment_info_concern.xml +++ b/module_message/src/main/res/layout/fragment_info_concern.xml @@ -3,14 +3,14 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_white" + android:background="@color/ui_surface" android:orientation="vertical"> + android:background="@color/ui_divider" /> diff --git a/module_message/src/main/res/layout/item_sorted_message.xml b/module_message/src/main/res/layout/item_sorted_message.xml index 2112bf84a0..e4d73478c0 100644 --- a/module_message/src/main/res/layout/item_sorted_message.xml +++ b/module_message/src/main/res/layout/item_sorted_message.xml @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/secondary_title_text_size" tools:text="系统通知" /> @@ -60,7 +60,7 @@ android:paddingStart="2dp" android:paddingEnd="2dp" android:singleLine="true" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="@dimen/tag_text_size" android:visibility="gone" tools:text="副标题副标题副标题副标题副标题副标题副标题副标题副标题" @@ -91,7 +91,7 @@ android:layout_marginEnd="16dp" android:layout_marginRight="16dp" android:singleLine="true" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" app:layout_constraintBottom_toBottomOf="@+id/iconCv" app:layout_constraintEnd_toStartOf="@+id/hintTv" @@ -136,7 +136,7 @@ android:layout_height="0.5dp" android:layout_marginStart="76dp" android:layout_marginLeft="76dp" - android:background="@color/divider" + android:background="@color/ui_divider" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/module_message/src/main/res/layout/message_item.xml b/module_message/src/main/res/layout/message_item.xml index 732d25964b..ab36d4549e 100644 --- a/module_message/src/main/res/layout/message_item.xml +++ b/module_message/src/main/res/layout/message_item.xml @@ -40,7 +40,7 @@ android:layout_marginLeft="3dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintHorizontal_chainStyle="packed" app:layout_constrainedWidth="true" @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:includeFontPadding="false" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" android:visibility="visible" app:layout_constraintLeft_toRightOf="@id/message_user_name" @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:includeFontPadding="false" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintLeft_toRightOf="@id/message_user_more" app:layout_constraintTop_toTopOf="@id/message_user_name" @@ -83,7 +83,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:includeFontPadding="false" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="10sp" app:layout_constraintLeft_toLeftOf="@id/message_user_name" app:layout_constraintTop_toBottomOf="@id/message_user_name" @@ -96,7 +96,7 @@ android:layout_marginTop="10dp" android:maxLines="3" android:ellipsize="end" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="14sp" app:layout_constraintLeft_toLeftOf="@id/message_user_name" app:layout_constraintRight_toRightOf="parent" @@ -133,7 +133,7 @@ android:layout_marginRight="12dp" android:ellipsize="end" android:maxLines="2" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="12sp" tools:text="我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容我是内容" app:layout_constrainedWidth="true" diff --git a/module_message/src/main/res/layout/message_item_top.xml b/module_message/src/main/res/layout/message_item_top.xml index ac576968a0..58b13148e2 100644 --- a/module_message/src/main/res/layout/message_item_top.xml +++ b/module_message/src/main/res/layout/message_item_top.xml @@ -61,7 +61,7 @@ android:layout_marginBottom="16dp" android:includeFontPadding="false" android:text="赞同" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -126,7 +126,7 @@ android:layout_marginBottom="16dp" android:includeFontPadding="false" android:text="邀请" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -191,7 +191,7 @@ android:layout_marginBottom="16dp" android:includeFontPadding="false" android:text="系统" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" diff --git a/module_message/src/main/res/layout/message_kefu_item.xml b/module_message/src/main/res/layout/message_kefu_item.xml index 30d42c68fa..c7f670d638 100644 --- a/module_message/src/main/res/layout/message_kefu_item.xml +++ b/module_message/src/main/res/layout/message_kefu_item.xml @@ -110,7 +110,7 @@ android:layout_marginLeft="20dp" android:layout_marginTop="8dp" android:layout_marginRight="20dp" - android:background="@color/background" + android:background="@color/ui_background" android:padding="11dp" android:textColor="@color/title" android:textSize="12sp" @@ -152,7 +152,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:text="@string/copy_id" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:textSize="10sp" /> diff --git a/module_message/src/main/res/layout/message_tab_item.xml b/module_message/src/main/res/layout/message_tab_item.xml index f1a056d75a..968d148f24 100644 --- a/module_message/src/main/res/layout/message_tab_item.xml +++ b/module_message/src/main/res/layout/message_tab_item.xml @@ -16,7 +16,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" tools:text="动态" - tools:textColor="@color/text_subtitle" /> + tools:textColor="@color/text_secondary" /> - + \ No newline at end of file diff --git a/module_setting/src/main/res/drawable/button_border_blue_oval.xml b/module_setting/src/main/res/drawable/button_border_blue_oval.xml index 36a9716d72..1c997834fb 100644 --- a/module_setting/src/main/res/drawable/button_border_blue_oval.xml +++ b/module_setting/src/main/res/drawable/button_border_blue_oval.xml @@ -4,7 +4,7 @@ + android:color = "@color/text_theme" /> diff --git a/module_setting/src/main/res/layout/activity_network_diagnosis.xml b/module_setting/src/main/res/layout/activity_network_diagnosis.xml index c6cfb6e3b6..e48c1b504b 100644 --- a/module_setting/src/main/res/layout/activity_network_diagnosis.xml +++ b/module_setting/src/main/res/layout/activity_network_diagnosis.xml @@ -51,7 +51,7 @@ android:paddingEnd="12dp" android:layout_marginBottom="14dp" android:text="@string/post_suggest" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/module_setting/src/main/res/layout/dialog_conflict_guide.xml b/module_setting/src/main/res/layout/dialog_conflict_guide.xml index 011a57e01a..403cc7bde8 100644 --- a/module_setting/src/main/res/layout/dialog_conflict_guide.xml +++ b/module_setting/src/main/res/layout/dialog_conflict_guide.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:lineSpacingExtra="6dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" android:text="@string/bind_phone_conflict_guide_content1" /> @@ -26,7 +26,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:lineSpacingExtra="6dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" android:text="@string/bind_phone_conflict_guide_content2" /> @@ -35,7 +35,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:lineSpacingExtra="6dp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="12sp" android:text="@string/bind_phone_conflict_guide_content3" /> diff --git a/module_setting/src/main/res/layout/fragment_bind_phone.xml b/module_setting/src/main/res/layout/fragment_bind_phone.xml index 543005fefd..4da3b62a90 100644 --- a/module_setting/src/main/res/layout/fragment_bind_phone.xml +++ b/module_setting/src/main/res/layout/fragment_bind_phone.xml @@ -6,7 +6,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:orientation="vertical" - android:background="@color/background_white"> + android:background="@color/ui_surface"> @@ -42,7 +42,7 @@ android:layout_marginTop="16dp" android:lineSpacingExtra="8dp" android:textSize="14sp" - android:textColor="@color/text_subtitle" + android:textColor="@color/text_secondary" android:text="@string/bind_phone_desc" /> @@ -74,8 +74,8 @@ android:paddingTop="10dp" android:paddingBottom="10dp" android:paddingRight="16dp" - android:textColor="@color/text_title" - android:textColorHint="@color/text_body" + android:textColor="@color/text_primary" + android:textColorHint="@color/text_instance" android:textCursorDrawable="@drawable/cursor_color" android:textSize="16sp" /> @@ -83,7 +83,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/background" /> + android:background="@color/ui_background" /> @@ -130,14 +130,14 @@ android:layout_centerVertical="true" android:gravity="center" android:text="@string/login_get_captcha" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="14sp" /> + android:background="@color/ui_background" /> @@ -177,7 +177,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_alignParentBottom="true" - android:background="@color/background" /> + android:background="@color/ui_background" /> + android:background="@color/ui_surface"> + android:textColor="@color/text_secondary" /> @@ -50,7 +50,7 @@ android:includeFontPadding="false" android:textStyle="bold" android:textSize="14sp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:text="@string/bind_phone_conflict_item_current_text" /> + android:textColor="@color/text_primary" /> + android:textColor="@color/text_tertiary" /> @@ -105,7 +105,7 @@ @@ -116,7 +116,7 @@ android:includeFontPadding="false" android:textStyle="bold" android:textSize="14sp" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:text="@string/bind_phone_conflict_item_conflict_text" /> + android:textColor="@color/text_primary" /> + android:textColor="@color/text_tertiary" /> @@ -169,7 +169,7 @@ android:drawablePadding="2dp" android:lineSpacingExtra="8dp" android:textSize="12sp" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:text="@string/bind_phone_conflict_guide" /> \ No newline at end of file diff --git a/module_setting/src/main/res/layout/fragment_security.xml b/module_setting/src/main/res/layout/fragment_security.xml index e1cd6fb491..57c3aec577 100644 --- a/module_setting/src/main/res/layout/fragment_security.xml +++ b/module_setting/src/main/res/layout/fragment_security.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/module_setting/src/main/res/layout/fragment_setting.xml b/module_setting/src/main/res/layout/fragment_setting.xml index ef01702438..e7c0e40f94 100644 --- a/module_setting/src/main/res/layout/fragment_setting.xml +++ b/module_setting/src/main/res/layout/fragment_setting.xml @@ -147,7 +147,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:text="退出登录" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="15sp" /> diff --git a/module_setting/src/main/res/layout/layout_setting_item.xml b/module_setting/src/main/res/layout/layout_setting_item.xml index 412f09d313..d62b27780f 100644 --- a/module_setting/src/main/res/layout/layout_setting_item.xml +++ b/module_setting/src/main/res/layout/layout_setting_item.xml @@ -29,7 +29,7 @@ android:id="@+id/titleTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/text_title" + android:textColor="@color/text_primary" android:textSize="@dimen/primary_text_size" android:includeFontPadding="false" app:layout_constraintStart_toStartOf="parent" @@ -56,7 +56,7 @@ android:layout_marginTop="8dp" android:includeFontPadding="false" android:lineHeight="16dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" android:visibility="gone" tools:text="@string/setting_personal_recommend_hint" /> @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:drawablePadding="4dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/primary_text_size" android:visibility="gone" app:drawableEndCompat="@drawable/icon_more" @@ -103,7 +103,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/setting_cache_size_def" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/primary_text_size" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/module_setting/src/main/res/layout/layout_setting_title_item.xml b/module_setting/src/main/res/layout/layout_setting_title_item.xml index 3884a1d8f3..606fce64d3 100644 --- a/module_setting/src/main/res/layout/layout_setting_title_item.xml +++ b/module_setting/src/main/res/layout/layout_setting_title_item.xml @@ -7,6 +7,6 @@ android:gravity="center_vertical" android:paddingStart="20dp" android:paddingLeft="20dp" - android:textColor="@color/text_subtitleDesc" + android:textColor="@color/text_tertiary" android:textSize="@dimen/secondary_size" tools:text="内容视频" /> \ No newline at end of file diff --git a/module_setting/src/main/res/layout/piece_setting_divider.xml b/module_setting/src/main/res/layout/piece_setting_divider.xml index 45ce215a32..b86521dd58 100644 --- a/module_setting/src/main/res/layout/piece_setting_divider.xml +++ b/module_setting/src/main/res/layout/piece_setting_divider.xml @@ -5,11 +5,11 @@ android:layout_height="1px" android:paddingLeft="20dp" android:paddingRight="20dp" - android:background="@color/background_white"> + android:background="@color/ui_surface"> + android:background="@color/ui_divider" /> \ No newline at end of file diff --git a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeBindPhoneActivity.kt b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeBindPhoneActivity.kt index a90dfe7e7a..6891927619 100644 --- a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeBindPhoneActivity.kt +++ b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeBindPhoneActivity.kt @@ -48,7 +48,6 @@ import androidx.compose.ui.viewinterop.AndroidView import androidx.compose.ui.window.Popup import androidx.constraintlayout.compose.ConstraintLayout import androidx.constraintlayout.compose.Dimension -import com.alibaba.android.arouter.facade.annotation.Route import com.alibaba.android.arouter.launcher.ARouter import com.facebook.drawee.drawable.ScalingUtils import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder @@ -760,7 +759,7 @@ class ComposeBindPhoneActivity : ComposeBaseActivity() { .setPlaceholderImage(R.drawable.occupy) .setPlaceholderImageScaleType(ScalingUtils.ScaleType.FIT_XY) .setRoundingParams(RoundingParams.asCircle().apply { - borderColor = R.color.divider.toColor(it) + borderColor = R.color.ui_divider.toColor(it) borderWidth = 1F.dip2px().toFloat() }) .build() diff --git a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeSettingActivity.kt b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeSettingActivity.kt index 60f63c39cb..833b0a1e9c 100644 --- a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeSettingActivity.kt +++ b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeSettingActivity.kt @@ -323,7 +323,7 @@ class ComposeSettingActivity : ComposeBaseActivity() { centerContent = true ), uiModificationCallback = { - it.confirmTv.setTextColor(R.color.theme_red.toColor(this@ComposeSettingActivity)) + it.confirmTv.setTextColor(R.color.secondary_red.toColor(this@ComposeSettingActivity)) } ) } @@ -433,7 +433,7 @@ class ComposeSettingActivity : ComposeBaseActivity() { channelContainer.addView( TextView(this).apply { text = title - setTextColor(ContextCompat.getColor(context, R.color.theme_font)) + setTextColor(ContextCompat.getColor(context, R.color.text_theme)) setOnClickListener { editText.setText(title, TextView.BufferType.EDITABLE) } diff --git a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/NetworkDiagnosisActivity.kt b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/NetworkDiagnosisActivity.kt index 0e88ffc1e3..a58fbdf9cb 100644 --- a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/NetworkDiagnosisActivity.kt +++ b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/NetworkDiagnosisActivity.kt @@ -252,7 +252,7 @@ class NetworkDiagnosisActivity : ToolBarActivity() { builder.setSpan(object : ClickableSpan() { override fun updateDrawState(ds: TextPaint) { super.updateDrawState(ds) - ds.color = resources.getColor(R.color.theme_font) + ds.color = resources.getColor(R.color.text_theme) ds.isUnderlineText = false } diff --git a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/base/ComposeBaseActivity.kt b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/base/ComposeBaseActivity.kt index 7f1a17d2b6..fab161a7a5 100644 --- a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/base/ComposeBaseActivity.kt +++ b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/base/ComposeBaseActivity.kt @@ -46,7 +46,7 @@ abstract class ComposeBaseActivity : AppCompatActivity() { mOldUiMode = newConfig.uiMode mIsDarkModeOn = DarkModeUtils.isDarkModeOn(this) WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = !mIsDarkModeOn - window.statusBarColor = R.color.background_white.toColor(this) + window.statusBarColor = R.color.ui_surface.toColor(this) } } } \ No newline at end of file diff --git a/module_setting_compose/src/main/res/drawable/button_border_blue_oval.xml b/module_setting_compose/src/main/res/drawable/button_border_blue_oval.xml index 4ad33379fb..e1046c989a 100644 --- a/module_setting_compose/src/main/res/drawable/button_border_blue_oval.xml +++ b/module_setting_compose/src/main/res/drawable/button_border_blue_oval.xml @@ -4,7 +4,7 @@ + android:color="@color/text_theme" /> diff --git a/module_setting_compose/src/main/res/drawable/ic_bar_back.xml b/module_setting_compose/src/main/res/drawable/ic_bar_back.xml index 27c2101c3b..2b0df4074b 100644 --- a/module_setting_compose/src/main/res/drawable/ic_bar_back.xml +++ b/module_setting_compose/src/main/res/drawable/ic_bar_back.xml @@ -8,6 +8,6 @@ android:strokeLineJoin="round" android:strokeWidth="2" android:fillColor="#00000000" - android:strokeColor="#333333" + android:strokeColor="@color/text_primary" android:strokeLineCap="round" /> diff --git a/module_setting_compose/src/main/res/layout/activity_network_diagnosis.xml b/module_setting_compose/src/main/res/layout/activity_network_diagnosis.xml index c6cfb6e3b6..e48c1b504b 100644 --- a/module_setting_compose/src/main/res/layout/activity_network_diagnosis.xml +++ b/module_setting_compose/src/main/res/layout/activity_network_diagnosis.xml @@ -51,7 +51,7 @@ android:paddingEnd="12dp" android:layout_marginBottom="14dp" android:text="@string/post_suggest" - android:textColor="@color/theme_font" + android:textColor="@color/text_theme" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/module_setting_compose/src/main/res/values-night/themes.xml b/module_setting_compose/src/main/res/values-night/themes.xml index 3b47e38f50..bbdcea76e4 100644 --- a/module_setting_compose/src/main/res/values-night/themes.xml +++ b/module_setting_compose/src/main/res/values-night/themes.xml @@ -2,6 +2,6 @@ \ No newline at end of file diff --git a/module_setting_compose/src/main/res/values/themes.xml b/module_setting_compose/src/main/res/values/themes.xml index 3b47e38f50..bbdcea76e4 100644 --- a/module_setting_compose/src/main/res/values/themes.xml +++ b/module_setting_compose/src/main/res/values/themes.xml @@ -2,6 +2,6 @@ \ No newline at end of file