From 047dc9a7aea5cc95cbfd459a9be6f454821df827 Mon Sep 17 00:00:00 2001 From: leafwai Date: Thu, 3 Mar 2022 11:46:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=A0=94=E6=97=A5/=E5=A4=9C=E9=97=B4?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8D=A2=E7=9A=84=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=20https://git.shanqu.cc/halo/android/assistant-android/-/issue?= =?UTF-8?q?s/60?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/base/BaseActivity.java | 80 ++- .../com/gh/common/constant/Constants.java | 5 + .../java/com/gh/common/util/DisplayUtils.java | 2 +- .../java/com/gh/common/util/Extensions.kt | 14 + .../java/com/gh/common/util/NightModeUtils.kt | 52 ++ .../gh/common/view/GameTagFlexLinearLayout.kt | 3 +- .../java/com/gh/gamecenter/MainActivity.java | 2 +- .../adapter/viewholder/GameHeadViewHolder.kt | 3 + .../fragment/HomeSearchToolWrapperFragment.kt | 53 +- .../fragment/MainWrapperFragment.java | 14 +- .../fragment/SearchToolbarFragment.java | 4 +- .../CommonCollectionAdapter.kt | 9 +- .../game/gallery/GameGalleryViewHolder.kt | 3 + .../horizontal/GameHorizontalSlideAdapter.kt | 10 +- .../GameHorizontalSlideListViewHolder.kt | 2 + .../game/imageslide/ImageSlideAdapter.kt | 3 + .../game/rank/RankCollectionAdapter.kt | 13 +- .../com/gh/gamecenter/home/HomeFragment.kt | 15 + .../gh/gamecenter/home/HomeFragmentAdapter.kt | 2 +- .../gamecenter/home/HomeGameItemViewHolder.kt | 4 + .../home/HomeRecommendItemViewHolder.kt | 6 + .../LegacyHomeFragmentAdapterAssistant.kt | 6 +- .../gamecenter/home/amway/HomeAmwayAdapter.kt | 2 + .../home/amway/HomeAmwayItemViewHolder.kt | 20 +- .../home/slide/HomeSlideListViewHolder.kt | 14 +- .../main/java/com/halo/assistant/HaloApp.java | 2 + .../reuse_listview_item_style.xml | 8 + .../drawable/reuse_listview_item_style.xml | 2 +- .../res/layout/activity_background_clip.xml | 4 +- .../activity_community_article_edit.xml | 2 +- .../layout/activity_game_collection_edit.xml | 2 +- .../res/layout/activity_help_and_feedback.xml | 2 +- .../main/res/layout/activity_kaifu_add.xml | 4 +- .../main/res/layout/activity_kaifu_patch.xml | 22 +- .../main/res/layout/activity_news_detail.xml | 2 +- .../main/res/layout/activity_poster_clip.xml | 2 +- .../main/res/layout/activity_rating_edit.xml | 2 +- .../activity_tablayout_no_title_viewpager.xml | 2 +- .../main/res/layout/activity_video_game.xml | 8 +- .../main/res/layout/activity_video_uplaod.xml | 6 +- .../res/layout/app_update_hint_dialog.xml | 4 +- .../main/res/layout/app_updating_dialog.xml | 2 +- app/src/main/res/layout/ask_answer_item.xml | 2 +- .../main/res/layout/ask_recommend_change.xml | 2 +- .../layout/ask_recommends_item_concern.xml | 2 +- .../res/layout/ask_recommends_subject.xml | 4 +- app/src/main/res/layout/ask_search_item.xml | 2 +- .../res/layout/ask_search_question_item.xml | 2 +- .../main/res/layout/banner_viewpager_item.xml | 2 +- .../main/res/layout/catalog_header_item.xml | 2 +- .../main/res/layout/catalog_image_item.xml | 2 +- app/src/main/res/layout/comment_item.xml | 2 +- app/src/main/res/layout/commodity_item.xml | 2 +- .../common_collection_detail_one_item.xml | 3 +- .../common_collection_detail_two_item.xml | 3 +- .../common_collection_image_text_item.xml | 1 - .../res/layout/common_collection_item.xml | 4 +- .../layout/community_select_opened_item.xml | 2 +- app/src/main/res/layout/daily_task_item.xml | 2 +- .../res/layout/dialog_apply_moderator.xml | 2 +- .../res/layout/dialog_cancel_reservation.xml | 2 +- .../main/res/layout/dialog_choose_forum.xml | 2 +- app/src/main/res/layout/dialog_community.xml | 2 +- .../main/res/layout/dialog_download_link.xml | 2 +- .../res/layout/dialog_download_traffic.xml | 2 +- .../main/res/layout/dialog_game_collect.xml | 2 +- .../layout/dialog_game_resource_policy.xml | 2 +- app/src/main/res/layout/dialog_input_url.xml | 2 +- .../res/layout/dialog_install_permission.xml | 2 +- .../main/res/layout/dialog_installed_game.xml | 2 +- .../res/layout/dialog_notification_hint.xml | 2 +- .../main/res/layout/dialog_privacy_policy.xml | 2 +- .../main/res/layout/dialog_receive_badge.xml | 2 +- .../main/res/layout/dialog_report_reason.xml | 2 +- .../res/layout/dialog_shortcut_permission.xml | 2 +- .../main/res/layout/dialog_sign_success.xml | 2 +- .../res/layout/dialog_upload_schedule.xml | 2 +- .../main/res/layout/dialog_version_number.xml | 2 +- .../res/layout/dialog_video_upload_draft.xml | 2 +- app/src/main/res/layout/dialog_view_badge.xml | 2 +- .../layout/dialog_wechat_reserve_success.xml | 2 +- .../layout/download_dialog_installed_item.xml | 6 +- .../main/res/layout/download_dialog_item.xml | 6 +- .../res/layout/download_simulator_dialog.xml | 2 +- .../res/layout/followers_or_fans_item.xml | 2 +- .../res/layout/forum_search_content_list.xml | 2 +- app/src/main/res/layout/fragment_about.xml | 2 +- app/src/main/res/layout/fragment_amway.xml | 6 +- app/src/main/res/layout/fragment_amway_al.xml | 4 +- .../res/layout/fragment_amway_success.xml | 2 +- .../res/layout/fragment_answer_comment.xml | 2 +- .../res/layout/fragment_answer_detail.xml | 2 +- .../fragment_answer_detail_skeleton.xml | 4 +- .../main/res/layout/fragment_answer_edit.xml | 6 +- app/src/main/res/layout/fragment_ask_all.xml | 2 +- .../main/res/layout/fragment_ask_column.xml | 2 +- .../res/layout/fragment_avatar_border.xml | 4 +- .../layout/fragment_background_preview.xml | 2 +- .../main/res/layout/fragment_bind_phone.xml | 2 +- .../layout/fragment_bind_phone_conflict.xml | 2 +- app/src/main/res/layout/fragment_category.xml | 2 +- .../res/layout/fragment_category_list.xml | 2 +- .../main/res/layout/fragment_comment_dark.xml | 2 +- .../main/res/layout/fragment_community.xml | 6 +- app/src/main/res/layout/fragment_concern.xml | 4 +- .../res/layout/fragment_energy_center.xml | 2 +- .../main/res/layout/fragment_energy_house.xml | 6 +- .../res/layout/fragment_followed_game.xml | 4 +- .../main/res/layout/fragment_forum_detail.xml | 12 +- .../main/res/layout/fragment_forum_home.xml | 6 +- .../layout/fragment_forum_video_detail.xml | 2 +- .../fragment_game_collection_detail.xml | 2 +- .../fragment_game_collection_poster.xml | 10 +- .../fragment_game_collection_square.xml | 2 +- .../main/res/layout/fragment_game_upload.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 46 +- .../main/res/layout/fragment_home_video.xml | 2 +- .../res/layout/fragment_kaifu_content.xml | 2 +- .../res/layout/fragment_libao_wrapper.xml | 2 +- ...fragment_list_base_skeleton_no_loading.xml | 2 +- .../main/res/layout/fragment_local_media.xml | 2 +- app/src/main/res/layout/fragment_login.xml | 2 +- app/src/main/res/layout/fragment_main.xml | 2 +- .../main/res/layout/fragment_main_home.xml | 2 +- .../fragment_my_game_collection_list.xml | 2 +- .../main/res/layout/fragment_new_personal.xml | 10 +- ...ragment_no_padding_tablayout_viewpager.xml | 2 +- app/src/main/res/layout/fragment_personal.xml | 10 +- .../res/layout/fragment_preview_video.xml | 6 +- .../main/res/layout/fragment_real_name.xml | 2 +- .../res/layout/fragment_search_default.xml | 4 +- .../main/res/layout/fragment_search_game.xml | 2 +- .../res/layout/fragment_simulator_game.xml | 2 +- .../main/res/layout/fragment_subject_rows.xml | 2 +- .../main/res/layout/fragment_subject_tab.xml | 2 +- .../res/layout/fragment_subject_tiled.xml | 2 +- .../res/layout/fragment_suggest_select.xml | 2 +- .../layout/fragment_tablayout_viewpager.xml | 2 +- .../res/layout/fragment_userinfo_edit.xml | 6 +- .../fragment_video_detail_container.xml | 4 +- .../res/layout/fragment_video_publish.xml | 4 +- .../main/res/layout/gallery_video_item.xml | 4 +- .../game_collection_detail_image_item.xml | 2 +- .../main/res/layout/game_collection_item.xml | 10 +- .../game_collection_square_amway_item.xml | 2 +- .../layout/game_collection_square_item.xml | 8 +- .../layout/game_column_collection_list.xml | 1 - .../main/res/layout/game_comment_log_item.xml | 2 +- app/src/main/res/layout/game_gallery_item.xml | 3 +- .../res/layout/game_gallery_slide_item.xml | 1 - app/src/main/res/layout/game_head_item.xml | 1 - .../main/res/layout/game_horizontal_list.xml | 1 - app/src/main/res/layout/game_image_item.xml | 5 +- .../main/res/layout/game_image_slide_item.xml | 7 +- app/src/main/res/layout/game_plugin_item.xml | 1 - app/src/main/res/layout/game_test_item.xml | 2 +- .../res/layout/game_vertical_slide_item.xml | 1 - .../main/res/layout/game_viewpager_item.xml | 1 - app/src/main/res/layout/gamedetail_body.xml | 6 +- .../res/layout/gamedetail_item_answer.xml | 2 +- .../layout/gamedetail_item_custom_column.xml | 2 +- app/src/main/res/layout/home_amway_item.xml | 1 - app/src/main/res/layout/home_amway_list.xml | 1 - app/src/main/res/layout/home_divider_item.xml | 4 +- .../layout/home_game_collection_card_item.xml | 8 +- app/src/main/res/layout/home_game_item.xml | 3 +- .../main/res/layout/home_recommend_item.xml | 1 - app/src/main/res/layout/home_slide_list.xml | 1 - .../main/res/layout/home_slide_list_item.xml | 6 +- app/src/main/res/layout/home_unknown_item.xml | 2 +- .../main/res/layout/imprint_content_item.xml | 6 +- .../layout/item_article_detail_comment.xml | 2 +- .../layout/item_article_detail_content.xml | 2 +- .../main/res/layout/item_blank_divider.xml | 2 +- .../main/res/layout/item_community_image.xml | 2 +- app/src/main/res/layout/item_forum_video.xml | 2 +- .../layout/item_game_collection_flex_tag.xml | 2 +- .../item_game_collection_selected_tag.xml | 2 +- .../main/res/layout/item_game_detail_news.xml | 2 +- app/src/main/res/layout/item_game_libao.xml | 2 +- .../res/layout/item_my_game_collection.xml | 10 +- .../res/layout/item_video_data_overview.xml | 2 +- .../res/layout/layout_article_item_video.xml | 2 +- .../res/layout/layout_chart_markerview.xml | 2 +- ..._forum_video_detail_videoview_portrait.xml | 4 +- ...yout_full_screen_detail_video_portrait.xml | 4 +- ...yout_game_collection_crop_image_assist.xml | 4 +- .../res/layout/layout_game_collection_tag.xml | 2 +- .../layout_game_detail_video_portrait.xml | 4 +- .../res/layout/layout_menu_answer_post.xml | 2 +- .../layout_menu_game_collection_post.xml | 2 +- .../res/layout/layout_menu_question_post.xml | 2 +- .../res/layout/layout_popup_container.xml | 2 +- app/src/main/res/layout/layout_task_back.xml | 2 +- .../layout/layout_video_detail_surface.xml | 20 +- .../res/layout/libaodetail_item_content.xml | 6 +- .../main/res/layout/libaodetail_item_top.xml | 2 +- app/src/main/res/layout/local_video_item.xml | 4 +- app/src/main/res/layout/novice_task_item.xml | 2 +- .../res/layout/photo_poster_albums_item.xml | 4 +- .../layout/piece_article_video_control.xml | 2 +- .../piece_comment_typing_container_dark.xml | 2 +- .../res/layout/piece_question_content.xml | 2 +- .../main/res/layout/pop_reserver_guide.xml | 2 +- .../main/res/layout/popup_server_category.xml | 2 +- .../main/res/layout/popup_simulator_guide.xml | 2 +- .../question_edit_title_search_item.xml | 2 +- .../main/res/layout/questions_edit_tag.xml | 2 +- .../res/layout/questions_history_detail.xml | 6 +- .../main/res/layout/questionsdetail_item.xml | 4 +- .../main/res/layout/questionsinvite_item.xml | 4 +- .../main/res/layout/rank_collection_item.xml | 1 + .../main/res/layout/rating_comment_item.xml | 4 +- app/src/main/res/layout/rating_reply_item.xml | 2 +- .../main/res/layout/stairs_comment_item.xml | 4 +- app/src/main/res/layout/toolbar_search.xml | 2 +- app/src/main/res/values-night/colors.xml | 305 +++++++++++ app/src/main/res/values-night/styles.xml | 500 ++++++++++++++++++ app/src/main/res/values/colors.xml | 2 + libraries/LGLibrary | 2 +- 220 files changed, 1407 insertions(+), 390 deletions(-) create mode 100644 app/src/main/java/com/gh/common/util/NightModeUtils.kt create mode 100644 app/src/main/res/drawable-night/reuse_listview_item_style.xml create mode 100644 app/src/main/res/values-night/colors.xml create mode 100644 app/src/main/res/values-night/styles.xml diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 43c1f39021..eca636dd62 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -1,5 +1,7 @@ package com.gh.base; +import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE; + import android.content.Intent; import android.content.res.Configuration; import android.content.res.Resources; @@ -33,10 +35,11 @@ import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.EnvHelper; -import com.gh.common.util.PackageFlavorHelper; import com.gh.common.util.ExtensionsKt; import com.gh.common.util.MtaHelper; import com.gh.common.util.NetworkUtils; +import com.gh.common.util.NightModeUtils; +import com.gh.common.util.PackageFlavorHelper; import com.gh.common.util.PackageInstaller; import com.gh.common.util.QuickLoginHelper; import com.gh.common.util.RunningUtils; @@ -66,8 +69,6 @@ import java.util.List; import kotlin.Pair; import pub.devrel.easypermissions.EasyPermissions; -import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE; - /** * 只提供基础的服务(EventBus/ButterKnife/Share/GlobalDialog/Permissions) *

@@ -82,6 +83,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy public final static String PLUGGABLE = "plugin"; public final static String SIGNATURE_CONFLICT = "signature_conflict"; public final static int ID_ROOT_INDICATOR = 999; + public final static int ID_NIGHT_INDICATOR = 998; public final int MAX_BUNDLE_SIZE = 300; @NonNull @@ -255,6 +257,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy screenRootView.addView(view); screenRootView.addView(ll); + screenRootView.addView(getNightModeIndicatorView()); RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) ll.getLayoutParams(); lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); @@ -262,6 +265,67 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy return screenRootView; } + private View getNightModeIndicatorView() { + LinearLayout ll = new LinearLayout(this); + TextView tv = new TextView(this); + String envText = NightModeUtils.INSTANCE.isNightMode(this) ? "夜间模式" : "日间模式"; + tv.setBackground(ContextCompat.getDrawable(this, R.color.theme)); + tv.setText(envText); + tv.setGravity(Gravity.CENTER); + tv.setTextColor(Color.WHITE); + tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13); + tv.measure(0, 0); + tv.setAlpha(NightModeUtils.INSTANCE.isNightMode(this) ? 0.8F : 0.15F); + tv.setId(ID_NIGHT_INDICATOR); + int height = tv.getMeasuredHeight(); + int width = tv.getMeasuredWidth(); + tv.setPadding(DisplayUtils.dip2px(20), 0, DisplayUtils.dip2px(20), 0); + ll.setTranslationX(DisplayUtils.dip2px(-20)); + ll.setRotation(-45); + ll.addView(tv); + ll.setPadding(0, (width - height) / 2, 0, (width - height) / 2); + + if (BuildConfig.DEBUG) { + tv.setOnClickListener(v -> { + //切换深色模式 + String mode; + String positive; + String negative; + if (NightModeUtils.INSTANCE.getSystemMode()) { + mode = "跟随系统模式"; + positive = "普通模式"; + negative = "深色模式"; + } else if (NightModeUtils.INSTANCE.getNightMode()) { + mode = "深色模式"; + positive = "跟随系统模式"; + negative = "普通模式"; + } else { + mode = "普通模式"; + positive = "跟随系统模式"; + negative = "深色模式"; + } + DialogHelper.showCenterDialog(this, "选择模式", "当前为 " + mode, positive, negative, () -> { + if (NightModeUtils.INSTANCE.getSystemMode()) { + NightModeUtils.INSTANCE.setNightMode(false); + NightModeUtils.INSTANCE.setSystemMode(false); + } else { + NightModeUtils.INSTANCE.setSystemMode(true); + } + NightModeUtils.INSTANCE.initNightMode(); + }, () -> { + if (NightModeUtils.INSTANCE.getSystemMode()) { + NightModeUtils.INSTANCE.setNightMode(true); + } else { + NightModeUtils.INSTANCE.setNightMode(!NightModeUtils.INSTANCE.getNightMode()); + } + NightModeUtils.INSTANCE.setSystemMode(false); + NightModeUtils.INSTANCE.initNightMode(); + }); + }); + } + return ll; + } + @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(final EBShowDialog showDialog) { if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED) @@ -445,4 +509,14 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy public Pair getBusinessId() { return null; } + + @Override + public void onConfigurationChanged(@NonNull Configuration newConfig) { + super.onConfigurationChanged(newConfig); + TextView tv = findViewById(ID_NIGHT_INDICATOR); + if (tv != null) { + tv.setText(NightModeUtils.INSTANCE.isNightMode(this) ? "夜间模式" : "日间模式"); + tv.setAlpha(NightModeUtils.INSTANCE.isNightMode(this) ? 0.8F : 0.15F); + } + } } diff --git a/app/src/main/java/com/gh/common/constant/Constants.java b/app/src/main/java/com/gh/common/constant/Constants.java index 0c3a2a5d20..bdd654a5ae 100644 --- a/app/src/main/java/com/gh/common/constant/Constants.java +++ b/app/src/main/java/com/gh/common/constant/Constants.java @@ -415,4 +415,9 @@ public class Constants { public static final String DEFAULT_VIVO_BROWSER_HINT_URL = "https://static-web.ghzs.com/ghzs_help/help.html?content=618112ce04796e63e97643a4&from=ghzs"; public static final int FOLLOW_HINT_TRIGGER_HEIGHT = 10; + + // 深色模式 + public static final String SP_NIGHT_MODE = "night_mode"; + // 跟随系统模式 + public static final String SP_SYSTEM_MODE = "system_mode"; } diff --git a/app/src/main/java/com/gh/common/util/DisplayUtils.java b/app/src/main/java/com/gh/common/util/DisplayUtils.java index 972aebdd2b..88920bcae3 100644 --- a/app/src/main/java/com/gh/common/util/DisplayUtils.java +++ b/app/src/main/java/com/gh/common/util/DisplayUtils.java @@ -162,7 +162,7 @@ public class DisplayUtils { } public static void setLightStatusBar(Activity activity, boolean lightStatusBar) { - setLightStatusBar(activity, lightStatusBar, true); + setLightStatusBar(activity, !NightModeUtils.INSTANCE.isNightMode(activity) && lightStatusBar, true); } private static void setMIUIStatusBarStyle(Activity activity, boolean lightStatusBar, boolean isKeepLowVersionMiui) { diff --git a/app/src/main/java/com/gh/common/util/Extensions.kt b/app/src/main/java/com/gh/common/util/Extensions.kt index 74761d105e..cf06e10cf5 100644 --- a/app/src/main/java/com/gh/common/util/Extensions.kt +++ b/app/src/main/java/com/gh/common/util/Extensions.kt @@ -881,10 +881,24 @@ fun Int.toColor(): Int { return ContextCompat.getColor(HaloApp.getInstance().application, this) } +/** + * 只能传Activity的context，如果是Application的context会导致切换夜间模式变不了色 + */ +fun Int.toColor(context: Context): Int { + return ContextCompat.getColor(context, this) +} + fun Int.toDrawable(): Drawable? { return ContextCompat.getDrawable(HaloApp.getInstance().application, this) } +/** + * 只能传Activity的context，如果是Application的context会导致切换夜间模式变不了色 + */ +fun Int.toDrawable(context: Context): Drawable? { + return ContextCompat.getDrawable(context, this) +} + fun Int.toResString(): String { return HaloApp.getInstance().application.resources.getString(this) } diff --git a/app/src/main/java/com/gh/common/util/NightModeUtils.kt b/app/src/main/java/com/gh/common/util/NightModeUtils.kt new file mode 100644 index 0000000000..b11d02860f --- /dev/null +++ b/app/src/main/java/com/gh/common/util/NightModeUtils.kt @@ -0,0 +1,52 @@ +package com.gh.common.util + +import android.content.Context +import android.content.res.Configuration +import androidx.appcompat.app.AppCompatDelegate +import com.gh.common.constant.Constants + +object NightModeUtils { + /** + * 当前系统是否是深色模式 + */ + fun isNightMode(context: Context): Boolean { + val uiMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK + return uiMode == Configuration.UI_MODE_NIGHT_YES + } + + /** + * 获取是否跟随系统，默认true + */ + fun getSystemMode() = SPUtils.getBoolean(Constants.SP_SYSTEM_MODE, true) + + fun setSystemMode(nightMode: Boolean) = SPUtils.setBoolean(Constants.SP_SYSTEM_MODE, nightMode) + + /** + * 获取是否设置深色模式，默认false + */ + fun getNightMode() = SPUtils.getBoolean(Constants.SP_NIGHT_MODE, false) + + fun setNightMode(nightMode: Boolean) = SPUtils.setBoolean(Constants.SP_NIGHT_MODE, nightMode) + + fun initNightMode() { + initNightMode(getSystemMode(), getNightMode()) + } + + /** + * 初始化App深色模式 + * + * @param systemMode 是否是跟随系统 + * @param nightMode 是否是深色模式 + */ + fun initNightMode(systemMode: Boolean, nightMode: Boolean) { + if (systemMode) { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) + } else { + if (nightMode) { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES) + } else { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt b/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt index e5d68aca38..23ca27bcf8 100644 --- a/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt +++ b/app/src/main/java/com/gh/common/view/GameTagFlexLinearLayout.kt @@ -12,6 +12,7 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat import com.gh.common.util.DisplayUtils +import com.gh.common.util.toColor import com.gh.gamecenter.R import com.gh.gamecenter.entity.TagStyleEntity import kotlin.math.ceil @@ -80,7 +81,7 @@ class GameTagFlexLinearLayout @JvmOverloads constructor(context: Context, attrs: includeFontPadding = false textSize = mTextSize gravity = Gravity.CENTER - setTextColor(Color.parseColor("#666666")) + setTextColor(R.color.text_subtitle.toColor(context)) val params = LayoutParams(LayoutParams.WRAP_CONTENT, mItemHeight) params.setMargins(0, 0, mMargin, 0) diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index 88e1c3b0c7..f892fcd9f1 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; +import android.content.res.Configuration; import android.graphics.Color; import android.os.Build; import android.os.Bundle; @@ -1033,5 +1034,4 @@ public class MainActivity extends BaseActivity { } } } - } 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 23bc84d95e..8c47c2bf6a 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 @@ -4,6 +4,8 @@ import android.view.View import android.view.ViewGroup import com.gh.base.BaseRecyclerViewHolder import com.gh.common.util.dip2px +import com.gh.common.util.toColor +import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameHeadItemBinding import com.gh.gamecenter.entity.SubjectEntity @@ -56,5 +58,6 @@ class GameHeadViewHolder(var binding: GameHeadItemBinding) : } else { binding.headMore.visibility = View.VISIBLE } + binding.headTitle.setTextColor(R.color.text_title.toColor(binding.root.context)) } } diff --git a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt index 5b5a04e23b..fc5e00d6e9 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/HomeSearchToolWrapperFragment.kt @@ -1,6 +1,6 @@ package com.gh.gamecenter.fragment -import android.graphics.Color +import android.content.res.Configuration import android.graphics.Typeface import android.os.Bundle import android.view.LayoutInflater @@ -162,9 +162,9 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { onPageScrolled = { position, positionOffset, _ -> if (position + 1 != mTabTitleList.size) { val currentAppBarColor = - tabList.safelyGetInRelease(position)?.primaryColor ?: Color.WHITE + tabList.safelyGetInRelease(position)?.primaryColor ?: R.color.background_white.toColor(requireContext()) val incomingAppBarColor = - tabList.safelyGetInRelease(position + 1)?.primaryColor ?: Color.WHITE + tabList.safelyGetInRelease(position + 1)?.primaryColor ?: R.color.background_white.toColor(requireContext()) val proximatelySelectedPosition = if (positionOffset < 0.5) position else position + 1 @@ -181,8 +181,8 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { mIsDisplayingLightContent = tabList.safelyGetInRelease(proximatelySelectedPosition)?.useLightStyle ?: false - mTabSelectedColor = if (mIsDisplayingLightContent) TAB_DEFAULT_COLOR_LIGHT else TAB_SELECTED_COLOR - mTabDefaultColor = if (mIsDisplayingLightContent) TAB_DEFAULT_COLOR_LIGHT else TAB_DEFAULT_COLOR + mTabSelectedColor = if (mIsDisplayingLightContent) TAB_DEFAULT_COLOR_LIGHT.toColor(requireContext()) else TAB_SELECTED_COLOR.toColor(requireContext()) + mTabDefaultColor = if (mIsDisplayingLightContent) TAB_DEFAULT_COLOR_LIGHT.toColor(requireContext()) else TAB_DEFAULT_COLOR.toColor(requireContext()) if (isContentStyleChanged) { updateIndicatorDrawable() @@ -211,10 +211,10 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { mCurrentAppBarColor = appBarColorInBetween updateAppBarStyle(appBarColorInBetween, mIsDisplayingLightContent) } else { - val currentAppBarColor = tabList.safelyGetInRelease(position)?.primaryColor ?: Color.WHITE + val currentAppBarColor = tabList.safelyGetInRelease(position)?.primaryColor ?: R.color.background_white.toColor(requireContext()) mIsDisplayingLightContent = tabList.safelyGetInRelease(position)?.useLightStyle == true - mTabSelectedColor = if (mIsDisplayingLightContent) TAB_DEFAULT_COLOR_LIGHT else TAB_SELECTED_COLOR - mTabDefaultColor = if (mIsDisplayingLightContent) TAB_DEFAULT_COLOR_LIGHT else TAB_DEFAULT_COLOR + mTabSelectedColor = if (mIsDisplayingLightContent) TAB_DEFAULT_COLOR_LIGHT.toColor(requireContext()) else TAB_SELECTED_COLOR.toColor(requireContext()) + mTabDefaultColor = if (mIsDisplayingLightContent) TAB_DEFAULT_COLOR_LIGHT.toColor(requireContext()) else TAB_DEFAULT_COLOR.toColor(requireContext()) updateAppBarStyle(currentAppBarColor, mIsDisplayingLightContent) updateIndicatorDrawable() @@ -279,19 +279,19 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { currentTab?.offsetRatio = offset / totalHeight.toFloat() if (currentTab?.isTopViewShow == true && offset >= totalHeight) { currentTab.isTopViewShow = false - currentTab.primaryColor = Color.WHITE + currentTab.primaryColor = R.color.background_white.toColor(requireContext()) currentTab.useLightStyle = false mIsDisplayingLightContent = false - updateAppBarColorWhenScrollChanged(Color.WHITE) + updateAppBarColorWhenScrollChanged(R.color.background_white.toColor(requireContext())) DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent) - mTabSelectedColor = TAB_SELECTED_COLOR - mTabDefaultColor = TAB_DEFAULT_COLOR + mTabSelectedColor = TAB_SELECTED_COLOR.toColor(requireContext()) + mTabDefaultColor = TAB_DEFAULT_COLOR.toColor(requireContext()) mBinding?.indicatorView?.updateIndicatorDrawable(R.drawable.ic_commodity_selected.toDrawable()) updateTabTextStyle(mLastSelectedPosition, 0f) } else if (offset < totalHeight) { currentTab?.isTopViewShow = true val colorInBetween = - ColorUtils.blendARGB(currentTab?.currentSelectColor ?: 0, Color.WHITE, currentTab?.offsetRatio ?: 0f) + ColorUtils.blendARGB(currentTab?.currentSelectColor ?: 0, R.color.background_white.toColor(requireContext()), currentTab?.offsetRatio ?: 0f) updateAppBarColorWhenScrollChanged(colorInBetween) currentTab?.primaryColor = colorInBetween currentTab?.useLightStyle = currentTab?.offsetRatio ?: 0f < mOffsetCritical @@ -301,10 +301,8 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { mIsDisplayingLightContent = currentTab?.offsetRatio ?: 0f < mOffsetCritical DisplayUtils.setLightStatusBar(requireActivity(), !mIsDisplayingLightContent) } - mTabSelectedColor = - if (currentTab?.offsetRatio ?: 0f < mOffsetCritical) TAB_DEFAULT_COLOR_LIGHT else TAB_SELECTED_COLOR - mTabDefaultColor = - if (currentTab?.offsetRatio ?: 0f < mOffsetCritical) TAB_DEFAULT_COLOR_LIGHT else TAB_DEFAULT_COLOR + mTabSelectedColor = if (currentTab?.offsetRatio ?: 0f < mOffsetCritical) TAB_DEFAULT_COLOR_LIGHT.toColor(requireContext()) else TAB_SELECTED_COLOR.toColor(requireContext()) + mTabDefaultColor = if (currentTab?.offsetRatio ?: 0f < mOffsetCritical) TAB_DEFAULT_COLOR_LIGHT.toColor(requireContext()) else TAB_DEFAULT_COLOR.toColor(requireContext()) mBinding?.indicatorView?.updateIndicatorDrawable( if (currentTab?.offsetRatio ?: 0f < mOffsetCritical) R.drawable.ic_home_tab_indicator_white.toDrawable() else R.drawable.ic_commodity_selected.toDrawable() @@ -315,11 +313,11 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { private fun updateAppBarColorWhenScrollChanged(color: Int) { val currentTab = getCurrentTab() - if (color != Color.WHITE && (currentTab?.offsetRatio ?: 0f) >= 1f) { + if (color != R.color.background_white.toColor(requireContext()) && (currentTab?.offsetRatio ?: 0f) >= 1f) { currentTab?.currentSelectColor = color currentTab?.primaryColor = color } - updateAppBarStyle(color, color != Color.WHITE) + updateAppBarStyle(color, color != R.color.background_white.toColor(requireContext())) } fun changeAppBarColor(color: Int) { @@ -330,16 +328,16 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { homeTab?.currentSelectColor = color if (homeTab?.isTopViewShow == true) { val colorInBetween = - ColorUtils.blendARGB(color, Color.WHITE, homeTab.offsetRatio) + ColorUtils.blendARGB(color, R.color.background_white.toColor(requireContext()), homeTab.offsetRatio) homeTab.primaryColor = colorInBetween } } else { currentTab.currentSelectColor = color if (currentTab.isTopViewShow) { val colorInBetween = - ColorUtils.blendARGB(color, Color.WHITE, currentTab.offsetRatio) + ColorUtils.blendARGB(color, R.color.background_white.toColor(requireContext()), currentTab.offsetRatio) currentTab.primaryColor = colorInBetween - updateAppBarStyle(colorInBetween, colorInBetween != Color.WHITE) + updateAppBarStyle(colorInBetween, colorInBetween != R.color.background_white.toColor(requireContext())) } } } @@ -503,13 +501,18 @@ class HomeSearchToolWrapperFragment : SearchToolWrapperFragment() { return super.onBackPressed() } + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + getCurrentTab()?.isTopViewShow = true + } + companion object { const val LAST_SELECTED_POSITION = "last_selected_position" - var TAB_SELECTED_COLOR: Int = R.color.text_title.toColor() - var TAB_DEFAULT_COLOR: Int = R.color.text_subtitle.toColor() + var TAB_SELECTED_COLOR: Int = R.color.text_title + var TAB_DEFAULT_COLOR: Int = R.color.text_subtitle - var TAB_DEFAULT_COLOR_LIGHT: Int = R.color.search_text_color_light.toColor() + var TAB_DEFAULT_COLOR_LIGHT: Int = R.color.search_text_color_light var DEFAULT_TAB_TEXT_SIZE = 16F diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java index 71f93c8c6d..3edbd8dbf8 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.java @@ -1,5 +1,6 @@ package com.gh.gamecenter.fragment; +import android.content.res.Configuration; import android.graphics.Bitmap; import android.graphics.PorterDuff; import android.graphics.drawable.Animatable; @@ -11,6 +12,7 @@ import android.widget.CheckedTextView; import android.widget.ImageView; import androidx.annotation.ColorRes; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.fragment.app.Fragment; @@ -39,6 +41,7 @@ import com.gh.common.util.HomeBottomBarHelper; import com.gh.common.util.ImageUtils; import com.gh.common.util.IntegralLogHelper; import com.gh.common.util.LogUtils; +import com.gh.common.util.NightModeUtils; import com.gh.common.view.ReserveDialog; import com.gh.common.view.WelcomeDialog; import com.gh.gamecenter.R; @@ -172,6 +175,7 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem .placeholder(R.drawable.ic_game_unselect) .into(mBinding.mainTabGameIcon); } + mBinding.viewShadow.setVisibility(NightModeUtils.INSTANCE.isNightMode(requireContext()) ? View.GONE : View.VISIBLE); mViewModel.getNavBar().observe(this, this::updateGameBarContent); @@ -299,8 +303,8 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem changeTabImageColor(R.color.text_A1A5B7, PorterDuff.Mode.SRC_ATOP); changeTabTextColor(R.color.text_A1A5B7, false); } else { - mBinding.viewShadow.setVisibility(View.VISIBLE); - mCheckableGroup.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.white)); + mBinding.viewShadow.setVisibility(NightModeUtils.INSTANCE.isNightMode(requireContext()) ? View.GONE : View.VISIBLE); + mCheckableGroup.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.background_white)); changeTabImageColor(R.color.text_50556B, PorterDuff.Mode.DST); changeTabTextColor(R.color.tab_selector, true); } @@ -543,4 +547,10 @@ public class MainWrapperFragment extends BaseFragment_ViewPager_Checkable implem public int getChildCount() { return 5; } + + @Override + public void onConfigurationChanged(@NonNull Configuration newConfig) { + super.onConfigurationChanged(newConfig); + changeColor(mViewPager.getCurrentItem()); + } } 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 d33a3b175b..ee3c58c4cf 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -384,7 +384,7 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl mSearchRightView.setImageResource(R.drawable.toolbar_search_light); mTeenagerModelView.setBackgroundResource(R.drawable.button_round_black_alpha_10); mSearchHintTv.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.search_text_color_light)); - mSearchContainerView.setBackgroundResource(R.drawable.home_search_bg_light); + mSearchContainerView.setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.home_search_bg_light)); } else { ((ImageView) mCachedView.findViewById(R.id.actionbar_iv_search)).setImageResource(R.drawable.toolbar_search_icon); ((ImageView) mCachedView.findViewById(R.id.actionbar_download)).setImageResource(R.drawable.toolbar_download); @@ -394,7 +394,7 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl mSearchRightView.setImageResource(R.drawable.toolbar_search); mTeenagerModelView.setBackgroundResource(R.drawable.button_round_f2f4f7); mSearchHintTv.setHintTextColor(ContextCompat.getColor(requireContext(), R.color.search_text_color_default)); - mSearchContainerView.setBackgroundResource(R.drawable.home_search_bg); + mSearchContainerView.setBackground(ContextCompat.getDrawable(requireContext(), R.drawable.home_search_bg)); } } } diff --git a/app/src/main/java/com/gh/gamecenter/game/commoncollection/CommonCollectionAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/commoncollection/CommonCollectionAdapter.kt index bec82a87e0..f7b6709877 100644 --- a/app/src/main/java/com/gh/gamecenter/game/commoncollection/CommonCollectionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/commoncollection/CommonCollectionAdapter.kt @@ -4,15 +4,14 @@ import android.content.Context import android.view.ViewGroup import androidx.constraintlayout.widget.ConstraintLayout import androidx.recyclerview.widget.RecyclerView -import com.gh.common.util.ImageUtils -import com.gh.common.util.dip2px -import com.gh.common.util.goneIf -import com.gh.common.util.toBinding +import com.gh.common.util.* +import com.gh.gamecenter.R import com.gh.gamecenter.adapter.viewholder.CommonCollectionItemViewHolder import com.gh.gamecenter.entity.CommonCollectionContentEntity import com.gh.gamecenter.entity.LinkEntity import com.gh.gamecenter.entity.SubjectEntity import com.lightgame.adapter.BaseRecyclerAdapter +import com.lightgame.utils.Utils class CommonCollectionAdapter( context: Context, @@ -62,8 +61,10 @@ class CommonCollectionAdapter( linkTitleTv.text = contentEntity.title linkDes1.goneIf(collectionStyle != "img-list") linkDes1.text = contentEntity.addedContent1 + linkDes1.setTextColor(R.color.text_subtitle.toColor(root.context)) linkDes2.goneIf(collectionStyle != "img-list") linkDes2.text = contentEntity.addedContent2 + linkDes2.setTextColor(R.color.text_subtitleDesc.toColor(root.context)) if (collectionStyle == "1-1") { val maskParams = maskView.layoutParams as ConstraintLayout.LayoutParams diff --git a/app/src/main/java/com/gh/gamecenter/game/gallery/GameGalleryViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/gallery/GameGalleryViewHolder.kt index 175102da6b..4271d8937f 100644 --- a/app/src/main/java/com/gh/gamecenter/game/gallery/GameGalleryViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/gallery/GameGalleryViewHolder.kt @@ -5,6 +5,8 @@ import com.gh.common.exposure.ExposureEvent import com.gh.common.exposure.ExposureSource import com.gh.common.runOnIoThread import com.gh.common.util.safelyGetInRelease +import com.gh.common.util.toColor +import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameGalleryItemBinding import com.gh.gamecenter.entity.SubjectEntity @@ -17,6 +19,7 @@ class GameGalleryViewHolder(val binding: GameGalleryItemBinding) : exposureClosure: (ExposureEvent) -> Unit ) { binding.titleTv.text = subjectEntity.name + binding.titleTv.setTextColor(R.color.text_title.toColor(binding.root.context)) val gameIconList = arrayListOf( binding.iconIv1, 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 bfc17c1e30..2e5e6d2a31 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 @@ -3,10 +3,7 @@ package com.gh.gamecenter.game.horizontal import android.content.Context import android.view.ViewGroup import com.gh.common.exposure.ExposureEvent -import com.gh.common.util.StringUtils -import com.gh.common.util.dip2px -import com.gh.common.util.safelyGetInRelease -import com.gh.common.util.toBinding +import com.gh.common.util.* import com.gh.gamecenter.GameDetailActivity import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameHorizontalItemBinding @@ -49,6 +46,8 @@ class GameHorizontalSlideAdapter( } override fun onBindViewHolder(holder: GameHorizontalItemViewHolder, position: Int) { + holder.binding.remarkLine.setBackgroundColor(R.color.background.toColor(holder.binding.root.context)) + holder.binding.secondRemark.setTextColor(R.color.text_subtitleDesc.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 = @@ -56,6 +55,7 @@ class GameHorizontalSlideAdapter( val gameEntity = mSubjectEntity.data!![position + getIndex()] holder.binding.simpleGameContainer.run { + gameName.setTextColor(R.color.text_title.toColor(root.context)) gameIcon.displayGameIcon(gameEntity) GameHorizontalSimpleItemViewHolder.setHorizontalNameAndGravity(gameName, gameEntity.name) } @@ -88,6 +88,8 @@ class GameHorizontalSlideAdapter( notifyItemRangeChanged(0, itemCount) } else if (countAndKey?.first != subjectEntity.data?.size) { // 数量发生改变 notifyDataSetChanged() + } else { + notifyItemRangeChanged(0, itemCount) } // 重新刷新数据标识 diff --git a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideListViewHolder.kt b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideListViewHolder.kt index 7726ca6be9..997e459533 100644 --- a/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideListViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/game/horizontal/GameHorizontalSlideListViewHolder.kt @@ -10,6 +10,7 @@ import com.gh.base.BaseRecyclerViewHolder import com.gh.common.iinterface.IOffsetable import com.gh.common.util.TimeUtils import com.gh.common.util.dip2px +import com.gh.common.util.toColor import com.gh.common.util.tryCatchInRelease import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameHorizontalListBinding @@ -26,6 +27,7 @@ class GameHorizontalSlideListViewHolder(val binding: GameHorizontalListBinding) offsetable: IOffsetable): GameHorizontalSlideAdapter { val context = binding.root.context var subjectAdapter = binding.horizontalRv.adapter + binding.fakeRemarkLine.setBackgroundColor(R.color.background.toColor(context)) if (subjectAdapter == null) { binding.horizontalRv.setPadding(10F.dip2px(), 8F.dip2px(), 10F.dip2px(), 8F.dip2px()) binding.horizontalRv.layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false) 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 7c8ccf1ee8..d4d15021cb 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 @@ -7,7 +7,9 @@ import android.view.ViewGroup import com.gh.common.util.StringUtils import com.gh.common.util.dip2px import com.gh.common.util.toBinding +import com.gh.common.util.toColor import com.gh.gamecenter.GameDetailActivity +import com.gh.gamecenter.R import com.gh.gamecenter.databinding.GameHorizontalSimpleItemBinding import com.gh.gamecenter.entity.GameEntity import com.gh.gamecenter.game.horizontal.GameHorizontalSimpleItemViewHolder @@ -36,6 +38,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)) 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 e832de6caa..b248f0f252 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 @@ -9,10 +9,7 @@ import com.gh.base.BaseRecyclerViewHolder import com.gh.common.exposure.ExposureEvent import com.gh.common.runOnIoThread import com.gh.common.runOnUiThread -import com.gh.common.util.DirectUtils -import com.gh.common.util.ImageUtils -import com.gh.common.util.dip2px -import com.gh.common.util.safelyGetInRelease +import com.gh.common.util.* import com.gh.common.view.AsyncCell import com.gh.gamecenter.R import com.gh.gamecenter.databinding.RankCollectionItemBinding @@ -136,6 +133,14 @@ class RankCollectionAdapter( } else { mViewHolderList.forEach { position, viewHolder -> viewHolder.checkResetData(updateDate.columns.safelyGetInRelease(position)) + (viewHolder.itemView as RankCollectionItemCell).binding?.run { + rankTitle.setTextColor(R.color.text_title.toColor(root.context)) + rankTitleIndicator.setTextColor(R.color.text_title.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)) + } + } } } } diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt index c2b62c22d8..adf83c2e16 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragment.kt @@ -1,5 +1,6 @@ package com.gh.gamecenter.home +import android.content.res.Configuration import android.view.View import androidx.core.content.ContextCompat import androidx.recyclerview.widget.DefaultItemAnimator @@ -315,4 +316,18 @@ class HomeFragment : LazyFragment() { } } } + + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + mBinding.gameList.setBackgroundColor(R.color.background_white.toColor(requireContext())) + mBinding.gameList.recycledViewPool.clear() + mListAdapter.notifyItemRangeChanged(0, mListAdapter.itemCount) + if (parentFragment is HomeSearchToolWrapperFragment) { + val bannerViewHeight = mAutomaticLayoutManager.heightMap[0] ?: 0 + (parentFragment as HomeSearchToolWrapperFragment).onScrollChanged( + bannerViewHeight, + mBinding.gameList.computeVerticalScrollOffset() + ) + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt index f22351bc22..f492305adc 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeFragmentAdapter.kt @@ -35,7 +35,6 @@ import com.halo.assistant.fragment.game.GamePluginAdapter import com.lightgame.download.DownloadEntity import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder import com.shuyu.gsyvideoplayer.video.base.GSYVideoView -import java.util.* class HomeFragmentAdapter( context: Context, @@ -480,6 +479,7 @@ class HomeFragmentAdapter( val lp = binding.container.layoutParams lp.height = height.dip2px() binding.container.layoutParams = lp + binding.divider.setBackgroundColor(R.color.background.toColor(binding.root.context)) } } diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt index 790332fd64..7cf2e076d4 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeGameItemViewHolder.kt @@ -7,6 +7,8 @@ import com.gh.base.BaseRecyclerViewHolder import com.gh.common.util.ImageUtils import com.gh.common.util.RandomUtils import com.gh.common.util.goneIf +import com.gh.common.util.toColor +import com.gh.gamecenter.R import com.gh.gamecenter.databinding.HomeGameItemBinding import com.gh.gamecenter.entity.GameEntity @@ -15,6 +17,8 @@ class HomeGameItemViewHolder(val binding: HomeGameItemBinding) : BaseRecyclerVie fun bindGame(game: GameEntity) { binding.gameIcon.displayGameIcon(game) binding.gameName.text = game.name + binding.gameName.setTextColor(R.color.text_title.toColor(binding.root.context)) + binding.gameBrief.setTextColor(R.color.text_title.toColor(binding.root.context)) binding.gameRating.goneIf(!(game.showComment && game.commentCount >= 3 && game.star >= 7)) binding.gameRating.text = game.star.toString() ImageUtils.display(binding.gameImage, game.homeSetting.image) diff --git a/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt index e1ff173267..c231571701 100644 --- a/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/home/HomeRecommendItemViewHolder.kt @@ -3,6 +3,7 @@ package com.gh.gamecenter.home import com.gh.base.BaseRecyclerViewHolder import com.gh.base.OnViewClickListener import com.gh.common.util.* +import com.gh.gamecenter.R import com.gh.gamecenter.databinding.HomeRecommendItemBinding import com.gh.gamecenter.entity.HomeRecommend @@ -52,6 +53,11 @@ class HomeRecommendItemViewHolder(val binding: HomeRecommendItemBinding) : BaseR nameTvThree.text = if (recommends.size > 2) recommends[2].name else "推荐入口" nameTvFour.text = if (recommends.size > 3) recommends[3].name else "推荐入口" nameTvFive.text = if (recommends.size > 4) recommends[4].name else "推荐入口" + nameTvOne.setTextColor(R.color.text_title.toColor(root.context)) + nameTvTwo.setTextColor(R.color.text_title.toColor(root.context)) + nameTvThree.setTextColor(R.color.text_title.toColor(root.context)) + nameTvFour.setTextColor(R.color.text_title.toColor(root.context)) + nameTvFive.setTextColor(R.color.text_title.toColor(root.context)) } } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt index dcf43bddf9..ca96d5d617 100644 --- a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt +++ b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt @@ -125,7 +125,7 @@ class LegacyHomeFragmentAdapterAssistant( is GameGalleryViewHolder -> bindGallery(holder, item) is BlankDividerViewHolder -> holder.bindView( item.blankDivider!!, - if (mOuterType == OuterType.NEW_HOME) Color.WHITE else ContextCompat.getColor(mContext, R.color.background) + if (mOuterType == OuterType.NEW_HOME) R.color.background_white.toColor(mContext) else R.color.background.toColor(mContext) ) is CommonCollectionViewHolder -> bindCommonCollection(holder, item) is RankCollectionViewHolder -> bindRankCollection(holder, item) @@ -537,6 +537,8 @@ 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)) } private fun bindHeadView(holder: GameHeadViewHolder, item: LegacyHomeItemData) { @@ -816,7 +818,7 @@ class LegacyHomeFragmentAdapterAssistant( } class BlankDividerViewHolder(var binding: ItemBlankDividerBinding) : RecyclerView.ViewHolder(binding.root) { - fun bindView(height: Float, color: Int = Color.WHITE) { + fun bindView(height: Float, color: Int = R.color.background_white.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/HomeAmwayAdapter.kt b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt index ca00409e9e..57817b396e 100644 --- a/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/home/amway/HomeAmwayAdapter.kt @@ -79,6 +79,8 @@ class HomeAmwayAdapter( if (dataList != update) { dataList = update notifyDataSetChanged() + } else { + notifyItemRangeChanged(0, itemCount) } } } \ No newline at end of file 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 0b6a53d994..a598433b39 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 @@ -6,6 +6,8 @@ import com.gh.base.BaseRecyclerViewHolder import com.gh.common.databind.BindingAdapters import com.gh.common.util.ImageUtils import com.gh.common.util.TextHelper +import com.gh.common.util.toColor +import com.gh.common.util.toDrawable import com.gh.common.view.AsyncCell import com.gh.gamecenter.R import com.gh.gamecenter.databinding.HomeAmwayItemBinding @@ -21,10 +23,10 @@ class HomeAmwayItemViewHolder(val cell: HomeAmwayAsyncCell) : BaseRecyclerViewHo binding.amwayScoreNumber.text = amway.game.star.toString() BindingAdapters.setGameTags(binding.gameTags, amway.game.tag, 2) - ImageUtils.display(binding.userIcon,amway.comment.user.icon) - ImageUtils.display(binding.userBadge,amway.comment.user.auth?.icon) - binding.userName.text=amway.comment.user.name - binding.ratingStart.rating=amway.comment.star.toFloat() + ImageUtils.display(binding.userIcon, amway.comment.user.icon) + ImageUtils.display(binding.userBadge, amway.comment.user.auth?.icon) + binding.userName.text = amway.comment.user.name + binding.ratingStart.rating = amway.comment.star.toFloat() // 强制更改标签颜色 val tags = amway.game.tag @@ -43,6 +45,16 @@ class HomeAmwayItemViewHolder(val cell: HomeAmwayAsyncCell) : BaseRecyclerViewHo } else { binding.content.text = amway.comment.content } + binding.run { + 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)) + } } } 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 b88d8aed5e..1a75c105d2 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 @@ -1,7 +1,6 @@ package com.gh.gamecenter.home.slide import android.annotation.SuppressLint -import android.graphics.Color import android.graphics.drawable.GradientDrawable import android.view.MotionEvent import androidx.core.graphics.ColorUtils @@ -11,14 +10,12 @@ import androidx.recyclerview.widget.RecyclerView import androidx.viewpager2.widget.ViewPager2 import com.gh.base.BaseRecyclerViewHolder import com.gh.common.exposure.ExposureSource -import com.gh.common.util.MtaHelper -import com.gh.common.util.hexStringToIntColor -import com.gh.common.util.safelyGetInRelease -import com.gh.common.util.throwExceptionInDebug +import com.gh.common.util.* import com.gh.common.view.DrawableView import com.gh.common.view.FixLinearLayoutManager import com.gh.common.view.ScrollEventListener import com.gh.common.view.TouchSlopRecyclerView +import com.gh.gamecenter.R import com.gh.gamecenter.databinding.HomeSlideListBinding import com.gh.gamecenter.home.HomeItemData import kotlin.math.abs @@ -43,6 +40,7 @@ class HomeSlideListViewHolder( if (adapter is HomeSlideListAdapter) { adapter.itemData = itemData adapter.checkResetData(slideList) + updateImmersiveColor(slideList[0].placeholderColor.hexStringToIntColor()) // 刷新页面时有可能动画会出现混乱 binding.recyclerView.postDelayed({ updateZoomAnimation() }, 200) @@ -125,7 +123,7 @@ class HomeSlideListViewHolder( } lastStatePosition = curPosition lastScrollState = scrollState - updateImmersiveColor(slideList.safelyGetInRelease(curPosition)?.placeholderColor?.hexStringToIntColor() ?: Color.WHITE) + updateImmersiveColor(slideList.safelyGetInRelease(curPosition)?.placeholderColor?.hexStringToIntColor() ?: R.color.background_white.toColor(binding.root.context)) } else if (scrollState == RecyclerView.SCROLL_STATE_DRAGGING) { lastScrollState = scrollState } @@ -140,7 +138,7 @@ class HomeSlideListViewHolder( val nextPosition = adapter.getActualPosition(position + 1) val currentColor = - slideList.safelyGetInRelease(currentPosition)?.placeholderColor?.hexStringToIntColor() ?: Color.WHITE + slideList.safelyGetInRelease(currentPosition)?.placeholderColor?.hexStringToIntColor() ?: R.color.background_white.toColor(binding.root.context) val nextColor = slideList.safelyGetInRelease(nextPosition)?.placeholderColor?.hexStringToIntColor() ?: currentColor val colorInBetween = @@ -157,7 +155,7 @@ class HomeSlideListViewHolder( callback.invoke(color) val gradientDrawable = DrawableView.getGradientDrawable( color, - Color.WHITE, GradientDrawable.Orientation.TOP_BOTTOM, 0f + R.color.background_white.toColor(binding.root.context), GradientDrawable.Orientation.TOP_BOTTOM, 0f ) binding.placeholderView.background = gradientDrawable } diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 2b6a42511a..967cb30902 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -40,6 +40,7 @@ import com.gh.common.util.EmulatorUtil; import com.gh.common.util.ExtensionsKt; import com.gh.common.util.HomeBottomBarHelper; import com.gh.common.util.ImageUtils; +import com.gh.common.util.NightModeUtils; import com.gh.common.util.PackageFlavorHelper; import com.gh.common.util.PackageHelper; import com.gh.common.util.PackageUtils; @@ -213,6 +214,7 @@ public class HaloApp extends MultiDexApplication implements Configuration.Provid } registerActivityLifecycleCallbacks(new GlobalActivityLifecycleObserver()); + NightModeUtils.INSTANCE.initNightMode(); } /** diff --git a/app/src/main/res/drawable-night/reuse_listview_item_style.xml b/app/src/main/res/drawable-night/reuse_listview_item_style.xml new file mode 100644 index 0000000000..98ea051055 --- /dev/null +++ b/app/src/main/res/drawable-night/reuse_listview_item_style.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/reuse_listview_item_style.xml b/app/src/main/res/drawable/reuse_listview_item_style.xml index 514b4659da..fda4d6f965 100644 --- a/app/src/main/res/drawable/reuse_listview_item_style.xml +++ b/app/src/main/res/drawable/reuse_listview_item_style.xml @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_background_clip.xml b/app/src/main/res/layout/activity_background_clip.xml index 2ce069b904..e630ef796e 100644 --- a/app/src/main/res/layout/activity_background_clip.xml +++ b/app/src/main/res/layout/activity_background_clip.xml @@ -36,7 +36,7 @@ android:layout_marginLeft="16dp" android:layout_marginBottom="35dp" android:text="取消" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="13sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -50,7 +50,7 @@ android:background="@drawable/bg_notification_open_btn_style_2" android:gravity="center" android:text="下一步" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" 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 6e95fe476e..d046b441d0 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="@android:color/white" + android:background="@color/white" android:focusable="true" android:focusableInTouchMode="true" android:orientation="vertical"> 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 9062b44d0c..ce71ee3690 100644 --- a/app/src/main/res/layout/activity_game_collection_edit.xml +++ b/app/src/main/res/layout/activity_game_collection_edit.xml @@ -37,7 +37,7 @@ android:background="@drawable/bg_game_collectionchange_poster" android:gravity="center" android:text="更改封面" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/activity_help_and_feedback.xml b/app/src/main/res/layout/activity_help_and_feedback.xml index 38deea8cb7..c98a851533 100644 --- a/app/src/main/res/layout/activity_help_and_feedback.xml +++ b/app/src/main/res/layout/activity_help_and_feedback.xml @@ -11,7 +11,7 @@ android:id="@+id/activity_tab_container" android:layout_width="match_parent" android:layout_height="48dp" - android:background="@android:color/white"> + android:background="@color/white"> + android:background="@color/white"> + android:background="@color/white"> @@ -36,7 +36,7 @@ android:layout_height="50dp" android:layout_marginRight="1dp" android:layout_weight="15" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" android:maxLines="2" android:textColor="@color/title" @@ -49,7 +49,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="29" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" android:maxLines="2" android:textColor="@color/title" @@ -61,7 +61,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" android:maxLines="2" android:textColor="@color/title" @@ -86,7 +86,7 @@ android:layout_height="50dp" android:layout_marginRight="1dp" android:layout_weight="15" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" android:orientation="horizontal"> @@ -108,7 +108,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="29" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" android:hint="点击填写" android:singleLine="true" @@ -121,7 +121,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:background="@android:color/white" + android:background="@color/white" android:enabled="false" android:gravity="center" android:maxLength="4" @@ -148,7 +148,7 @@ android:layout_height="50dp" android:layout_marginRight="1dp" android:layout_weight="15" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" android:orientation="horizontal"> @@ -170,7 +170,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="29" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" android:maxLines="2" android:textColor="@color/hint" @@ -182,7 +182,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="15" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" android:maxLines="2" android:textColor="@color/hint" @@ -196,7 +196,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="1dp" - android:background="@android:color/white"> + android:background="@color/white"> diff --git a/app/src/main/res/layout/activity_rating_edit.xml b/app/src/main/res/layout/activity_rating_edit.xml index 6e94bdfa8d..6bb80d7a86 100644 --- a/app/src/main/res/layout/activity_rating_edit.xml +++ b/app/src/main/res/layout/activity_rating_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="@android:color/white"> + android:background="@color/white"> + android:background="@color/white"> + android:background="@color/white"> + android:background="@color/white"> @@ -546,7 +546,7 @@ 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 4786443b31..ab59ad58cc 100644 --- a/app/src/main/res/layout/app_update_hint_dialog.xml +++ b/app/src/main/res/layout/app_update_hint_dialog.xml @@ -41,7 +41,7 @@ android:layout_marginTop="32dp" android:includeFontPadding="false" android:text="发现新版本" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="22sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" @@ -55,7 +55,7 @@ android:layout_marginTop="8dp" android:alpha="0.7" android:text="大小 18.19Mb" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@id/title" /> diff --git a/app/src/main/res/layout/app_updating_dialog.xml b/app/src/main/res/layout/app_updating_dialog.xml index c658c86d3e..3d278ba644 100644 --- a/app/src/main/res/layout/app_updating_dialog.xml +++ b/app/src/main/res/layout/app_updating_dialog.xml @@ -54,7 +54,7 @@ android:background="@drawable/app_updating_percent_bg" android:gravity="center_horizontal" android:paddingTop="2dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintBottom_toTopOf="@id/progress_anchor" app:layout_constraintLeft_toLeftOf="@id/progress_anchor" diff --git a/app/src/main/res/layout/ask_answer_item.xml b/app/src/main/res/layout/ask_answer_item.xml index 52c5bbaed1..2aa9b8bcd9 100644 --- a/app/src/main/res/layout/ask_answer_item.xml +++ b/app/src/main/res/layout/ask_answer_item.xml @@ -157,7 +157,7 @@ android:paddingTop="3dp" android:paddingRight="6dp" android:paddingBottom="3dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@id/ask_answer_item_img" app:layout_constraintRight_toRightOf="@id/ask_answer_item_img" /> diff --git a/app/src/main/res/layout/ask_recommend_change.xml b/app/src/main/res/layout/ask_recommend_change.xml index 9586a60022..11798bffde 100644 --- a/app/src/main/res/layout/ask_recommend_change.xml +++ b/app/src/main/res/layout/ask_recommend_change.xml @@ -10,7 +10,7 @@ diff --git a/app/src/main/res/layout/ask_recommends_subject.xml b/app/src/main/res/layout/ask_recommends_subject.xml index bbe5f7032a..ab3da7e6d3 100644 --- a/app/src/main/res/layout/ask_recommends_subject.xml +++ b/app/src/main/res/layout/ask_recommends_subject.xml @@ -4,7 +4,7 @@ android:id="@+id/containerLl" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" android:clipChildren="false" android:orientation="vertical" app:layout_scrollFlags="scroll|enterAlwaysCollapsed"> @@ -26,7 +26,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - android:background="@android:color/white" + android:background="@color/white" android:orientation="horizontal" android:visibility="gone" /> diff --git a/app/src/main/res/layout/ask_search_item.xml b/app/src/main/res/layout/ask_search_item.xml index f2e9ab34c9..2493e84e1a 100644 --- a/app/src/main/res/layout/ask_search_item.xml +++ b/app/src/main/res/layout/ask_search_item.xml @@ -78,7 +78,7 @@ android:paddingTop="2dp" android:paddingRight="4dp" android:paddingBottom="2dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" /> diff --git a/app/src/main/res/layout/ask_search_question_item.xml b/app/src/main/res/layout/ask_search_question_item.xml index 469f9f324e..cdc1657161 100644 --- a/app/src/main/res/layout/ask_search_question_item.xml +++ b/app/src/main/res/layout/ask_search_question_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="@android:color/white" + android:background="@color/white" android:paddingLeft="20dp" android:paddingTop="16dp" android:paddingRight="20dp" diff --git a/app/src/main/res/layout/banner_viewpager_item.xml b/app/src/main/res/layout/banner_viewpager_item.xml index ae11de8560..61caae3ae4 100644 --- a/app/src/main/res/layout/banner_viewpager_item.xml +++ b/app/src/main/res/layout/banner_viewpager_item.xml @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_margin="12dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" tools:text="来一场绝妙的冒险吧" /> \ No newline at end of file diff --git a/app/src/main/res/layout/catalog_header_item.xml b/app/src/main/res/layout/catalog_header_item.xml index cd2b2201ff..4d1384d26c 100644 --- a/app/src/main/res/layout/catalog_header_item.xml +++ b/app/src/main/res/layout/catalog_header_item.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" android:orientation="vertical" android:paddingTop="32dp"> diff --git a/app/src/main/res/layout/catalog_image_item.xml b/app/src/main/res/layout/catalog_image_item.xml index 18b2c5a6ec..72b21bcf98 100644 --- a/app/src/main/res/layout/catalog_image_item.xml +++ b/app/src/main/res/layout/catalog_image_item.xml @@ -25,7 +25,7 @@ android:layout_alignBottom="@+id/image" android:layout_marginLeft="12dp" android:layout_marginBottom="12dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" tools:text="来一场绝妙的冒险吧" /> \ No newline at end of file diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml index 0d91f048b7..7be225a973 100644 --- a/app/src/main/res/layout/comment_item.xml +++ b/app/src/main/res/layout/comment_item.xml @@ -79,7 +79,7 @@ android:paddingRight="4dp" android:paddingBottom="2dp" android:text="作者" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="9sp" android:visibility="gone" app:layout_constrainedWidth="true" diff --git a/app/src/main/res/layout/commodity_item.xml b/app/src/main/res/layout/commodity_item.xml index 679007dcae..d74e38351d 100644 --- a/app/src/main/res/layout/commodity_item.xml +++ b/app/src/main/res/layout/commodity_item.xml @@ -122,7 +122,7 @@ android:gravity="center" android:paddingLeft="8dp" android:paddingRight="8dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/common_collection_detail_one_item.xml b/app/src/main/res/layout/common_collection_detail_one_item.xml index 4fbc2b97a3..ba9eb1f178 100644 --- a/app/src/main/res/layout/common_collection_detail_one_item.xml +++ b/app/src/main/res/layout/common_collection_detail_one_item.xml @@ -19,7 +19,6 @@ app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/preload" app:pressedStateOverlayImage="@color/pressed_bg" - app:roundWithOverlayColor="@color/white" app:roundedCornerRadius="8dp" /> diff --git a/app/src/main/res/layout/common_collection_detail_two_item.xml b/app/src/main/res/layout/common_collection_detail_two_item.xml index 92b27ffbce..96625b683b 100644 --- a/app/src/main/res/layout/common_collection_detail_two_item.xml +++ b/app/src/main/res/layout/common_collection_detail_two_item.xml @@ -19,7 +19,6 @@ app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/preload" app:pressedStateOverlayImage="@color/pressed_bg" - app:roundWithOverlayColor="@color/white" app:roundedCornerRadius="8dp" /> 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 8bd9cf2d33..e1b1335b1f 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 @@ -16,7 +16,6 @@ app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/preload" app:pressedStateOverlayImage="@color/pressed_bg" - app:roundWithOverlayColor="@color/white" app:roundedCornerRadius="8dp" app:viewAspectRatio="2" /> diff --git a/app/src/main/res/layout/common_collection_item.xml b/app/src/main/res/layout/common_collection_item.xml index 9c697f91ef..2ed87bd9e1 100644 --- a/app/src/main/res/layout/common_collection_item.xml +++ b/app/src/main/res/layout/common_collection_item.xml @@ -24,7 +24,7 @@ app:layout_constraintTop_toTopOf="parent" app:placeholderImage="@drawable/preload" app:pressedStateOverlayImage="@color/pressed_bg" - app:roundWithOverlayColor="@color/white" + app:roundWithOverlayColor="@color/background_white" app:roundedCornerRadius="8dp" app:viewAspectRatio="2" /> @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" tools:text="8月游戏热点回顾下载" /> diff --git a/app/src/main/res/layout/community_select_opened_item.xml b/app/src/main/res/layout/community_select_opened_item.xml index ea94a5eea8..a7f77c17a0 100644 --- a/app/src/main/res/layout/community_select_opened_item.xml +++ b/app/src/main/res/layout/community_select_opened_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="@android:color/white" + android:background="@color/white" android:orientation="horizontal" android:paddingTop="12dp" android:paddingBottom="12dp"> diff --git a/app/src/main/res/layout/daily_task_item.xml b/app/src/main/res/layout/daily_task_item.xml index 01feafcf4d..e619ffe4b6 100644 --- a/app/src/main/res/layout/daily_task_item.xml +++ b/app/src/main/res/layout/daily_task_item.xml @@ -73,7 +73,7 @@ android:layout_marginRight="12dp" android:background="@drawable/bg_energy_task_btn_normal" android:gravity="center" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="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..eca004963a 100644 --- a/app/src/main/res/layout/dialog_apply_moderator.xml +++ b/app/src/main/res/layout/dialog_apply_moderator.xml @@ -55,7 +55,7 @@ android:background="@drawable/button_blue_oval" android:gravity="center" android:text="我知道了" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/dialog_cancel_reservation.xml b/app/src/main/res/layout/dialog_cancel_reservation.xml index 9149e807be..b1260b5c4c 100644 --- a/app/src/main/res/layout/dialog_cancel_reservation.xml +++ b/app/src/main/res/layout/dialog_cancel_reservation.xml @@ -52,7 +52,7 @@ android:background="@drawable/button_blue_oval" android:gravity="center" android:text="确定取消" - android:textColor="@color/white" /> + android:textColor="@color/text_white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_choose_forum.xml b/app/src/main/res/layout/dialog_choose_forum.xml index 753bede29a..d0e2f099ea 100644 --- a/app/src/main/res/layout/dialog_choose_forum.xml +++ b/app/src/main/res/layout/dialog_choose_forum.xml @@ -74,7 +74,7 @@ android:id="@+id/tab_container" android:layout_width="match_parent" android:layout_height="@dimen/tab_layout_height" - android:background="@android:color/white" + android:background="@color/white" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/searchEt"> diff --git a/app/src/main/res/layout/dialog_community.xml b/app/src/main/res/layout/dialog_community.xml index 036d574863..39e68c2020 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="@android:color/white" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/dialog_game_collect.xml b/app/src/main/res/layout/dialog_game_collect.xml index 1c78ad5591..40d9ba5bef 100644 --- a/app/src/main/res/layout/dialog_game_collect.xml +++ b/app/src/main/res/layout/dialog_game_collect.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" android:orientation="vertical"> + android:textColor="@color/text_white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_install_permission.xml b/app/src/main/res/layout/dialog_install_permission.xml index 79635843b3..68728c7c78 100644 --- a/app/src/main/res/layout/dialog_install_permission.xml +++ b/app/src/main/res/layout/dialog_install_permission.xml @@ -72,7 +72,7 @@ android:background="@drawable/bg_install_permission_btn" android:gravity="center" android:text="立即开启" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" app:layout_constraintTop_toBottomOf="@+id/contentTv" /> diff --git a/app/src/main/res/layout/dialog_installed_game.xml b/app/src/main/res/layout/dialog_installed_game.xml index 68409b954f..edd58525c9 100644 --- a/app/src/main/res/layout/dialog_installed_game.xml +++ b/app/src/main/res/layout/dialog_installed_game.xml @@ -56,6 +56,6 @@ android:gravity="center" android:text="确定" android:textStyle="bold" - android:textColor="@color/white" /> + android:textColor="@color/text_white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_notification_hint.xml b/app/src/main/res/layout/dialog_notification_hint.xml index 58af6b750e..c704369cca 100644 --- a/app/src/main/res/layout/dialog_notification_hint.xml +++ b/app/src/main/res/layout/dialog_notification_hint.xml @@ -60,7 +60,7 @@ android:background="@drawable/bg_notification_open_btn_style_2" android:gravity="center" android:text="立即开启" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@+id/notificationContent" /> diff --git a/app/src/main/res/layout/dialog_privacy_policy.xml b/app/src/main/res/layout/dialog_privacy_policy.xml index 45ff3fa2e5..a88dac22e0 100644 --- a/app/src/main/res/layout/dialog_privacy_policy.xml +++ b/app/src/main/res/layout/dialog_privacy_policy.xml @@ -131,7 +131,7 @@ android:gravity="center" android:paddingBottom="16dp" android:text="授权，开启光环" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" android:textStyle="bold" app:layout_constraintBottom_toTopOf="@id/disallow_button" diff --git a/app/src/main/res/layout/dialog_receive_badge.xml b/app/src/main/res/layout/dialog_receive_badge.xml index 56c85823ad..b7460c522b 100644 --- a/app/src/main/res/layout/dialog_receive_badge.xml +++ b/app/src/main/res/layout/dialog_receive_badge.xml @@ -47,7 +47,7 @@ android:paddingTop="13dp" android:gravity="center_horizontal" android:background="@drawable/bg_badge_btn" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" tools:text="@string/receive_badge" /> diff --git a/app/src/main/res/layout/dialog_report_reason.xml b/app/src/main/res/layout/dialog_report_reason.xml index 7a90f3287a..f45d38dd86 100644 --- a/app/src/main/res/layout/dialog_report_reason.xml +++ b/app/src/main/res/layout/dialog_report_reason.xml @@ -17,7 +17,7 @@ android:background="@drawable/bg_report_reason_top" android:gravity="center" android:textStyle="bold" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" android:text="@string/report_reason_title" /> diff --git a/app/src/main/res/layout/dialog_shortcut_permission.xml b/app/src/main/res/layout/dialog_shortcut_permission.xml index 61bd773df2..440c5b6568 100644 --- a/app/src/main/res/layout/dialog_shortcut_permission.xml +++ b/app/src/main/res/layout/dialog_shortcut_permission.xml @@ -39,7 +39,7 @@ android:layout_marginTop="20dp" android:gravity="center" android:background="@drawable/shortcut_dialog_btn_bg" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" android:text="立即开启" /> diff --git a/app/src/main/res/layout/dialog_sign_success.xml b/app/src/main/res/layout/dialog_sign_success.xml index c8ec1d0400..c8f89f1776 100644 --- a/app/src/main/res/layout/dialog_sign_success.xml +++ b/app/src/main/res/layout/dialog_sign_success.xml @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:layout_centerHorizontal="true" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" android:text="+2光能" /> diff --git a/app/src/main/res/layout/dialog_upload_schedule.xml b/app/src/main/res/layout/dialog_upload_schedule.xml index 9e137e32e4..def6dcabdd 100644 --- a/app/src/main/res/layout/dialog_upload_schedule.xml +++ b/app/src/main/res/layout/dialog_upload_schedule.xml @@ -80,7 +80,7 @@ android:background="@drawable/button_blue_oval" android:gravity="center" android:text="联系客服" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/dialog_version_number.xml b/app/src/main/res/layout/dialog_version_number.xml index d98c6acd86..b07e5d81bc 100644 --- a/app/src/main/res/layout/dialog_version_number.xml +++ b/app/src/main/res/layout/dialog_version_number.xml @@ -57,7 +57,7 @@ android:gravity="center" android:layout_marginLeft="24dp" android:textSize="14sp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:background="@drawable/button_blue_oval"/> 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..79e6a68d3f 100644 --- a/app/src/main/res/layout/dialog_video_upload_draft.xml +++ b/app/src/main/res/layout/dialog_video_upload_draft.xml @@ -78,7 +78,7 @@ android:paddingRight="31dp" android:paddingBottom="13dp" android:text="继续上传" - android:textColor="@color/white" + android:textColor="@color/text_white" app:layout_constraintLeft_toRightOf="@id/positive" app:layout_constraintRight_toRightOf="parent" 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 56d29a81a5..dd02ee76c3 100644 --- a/app/src/main/res/layout/dialog_view_badge.xml +++ b/app/src/main/res/layout/dialog_view_badge.xml @@ -50,7 +50,7 @@ android:paddingTop="13dp" android:gravity="center_horizontal" android:background="@drawable/bg_badge_btn" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" android:text="@string/badge_center" /> 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 dd74712374..8018adf34d 100644 --- a/app/src/main/res/layout/dialog_wechat_reserve_success.xml +++ b/app/src/main/res/layout/dialog_wechat_reserve_success.xml @@ -58,7 +58,7 @@ android:background="@drawable/textview_concern_red_up_round" android:gravity="center" android:text="开启微信提醒" - android:textColor="@color/white" + android:textColor="@color/text_white" 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/download_dialog_installed_item.xml b/app/src/main/res/layout/download_dialog_installed_item.xml index 81a02c266e..45e7523ecd 100644 --- a/app/src/main/res/layout/download_dialog_installed_item.xml +++ b/app/src/main/res/layout/download_dialog_installed_item.xml @@ -153,7 +153,7 @@ android:paddingTop="4dp" android:paddingRight="12dp" android:paddingBottom="4dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" android:visibility="gone" /> @@ -169,7 +169,7 @@ android:paddingTop="4dp" android:paddingRight="12dp" android:paddingBottom="4dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" android:visibility="gone" /> @@ -192,7 +192,7 @@ android:background="@drawable/download_dialog_item_install_background" android:gravity="center" android:text="安装" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/download_dialog_item.xml b/app/src/main/res/layout/download_dialog_item.xml index 326f0ccb25..3238bc5827 100644 --- a/app/src/main/res/layout/download_dialog_item.xml +++ b/app/src/main/res/layout/download_dialog_item.xml @@ -114,7 +114,7 @@ android:maxLength="16" android:paddingLeft="8dp" android:paddingRight="8dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="9dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" @@ -140,7 +140,7 @@ android:background="@drawable/download_dialog_item_install_background" android:gravity="center" android:text="安装" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" /> @@ -168,7 +168,7 @@ android:gravity="center_vertical" android:includeFontPadding="false" android:maxLength="10" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="8sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/download_simulator_dialog.xml b/app/src/main/res/layout/download_simulator_dialog.xml index 23678f7002..5f85cebd5f 100644 --- a/app/src/main/res/layout/download_simulator_dialog.xml +++ b/app/src/main/res/layout/download_simulator_dialog.xml @@ -54,7 +54,7 @@ android:background="@drawable/app_updating_percent_bg" android:gravity="center_horizontal" android:paddingTop="2dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="13sp" app:layout_constraintBottom_toTopOf="@id/progress_anchor" app:layout_constraintLeft_toLeftOf="@id/progress_anchor" 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 6652abd54b..ef87b3fd7a 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="@android:color/white" + android:background="@color/white" android:paddingLeft="5dp" android:paddingRight="16dp"> 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 60caa9d8ee..4688156809 100644 --- a/app/src/main/res/layout/forum_search_content_list.xml +++ b/app/src/main/res/layout/forum_search_content_list.xml @@ -86,7 +86,7 @@ android:layout_marginBottom="4dp" android:includeFontPadding="false" android:padding="3dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="9sp" app:layout_constraintBottom_toBottomOf="@+id/image" app:layout_constraintEnd_toEndOf="@+id/image" /> diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index 9c439d17bf..c82e3761b9 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -40,7 +40,7 @@ android:id="@+id/about_content" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" android:orientation="vertical"> @@ -118,7 +118,7 @@ android:gravity="center" android:singleLine="true" android:text="安利墙" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="15sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_amway_al.xml b/app/src/main/res/layout/fragment_amway_al.xml index 275f2f710f..df8225138d 100644 --- a/app/src/main/res/layout/fragment_amway_al.xml +++ b/app/src/main/res/layout/fragment_amway_al.xml @@ -78,7 +78,7 @@ android:shadowDy="1.0" android:shadowRadius="2.0" android:text="刷评论，写推荐" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="18sp" android:textStyle="bold" /> @@ -89,7 +89,7 @@ android:layout_marginTop="2dp" android:alpha="0.7" android:text="一起发现更广阔的游戏世界" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/fragment_amway_success.xml b/app/src/main/res/layout/fragment_amway_success.xml index 78241eaf53..771d18c5e3 100644 --- a/app/src/main/res/layout/fragment_amway_success.xml +++ b/app/src/main/res/layout/fragment_amway_success.xml @@ -72,7 +72,7 @@ android:paddingLeft="26dp" android:paddingRight="26dp" android:text="返回安利墙" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_answer_comment.xml b/app/src/main/res/layout/fragment_answer_comment.xml index 472f82544e..bdc17ed545 100644 --- a/app/src/main/res/layout/fragment_answer_comment.xml +++ b/app/src/main/res/layout/fragment_answer_comment.xml @@ -8,7 +8,7 @@ android:id="@+id/answer_comment_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/white" + android:background="@color/white" android:orientation="vertical"> + android:background="@color/white"> @@ -36,7 +36,7 @@ android:id="@+id/app_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> @@ -113,7 +113,7 @@ android:paddingTop="3dp" android:paddingRight="6dp" android:paddingBottom="3dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" android:visibility="gone" /> diff --git a/app/src/main/res/layout/fragment_ask_all.xml b/app/src/main/res/layout/fragment_ask_all.xml index 512915ebd2..67e10ef3e9 100644 --- a/app/src/main/res/layout/fragment_ask_all.xml +++ b/app/src/main/res/layout/fragment_ask_all.xml @@ -7,7 +7,7 @@ + android:background="@color/white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_avatar_border.xml b/app/src/main/res/layout/fragment_avatar_border.xml index bf34c70e28..f9fbcbeb67 100644 --- a/app/src/main/res/layout/fragment_avatar_border.xml +++ b/app/src/main/res/layout/fragment_avatar_border.xml @@ -76,7 +76,7 @@ android:background="@drawable/background_shape_round_white_alpha_20" android:gravity="center" android:text="更换头像" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="11sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -119,7 +119,7 @@ android:gravity="center" android:maxLines="1" android:text="头像挂件" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_background_preview.xml b/app/src/main/res/layout/fragment_background_preview.xml index f6cbbf0eac..109c1e04dc 100644 --- a/app/src/main/res/layout/fragment_background_preview.xml +++ b/app/src/main/res/layout/fragment_background_preview.xml @@ -217,7 +217,7 @@ android:gravity="center" android:padding="10dp" android:text="使用" - android:textColor="@color/white" + android:textColor="@color/text_white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/layout/fragment_bind_phone.xml b/app/src/main/res/layout/fragment_bind_phone.xml index 5ccf38d422..f54b49d326 100644 --- a/app/src/main/res/layout/fragment_bind_phone.xml +++ b/app/src/main/res/layout/fragment_bind_phone.xml @@ -6,7 +6,7 @@ android:paddingLeft="20dp" android:paddingRight="20dp" android:orientation="vertical" - android:background="@android:color/white"> + android:background="@color/white"> + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_category_list.xml b/app/src/main/res/layout/fragment_category_list.xml index f0c25eef08..f0dc8a3e98 100644 --- a/app/src/main/res/layout/fragment_category_list.xml +++ b/app/src/main/res/layout/fragment_category_list.xml @@ -87,7 +87,7 @@ android:layout_marginTop="24dp" android:background="@drawable/bg_tag_text" android:gravity="center" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" android:text="重置" /> diff --git a/app/src/main/res/layout/fragment_comment_dark.xml b/app/src/main/res/layout/fragment_comment_dark.xml index 86e3339329..29c2f1ee73 100644 --- a/app/src/main/res/layout/fragment_comment_dark.xml +++ b/app/src/main/res/layout/fragment_comment_dark.xml @@ -25,7 +25,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerInParent="true" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="13sp" android:textStyle="bold" tools:text="35条评论" /> diff --git a/app/src/main/res/layout/fragment_community.xml b/app/src/main/res/layout/fragment_community.xml index 3b491ddd7a..c3c87bd951 100644 --- a/app/src/main/res/layout/fragment_community.xml +++ b/app/src/main/res/layout/fragment_community.xml @@ -10,7 +10,7 @@ android:id="@+id/community_head" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" android:orientation="vertical"> + android:background="@color/white"> + android:background="@color/white" /> @@ -57,7 +57,7 @@ android:id="@+id/concern_rv_recommend" android:layout_width="match_parent" android:layout_height="300dp" - android:background="@android:color/white" + android:background="@color/white" android:overScrollMode="never" android:visibility="gone" /> diff --git a/app/src/main/res/layout/fragment_energy_center.xml b/app/src/main/res/layout/fragment_energy_center.xml index 3f72b8d317..4f7eaabec5 100644 --- a/app/src/main/res/layout/fragment_energy_center.xml +++ b/app/src/main/res/layout/fragment_energy_center.xml @@ -178,7 +178,7 @@ android:gravity="center" android:layout_centerVertical="true" android:background="@drawable/bg_energy_value" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" android:text="0"/> diff --git a/app/src/main/res/layout/fragment_energy_house.xml b/app/src/main/res/layout/fragment_energy_house.xml index 553d21793f..856989b788 100644 --- a/app/src/main/res/layout/fragment_energy_house.xml +++ b/app/src/main/res/layout/fragment_energy_house.xml @@ -44,7 +44,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="92dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textStyle="bold" android:textSize="14sp" android:text="@string/energy_house_login_tip" @@ -72,7 +72,7 @@ android:gravity="center" android:layout_centerVertical="true" android:background="@drawable/bg_energy_value" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" android:text="1520"/> @@ -281,7 +281,7 @@ android:layout_centerInParent="true" android:gravity="center_vertical" android:drawablePadding="4dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textStyle="bold" android:textSize="16sp" android:text="@string/energy_house"/> diff --git a/app/src/main/res/layout/fragment_followed_game.xml b/app/src/main/res/layout/fragment_followed_game.xml index 9d13bc1b9e..df5cc5b578 100644 --- a/app/src/main/res/layout/fragment_followed_game.xml +++ b/app/src/main/res/layout/fragment_followed_game.xml @@ -56,7 +56,7 @@ android:id="@+id/concern_rv_recommend" android:layout_width="match_parent" android:layout_height="300dp" - android:background="@android:color/white" + android:background="@color/white" android:overScrollMode="never" android:visibility="gone" /> @@ -82,7 +82,7 @@ android:drawablePadding="4dp" android:textSize="12sp" android:drawableLeft="@drawable/ico_concern" - android:textColor="@color/white" + android:textColor="@color/text_white" android:text="管理关注 >" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_forum_detail.xml b/app/src/main/res/layout/fragment_forum_detail.xml index 0d5f532dec..01e06e6d7e 100644 --- a/app/src/main/res/layout/fragment_forum_detail.xml +++ b/app/src/main/res/layout/fragment_forum_detail.xml @@ -23,7 +23,7 @@ android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" android:fitsSystemWindows="true" android:gravity="center" app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> @@ -130,7 +130,7 @@ android:ellipsize="end" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="20sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" @@ -203,7 +203,7 @@ android:drawablePadding="4dp" android:includeFontPadding="false" android:text="版主成员" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintStart_toEndOf="@+id/moderatorContainer" app:layout_constraintTop_toBottomOf="@+id/forumThumbBig" /> @@ -223,7 +223,7 @@ android:paddingRight="10dp" android:paddingBottom="5dp" android:text="攻略专区" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/forumThumbBig" /> @@ -298,7 +298,7 @@ android:layout_weight="1" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" android:textStyle="bold" /> @@ -319,7 +319,7 @@ android:id="@+id/tab_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white"> + android:background="@color/white"> @@ -45,7 +45,7 @@ android:id="@+id/containerLl" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" android:clipChildren="false" android:orientation="vertical" app:layout_scrollFlags="scroll|enterAlwaysCollapsed"> @@ -144,7 +144,7 @@ android:id="@+id/tab_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white"> + android:background="@color/white"> @@ -53,7 +53,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="6dp" android:maxLines="2" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="22sp" android:textStyle="bold" tools:text="战役类新游（ 11-12月 ），平衡完美，轻度氪金" /> @@ -99,7 +99,7 @@ android:layout_marginLeft="60dp" android:layout_marginRight="36dp" android:singleLine="true" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="@+id/userIcon" app:layout_constraintLeft_toLeftOf="parent" @@ -114,7 +114,7 @@ android:background="@drawable/button_round_white_alpha_20" android:gravity="center" android:text="关注" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/userIcon" app:layout_constraintRight_toRightOf="parent" @@ -138,7 +138,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="7dp" android:paddingBottom="8dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" app:layout_constraintTop_toBottomOf="@+id/divider" tools:text="第一行一二三四五六七八九十一二三四五六七八第一行一二三四五六七八九十一二三四五六七八第一行一二三四五六七八九十一二三四五六七八" /> 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 c76155d273..31db5c2f68 100644 --- a/app/src/main/res/layout/fragment_game_collection_square.xml +++ b/app/src/main/res/layout/fragment_game_collection_square.xml @@ -64,7 +64,7 @@ android:gravity="center" android:singleLine="true" android:text="游戏单广场" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="15sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_game_upload.xml b/app/src/main/res/layout/fragment_game_upload.xml index ced7f5f950..b1abb0ff83 100644 --- a/app/src/main/res/layout/fragment_game_upload.xml +++ b/app/src/main/res/layout/fragment_game_upload.xml @@ -618,7 +618,7 @@ android:id="@+id/suggest_post_ll" android:layout_width="match_parent" android:layout_height="60dp" - android:background="@android:color/white" + android:background="@color/white" android:orientation="horizontal" android:padding="10dp"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 75aa891749..c41f09308b 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="@android:color/white"> + android:background="@color/white"> @@ -200,7 +200,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="2dp" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" android:textStyle="bold" android:visibility="gone" @@ -271,7 +271,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="2dp" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" tools:text="认证：游戏达人" /> @@ -288,7 +288,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="5dp" android:maxLines="2" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/auth_container" @@ -315,7 +315,7 @@ android:layout_marginTop="8dp" android:includeFontPadding="false" android:text="@string/recent_visit" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -343,7 +343,7 @@ android:layout_height="wrap_content" android:includeFontPadding="false" android:text="@string/empty" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" tools:visibility="gone" /> @@ -355,7 +355,7 @@ android:layout_marginTop="5dp" android:includeFontPadding="false" android:text="@string/today_visit" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/recent_visit_tv" /> @@ -368,7 +368,7 @@ android:layout_marginTop="5dp" android:layout_toRightOf="@+id/today_visit_tv" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" app:layout_constraintLeft_toLeftOf="@+id/recentVisitRightContainer" app:layout_constraintRight_toRightOf="@+id/recentVisitRightContainer" @@ -400,7 +400,7 @@ android:id="@+id/user_follower_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" android:textStyle="bold" tools:text="0" /> @@ -410,7 +410,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:text="@string/follow" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> @@ -429,7 +429,7 @@ android:id="@+id/user_fans_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" android:textStyle="bold" tools:text="0" /> @@ -439,7 +439,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:text="@string/fans" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> @@ -482,7 +482,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:text="@string/agree" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> @@ -514,7 +514,7 @@ android:layout_marginLeft="4dp" android:gravity="center" android:text="@string/follow" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" /> @@ -528,7 +528,7 @@ android:paddingLeft="12dp" android:paddingRight="12dp" android:text="@string/concerned" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="11sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/user_icon" @@ -544,7 +544,7 @@ android:background="@drawable/background_shape_round_white_alpha_20" android:gravity="center" android:orientation="horizontal" - android:textColor="@color/white" + android:textColor="@color/text_white" android:visibility="gone" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/recent_visit_container" @@ -571,7 +571,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/change_bg_tips" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> @@ -694,7 +694,7 @@ android:id="@+id/tabContainer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white"> + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_kaifu_content.xml b/app/src/main/res/layout/fragment_kaifu_content.xml index bdb7115dc1..249ba3b63a 100644 --- a/app/src/main/res/layout/fragment_kaifu_content.xml +++ b/app/src/main/res/layout/fragment_kaifu_content.xml @@ -87,7 +87,7 @@ android:paddingLeft="84dp" android:paddingRight="84dp" android:text="查看全部" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_libao_wrapper.xml b/app/src/main/res/layout/fragment_libao_wrapper.xml index c2f44291c3..c6aaff0460 100644 --- a/app/src/main/res/layout/fragment_libao_wrapper.xml +++ b/app/src/main/res/layout/fragment_libao_wrapper.xml @@ -17,7 +17,7 @@ android:id="@+id/fragment_tab_rl" android:layout_width="match_parent" android:layout_height="@dimen/tab_layout_height" - android:background="@android:color/white"> + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_local_media.xml b/app/src/main/res/layout/fragment_local_media.xml index 171cd4f220..a817b7c917 100644 --- a/app/src/main/res/layout/fragment_local_media.xml +++ b/app/src/main/res/layout/fragment_local_media.xml @@ -57,7 +57,7 @@ android:enabled="false" android:gravity="center" android:text="确定" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_main_home.xml b/app/src/main/res/layout/fragment_main_home.xml index 1df3488094..5ea97f08b2 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/white" + android:background="@color/background_white" android:clipToPadding="false" /> diff --git a/app/src/main/res/layout/fragment_my_game_collection_list.xml b/app/src/main/res/layout/fragment_my_game_collection_list.xml index 5081265a4b..664cd89901 100644 --- a/app/src/main/res/layout/fragment_my_game_collection_list.xml +++ b/app/src/main/res/layout/fragment_my_game_collection_list.xml @@ -81,7 +81,7 @@ android:background="@drawable/textview_concern_red_up_round" android:gravity="center" android:text="创建游戏单" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" /> 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 99b72ada15..adfce0eb21 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="@android:color/white"> + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_preview_video.xml b/app/src/main/res/layout/fragment_preview_video.xml index 3713ffd515..4fba473789 100644 --- a/app/src/main/res/layout/fragment_preview_video.xml +++ b/app/src/main/res/layout/fragment_preview_video.xml @@ -58,7 +58,7 @@ android:background="@drawable/button_blue_oval" android:gravity="center" android:text="确定" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> @@ -70,7 +70,7 @@ android:layout_marginRight="12dp" android:alpha="0.6" android:text="1/1" - android:textColor="@color/white" + android:textColor="@color/text_white" app:layout_constraintBottom_toBottomOf="@+id/confirmTv" app:layout_constraintEnd_toStartOf="@+id/confirmTv" app:layout_constraintTop_toTopOf="@+id/confirmTv" /> @@ -92,7 +92,7 @@ android:background="@drawable/bg_change_cover_btn" android:gravity="center" android:text="更改封面" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintBottom_toTopOf="@+id/videoSelectorRv" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/layout/fragment_real_name.xml b/app/src/main/res/layout/fragment_real_name.xml index 93dce48801..5bb6607713 100644 --- a/app/src/main/res/layout/fragment_real_name.xml +++ b/app/src/main/res/layout/fragment_real_name.xml @@ -75,7 +75,7 @@ android:layout_marginTop="8dp" android:includeFontPadding="false" android:text="您已完成实名认证，该信息仅自己可见" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/fragment_search_default.xml b/app/src/main/res/layout/fragment_search_default.xml index 39d8a9649c..57c070acfe 100644 --- a/app/src/main/res/layout/fragment_search_default.xml +++ b/app/src/main/res/layout/fragment_search_default.xml @@ -36,7 +36,7 @@ android:id="@+id/history_flex_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" app:layout_constraintTop_toBottomOf="@id/history_title"> diff --git a/app/src/main/res/layout/fragment_simulator_game.xml b/app/src/main/res/layout/fragment_simulator_game.xml index 1f7a4f3b24..0999600d1f 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="@android:color/white"> + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_subject_tiled.xml b/app/src/main/res/layout/fragment_subject_tiled.xml index cb36e1792a..6bd0e702b3 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="@android:color/white" + android:background="@color/white" android:gravity="center" app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> diff --git a/app/src/main/res/layout/fragment_suggest_select.xml b/app/src/main/res/layout/fragment_suggest_select.xml index 5ba060ca70..f0bb0c195d 100644 --- a/app/src/main/res/layout/fragment_suggest_select.xml +++ b/app/src/main/res/layout/fragment_suggest_select.xml @@ -2,7 +2,7 @@ + android:background="@color/white"> + android:background="@color/white"> + android:textColor="@color/text_white" /> @@ -186,7 +186,7 @@ diff --git a/app/src/main/res/layout/fragment_video_detail_container.xml b/app/src/main/res/layout/fragment_video_detail_container.xml index bd56f55379..00e1e50ede 100644 --- a/app/src/main/res/layout/fragment_video_detail_container.xml +++ b/app/src/main/res/layout/fragment_video_detail_container.xml @@ -41,7 +41,7 @@ android:background="@drawable/round_333_alpha_20" android:gravity="center" android:text="已刷新" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> @@ -119,7 +119,7 @@ android:layout_marginLeft="20dp" android:layout_marginRight="20dp" android:text="上滑查看更多视频" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="18sp" /> + android:background="@color/white"> diff --git a/app/src/main/res/layout/gallery_video_item.xml b/app/src/main/res/layout/gallery_video_item.xml index 799287871f..4fca6fc105 100644 --- a/app/src/main/res/layout/gallery_video_item.xml +++ b/app/src/main/res/layout/gallery_video_item.xml @@ -35,7 +35,7 @@ android:id="@+id/username_tv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" android:includeFontPadding="false" tools:text="光环老司机" /> @@ -49,7 +49,7 @@ android:drawablePadding="4dp" android:text="0" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" tools:text="0" /> diff --git a/app/src/main/res/layout/game_collection_detail_image_item.xml b/app/src/main/res/layout/game_collection_detail_image_item.xml index 293dfe3ff8..0d6019b355 100644 --- a/app/src/main/res/layout/game_collection_detail_image_item.xml +++ b/app/src/main/res/layout/game_collection_detail_image_item.xml @@ -43,7 +43,7 @@ android:includeFontPadding="false" android:lineSpacingExtra="2dp" android:maxLines="2" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="22sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/game_collection_item.xml b/app/src/main/res/layout/game_collection_item.xml index 8a89437896..3f8e291f91 100644 --- a/app/src/main/res/layout/game_collection_item.xml +++ b/app/src/main/res/layout/game_collection_item.xml @@ -38,7 +38,7 @@ android:layout_marginEnd="16dp" android:includeFontPadding="false" android:singleLine="true" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/tagIv" @@ -106,7 +106,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="10dp" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="18sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/gameThree" @@ -135,7 +135,7 @@ android:layout_marginLeft="16dp" android:layout_marginBottom="20dp" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" @@ -165,7 +165,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="6dp" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@+id/userIconCv" app:layout_constraintLeft_toRightOf="@+id/userIconCv" @@ -265,7 +265,7 @@ android:gravity="center" android:paddingTop="20dp" android:paddingBottom="20dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" tools:text="999" /> 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 82e533985e..d762ad7f88 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 @@ -38,7 +38,7 @@ android:includeFontPadding="false" android:singleLine="true" android:text="玩家们都在安利喜欢的游戏" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="@dimen/primary_text_size" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/game_collection_square_item.xml b/app/src/main/res/layout/game_collection_square_item.xml index 4a0b316040..35dac82ede 100644 --- a/app/src/main/res/layout/game_collection_square_item.xml +++ b/app/src/main/res/layout/game_collection_square_item.xml @@ -50,7 +50,7 @@ android:layout_marginTop="18dp" android:ellipsize="end" android:lines="1" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="@dimen/secondary_title_text_size" android:textStyle="bold" app:layout_constraintEnd_toStartOf="@+id/rightContainer" @@ -100,7 +100,7 @@ android:layout_height="wrap_content" android:layout_marginStart="9dp" android:layout_marginLeft="9dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="@dimen/primary_title_text_size" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="@+id/iconIvThree" @@ -152,7 +152,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="4dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="@dimen/secondary_size" tools:text="999" /> @@ -243,7 +243,7 @@ android:layout_height="wrap_content" android:layout_marginStart="8dp" android:lines="1" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="@dimen/tag_text_size" /> diff --git a/app/src/main/res/layout/game_column_collection_list.xml b/app/src/main/res/layout/game_column_collection_list.xml index 901a3e0269..fc1b851135 100644 --- a/app/src/main/res/layout/game_column_collection_list.xml +++ b/app/src/main/res/layout/game_column_collection_list.xml @@ -3,7 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" android:descendantFocusability="blocksDescendants" android:orientation="vertical" android:paddingTop="@dimen/home_item_padding" 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 190f6ffd83..c4ddb0cbbe 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="@android:color/white" + android:background="@color/white" android:paddingLeft="20dp" android:paddingRight="20dp" android:paddingBottom="12dp"> diff --git a/app/src/main/res/layout/game_gallery_item.xml b/app/src/main/res/layout/game_gallery_item.xml index fc87a85aa5..bd6cb58439 100644 --- a/app/src/main/res/layout/game_gallery_item.xml +++ b/app/src/main/res/layout/game_gallery_item.xml @@ -3,8 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/white"> + android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/game_head_item.xml b/app/src/main/res/layout/game_head_item.xml index 09dd43e5bf..e1e2fcd3df 100644 --- a/app/src/main/res/layout/game_head_item.xml +++ b/app/src/main/res/layout/game_head_item.xml @@ -3,7 +3,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" android:orientation="vertical"> + android:layout_height="wrap_content"> + android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/game_plugin_item.xml b/app/src/main/res/layout/game_plugin_item.xml index bcd08c7129..75d12db6dd 100644 --- a/app/src/main/res/layout/game_plugin_item.xml +++ b/app/src/main/res/layout/game_plugin_item.xml @@ -3,7 +3,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" android:descendantFocusability="blocksDescendants" android:orientation="vertical"> diff --git a/app/src/main/res/layout/game_test_item.xml b/app/src/main/res/layout/game_test_item.xml index 6d38bb3775..305434eb23 100644 --- a/app/src/main/res/layout/game_test_item.xml +++ b/app/src/main/res/layout/game_test_item.xml @@ -178,7 +178,7 @@ android:id="@+id/extend_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" android:visibility="gone"> diff --git a/app/src/main/res/layout/game_viewpager_item.xml b/app/src/main/res/layout/game_viewpager_item.xml index cda74f4dd5..cf91d41439 100644 --- a/app/src/main/res/layout/game_viewpager_item.xml +++ b/app/src/main/res/layout/game_viewpager_item.xml @@ -51,7 +51,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:background="@android:color/white" android:paddingLeft="8dp" android:paddingTop="16dp" android:paddingRight="8dp" diff --git a/app/src/main/res/layout/gamedetail_body.xml b/app/src/main/res/layout/gamedetail_body.xml index 43fe37efdd..08414041f8 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="@android:color/white" + android:background="@color/white" android:fitsSystemWindows="true" android:gravity="center" app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior" @@ -93,7 +93,7 @@ android:includeFontPadding="false" android:marqueeRepeatLimit="marquee_forever" android:singleLine="true" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="9sp" android:textStyle="bold" tools:text="预约榜第1名" /> @@ -241,7 +241,7 @@ android:layout_marginLeft="8dp" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/gamedetail_item_answer.xml b/app/src/main/res/layout/gamedetail_item_answer.xml index 87347e6113..ed3af9194a 100644 --- a/app/src/main/res/layout/gamedetail_item_answer.xml +++ b/app/src/main/res/layout/gamedetail_item_answer.xml @@ -2,7 +2,7 @@ diff --git a/app/src/main/res/layout/home_amway_item.xml b/app/src/main/res/layout/home_amway_item.xml index be429de70a..eb2932cb95 100644 --- a/app/src/main/res/layout/home_amway_item.xml +++ b/app/src/main/res/layout/home_amway_item.xml @@ -4,7 +4,6 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" android:orientation="vertical" android:paddingBottom="12dp"> diff --git a/app/src/main/res/layout/home_amway_list.xml b/app/src/main/res/layout/home_amway_list.xml index 9cba2725c6..add7d07aca 100644 --- a/app/src/main/res/layout/home_amway_list.xml +++ b/app/src/main/res/layout/home_amway_list.xml @@ -3,7 +3,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" android:descendantFocusability="blocksDescendants"> + android:layout_height="1dp"> diff --git a/app/src/main/res/layout/imprint_content_item.xml b/app/src/main/res/layout/imprint_content_item.xml index dd27a8e8b2..788e84df12 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="@android:color/white" + android:background="@color/white" android:gravity="center" android:maxLines="2" android:textColor="@color/text_5d5d5d" @@ -26,7 +26,7 @@ android:layout_height="match_parent" android:layout_marginRight="1dp" android:layout_weight="4" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" android:maxLines="2" android:textColor="@color/text_5d5d5d" @@ -37,7 +37,7 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="5" - android:background="@android:color/white" + android:background="@color/white" android:gravity="center" android:maxLines="2" android:textColor="@color/text_5d5d5d" 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 15aa19c05c..78f3699027 100644 --- a/app/src/main/res/layout/item_article_detail_comment.xml +++ b/app/src/main/res/layout/item_article_detail_comment.xml @@ -59,7 +59,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="作者" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="9sp" android:visibility="gone" app:layout_constrainedWidth="true" diff --git a/app/src/main/res/layout/item_article_detail_content.xml b/app/src/main/res/layout/item_article_detail_content.xml index 2abec6ba8a..8ddd904936 100644 --- a/app/src/main/res/layout/item_article_detail_content.xml +++ b/app/src/main/res/layout/item_article_detail_content.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@android:color/white" + android:background="@color/white" android:orientation="vertical"> + android:background="@color/background_white"> diff --git a/app/src/main/res/layout/item_community_image.xml b/app/src/main/res/layout/item_community_image.xml index 87f9c8d126..8fe464f290 100644 --- a/app/src/main/res/layout/item_community_image.xml +++ b/app/src/main/res/layout/item_community_image.xml @@ -79,7 +79,7 @@ android:paddingLeft="4dp" android:paddingRight="4dp" android:text="00:00" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/item_forum_video.xml b/app/src/main/res/layout/item_forum_video.xml index c045ba238c..ecd260bb0d 100644 --- a/app/src/main/res/layout/item_forum_video.xml +++ b/app/src/main/res/layout/item_forum_video.xml @@ -41,7 +41,7 @@ android:paddingTop="1dp" android:paddingRight="2dp" android:paddingBottom="1dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" app:layout_constraintBottom_toBottomOf="@+id/video_poster" app:layout_constraintEnd_toEndOf="@+id/video_poster" /> diff --git a/app/src/main/res/layout/item_game_collection_flex_tag.xml b/app/src/main/res/layout/item_game_collection_flex_tag.xml index 66f46971fb..34a1f39b2f 100644 --- a/app/src/main/res/layout/item_game_collection_flex_tag.xml +++ b/app/src/main/res/layout/item_game_collection_flex_tag.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="@dimen/tag_text_size" tools:text="标签标签" /> diff --git a/app/src/main/res/layout/item_game_collection_selected_tag.xml b/app/src/main/res/layout/item_game_collection_selected_tag.xml index b8af452b30..b583bf959c 100644 --- a/app/src/main/res/layout/item_game_collection_selected_tag.xml +++ b/app/src/main/res/layout/item_game_collection_selected_tag.xml @@ -26,7 +26,7 @@ android:lines="1" android:text="这是八个字的标签" android:textAlignment="center" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> @@ -124,7 +124,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="编辑" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="@dimen/secondary_size" /> @@ -144,7 +144,7 @@ android:gravity="center" android:includeFontPadding="false" android:text="删除" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="@dimen/secondary_size" /> 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 5a3c4b2996..37a1b06693 100644 --- a/app/src/main/res/layout/item_video_data_overview.xml +++ b/app/src/main/res/layout/item_video_data_overview.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="每天 10:00 更新昨日数据" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/layout_article_item_video.xml b/app/src/main/res/layout/layout_article_item_video.xml index f69576ef59..a5d716433c 100644 --- a/app/src/main/res/layout/layout_article_item_video.xml +++ b/app/src/main/res/layout/layout_article_item_video.xml @@ -83,7 +83,7 @@ android:paddingLeft="4dp" android:paddingRight="4dp" android:text="00:00" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" /> diff --git a/app/src/main/res/layout/layout_chart_markerview.xml b/app/src/main/res/layout/layout_chart_markerview.xml index 7c835d4efe..400c2bd046 100644 --- a/app/src/main/res/layout/layout_chart_markerview.xml +++ b/app/src/main/res/layout/layout_chart_markerview.xml @@ -15,7 +15,7 @@ android:paddingTop="2dp" android:paddingRight="8dp" android:paddingBottom="2dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" tools:text="10000" /> diff --git a/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml b/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml index 7d6bea607e..9620a3359a 100644 --- a/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml +++ b/app/src/main/res/layout/layout_forum_video_detail_videoview_portrait.xml @@ -118,7 +118,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="视频加载失败" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/layout_full_screen_detail_video_portrait.xml b/app/src/main/res/layout/layout_full_screen_detail_video_portrait.xml index 5ca1fde6ea..f6253792ee 100644 --- a/app/src/main/res/layout/layout_full_screen_detail_video_portrait.xml +++ b/app/src/main/res/layout/layout_full_screen_detail_video_portrait.xml @@ -108,7 +108,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="视频加载失败" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/layout_game_collection_crop_image_assist.xml b/app/src/main/res/layout/layout_game_collection_crop_image_assist.xml index c49fbcefd4..60142dc55a 100644 --- a/app/src/main/res/layout/layout_game_collection_crop_image_assist.xml +++ b/app/src/main/res/layout/layout_game_collection_crop_image_assist.xml @@ -11,7 +11,7 @@ android:layout_marginTop="6dp" android:includeFontPadding="false" android:text="卡片封面" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -50,7 +50,7 @@ android:layout_marginTop="6dp" android:includeFontPadding="false" android:text="大图封面" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintStart_toStartOf="@+id/view" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/layout_game_collection_tag.xml b/app/src/main/res/layout/layout_game_collection_tag.xml index 7558227384..5eb9d66296 100644 --- a/app/src/main/res/layout/layout_game_collection_tag.xml +++ b/app/src/main/res/layout/layout_game_collection_tag.xml @@ -11,7 +11,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" tools:text="即使作战" /> diff --git a/app/src/main/res/layout/layout_game_detail_video_portrait.xml b/app/src/main/res/layout/layout_game_detail_video_portrait.xml index 81748fee35..d43ce9d947 100644 --- a/app/src/main/res/layout/layout_game_detail_video_portrait.xml +++ b/app/src/main/res/layout/layout_game_detail_video_portrait.xml @@ -109,7 +109,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="视频加载失败" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/layout_menu_answer_post.xml b/app/src/main/res/layout/layout_menu_answer_post.xml index 8a092019db..45cb1019cf 100644 --- a/app/src/main/res/layout/layout_menu_answer_post.xml +++ b/app/src/main/res/layout/layout_menu_answer_post.xml @@ -12,7 +12,7 @@ android:background="@drawable/textview_concern_red_up_round" android:gravity="center" android:text="@string/answer_post" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> 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 8c053e6650..03e70ff838 100644 --- a/app/src/main/res/layout/layout_video_detail_surface.xml +++ b/app/src/main/res/layout/layout_video_detail_surface.xml @@ -108,7 +108,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" android:textStyle="bold" tools:text="地海争霸" /> @@ -136,7 +136,7 @@ android:shadowDx="0" android:shadowDy="0.5" android:shadowRadius="1" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" android:textStyle="bold" app:layout_constrainedWidth="true" @@ -166,7 +166,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="@+id/sdv_user_badge" @@ -188,7 +188,7 @@ android:shadowDx="0" android:shadowDy="0.5" android:shadowRadius="1" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" tools:text="举例：比如切换之前，当前视频已播放了 ，切换App或者回到手机桌面，在切换回光环助手，要从开始播放" /> @@ -214,7 +214,7 @@ android:layout_toRightOf="@id/censorIv" android:alpha="0.6" android:text="视频审核中，详情请点击查看" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> @@ -370,7 +370,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:includeFontPadding="false" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" tools:text="1.0W" /> @@ -399,7 +399,7 @@ android:layout_marginTop="4dp" android:includeFontPadding="false" android:text="0" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" tools:text="1.0W" /> @@ -465,7 +465,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:text="00:00" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" /> diff --git a/app/src/main/res/layout/novice_task_item.xml b/app/src/main/res/layout/novice_task_item.xml index e31cb78919..f087ed35bf 100644 --- a/app/src/main/res/layout/novice_task_item.xml +++ b/app/src/main/res/layout/novice_task_item.xml @@ -53,7 +53,7 @@ android:layout_marginTop="8dp" android:background="@drawable/bg_energy_task_btn_normal" android:gravity="center" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/photo_poster_albums_item.xml b/app/src/main/res/layout/photo_poster_albums_item.xml index 92315e4b54..76933f3e48 100644 --- a/app/src/main/res/layout/photo_poster_albums_item.xml +++ b/app/src/main/res/layout/photo_poster_albums_item.xml @@ -21,7 +21,7 @@ android:layout_toRightOf="@id/album_cover" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="16sp" /> diff --git a/app/src/main/res/layout/piece_article_video_control.xml b/app/src/main/res/layout/piece_article_video_control.xml index ec681d783d..18d1780318 100644 --- a/app/src/main/res/layout/piece_article_video_control.xml +++ b/app/src/main/res/layout/piece_article_video_control.xml @@ -41,7 +41,7 @@ android:paddingLeft="4dp" android:paddingRight="4dp" android:text="00:00" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" app:layout_constraintRight_toRightOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> 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..9c46bc2acc 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 @@ -44,7 +44,7 @@ android:drawablePadding="4dp" android:hint="说点什么吧" android:lineSpacingExtra="4dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textColorHint="@color/text_subtitle" android:textCursorDrawable="@drawable/cursor_color" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/piece_question_content.xml b/app/src/main/res/layout/piece_question_content.xml index 89634e5230..f7b6f61ad7 100644 --- a/app/src/main/res/layout/piece_question_content.xml +++ b/app/src/main/res/layout/piece_question_content.xml @@ -71,7 +71,7 @@ android:paddingTop="3dp" android:paddingRight="6dp" android:paddingBottom="3dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" android:visibility="gone" /> diff --git a/app/src/main/res/layout/pop_reserver_guide.xml b/app/src/main/res/layout/pop_reserver_guide.xml index cc4c154484..33d6adc7db 100644 --- a/app/src/main/res/layout/pop_reserver_guide.xml +++ b/app/src/main/res/layout/pop_reserver_guide.xml @@ -14,7 +14,7 @@ android:layout_marginLeft="8dp" android:includeFontPadding="false" android:text="点我也可以预约游戏啦~" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" android:layout_marginTop="12dp" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/popup_server_category.xml b/app/src/main/res/layout/popup_server_category.xml index f0209c7aa2..96e53cdbc2 100644 --- a/app/src/main/res/layout/popup_server_category.xml +++ b/app/src/main/res/layout/popup_server_category.xml @@ -42,7 +42,7 @@ android:layout_weight="1" android:gravity="center" android:text="确定" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/popup_simulator_guide.xml b/app/src/main/res/layout/popup_simulator_guide.xml index 4119b418f6..ab9fce3e05 100644 --- a/app/src/main/res/layout/popup_simulator_guide.xml +++ b/app/src/main/res/layout/popup_simulator_guide.xml @@ -26,6 +26,6 @@ android:layout_marginLeft="4dp" android:layout_marginRight="10dp" android:text="点击管理「我的模拟器」" - android:textColor="@color/white" /> + android:textColor="@color/text_white" /> \ No newline at end of file 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 bd3084fdfa..1cffa58a9f 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="@android:color/white"> + android:background="@color/white"> @@ -161,7 +161,7 @@ android:layout_width="0dp" android:layout_height="50dp" android:layout_weight="1" - android:background="@android:color/white" + android:background="@color/white" app:layout_constraintLeft_toRightOf="@+id/question_history_line_center" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@+id/question_history_line_center"> diff --git a/app/src/main/res/layout/questionsdetail_item.xml b/app/src/main/res/layout/questionsdetail_item.xml index 3a94ee1928..d599f8a7b7 100644 --- a/app/src/main/res/layout/questionsdetail_item.xml +++ b/app/src/main/res/layout/questionsdetail_item.xml @@ -76,7 +76,7 @@ android:layout_width="0dp" android:layout_height="50dp" android:layout_weight="1" - android:background="@android:color/white" + android:background="@color/white" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/questionsdetail_line_center" app:layout_constraintTop_toTopOf="@+id/questionsdetail_line_center"> @@ -112,7 +112,7 @@ android:layout_width="0dp" android:layout_height="50dp" android:layout_weight="1" - android:background="@android:color/white" + android:background="@color/white" app:layout_constraintLeft_toRightOf="@id/questionsdetail_line_center" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="@id/questionsdetail_line_center"> diff --git a/app/src/main/res/layout/questionsinvite_item.xml b/app/src/main/res/layout/questionsinvite_item.xml index 6266c61ee6..d19a0562f8 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="@android:color/white" + android:background="@color/white" android:paddingLeft="20dp" android:paddingTop="15dp" android:paddingRight="20dp" @@ -110,7 +110,7 @@ android:background="@drawable/button_blue_oval" android:gravity="center" android:text="@string/invite" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/rank_collection_item.xml b/app/src/main/res/layout/rank_collection_item.xml index 69bcf8e6fe..a2a77a43b0 100644 --- a/app/src/main/res/layout/rank_collection_item.xml +++ b/app/src/main/res/layout/rank_collection_item.xml @@ -27,6 +27,7 @@ tools:text="热门榜" /> diff --git a/app/src/main/res/layout/stairs_comment_item.xml b/app/src/main/res/layout/stairs_comment_item.xml index e3c013412c..4ea8608d23 100644 --- a/app/src/main/res/layout/stairs_comment_item.xml +++ b/app/src/main/res/layout/stairs_comment_item.xml @@ -64,7 +64,7 @@ android:paddingRight="4dp" android:paddingBottom="2dp" android:text="作者" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="10sp" android:visibility="gone" app:layout_constrainedWidth="true" @@ -139,7 +139,7 @@ android:layout_toLeftOf="@id/command_container" android:includeFontPadding="false" android:lineSpacingExtra="3dp" - android:textColor="@color/white" + android:textColor="@color/text_white" android:textSize="14sp" tools:text="星際爭霸與星際爭霸2的職業選電競戰隊的經理美少女团体星際老男孩成員之一，還在杭州經營水產生意。" /> diff --git a/app/src/main/res/layout/toolbar_search.xml b/app/src/main/res/layout/toolbar_search.xml index 05b34d8992..753d5154d5 100644 --- a/app/src/main/res/layout/toolbar_search.xml +++ b/app/src/main/res/layout/toolbar_search.xml @@ -3,7 +3,7 @@ android:id="@+id/searchContainer" android:layout_width="match_parent" android:layout_height="48dp" - android:background="@android:color/white" + android:background="@color/white" android:orientation="horizontal"> + + + + #2496FF + #332496FF + + #FFA142 + + #FF4147 + + #06CEA8 + + + #1383EB + #991383EB + + + #CCCCCC + #999999 + #666666 + #333333 + #FFFFFF + + + #2B2B2B + #000000 + + #111111 + + #1A000000 + + #66000000 + + #33000000 + + + @color/white + + @color/text_5d5d5d + + @color/text_9a9a9a + + #B3B3B3 + + + #121212 + + + #0DFFFFFF + + #E1E1E1 + + #d1e5f7 + + + @color/background + + + @color/theme + #06D0A8 + #FFB13C + @color/c7c7c7 + #A7A8B2 + + + #05C400 + #FFB13C + #FF6A28 + + + #FDA34D + + #1BA4FC + + #D63338 + + #FDA34D + + #2EC991 + + #ECECEC + + #30000000 + + #1668d0 + + #59d3ff + + #717171 + + #676767 + + #f8f8f8 + + #FF4E00 + + #175aa3 + + #60d6d5ff + + #949494 + + #454545 + + #e9e9e9 + + #FFB048 + + #1E1E1E + + @color/white_alpha_20 + + #CCCCCC + #FFFDF2 + + #4BC3FF + + #ecfaff + + #000000 + #08000000 + #0D000000 + #1A000000 + #33000000 + #4D000000 + #99000000 + #66000000 + #80000000 + + #1AFFFFFF + #33FFFFFF + #66FFFFFF + #80FFFFFF + #99FFFFFF + #CCFFFFFF + #E6FFFFFF + @android:color/white + @android:color/white + @android:color/transparent + + #b3b3b3 + + #5C8399 + #5C9599 + #6F5EA8 + #996283 + #748054 + #946262 + + + #aaaaaa + #AAAAAA + #dcdcdc + #c7c7c7 + #d6d5ff + #f8f8f8 + #e5e5e5 + #e6e6e6 + #ECF6FF + #EDEDED + #F2F2F2 + #FFC247 + #FF9933 + #F4F5F6 + #CDF5F0 + #80000000 + #404040 + #ededed + #26262B + #1F1F23 + #303030 + #F7F7F7 + #FFF6E6 + #EBF5FF + #3797FF + #EFF7FF + #806F9CEF + #EBFDFF + #7CE7F8 + #E6F8FA + #91F0FD + #F6FBFF + #50DCDC + #81B5FF + #20FFB5 + #00DDDD + #74FFFF + #60D5FF + #EDF5FC + #F2F7FC + #EBFAF7 + #b2b2b2 + #9a9a9a + #3a3a3a + #3A3A3A + #5d5d5d + #5D5D5D + #949494 + #fbfbfb + #d5d5d5 + #b3b3b3 + #B3B3B3 + #6c6c6c + #ff5151 + #ffbf00 + #FA8500 + #f67722 + #989898 + #444444 + #777777 + #f2f2f2 + #292929 + #00DD08 + #E0FFF9 + #F10000 + #EA3333 + #FF700F + #FF7C1F + #181927 + #e6f3ff + #1F89EC + #EEF5FB + #C1BFC9 + #FF5F14 + #FFDAA2 + #F9A755 + #FF9B06 + #D8D8D8 + #FAFAFA + #3BABFF + #2461FF + #FF0000 + #A1A5B7 + #50556B + #979A9F + #C2C6CC + #C0C0C0 + #242529 + #ebebeb + #4BC7FF + #F8F8F8 + #F0F0F0 + #00DBB0 + #00B8B8 + #00D7B0 + #dddddd + #FFB749 + #FF6D3C + #F56614 + #FF6455 + #F0F8FF + #2A85FB + #F3F3F3 + #3CB9FF + #E8F3FF + #05CBA3 + #F2F3F7 + #EDF4FB + #2E96FF + #FFB84F + #FFEACC + #FEDD26 + #140B6D + #16161A + #28282E + #8798A8 + #3796FF + #213964 + #06CCF4 + #F8A142 + #f9f9f9 + #a9a9a9 + #757575 + #0E0E0E + #F9FAFB + #00CDEB + #80EFFF + #00BFDB + #00DFFF + #3682C2 + #F67722 + #4B4B4B + #FF925C + #3087D9 + #C0C6CC + #717C8E + #DAF7F1 + #FFE5E6 + #17C2A1 + #0089D1 + #00DBA4 + #07B896 + #279BFE + #C4C4C4 + + #99666666 + #6621282E + + \ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000000..79d8b9456f --- /dev/null +++ b/app/src/main/res/values-night/styles.xml @@ -0,0 +1,500 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 401e82cc42..579e0f2bea 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -25,9 +25,11 @@ #666666 #999999 #CCCCCC + #FFFFFF #F5F5F5 + #FFFFFF #EEEEEE diff --git a/libraries/LGLibrary b/libraries/LGLibrary index 2681cb01e7..6808635682 160000 --- a/libraries/LGLibrary +++ b/libraries/LGLibrary @@ -1 +1 @@ -Subproject commit 2681cb01e798c2e62721f57436d7d2dcd8a1ed8b +Subproject commit 6808635682566021bbf3083105cdd59f79b83c44